From c4031285ea4a00b5f78aec390707fb07fc4a4554 Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Fri, 1 Nov 2024 15:11:20 +0200 Subject: [PATCH 01/38] move shared files to common --- packages/devextreme/js/{core => common}/config.js | 0 packages/devextreme/js/{ => common/core}/animation/easing.js | 0 packages/devextreme/js/{ => common/core}/animation/frame.js | 0 packages/devextreme/js/{ => common/core}/animation/fx.js | 0 packages/devextreme/js/{ => common/core}/animation/position.js | 0 packages/devextreme/js/{ => common/core}/animation/presets.js | 0 .../devextreme/js/{ => common/core}/animation/presets/presets.js | 0 .../js/{ => common/core}/animation/transition_executor.js | 0 .../core}/animation/transition_executor/transition_executor.js | 0 packages/devextreme/js/{ => common/core}/animation/translator.js | 0 .../devextreme/js/{core => common/core/environment}/devices.js | 0 .../js/{mobile => common/core/environment}/hide_callback.js | 0 .../js/{mobile => common/core/environment}/hide_top_overlay.js | 0 .../{mobile => common/core/environment}/init_mobile_viewport.js | 0 .../environment}/init_mobile_viewport/init_mobile_viewport.js | 0 .../js/{ => common/core/environment}/time_zone_utils.js | 0 packages/devextreme/js/{ => common/core}/events/click.d.ts | 0 packages/devextreme/js/{ => common/core}/events/click.js | 0 packages/devextreme/js/{ => common/core}/events/contextmenu.js | 0 packages/devextreme/js/{ => common/core}/events/core.js | 0 .../js/{ => common/core}/events/core/emitter.feedback.js | 0 packages/devextreme/js/{ => common/core}/events/core/emitter.js | 0 .../js/{ => common/core}/events/core/emitter_registrator.js | 0 .../js/{ => common/core}/events/core/event_registrator.js | 0 .../{ => common/core}/events/core/event_registrator_callbacks.js | 0 .../js/{ => common/core}/events/core/events_engine.d.ts | 0 .../devextreme/js/{ => common/core}/events/core/events_engine.js | 0 .../js/{ => common/core}/events/core/hook_touch_props.js | 0 .../js/{ => common/core}/events/core/keyboard_processor.js | 0 packages/devextreme/js/{ => common/core}/events/core/wheel.js | 0 packages/devextreme/js/{ => common/core}/events/dblclick.js | 0 packages/devextreme/js/{ => common/core}/events/double_click.js | 0 packages/devextreme/js/{ => common/core}/events/drag.js | 0 .../js/{ => common/core}/events/gesture/emitter.gesture.js | 0 .../js/{ => common/core}/events/gesture/emitter.gesture.scroll.js | 0 .../devextreme/js/{ => common/core}/events/gesture/swipeable.js | 0 packages/devextreme/js/{ => common/core}/events/hold.js | 0 packages/devextreme/js/{ => common/core}/events/hover.js | 0 packages/devextreme/js/{ => common/core}/events/index.d.ts | 0 packages/devextreme/js/{ => common/core}/events/index.js | 0 packages/devextreme/js/{ => common/core}/events/pointer.d.ts | 0 packages/devextreme/js/{ => common/core}/events/pointer.js | 0 packages/devextreme/js/{ => common/core}/events/pointer/base.js | 0 packages/devextreme/js/{ => common/core}/events/pointer/mouse.js | 0 .../js/{ => common/core}/events/pointer/mouse_and_touch.js | 0 .../devextreme/js/{ => common/core}/events/pointer/observer.js | 0 packages/devextreme/js/{ => common/core}/events/pointer/touch.js | 0 packages/devextreme/js/{ => common/core}/events/remove.js | 0 packages/devextreme/js/{ => common/core}/events/short.js | 0 packages/devextreme/js/{ => common/core}/events/swipe.js | 0 packages/devextreme/js/{ => common/core}/events/transform.js | 0 .../devextreme/js/{ => common/core}/events/utils/add_namespace.js | 0 .../js/{ => common/core}/events/utils/event_nodes_disposing.js | 0 .../devextreme/js/{ => common/core}/events/utils/event_target.js | 0 packages/devextreme/js/{ => common/core}/events/utils/index.d.ts | 0 packages/devextreme/js/{ => common/core}/events/utils/index.js | 0 .../devextreme/js/{ => common/core}/events/visibility_change.js | 0 packages/devextreme/js/{ => common/core}/localization.js | 0 packages/devextreme/js/{ => common/core}/localization/core.js | 0 packages/devextreme/js/{ => common/core}/localization/currency.js | 0 packages/devextreme/js/{ => common/core}/localization/date.d.ts | 0 packages/devextreme/js/{ => common/core}/localization/date.js | 0 .../js/{ => common/core}/localization/default_date_names.js | 0 .../js/{ => common/core}/localization/globalize/core.js | 0 .../js/{ => common/core}/localization/globalize/currency.js | 0 .../js/{ => common/core}/localization/globalize/date.js | 0 .../js/{ => common/core}/localization/globalize/message.js | 0 .../js/{ => common/core}/localization/globalize/number.js | 0 .../devextreme/js/{ => common/core}/localization/intl/date.js | 0 .../devextreme/js/{ => common/core}/localization/intl/number.js | 0 .../js/{ => common/core}/localization/language_codes.js | 0 .../js/{ => common/core}/localization/ldml/date.format.js | 0 .../js/{ => common/core}/localization/ldml/date.formatter.js | 0 .../js/{ => common/core}/localization/ldml/date.parser.js | 0 .../devextreme/js/{ => common/core}/localization/ldml/number.js | 0 .../devextreme/js/{ => common/core}/localization/message.d.ts | 0 packages/devextreme/js/{ => common/core}/localization/message.js | 0 .../devextreme/js/{ => common/core}/localization/messages/ar.json | 0 .../devextreme/js/{ => common/core}/localization/messages/ca.json | 0 .../devextreme/js/{ => common/core}/localization/messages/cs.json | 0 .../devextreme/js/{ => common/core}/localization/messages/de.json | 0 .../devextreme/js/{ => common/core}/localization/messages/el.json | 0 .../devextreme/js/{ => common/core}/localization/messages/en.json | 0 .../devextreme/js/{ => common/core}/localization/messages/es.json | 0 .../devextreme/js/{ => common/core}/localization/messages/fa.json | 0 .../devextreme/js/{ => common/core}/localization/messages/fi.json | 0 .../devextreme/js/{ => common/core}/localization/messages/fr.json | 0 .../devextreme/js/{ => common/core}/localization/messages/hu.json | 0 .../devextreme/js/{ => common/core}/localization/messages/it.json | 0 .../devextreme/js/{ => common/core}/localization/messages/ja.json | 0 .../devextreme/js/{ => common/core}/localization/messages/lt.json | 0 .../devextreme/js/{ => common/core}/localization/messages/lv.json | 0 .../devextreme/js/{ => common/core}/localization/messages/nb.json | 0 .../devextreme/js/{ => common/core}/localization/messages/nl.json | 0 .../devextreme/js/{ => common/core}/localization/messages/pl.json | 0 .../devextreme/js/{ => common/core}/localization/messages/pt.json | 0 .../devextreme/js/{ => common/core}/localization/messages/ro.json | 0 .../devextreme/js/{ => common/core}/localization/messages/ru.json | 0 .../devextreme/js/{ => common/core}/localization/messages/sl.json | 0 .../devextreme/js/{ => common/core}/localization/messages/sv.json | 0 .../devextreme/js/{ => common/core}/localization/messages/tr.json | 0 .../devextreme/js/{ => common/core}/localization/messages/vi.json | 0 .../js/{ => common/core}/localization/messages/zh-tw.json | 0 .../devextreme/js/{ => common/core}/localization/messages/zh.json | 0 packages/devextreme/js/{ => common/core}/localization/number.js | 0 .../js/{ => common/core}/localization/open_xml_currency_format.js | 0 .../devextreme/js/{ => common/core}/localization/parentLocale.js | 0 packages/devextreme/js/{ => common/core}/localization/utils.js | 0 packages/devextreme/js/{ => common}/data/abstract_store.d.ts | 0 packages/devextreme/js/{ => common}/data/abstract_store.js | 0 packages/devextreme/js/{ => common}/data/apply_changes.js | 0 packages/devextreme/js/{ => common}/data/array_query.js | 0 packages/devextreme/js/{ => common}/data/array_store.js | 0 packages/devextreme/js/{ => common}/data/array_utils.js | 0 packages/devextreme/js/{ => common}/data/custom_store.js | 0 packages/devextreme/js/{ => common}/data/data_source.js | 0 .../devextreme/js/{ => common}/data/data_source/data_source.js | 0 .../js/{ => common}/data/data_source/operation_manager.js | 0 packages/devextreme/js/{ => common}/data/data_source/utils.js | 0 packages/devextreme/js/{ => common}/data/endpoint_selector.js | 0 packages/devextreme/js/{ => common}/data/errors.js | 0 packages/devextreme/js/{ => common}/data/local_store.js | 0 packages/devextreme/js/{ => common}/data/odata/context.js | 0 packages/devextreme/js/{ => common}/data/odata/query_adapter.js | 0 .../devextreme/js/{ => common}/data/odata/request_dispatcher.js | 0 packages/devextreme/js/{ => common}/data/odata/store.js | 0 packages/devextreme/js/{ => common}/data/odata/utils.js | 0 packages/devextreme/js/{ => common}/data/query.js | 0 packages/devextreme/js/{ => common}/data/query_adapters.js | 0 packages/devextreme/js/{ => common}/data/query_implementation.js | 0 packages/devextreme/js/{ => common}/data/remote_query.js | 0 packages/devextreme/js/{ => common}/data/store_helper.js | 0 packages/devextreme/js/{ => common}/data/utils.js | 0 .../js/{exporter/export_load_panel.d.ts => common/export.d.ts} | 0 .../js/{excel_exporter.d.ts => common/export/excel.d.ts} | 0 .../devextreme/js/{excel_exporter.js => common/export/excel.js} | 0 .../devextreme/js/{pdf_exporter.d.ts => common/export/pdf.d.ts} | 0 packages/devextreme/js/{pdf_exporter.js => common/export/pdf.js} | 0 .../devextreme/js/{ => common}/file_management/custom_provider.js | 0 packages/devextreme/js/{ => common}/file_management/error.js | 0 .../devextreme/js/{ => common}/file_management/error_codes.js | 0 .../js/{ => common}/file_management/file_system_item.js | 0 .../devextreme/js/{ => common}/file_management/object_provider.js | 0 .../devextreme/js/{ => common}/file_management/provider_base.js | 0 .../devextreme/js/{ => common}/file_management/remote_provider.js | 0 packages/devextreme/js/{ => common}/file_management/utils.js | 0 packages/devextreme/js/{core => common}/guid.js | 0 packages/devextreme/js/{core => common}/set_template_engine.js | 0 148 files changed, 0 insertions(+), 0 deletions(-) rename packages/devextreme/js/{core => common}/config.js (100%) rename packages/devextreme/js/{ => common/core}/animation/easing.js (100%) rename packages/devextreme/js/{ => common/core}/animation/frame.js (100%) rename packages/devextreme/js/{ => common/core}/animation/fx.js (100%) rename packages/devextreme/js/{ => common/core}/animation/position.js (100%) rename packages/devextreme/js/{ => common/core}/animation/presets.js (100%) rename packages/devextreme/js/{ => common/core}/animation/presets/presets.js (100%) rename packages/devextreme/js/{ => common/core}/animation/transition_executor.js (100%) rename packages/devextreme/js/{ => common/core}/animation/transition_executor/transition_executor.js (100%) rename packages/devextreme/js/{ => common/core}/animation/translator.js (100%) rename packages/devextreme/js/{core => common/core/environment}/devices.js (100%) rename packages/devextreme/js/{mobile => common/core/environment}/hide_callback.js (100%) rename packages/devextreme/js/{mobile => common/core/environment}/hide_top_overlay.js (100%) rename packages/devextreme/js/{mobile => common/core/environment}/init_mobile_viewport.js (100%) rename packages/devextreme/js/{mobile => common/core/environment}/init_mobile_viewport/init_mobile_viewport.js (100%) rename packages/devextreme/js/{ => common/core/environment}/time_zone_utils.js (100%) rename packages/devextreme/js/{ => common/core}/events/click.d.ts (100%) rename packages/devextreme/js/{ => common/core}/events/click.js (100%) rename packages/devextreme/js/{ => common/core}/events/contextmenu.js (100%) rename packages/devextreme/js/{ => common/core}/events/core.js (100%) rename packages/devextreme/js/{ => common/core}/events/core/emitter.feedback.js (100%) rename packages/devextreme/js/{ => common/core}/events/core/emitter.js (100%) rename packages/devextreme/js/{ => common/core}/events/core/emitter_registrator.js (100%) rename packages/devextreme/js/{ => common/core}/events/core/event_registrator.js (100%) rename packages/devextreme/js/{ => common/core}/events/core/event_registrator_callbacks.js (100%) rename packages/devextreme/js/{ => common/core}/events/core/events_engine.d.ts (100%) rename packages/devextreme/js/{ => common/core}/events/core/events_engine.js (100%) rename packages/devextreme/js/{ => common/core}/events/core/hook_touch_props.js (100%) rename packages/devextreme/js/{ => common/core}/events/core/keyboard_processor.js (100%) rename packages/devextreme/js/{ => common/core}/events/core/wheel.js (100%) rename packages/devextreme/js/{ => common/core}/events/dblclick.js (100%) rename packages/devextreme/js/{ => common/core}/events/double_click.js (100%) rename packages/devextreme/js/{ => common/core}/events/drag.js (100%) rename packages/devextreme/js/{ => common/core}/events/gesture/emitter.gesture.js (100%) rename packages/devextreme/js/{ => common/core}/events/gesture/emitter.gesture.scroll.js (100%) rename packages/devextreme/js/{ => common/core}/events/gesture/swipeable.js (100%) rename packages/devextreme/js/{ => common/core}/events/hold.js (100%) rename packages/devextreme/js/{ => common/core}/events/hover.js (100%) rename packages/devextreme/js/{ => common/core}/events/index.d.ts (100%) rename packages/devextreme/js/{ => common/core}/events/index.js (100%) rename packages/devextreme/js/{ => common/core}/events/pointer.d.ts (100%) rename packages/devextreme/js/{ => common/core}/events/pointer.js (100%) rename packages/devextreme/js/{ => common/core}/events/pointer/base.js (100%) rename packages/devextreme/js/{ => common/core}/events/pointer/mouse.js (100%) rename packages/devextreme/js/{ => common/core}/events/pointer/mouse_and_touch.js (100%) rename packages/devextreme/js/{ => common/core}/events/pointer/observer.js (100%) rename packages/devextreme/js/{ => common/core}/events/pointer/touch.js (100%) rename packages/devextreme/js/{ => common/core}/events/remove.js (100%) rename packages/devextreme/js/{ => common/core}/events/short.js (100%) rename packages/devextreme/js/{ => common/core}/events/swipe.js (100%) rename packages/devextreme/js/{ => common/core}/events/transform.js (100%) rename packages/devextreme/js/{ => common/core}/events/utils/add_namespace.js (100%) rename packages/devextreme/js/{ => common/core}/events/utils/event_nodes_disposing.js (100%) rename packages/devextreme/js/{ => common/core}/events/utils/event_target.js (100%) rename packages/devextreme/js/{ => common/core}/events/utils/index.d.ts (100%) rename packages/devextreme/js/{ => common/core}/events/utils/index.js (100%) rename packages/devextreme/js/{ => common/core}/events/visibility_change.js (100%) rename packages/devextreme/js/{ => common/core}/localization.js (100%) rename packages/devextreme/js/{ => common/core}/localization/core.js (100%) rename packages/devextreme/js/{ => common/core}/localization/currency.js (100%) rename packages/devextreme/js/{ => common/core}/localization/date.d.ts (100%) rename packages/devextreme/js/{ => common/core}/localization/date.js (100%) rename packages/devextreme/js/{ => common/core}/localization/default_date_names.js (100%) rename packages/devextreme/js/{ => common/core}/localization/globalize/core.js (100%) rename packages/devextreme/js/{ => common/core}/localization/globalize/currency.js (100%) rename packages/devextreme/js/{ => common/core}/localization/globalize/date.js (100%) rename packages/devextreme/js/{ => common/core}/localization/globalize/message.js (100%) rename packages/devextreme/js/{ => common/core}/localization/globalize/number.js (100%) rename packages/devextreme/js/{ => common/core}/localization/intl/date.js (100%) rename packages/devextreme/js/{ => common/core}/localization/intl/number.js (100%) rename packages/devextreme/js/{ => common/core}/localization/language_codes.js (100%) rename packages/devextreme/js/{ => common/core}/localization/ldml/date.format.js (100%) rename packages/devextreme/js/{ => common/core}/localization/ldml/date.formatter.js (100%) rename packages/devextreme/js/{ => common/core}/localization/ldml/date.parser.js (100%) rename packages/devextreme/js/{ => common/core}/localization/ldml/number.js (100%) rename packages/devextreme/js/{ => common/core}/localization/message.d.ts (100%) rename packages/devextreme/js/{ => common/core}/localization/message.js (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/ar.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/ca.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/cs.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/de.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/el.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/en.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/es.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/fa.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/fi.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/fr.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/hu.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/it.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/ja.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/lt.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/lv.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/nb.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/nl.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/pl.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/pt.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/ro.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/ru.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/sl.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/sv.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/tr.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/vi.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/zh-tw.json (100%) rename packages/devextreme/js/{ => common/core}/localization/messages/zh.json (100%) rename packages/devextreme/js/{ => common/core}/localization/number.js (100%) rename packages/devextreme/js/{ => common/core}/localization/open_xml_currency_format.js (100%) rename packages/devextreme/js/{ => common/core}/localization/parentLocale.js (100%) rename packages/devextreme/js/{ => common/core}/localization/utils.js (100%) rename packages/devextreme/js/{ => common}/data/abstract_store.d.ts (100%) rename packages/devextreme/js/{ => common}/data/abstract_store.js (100%) rename packages/devextreme/js/{ => common}/data/apply_changes.js (100%) rename packages/devextreme/js/{ => common}/data/array_query.js (100%) rename packages/devextreme/js/{ => common}/data/array_store.js (100%) rename packages/devextreme/js/{ => common}/data/array_utils.js (100%) rename packages/devextreme/js/{ => common}/data/custom_store.js (100%) rename packages/devextreme/js/{ => common}/data/data_source.js (100%) rename packages/devextreme/js/{ => common}/data/data_source/data_source.js (100%) rename packages/devextreme/js/{ => common}/data/data_source/operation_manager.js (100%) rename packages/devextreme/js/{ => common}/data/data_source/utils.js (100%) rename packages/devextreme/js/{ => common}/data/endpoint_selector.js (100%) rename packages/devextreme/js/{ => common}/data/errors.js (100%) rename packages/devextreme/js/{ => common}/data/local_store.js (100%) rename packages/devextreme/js/{ => common}/data/odata/context.js (100%) rename packages/devextreme/js/{ => common}/data/odata/query_adapter.js (100%) rename packages/devextreme/js/{ => common}/data/odata/request_dispatcher.js (100%) rename packages/devextreme/js/{ => common}/data/odata/store.js (100%) rename packages/devextreme/js/{ => common}/data/odata/utils.js (100%) rename packages/devextreme/js/{ => common}/data/query.js (100%) rename packages/devextreme/js/{ => common}/data/query_adapters.js (100%) rename packages/devextreme/js/{ => common}/data/query_implementation.js (100%) rename packages/devextreme/js/{ => common}/data/remote_query.js (100%) rename packages/devextreme/js/{ => common}/data/store_helper.js (100%) rename packages/devextreme/js/{ => common}/data/utils.js (100%) rename packages/devextreme/js/{exporter/export_load_panel.d.ts => common/export.d.ts} (100%) rename packages/devextreme/js/{excel_exporter.d.ts => common/export/excel.d.ts} (100%) rename packages/devextreme/js/{excel_exporter.js => common/export/excel.js} (100%) rename packages/devextreme/js/{pdf_exporter.d.ts => common/export/pdf.d.ts} (100%) rename packages/devextreme/js/{pdf_exporter.js => common/export/pdf.js} (100%) rename packages/devextreme/js/{ => common}/file_management/custom_provider.js (100%) rename packages/devextreme/js/{ => common}/file_management/error.js (100%) rename packages/devextreme/js/{ => common}/file_management/error_codes.js (100%) rename packages/devextreme/js/{ => common}/file_management/file_system_item.js (100%) rename packages/devextreme/js/{ => common}/file_management/object_provider.js (100%) rename packages/devextreme/js/{ => common}/file_management/provider_base.js (100%) rename packages/devextreme/js/{ => common}/file_management/remote_provider.js (100%) rename packages/devextreme/js/{ => common}/file_management/utils.js (100%) rename packages/devextreme/js/{core => common}/guid.js (100%) rename packages/devextreme/js/{core => common}/set_template_engine.js (100%) diff --git a/packages/devextreme/js/core/config.js b/packages/devextreme/js/common/config.js similarity index 100% rename from packages/devextreme/js/core/config.js rename to packages/devextreme/js/common/config.js diff --git a/packages/devextreme/js/animation/easing.js b/packages/devextreme/js/common/core/animation/easing.js similarity index 100% rename from packages/devextreme/js/animation/easing.js rename to packages/devextreme/js/common/core/animation/easing.js diff --git a/packages/devextreme/js/animation/frame.js b/packages/devextreme/js/common/core/animation/frame.js similarity index 100% rename from packages/devextreme/js/animation/frame.js rename to packages/devextreme/js/common/core/animation/frame.js diff --git a/packages/devextreme/js/animation/fx.js b/packages/devextreme/js/common/core/animation/fx.js similarity index 100% rename from packages/devextreme/js/animation/fx.js rename to packages/devextreme/js/common/core/animation/fx.js diff --git a/packages/devextreme/js/animation/position.js b/packages/devextreme/js/common/core/animation/position.js similarity index 100% rename from packages/devextreme/js/animation/position.js rename to packages/devextreme/js/common/core/animation/position.js diff --git a/packages/devextreme/js/animation/presets.js b/packages/devextreme/js/common/core/animation/presets.js similarity index 100% rename from packages/devextreme/js/animation/presets.js rename to packages/devextreme/js/common/core/animation/presets.js diff --git a/packages/devextreme/js/animation/presets/presets.js b/packages/devextreme/js/common/core/animation/presets/presets.js similarity index 100% rename from packages/devextreme/js/animation/presets/presets.js rename to packages/devextreme/js/common/core/animation/presets/presets.js diff --git a/packages/devextreme/js/animation/transition_executor.js b/packages/devextreme/js/common/core/animation/transition_executor.js similarity index 100% rename from packages/devextreme/js/animation/transition_executor.js rename to packages/devextreme/js/common/core/animation/transition_executor.js diff --git a/packages/devextreme/js/animation/transition_executor/transition_executor.js b/packages/devextreme/js/common/core/animation/transition_executor/transition_executor.js similarity index 100% rename from packages/devextreme/js/animation/transition_executor/transition_executor.js rename to packages/devextreme/js/common/core/animation/transition_executor/transition_executor.js diff --git a/packages/devextreme/js/animation/translator.js b/packages/devextreme/js/common/core/animation/translator.js similarity index 100% rename from packages/devextreme/js/animation/translator.js rename to packages/devextreme/js/common/core/animation/translator.js diff --git a/packages/devextreme/js/core/devices.js b/packages/devextreme/js/common/core/environment/devices.js similarity index 100% rename from packages/devextreme/js/core/devices.js rename to packages/devextreme/js/common/core/environment/devices.js diff --git a/packages/devextreme/js/mobile/hide_callback.js b/packages/devextreme/js/common/core/environment/hide_callback.js similarity index 100% rename from packages/devextreme/js/mobile/hide_callback.js rename to packages/devextreme/js/common/core/environment/hide_callback.js diff --git a/packages/devextreme/js/mobile/hide_top_overlay.js b/packages/devextreme/js/common/core/environment/hide_top_overlay.js similarity index 100% rename from packages/devextreme/js/mobile/hide_top_overlay.js rename to packages/devextreme/js/common/core/environment/hide_top_overlay.js diff --git a/packages/devextreme/js/mobile/init_mobile_viewport.js b/packages/devextreme/js/common/core/environment/init_mobile_viewport.js similarity index 100% rename from packages/devextreme/js/mobile/init_mobile_viewport.js rename to packages/devextreme/js/common/core/environment/init_mobile_viewport.js diff --git a/packages/devextreme/js/mobile/init_mobile_viewport/init_mobile_viewport.js b/packages/devextreme/js/common/core/environment/init_mobile_viewport/init_mobile_viewport.js similarity index 100% rename from packages/devextreme/js/mobile/init_mobile_viewport/init_mobile_viewport.js rename to packages/devextreme/js/common/core/environment/init_mobile_viewport/init_mobile_viewport.js diff --git a/packages/devextreme/js/time_zone_utils.js b/packages/devextreme/js/common/core/environment/time_zone_utils.js similarity index 100% rename from packages/devextreme/js/time_zone_utils.js rename to packages/devextreme/js/common/core/environment/time_zone_utils.js diff --git a/packages/devextreme/js/events/click.d.ts b/packages/devextreme/js/common/core/events/click.d.ts similarity index 100% rename from packages/devextreme/js/events/click.d.ts rename to packages/devextreme/js/common/core/events/click.d.ts diff --git a/packages/devextreme/js/events/click.js b/packages/devextreme/js/common/core/events/click.js similarity index 100% rename from packages/devextreme/js/events/click.js rename to packages/devextreme/js/common/core/events/click.js diff --git a/packages/devextreme/js/events/contextmenu.js b/packages/devextreme/js/common/core/events/contextmenu.js similarity index 100% rename from packages/devextreme/js/events/contextmenu.js rename to packages/devextreme/js/common/core/events/contextmenu.js diff --git a/packages/devextreme/js/events/core.js b/packages/devextreme/js/common/core/events/core.js similarity index 100% rename from packages/devextreme/js/events/core.js rename to packages/devextreme/js/common/core/events/core.js diff --git a/packages/devextreme/js/events/core/emitter.feedback.js b/packages/devextreme/js/common/core/events/core/emitter.feedback.js similarity index 100% rename from packages/devextreme/js/events/core/emitter.feedback.js rename to packages/devextreme/js/common/core/events/core/emitter.feedback.js diff --git a/packages/devextreme/js/events/core/emitter.js b/packages/devextreme/js/common/core/events/core/emitter.js similarity index 100% rename from packages/devextreme/js/events/core/emitter.js rename to packages/devextreme/js/common/core/events/core/emitter.js diff --git a/packages/devextreme/js/events/core/emitter_registrator.js b/packages/devextreme/js/common/core/events/core/emitter_registrator.js similarity index 100% rename from packages/devextreme/js/events/core/emitter_registrator.js rename to packages/devextreme/js/common/core/events/core/emitter_registrator.js diff --git a/packages/devextreme/js/events/core/event_registrator.js b/packages/devextreme/js/common/core/events/core/event_registrator.js similarity index 100% rename from packages/devextreme/js/events/core/event_registrator.js rename to packages/devextreme/js/common/core/events/core/event_registrator.js diff --git a/packages/devextreme/js/events/core/event_registrator_callbacks.js b/packages/devextreme/js/common/core/events/core/event_registrator_callbacks.js similarity index 100% rename from packages/devextreme/js/events/core/event_registrator_callbacks.js rename to packages/devextreme/js/common/core/events/core/event_registrator_callbacks.js diff --git a/packages/devextreme/js/events/core/events_engine.d.ts b/packages/devextreme/js/common/core/events/core/events_engine.d.ts similarity index 100% rename from packages/devextreme/js/events/core/events_engine.d.ts rename to packages/devextreme/js/common/core/events/core/events_engine.d.ts diff --git a/packages/devextreme/js/events/core/events_engine.js b/packages/devextreme/js/common/core/events/core/events_engine.js similarity index 100% rename from packages/devextreme/js/events/core/events_engine.js rename to packages/devextreme/js/common/core/events/core/events_engine.js diff --git a/packages/devextreme/js/events/core/hook_touch_props.js b/packages/devextreme/js/common/core/events/core/hook_touch_props.js similarity index 100% rename from packages/devextreme/js/events/core/hook_touch_props.js rename to packages/devextreme/js/common/core/events/core/hook_touch_props.js diff --git a/packages/devextreme/js/events/core/keyboard_processor.js b/packages/devextreme/js/common/core/events/core/keyboard_processor.js similarity index 100% rename from packages/devextreme/js/events/core/keyboard_processor.js rename to packages/devextreme/js/common/core/events/core/keyboard_processor.js diff --git a/packages/devextreme/js/events/core/wheel.js b/packages/devextreme/js/common/core/events/core/wheel.js similarity index 100% rename from packages/devextreme/js/events/core/wheel.js rename to packages/devextreme/js/common/core/events/core/wheel.js diff --git a/packages/devextreme/js/events/dblclick.js b/packages/devextreme/js/common/core/events/dblclick.js similarity index 100% rename from packages/devextreme/js/events/dblclick.js rename to packages/devextreme/js/common/core/events/dblclick.js diff --git a/packages/devextreme/js/events/double_click.js b/packages/devextreme/js/common/core/events/double_click.js similarity index 100% rename from packages/devextreme/js/events/double_click.js rename to packages/devextreme/js/common/core/events/double_click.js diff --git a/packages/devextreme/js/events/drag.js b/packages/devextreme/js/common/core/events/drag.js similarity index 100% rename from packages/devextreme/js/events/drag.js rename to packages/devextreme/js/common/core/events/drag.js diff --git a/packages/devextreme/js/events/gesture/emitter.gesture.js b/packages/devextreme/js/common/core/events/gesture/emitter.gesture.js similarity index 100% rename from packages/devextreme/js/events/gesture/emitter.gesture.js rename to packages/devextreme/js/common/core/events/gesture/emitter.gesture.js diff --git a/packages/devextreme/js/events/gesture/emitter.gesture.scroll.js b/packages/devextreme/js/common/core/events/gesture/emitter.gesture.scroll.js similarity index 100% rename from packages/devextreme/js/events/gesture/emitter.gesture.scroll.js rename to packages/devextreme/js/common/core/events/gesture/emitter.gesture.scroll.js diff --git a/packages/devextreme/js/events/gesture/swipeable.js b/packages/devextreme/js/common/core/events/gesture/swipeable.js similarity index 100% rename from packages/devextreme/js/events/gesture/swipeable.js rename to packages/devextreme/js/common/core/events/gesture/swipeable.js diff --git a/packages/devextreme/js/events/hold.js b/packages/devextreme/js/common/core/events/hold.js similarity index 100% rename from packages/devextreme/js/events/hold.js rename to packages/devextreme/js/common/core/events/hold.js diff --git a/packages/devextreme/js/events/hover.js b/packages/devextreme/js/common/core/events/hover.js similarity index 100% rename from packages/devextreme/js/events/hover.js rename to packages/devextreme/js/common/core/events/hover.js diff --git a/packages/devextreme/js/events/index.d.ts b/packages/devextreme/js/common/core/events/index.d.ts similarity index 100% rename from packages/devextreme/js/events/index.d.ts rename to packages/devextreme/js/common/core/events/index.d.ts diff --git a/packages/devextreme/js/events/index.js b/packages/devextreme/js/common/core/events/index.js similarity index 100% rename from packages/devextreme/js/events/index.js rename to packages/devextreme/js/common/core/events/index.js diff --git a/packages/devextreme/js/events/pointer.d.ts b/packages/devextreme/js/common/core/events/pointer.d.ts similarity index 100% rename from packages/devextreme/js/events/pointer.d.ts rename to packages/devextreme/js/common/core/events/pointer.d.ts diff --git a/packages/devextreme/js/events/pointer.js b/packages/devextreme/js/common/core/events/pointer.js similarity index 100% rename from packages/devextreme/js/events/pointer.js rename to packages/devextreme/js/common/core/events/pointer.js diff --git a/packages/devextreme/js/events/pointer/base.js b/packages/devextreme/js/common/core/events/pointer/base.js similarity index 100% rename from packages/devextreme/js/events/pointer/base.js rename to packages/devextreme/js/common/core/events/pointer/base.js diff --git a/packages/devextreme/js/events/pointer/mouse.js b/packages/devextreme/js/common/core/events/pointer/mouse.js similarity index 100% rename from packages/devextreme/js/events/pointer/mouse.js rename to packages/devextreme/js/common/core/events/pointer/mouse.js diff --git a/packages/devextreme/js/events/pointer/mouse_and_touch.js b/packages/devextreme/js/common/core/events/pointer/mouse_and_touch.js similarity index 100% rename from packages/devextreme/js/events/pointer/mouse_and_touch.js rename to packages/devextreme/js/common/core/events/pointer/mouse_and_touch.js diff --git a/packages/devextreme/js/events/pointer/observer.js b/packages/devextreme/js/common/core/events/pointer/observer.js similarity index 100% rename from packages/devextreme/js/events/pointer/observer.js rename to packages/devextreme/js/common/core/events/pointer/observer.js diff --git a/packages/devextreme/js/events/pointer/touch.js b/packages/devextreme/js/common/core/events/pointer/touch.js similarity index 100% rename from packages/devextreme/js/events/pointer/touch.js rename to packages/devextreme/js/common/core/events/pointer/touch.js diff --git a/packages/devextreme/js/events/remove.js b/packages/devextreme/js/common/core/events/remove.js similarity index 100% rename from packages/devextreme/js/events/remove.js rename to packages/devextreme/js/common/core/events/remove.js diff --git a/packages/devextreme/js/events/short.js b/packages/devextreme/js/common/core/events/short.js similarity index 100% rename from packages/devextreme/js/events/short.js rename to packages/devextreme/js/common/core/events/short.js diff --git a/packages/devextreme/js/events/swipe.js b/packages/devextreme/js/common/core/events/swipe.js similarity index 100% rename from packages/devextreme/js/events/swipe.js rename to packages/devextreme/js/common/core/events/swipe.js diff --git a/packages/devextreme/js/events/transform.js b/packages/devextreme/js/common/core/events/transform.js similarity index 100% rename from packages/devextreme/js/events/transform.js rename to packages/devextreme/js/common/core/events/transform.js diff --git a/packages/devextreme/js/events/utils/add_namespace.js b/packages/devextreme/js/common/core/events/utils/add_namespace.js similarity index 100% rename from packages/devextreme/js/events/utils/add_namespace.js rename to packages/devextreme/js/common/core/events/utils/add_namespace.js diff --git a/packages/devextreme/js/events/utils/event_nodes_disposing.js b/packages/devextreme/js/common/core/events/utils/event_nodes_disposing.js similarity index 100% rename from packages/devextreme/js/events/utils/event_nodes_disposing.js rename to packages/devextreme/js/common/core/events/utils/event_nodes_disposing.js diff --git a/packages/devextreme/js/events/utils/event_target.js b/packages/devextreme/js/common/core/events/utils/event_target.js similarity index 100% rename from packages/devextreme/js/events/utils/event_target.js rename to packages/devextreme/js/common/core/events/utils/event_target.js diff --git a/packages/devextreme/js/events/utils/index.d.ts b/packages/devextreme/js/common/core/events/utils/index.d.ts similarity index 100% rename from packages/devextreme/js/events/utils/index.d.ts rename to packages/devextreme/js/common/core/events/utils/index.d.ts diff --git a/packages/devextreme/js/events/utils/index.js b/packages/devextreme/js/common/core/events/utils/index.js similarity index 100% rename from packages/devextreme/js/events/utils/index.js rename to packages/devextreme/js/common/core/events/utils/index.js diff --git a/packages/devextreme/js/events/visibility_change.js b/packages/devextreme/js/common/core/events/visibility_change.js similarity index 100% rename from packages/devextreme/js/events/visibility_change.js rename to packages/devextreme/js/common/core/events/visibility_change.js diff --git a/packages/devextreme/js/localization.js b/packages/devextreme/js/common/core/localization.js similarity index 100% rename from packages/devextreme/js/localization.js rename to packages/devextreme/js/common/core/localization.js diff --git a/packages/devextreme/js/localization/core.js b/packages/devextreme/js/common/core/localization/core.js similarity index 100% rename from packages/devextreme/js/localization/core.js rename to packages/devextreme/js/common/core/localization/core.js diff --git a/packages/devextreme/js/localization/currency.js b/packages/devextreme/js/common/core/localization/currency.js similarity index 100% rename from packages/devextreme/js/localization/currency.js rename to packages/devextreme/js/common/core/localization/currency.js diff --git a/packages/devextreme/js/localization/date.d.ts b/packages/devextreme/js/common/core/localization/date.d.ts similarity index 100% rename from packages/devextreme/js/localization/date.d.ts rename to packages/devextreme/js/common/core/localization/date.d.ts diff --git a/packages/devextreme/js/localization/date.js b/packages/devextreme/js/common/core/localization/date.js similarity index 100% rename from packages/devextreme/js/localization/date.js rename to packages/devextreme/js/common/core/localization/date.js diff --git a/packages/devextreme/js/localization/default_date_names.js b/packages/devextreme/js/common/core/localization/default_date_names.js similarity index 100% rename from packages/devextreme/js/localization/default_date_names.js rename to packages/devextreme/js/common/core/localization/default_date_names.js diff --git a/packages/devextreme/js/localization/globalize/core.js b/packages/devextreme/js/common/core/localization/globalize/core.js similarity index 100% rename from packages/devextreme/js/localization/globalize/core.js rename to packages/devextreme/js/common/core/localization/globalize/core.js diff --git a/packages/devextreme/js/localization/globalize/currency.js b/packages/devextreme/js/common/core/localization/globalize/currency.js similarity index 100% rename from packages/devextreme/js/localization/globalize/currency.js rename to packages/devextreme/js/common/core/localization/globalize/currency.js diff --git a/packages/devextreme/js/localization/globalize/date.js b/packages/devextreme/js/common/core/localization/globalize/date.js similarity index 100% rename from packages/devextreme/js/localization/globalize/date.js rename to packages/devextreme/js/common/core/localization/globalize/date.js diff --git a/packages/devextreme/js/localization/globalize/message.js b/packages/devextreme/js/common/core/localization/globalize/message.js similarity index 100% rename from packages/devextreme/js/localization/globalize/message.js rename to packages/devextreme/js/common/core/localization/globalize/message.js diff --git a/packages/devextreme/js/localization/globalize/number.js b/packages/devextreme/js/common/core/localization/globalize/number.js similarity index 100% rename from packages/devextreme/js/localization/globalize/number.js rename to packages/devextreme/js/common/core/localization/globalize/number.js diff --git a/packages/devextreme/js/localization/intl/date.js b/packages/devextreme/js/common/core/localization/intl/date.js similarity index 100% rename from packages/devextreme/js/localization/intl/date.js rename to packages/devextreme/js/common/core/localization/intl/date.js diff --git a/packages/devextreme/js/localization/intl/number.js b/packages/devextreme/js/common/core/localization/intl/number.js similarity index 100% rename from packages/devextreme/js/localization/intl/number.js rename to packages/devextreme/js/common/core/localization/intl/number.js diff --git a/packages/devextreme/js/localization/language_codes.js b/packages/devextreme/js/common/core/localization/language_codes.js similarity index 100% rename from packages/devextreme/js/localization/language_codes.js rename to packages/devextreme/js/common/core/localization/language_codes.js diff --git a/packages/devextreme/js/localization/ldml/date.format.js b/packages/devextreme/js/common/core/localization/ldml/date.format.js similarity index 100% rename from packages/devextreme/js/localization/ldml/date.format.js rename to packages/devextreme/js/common/core/localization/ldml/date.format.js diff --git a/packages/devextreme/js/localization/ldml/date.formatter.js b/packages/devextreme/js/common/core/localization/ldml/date.formatter.js similarity index 100% rename from packages/devextreme/js/localization/ldml/date.formatter.js rename to packages/devextreme/js/common/core/localization/ldml/date.formatter.js diff --git a/packages/devextreme/js/localization/ldml/date.parser.js b/packages/devextreme/js/common/core/localization/ldml/date.parser.js similarity index 100% rename from packages/devextreme/js/localization/ldml/date.parser.js rename to packages/devextreme/js/common/core/localization/ldml/date.parser.js diff --git a/packages/devextreme/js/localization/ldml/number.js b/packages/devextreme/js/common/core/localization/ldml/number.js similarity index 100% rename from packages/devextreme/js/localization/ldml/number.js rename to packages/devextreme/js/common/core/localization/ldml/number.js diff --git a/packages/devextreme/js/localization/message.d.ts b/packages/devextreme/js/common/core/localization/message.d.ts similarity index 100% rename from packages/devextreme/js/localization/message.d.ts rename to packages/devextreme/js/common/core/localization/message.d.ts diff --git a/packages/devextreme/js/localization/message.js b/packages/devextreme/js/common/core/localization/message.js similarity index 100% rename from packages/devextreme/js/localization/message.js rename to packages/devextreme/js/common/core/localization/message.js diff --git a/packages/devextreme/js/localization/messages/ar.json b/packages/devextreme/js/common/core/localization/messages/ar.json similarity index 100% rename from packages/devextreme/js/localization/messages/ar.json rename to packages/devextreme/js/common/core/localization/messages/ar.json diff --git a/packages/devextreme/js/localization/messages/ca.json b/packages/devextreme/js/common/core/localization/messages/ca.json similarity index 100% rename from packages/devextreme/js/localization/messages/ca.json rename to packages/devextreme/js/common/core/localization/messages/ca.json diff --git a/packages/devextreme/js/localization/messages/cs.json b/packages/devextreme/js/common/core/localization/messages/cs.json similarity index 100% rename from packages/devextreme/js/localization/messages/cs.json rename to packages/devextreme/js/common/core/localization/messages/cs.json diff --git a/packages/devextreme/js/localization/messages/de.json b/packages/devextreme/js/common/core/localization/messages/de.json similarity index 100% rename from packages/devextreme/js/localization/messages/de.json rename to packages/devextreme/js/common/core/localization/messages/de.json diff --git a/packages/devextreme/js/localization/messages/el.json b/packages/devextreme/js/common/core/localization/messages/el.json similarity index 100% rename from packages/devextreme/js/localization/messages/el.json rename to packages/devextreme/js/common/core/localization/messages/el.json diff --git a/packages/devextreme/js/localization/messages/en.json b/packages/devextreme/js/common/core/localization/messages/en.json similarity index 100% rename from packages/devextreme/js/localization/messages/en.json rename to packages/devextreme/js/common/core/localization/messages/en.json diff --git a/packages/devextreme/js/localization/messages/es.json b/packages/devextreme/js/common/core/localization/messages/es.json similarity index 100% rename from packages/devextreme/js/localization/messages/es.json rename to packages/devextreme/js/common/core/localization/messages/es.json diff --git a/packages/devextreme/js/localization/messages/fa.json b/packages/devextreme/js/common/core/localization/messages/fa.json similarity index 100% rename from packages/devextreme/js/localization/messages/fa.json rename to packages/devextreme/js/common/core/localization/messages/fa.json diff --git a/packages/devextreme/js/localization/messages/fi.json b/packages/devextreme/js/common/core/localization/messages/fi.json similarity index 100% rename from packages/devextreme/js/localization/messages/fi.json rename to packages/devextreme/js/common/core/localization/messages/fi.json diff --git a/packages/devextreme/js/localization/messages/fr.json b/packages/devextreme/js/common/core/localization/messages/fr.json similarity index 100% rename from packages/devextreme/js/localization/messages/fr.json rename to packages/devextreme/js/common/core/localization/messages/fr.json diff --git a/packages/devextreme/js/localization/messages/hu.json b/packages/devextreme/js/common/core/localization/messages/hu.json similarity index 100% rename from packages/devextreme/js/localization/messages/hu.json rename to packages/devextreme/js/common/core/localization/messages/hu.json diff --git a/packages/devextreme/js/localization/messages/it.json b/packages/devextreme/js/common/core/localization/messages/it.json similarity index 100% rename from packages/devextreme/js/localization/messages/it.json rename to packages/devextreme/js/common/core/localization/messages/it.json diff --git a/packages/devextreme/js/localization/messages/ja.json b/packages/devextreme/js/common/core/localization/messages/ja.json similarity index 100% rename from packages/devextreme/js/localization/messages/ja.json rename to packages/devextreme/js/common/core/localization/messages/ja.json diff --git a/packages/devextreme/js/localization/messages/lt.json b/packages/devextreme/js/common/core/localization/messages/lt.json similarity index 100% rename from packages/devextreme/js/localization/messages/lt.json rename to packages/devextreme/js/common/core/localization/messages/lt.json diff --git a/packages/devextreme/js/localization/messages/lv.json b/packages/devextreme/js/common/core/localization/messages/lv.json similarity index 100% rename from packages/devextreme/js/localization/messages/lv.json rename to packages/devextreme/js/common/core/localization/messages/lv.json diff --git a/packages/devextreme/js/localization/messages/nb.json b/packages/devextreme/js/common/core/localization/messages/nb.json similarity index 100% rename from packages/devextreme/js/localization/messages/nb.json rename to packages/devextreme/js/common/core/localization/messages/nb.json diff --git a/packages/devextreme/js/localization/messages/nl.json b/packages/devextreme/js/common/core/localization/messages/nl.json similarity index 100% rename from packages/devextreme/js/localization/messages/nl.json rename to packages/devextreme/js/common/core/localization/messages/nl.json diff --git a/packages/devextreme/js/localization/messages/pl.json b/packages/devextreme/js/common/core/localization/messages/pl.json similarity index 100% rename from packages/devextreme/js/localization/messages/pl.json rename to packages/devextreme/js/common/core/localization/messages/pl.json diff --git a/packages/devextreme/js/localization/messages/pt.json b/packages/devextreme/js/common/core/localization/messages/pt.json similarity index 100% rename from packages/devextreme/js/localization/messages/pt.json rename to packages/devextreme/js/common/core/localization/messages/pt.json diff --git a/packages/devextreme/js/localization/messages/ro.json b/packages/devextreme/js/common/core/localization/messages/ro.json similarity index 100% rename from packages/devextreme/js/localization/messages/ro.json rename to packages/devextreme/js/common/core/localization/messages/ro.json diff --git a/packages/devextreme/js/localization/messages/ru.json b/packages/devextreme/js/common/core/localization/messages/ru.json similarity index 100% rename from packages/devextreme/js/localization/messages/ru.json rename to packages/devextreme/js/common/core/localization/messages/ru.json diff --git a/packages/devextreme/js/localization/messages/sl.json b/packages/devextreme/js/common/core/localization/messages/sl.json similarity index 100% rename from packages/devextreme/js/localization/messages/sl.json rename to packages/devextreme/js/common/core/localization/messages/sl.json diff --git a/packages/devextreme/js/localization/messages/sv.json b/packages/devextreme/js/common/core/localization/messages/sv.json similarity index 100% rename from packages/devextreme/js/localization/messages/sv.json rename to packages/devextreme/js/common/core/localization/messages/sv.json diff --git a/packages/devextreme/js/localization/messages/tr.json b/packages/devextreme/js/common/core/localization/messages/tr.json similarity index 100% rename from packages/devextreme/js/localization/messages/tr.json rename to packages/devextreme/js/common/core/localization/messages/tr.json diff --git a/packages/devextreme/js/localization/messages/vi.json b/packages/devextreme/js/common/core/localization/messages/vi.json similarity index 100% rename from packages/devextreme/js/localization/messages/vi.json rename to packages/devextreme/js/common/core/localization/messages/vi.json diff --git a/packages/devextreme/js/localization/messages/zh-tw.json b/packages/devextreme/js/common/core/localization/messages/zh-tw.json similarity index 100% rename from packages/devextreme/js/localization/messages/zh-tw.json rename to packages/devextreme/js/common/core/localization/messages/zh-tw.json diff --git a/packages/devextreme/js/localization/messages/zh.json b/packages/devextreme/js/common/core/localization/messages/zh.json similarity index 100% rename from packages/devextreme/js/localization/messages/zh.json rename to packages/devextreme/js/common/core/localization/messages/zh.json diff --git a/packages/devextreme/js/localization/number.js b/packages/devextreme/js/common/core/localization/number.js similarity index 100% rename from packages/devextreme/js/localization/number.js rename to packages/devextreme/js/common/core/localization/number.js diff --git a/packages/devextreme/js/localization/open_xml_currency_format.js b/packages/devextreme/js/common/core/localization/open_xml_currency_format.js similarity index 100% rename from packages/devextreme/js/localization/open_xml_currency_format.js rename to packages/devextreme/js/common/core/localization/open_xml_currency_format.js diff --git a/packages/devextreme/js/localization/parentLocale.js b/packages/devextreme/js/common/core/localization/parentLocale.js similarity index 100% rename from packages/devextreme/js/localization/parentLocale.js rename to packages/devextreme/js/common/core/localization/parentLocale.js diff --git a/packages/devextreme/js/localization/utils.js b/packages/devextreme/js/common/core/localization/utils.js similarity index 100% rename from packages/devextreme/js/localization/utils.js rename to packages/devextreme/js/common/core/localization/utils.js diff --git a/packages/devextreme/js/data/abstract_store.d.ts b/packages/devextreme/js/common/data/abstract_store.d.ts similarity index 100% rename from packages/devextreme/js/data/abstract_store.d.ts rename to packages/devextreme/js/common/data/abstract_store.d.ts diff --git a/packages/devextreme/js/data/abstract_store.js b/packages/devextreme/js/common/data/abstract_store.js similarity index 100% rename from packages/devextreme/js/data/abstract_store.js rename to packages/devextreme/js/common/data/abstract_store.js diff --git a/packages/devextreme/js/data/apply_changes.js b/packages/devextreme/js/common/data/apply_changes.js similarity index 100% rename from packages/devextreme/js/data/apply_changes.js rename to packages/devextreme/js/common/data/apply_changes.js diff --git a/packages/devextreme/js/data/array_query.js b/packages/devextreme/js/common/data/array_query.js similarity index 100% rename from packages/devextreme/js/data/array_query.js rename to packages/devextreme/js/common/data/array_query.js diff --git a/packages/devextreme/js/data/array_store.js b/packages/devextreme/js/common/data/array_store.js similarity index 100% rename from packages/devextreme/js/data/array_store.js rename to packages/devextreme/js/common/data/array_store.js diff --git a/packages/devextreme/js/data/array_utils.js b/packages/devextreme/js/common/data/array_utils.js similarity index 100% rename from packages/devextreme/js/data/array_utils.js rename to packages/devextreme/js/common/data/array_utils.js diff --git a/packages/devextreme/js/data/custom_store.js b/packages/devextreme/js/common/data/custom_store.js similarity index 100% rename from packages/devextreme/js/data/custom_store.js rename to packages/devextreme/js/common/data/custom_store.js diff --git a/packages/devextreme/js/data/data_source.js b/packages/devextreme/js/common/data/data_source.js similarity index 100% rename from packages/devextreme/js/data/data_source.js rename to packages/devextreme/js/common/data/data_source.js diff --git a/packages/devextreme/js/data/data_source/data_source.js b/packages/devextreme/js/common/data/data_source/data_source.js similarity index 100% rename from packages/devextreme/js/data/data_source/data_source.js rename to packages/devextreme/js/common/data/data_source/data_source.js diff --git a/packages/devextreme/js/data/data_source/operation_manager.js b/packages/devextreme/js/common/data/data_source/operation_manager.js similarity index 100% rename from packages/devextreme/js/data/data_source/operation_manager.js rename to packages/devextreme/js/common/data/data_source/operation_manager.js diff --git a/packages/devextreme/js/data/data_source/utils.js b/packages/devextreme/js/common/data/data_source/utils.js similarity index 100% rename from packages/devextreme/js/data/data_source/utils.js rename to packages/devextreme/js/common/data/data_source/utils.js diff --git a/packages/devextreme/js/data/endpoint_selector.js b/packages/devextreme/js/common/data/endpoint_selector.js similarity index 100% rename from packages/devextreme/js/data/endpoint_selector.js rename to packages/devextreme/js/common/data/endpoint_selector.js diff --git a/packages/devextreme/js/data/errors.js b/packages/devextreme/js/common/data/errors.js similarity index 100% rename from packages/devextreme/js/data/errors.js rename to packages/devextreme/js/common/data/errors.js diff --git a/packages/devextreme/js/data/local_store.js b/packages/devextreme/js/common/data/local_store.js similarity index 100% rename from packages/devextreme/js/data/local_store.js rename to packages/devextreme/js/common/data/local_store.js diff --git a/packages/devextreme/js/data/odata/context.js b/packages/devextreme/js/common/data/odata/context.js similarity index 100% rename from packages/devextreme/js/data/odata/context.js rename to packages/devextreme/js/common/data/odata/context.js diff --git a/packages/devextreme/js/data/odata/query_adapter.js b/packages/devextreme/js/common/data/odata/query_adapter.js similarity index 100% rename from packages/devextreme/js/data/odata/query_adapter.js rename to packages/devextreme/js/common/data/odata/query_adapter.js diff --git a/packages/devextreme/js/data/odata/request_dispatcher.js b/packages/devextreme/js/common/data/odata/request_dispatcher.js similarity index 100% rename from packages/devextreme/js/data/odata/request_dispatcher.js rename to packages/devextreme/js/common/data/odata/request_dispatcher.js diff --git a/packages/devextreme/js/data/odata/store.js b/packages/devextreme/js/common/data/odata/store.js similarity index 100% rename from packages/devextreme/js/data/odata/store.js rename to packages/devextreme/js/common/data/odata/store.js diff --git a/packages/devextreme/js/data/odata/utils.js b/packages/devextreme/js/common/data/odata/utils.js similarity index 100% rename from packages/devextreme/js/data/odata/utils.js rename to packages/devextreme/js/common/data/odata/utils.js diff --git a/packages/devextreme/js/data/query.js b/packages/devextreme/js/common/data/query.js similarity index 100% rename from packages/devextreme/js/data/query.js rename to packages/devextreme/js/common/data/query.js diff --git a/packages/devextreme/js/data/query_adapters.js b/packages/devextreme/js/common/data/query_adapters.js similarity index 100% rename from packages/devextreme/js/data/query_adapters.js rename to packages/devextreme/js/common/data/query_adapters.js diff --git a/packages/devextreme/js/data/query_implementation.js b/packages/devextreme/js/common/data/query_implementation.js similarity index 100% rename from packages/devextreme/js/data/query_implementation.js rename to packages/devextreme/js/common/data/query_implementation.js diff --git a/packages/devextreme/js/data/remote_query.js b/packages/devextreme/js/common/data/remote_query.js similarity index 100% rename from packages/devextreme/js/data/remote_query.js rename to packages/devextreme/js/common/data/remote_query.js diff --git a/packages/devextreme/js/data/store_helper.js b/packages/devextreme/js/common/data/store_helper.js similarity index 100% rename from packages/devextreme/js/data/store_helper.js rename to packages/devextreme/js/common/data/store_helper.js diff --git a/packages/devextreme/js/data/utils.js b/packages/devextreme/js/common/data/utils.js similarity index 100% rename from packages/devextreme/js/data/utils.js rename to packages/devextreme/js/common/data/utils.js diff --git a/packages/devextreme/js/exporter/export_load_panel.d.ts b/packages/devextreme/js/common/export.d.ts similarity index 100% rename from packages/devextreme/js/exporter/export_load_panel.d.ts rename to packages/devextreme/js/common/export.d.ts diff --git a/packages/devextreme/js/excel_exporter.d.ts b/packages/devextreme/js/common/export/excel.d.ts similarity index 100% rename from packages/devextreme/js/excel_exporter.d.ts rename to packages/devextreme/js/common/export/excel.d.ts diff --git a/packages/devextreme/js/excel_exporter.js b/packages/devextreme/js/common/export/excel.js similarity index 100% rename from packages/devextreme/js/excel_exporter.js rename to packages/devextreme/js/common/export/excel.js diff --git a/packages/devextreme/js/pdf_exporter.d.ts b/packages/devextreme/js/common/export/pdf.d.ts similarity index 100% rename from packages/devextreme/js/pdf_exporter.d.ts rename to packages/devextreme/js/common/export/pdf.d.ts diff --git a/packages/devextreme/js/pdf_exporter.js b/packages/devextreme/js/common/export/pdf.js similarity index 100% rename from packages/devextreme/js/pdf_exporter.js rename to packages/devextreme/js/common/export/pdf.js diff --git a/packages/devextreme/js/file_management/custom_provider.js b/packages/devextreme/js/common/file_management/custom_provider.js similarity index 100% rename from packages/devextreme/js/file_management/custom_provider.js rename to packages/devextreme/js/common/file_management/custom_provider.js diff --git a/packages/devextreme/js/file_management/error.js b/packages/devextreme/js/common/file_management/error.js similarity index 100% rename from packages/devextreme/js/file_management/error.js rename to packages/devextreme/js/common/file_management/error.js diff --git a/packages/devextreme/js/file_management/error_codes.js b/packages/devextreme/js/common/file_management/error_codes.js similarity index 100% rename from packages/devextreme/js/file_management/error_codes.js rename to packages/devextreme/js/common/file_management/error_codes.js diff --git a/packages/devextreme/js/file_management/file_system_item.js b/packages/devextreme/js/common/file_management/file_system_item.js similarity index 100% rename from packages/devextreme/js/file_management/file_system_item.js rename to packages/devextreme/js/common/file_management/file_system_item.js diff --git a/packages/devextreme/js/file_management/object_provider.js b/packages/devextreme/js/common/file_management/object_provider.js similarity index 100% rename from packages/devextreme/js/file_management/object_provider.js rename to packages/devextreme/js/common/file_management/object_provider.js diff --git a/packages/devextreme/js/file_management/provider_base.js b/packages/devextreme/js/common/file_management/provider_base.js similarity index 100% rename from packages/devextreme/js/file_management/provider_base.js rename to packages/devextreme/js/common/file_management/provider_base.js diff --git a/packages/devextreme/js/file_management/remote_provider.js b/packages/devextreme/js/common/file_management/remote_provider.js similarity index 100% rename from packages/devextreme/js/file_management/remote_provider.js rename to packages/devextreme/js/common/file_management/remote_provider.js diff --git a/packages/devextreme/js/file_management/utils.js b/packages/devextreme/js/common/file_management/utils.js similarity index 100% rename from packages/devextreme/js/file_management/utils.js rename to packages/devextreme/js/common/file_management/utils.js diff --git a/packages/devextreme/js/core/guid.js b/packages/devextreme/js/common/guid.js similarity index 100% rename from packages/devextreme/js/core/guid.js rename to packages/devextreme/js/common/guid.js diff --git a/packages/devextreme/js/core/set_template_engine.js b/packages/devextreme/js/common/set_template_engine.js similarity index 100% rename from packages/devextreme/js/core/set_template_engine.js rename to packages/devextreme/js/common/set_template_engine.js From 14e14e04ee34fa0ad62fae333a5114b805533cfe Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Fri, 1 Nov 2024 16:34:10 +0200 Subject: [PATCH 02/38] update exports and re-exports --- .../src/common/data/custom-store/index.ts | 2 +- .../src/common/data/custom-store.ts | 2 +- .../src/common/data/custom-store.ts | 2 +- packages/devextreme/.eslintignore | 4 +- packages/devextreme/.gitignore | 4 +- .../build/gulp/localization-template.jst | 4 +- .../devextreme/build/gulp/localization.js | 22 +- .../js/__internal/core/m_element_data.ts | 2 +- .../__internal/core/r1/component_wrapper.ts | 8 +- .../__internal/core/r1/utils/resolve_rtl.ts | 2 +- .../core/r1/utils/subscribe_to_event.ts | 10 +- .../js/__internal/core/r1/widget.tsx | 10 +- .../core/templates/m_bindable_template.ts | 4 +- .../core/templates/m_template_base.ts | 2 +- .../core/utils/m_date_serialization.ts | 4 +- .../core/utils/m_public_component.ts | 4 +- .../__internal/core/widget/dom_component.ts | 2 +- .../js/__internal/core/widget/widget.ts | 12 +- .../data/data_source/m_data_source.ts | 30 +- .../data/data_source/m_operation_manager.ts | 2 +- .../js/__internal/data/data_source/m_utils.ts | 8 +- .../js/__internal/data/m_abstract_store.ts | 8 +- .../js/__internal/data/m_array_query.ts | 23 +- .../js/__internal/data/m_array_store.ts | 14 +- .../js/__internal/data/m_array_utils.ts | 12 +- .../js/__internal/data/m_custom_store.ts | 24 +- .../js/__internal/data/m_local_store.ts | 7 +- .../devextreme/js/__internal/data/m_query.ts | 2 +- .../js/__internal/data/m_remote_query.ts | 7 +- .../js/__internal/data/m_store_helper.ts | 5 +- .../js/__internal/data/odata/m_context.ts | 6 +- .../__internal/data/odata/m_query_adapter.ts | 2 +- .../data/odata/m_request_dispatcher.ts | 5 +- .../js/__internal/data/odata/m_store.ts | 11 +- .../js/__internal/data/odata/m_utils.ts | 8 +- .../js/__internal/data_controller.ts | 6 +- .../events/core/m_emitter.feedback.ts | 8 +- .../js/__internal/events/core/m_emitter.ts | 2 +- .../events/core/m_emitter_registrator.ts | 10 +- .../events/core/m_event_registrator.ts | 2 +- .../__internal/events/core/m_events_engine.ts | 6 +- .../events/core/m_keyboard_processor.ts | 4 +- .../js/__internal/events/core/m_wheel.ts | 6 +- .../gesture/m_emitter.gesture.scroll.ts | 12 +- .../events/gesture/m_emitter.gesture.ts | 10 +- .../__internal/events/gesture/m_swipeable.ts | 14 +- .../js/__internal/events/m_click.ts | 14 +- .../js/__internal/events/m_contextmenu.ts | 8 +- .../js/__internal/events/m_dblclick.ts | 6 +- .../devextreme/js/__internal/events/m_drag.ts | 8 +- .../devextreme/js/__internal/events/m_hold.ts | 6 +- .../js/__internal/events/m_hover.ts | 8 +- .../js/__internal/events/m_pointer.ts | 8 +- .../js/__internal/events/m_remove.ts | 4 +- .../js/__internal/events/m_short.ts | 6 +- .../js/__internal/events/m_swipe.ts | 6 +- .../js/__internal/events/m_transform.ts | 6 +- .../__internal/events/m_visibility_change.ts | 2 +- .../js/__internal/events/pointer/m_base.ts | 6 +- .../js/__internal/events/pointer/m_mouse.ts | 4 +- .../events/pointer/m_mouse_and_touch.ts | 8 +- .../js/__internal/events/pointer/m_touch.ts | 2 +- .../js/__internal/events/utils/index.ts | 2 +- .../events/utils/m_event_nodes_disposing.ts | 4 +- .../filter_builder/m_filter_builder.ts | 6 +- .../js/__internal/filter_builder/m_utils.ts | 9 +- .../grids/data_grid/export/m_export.ts | 2 +- .../grids/data_grid/grouping/m_grouping.ts | 2 +- .../grouping/m_grouping_collapsed.ts | 3 +- .../data_grid/grouping/m_grouping_core.ts | 3 +- .../data_grid/grouping/m_grouping_expanded.ts | 7 +- .../grids/data_grid/m_aggregate_calculator.ts | 6 +- .../js/__internal/grids/data_grid/m_utils.ts | 3 +- .../grids/data_grid/summary/m_summary.ts | 9 +- .../grid_core/adaptivity/m_adaptivity.ts | 10 +- .../column_chooser/m_column_chooser.ts | 2 +- .../column_fixing/m_column_fixing.ts | 8 +- .../column_headers/m_column_headers.ts | 4 +- .../m_columns_controller.ts | 10 +- .../m_columns_controller_utils.ts | 2 +- .../m_columns_resizing_reordering.ts | 18 +- .../data_controller/m_data_controller.ts | 3 +- .../data_controller/m_data_helper_mixin.ts | 4 +- .../m_data_source_adapter.ts | 4 +- .../grids/grid_core/editing/m_editing.ts | 14 +- .../grid_core/editing/m_editing_cell_based.ts | 12 +- .../grid_core/editing/m_editing_form_based.ts | 4 +- .../editor_factory/m_editor_factory.ts | 12 +- .../error_handling/m_error_handling.ts | 6 +- .../grid_core/filter/m_filter_builder.ts | 2 +- .../filter/m_filter_custom_operations.ts | 4 +- .../grids/grid_core/filter/m_filter_panel.ts | 4 +- .../grids/grid_core/filter/m_filter_row.ts | 6 +- .../header_filter/m_header_filter.ts | 14 +- .../header_filter/m_header_filter_core.ts | 2 +- .../grid_core/header_panel/m_header_panel.ts | 2 +- .../m_keyboard_navigation.ts | 18 +- .../__internal/grids/grid_core/m_modules.ts | 2 +- .../js/__internal/grids/grid_core/m_utils.ts | 9 +- .../master_detail/m_master_detail.ts | 2 +- .../grids/grid_core/pager/m_pager.ts | 2 +- .../grids/grid_core/search/m_search.ts | 4 +- .../grids/grid_core/selection/m_selection.ts | 12 +- .../grids/grid_core/sorting/m_sorting.ts | 8 +- .../grid_core/sorting/m_sorting_mixin.ts | 2 +- .../state_storing/m_state_storing_core.ts | 2 +- .../grid_core/validating/m_validating.ts | 8 +- .../grids/grid_core/views/m_columns_view.ts | 10 +- .../grids/grid_core/views/m_grid_view.ts | 2 +- .../grids/grid_core/views/m_rows_view.ts | 6 +- .../m_virtual_scrolling_core.ts | 5 +- .../pivot_grid/data_source/m_data_source.ts | 4 +- .../grids/pivot_grid/export/m_export.ts | 2 +- .../field_chooser/m_field_chooser.ts | 2 +- .../field_chooser/m_field_chooser_base.ts | 8 +- .../pivot_grid/local_store/m_local_store.ts | 11 +- .../__internal/grids/pivot_grid/m_widget.ts | 8 +- .../grids/pivot_grid/m_widget_utils.ts | 6 +- .../pivot_grid/remote_store/m_remote_store.ts | 4 +- .../grids/pivot_grid/sortable/m_sortable.ts | 20 +- .../pivot_grid/xmla_store/m_xmla_store.ts | 9 +- .../m_data_source_adapter.ts | 8 +- .../grids/tree_list/editing/m_editing.ts | 2 +- .../__internal/grids/tree_list/rows/m_rows.ts | 4 +- .../devextreme/js/__internal/m_draggable.ts | 24 +- .../devextreme/js/__internal/m_sortable.ts | 6 +- .../common/base_pagination_props.ts | 2 +- .../drop_down_editors/select_box.tsx | 5 +- .../pagination/utils/compatibility_utils.ts | 2 +- .../scheduler/appointment_popup/m_form.ts | 4 +- .../scheduler/appointment_popup/m_popup.ts | 4 +- .../data_provider/m_appointment_filter.ts | 2 +- .../scheduler/appointments/m_appointment.ts | 12 +- .../appointments/m_appointment_collection.ts | 8 +- .../appointments/m_appointment_layout.ts | 2 +- .../scheduler/appointments/m_text_utils.ts | 2 +- .../m_strategy_horizontal_month_line.ts | 2 +- .../scheduler/header/m_date_navigator.ts | 2 +- .../js/__internal/scheduler/header/m_utils.ts | 4 +- .../m_compact_appointments_helper.ts | 6 +- .../scheduler/m_recurrence_editor.ts | 4 +- .../js/__internal/scheduler/m_scheduler.ts | 8 +- .../scheduler/r1/appointment_popup/config.ts | 4 +- .../components/base/all_day_panel_title.tsx | 2 +- .../js/__internal/scheduler/r1/utils/base.ts | 2 +- .../scheduler/r1/utils/format_weekday.ts | 2 +- .../js/__internal/scheduler/r1/utils/month.ts | 2 +- .../js/__internal/scheduler/r1/utils/week.ts | 2 +- .../__internal/scheduler/resources/m_utils.ts | 4 +- .../scheduler/workspaces/m_agenda.ts | 2 +- .../workspaces/m_virtual_scrolling.ts | 4 +- .../scheduler/workspaces/m_work_space.ts | 24 +- .../view_model/m_view_data_generator_month.ts | 2 +- .../js/__internal/ui/button/button.tsx | 4 +- .../ui/calendar/m_calendar.base_view.ts | 12 +- .../js/__internal/ui/calendar/m_calendar.ts | 16 +- .../ui/calendar/m_calendar.views.ts | 2 +- .../js/__internal/ui/chat/alertlist.ts | 2 +- .../js/__internal/ui/chat/avatar.ts | 2 +- .../devextreme/js/__internal/ui/chat/chat.ts | 8 +- .../js/__internal/ui/chat/messagebox.ts | 4 +- .../js/__internal/ui/chat/messagegroup.ts | 6 +- .../js/__internal/ui/chat/messagelist.ts | 8 +- .../js/__internal/ui/chat/typingindicator.ts | 2 +- .../js/__internal/ui/collection/base.ts | 2 +- .../ui/collection/m_collection_widget.base.ts | 16 +- .../ui/collection/m_collection_widget.edit.ts | 6 +- .../m_collection_widget.live_update.ts | 5 +- .../__internal/ui/color_box/m_color_view.ts | 10 +- .../ui/context_menu/m_context_menu.ts | 16 +- .../__internal/ui/date_box/m_date_box.base.ts | 4 +- .../ui/date_box/m_date_box.mask.parts.ts | 2 +- .../__internal/ui/date_box/m_date_box.mask.ts | 14 +- .../date_box/m_date_box.strategy.calendar.ts | 2 +- .../m_date_box.strategy.calendar_with_time.ts | 2 +- .../date_box/m_date_box.strategy.date_view.ts | 2 +- .../ui/date_box/m_date_box.strategy.list.ts | 2 +- .../ui/date_box/m_date_box.strategy.ts | 4 +- .../js/__internal/ui/date_box/m_date_utils.ts | 2 +- .../js/__internal/ui/date_box/m_date_view.ts | 2 +- .../ui/date_box/m_date_view_roller.ts | 10 +- .../js/__internal/ui/date_box/m_time_view.ts | 2 +- .../ui/date_range_box/m_date_range_box.ts | 6 +- .../date_range_box/m_multiselect_date_box.ts | 4 +- .../strategy/m_rangeCalendar.ts | 2 +- .../ui/drawer/m_drawer.animation.ts | 2 +- .../m_drawer.rendering.strategy.overlap.ts | 2 +- .../m_drawer.rendering.strategy.push.ts | 2 +- .../js/__internal/ui/drawer/m_drawer.ts | 8 +- .../ui/drop_down_editor/m_drop_down_button.ts | 4 +- .../ui/drop_down_editor/m_drop_down_editor.ts | 14 +- .../ui/drop_down_editor/m_drop_down_list.ts | 8 +- .../__internal/ui/editor/m_data_expression.ts | 4 +- .../js/__internal/ui/editor/m_editor.ts | 4 +- .../ui/form/components/m_field_item.ts | 4 +- .../ui/form/m_form.layout_manager.ts | 6 +- .../js/__internal/ui/form/m_form.ts | 6 +- .../hierarchical_collection/m_data_adapter.ts | 4 +- .../ui/html_editor/m_html_editor.ts | 12 +- .../ui/html_editor/modules/m_dropImage.ts | 4 +- .../ui/html_editor/modules/m_imageCursor.ts | 4 +- .../ui/html_editor/modules/m_imageUpload.ts | 4 +- .../ui/html_editor/modules/m_mentions.ts | 2 +- .../ui/html_editor/modules/m_popup.ts | 4 +- .../ui/html_editor/modules/m_resizing.ts | 8 +- .../html_editor/modules/m_tableContextMenu.ts | 6 +- .../ui/html_editor/modules/m_tableResizing.ts | 6 +- .../ui/html_editor/modules/m_toolbar.ts | 6 +- .../ui/html_editor/ui/m_formDialog.ts | 2 +- .../utils/m_image_uploader_helper.ts | 2 +- .../ui/html_editor/utils/m_toolbar_helper.ts | 2 +- .../js/__internal/ui/list/m_list.base.ts | 12 +- .../ui/list/m_list.edit.decorator.context.ts | 2 +- .../ui/list/m_list.edit.decorator.reorder.ts | 4 +- .../list/m_list.edit.decorator.selection.ts | 8 +- .../ui/list/m_list.edit.decorator.swipe.ts | 4 +- ...m_list.edit.decorator.switchable.button.ts | 4 +- .../m_list.edit.decorator.switchable.slide.ts | 14 +- .../list/m_list.edit.decorator.switchable.ts | 8 +- .../ui/list/m_list.edit.decorator.ts | 14 +- .../ui/list/m_list.edit.strategy.grouped.ts | 4 +- .../js/__internal/ui/list/m_list.edit.ts | 4 +- .../js/__internal/ui/m_accordion.ts | 8 +- .../js/__internal/ui/m_action_sheet.ts | 2 +- .../js/__internal/ui/m_autocomplete.ts | 2 +- .../js/__internal/ui/m_defer_rendering.ts | 6 +- .../devextreme/js/__internal/ui/m_dialog.ts | 4 +- .../js/__internal/ui/m_drop_down_box.ts | 4 +- .../js/__internal/ui/m_drop_down_button.ts | 2 +- .../js/__internal/ui/m_file_uploader.ts | 8 +- .../devextreme/js/__internal/ui/m_gallery.ts | 16 +- .../js/__internal/ui/m_load_indicator.ts | 2 +- .../js/__internal/ui/m_load_panel.ts | 2 +- .../devextreme/js/__internal/ui/m_lookup.ts | 6 +- .../js/__internal/ui/m_multi_view.ts | 8 +- .../js/__internal/ui/m_range_slider.ts | 6 +- .../js/__internal/ui/m_select_box.ts | 4 +- .../devextreme/js/__internal/ui/m_switch.ts | 14 +- .../devextreme/js/__internal/ui/m_tag_box.ts | 10 +- .../js/__internal/ui/m_text_area.ts | 8 +- .../js/__internal/ui/m_track_bar.ts | 2 +- .../js/__internal/ui/m_validation_engine.ts | 4 +- .../js/__internal/ui/m_validation_summary.ts | 2 +- .../devextreme/js/__internal/ui/map/m_map.ts | 6 +- .../ui/map/m_provider.google_static.ts | 4 +- .../js/__internal/ui/map/m_provider.ts | 2 +- .../js/__internal/ui/menu/m_menu.ts | 10 +- .../js/__internal/ui/menu/m_submenu.ts | 5 +- .../ui/multi_view/m_multi_view.animation.ts | 4 +- .../ui/number_box/m_number_box.base.ts | 10 +- .../ui/number_box/m_number_box.caret.ts | 2 +- .../ui/number_box/m_number_box.mask.ts | 14 +- .../ui/number_box/m_number_box.spin.ts | 10 +- .../ui/number_box/m_number_box.spins.ts | 6 +- .../js/__internal/ui/overlay/m_overlay.ts | 20 +- .../overlay/m_overlay_position_controller.ts | 6 +- .../js/__internal/ui/popover/m_popover.ts | 16 +- .../popover/m_popover_position_controller.ts | 6 +- .../js/__internal/ui/popup/m_popup.ts | 4 +- .../js/__internal/ui/popup/m_popup_drag.ts | 16 +- .../ui/popup/m_popup_position_controller.ts | 2 +- .../ui/radio_group/m_radio_button.ts | 6 +- .../js/__internal/ui/resizable/m_resizable.ts | 10 +- .../__internal/ui/scroll_view/m_animator.ts | 2 +- .../m_scroll_view.native.pull_down.ts | 2 +- .../m_scroll_view.native.swipe_down.ts | 4 +- .../ui/scroll_view/m_scroll_view.ts | 2 +- .../ui/scroll_view/m_scrollable.native.ts | 4 +- .../ui/scroll_view/m_scrollable.simulated.ts | 16 +- .../__internal/ui/scroll_view/m_scrollable.ts | 6 +- .../__internal/ui/scroll_view/m_scrollbar.ts | 8 +- .../m_selection.strategy.deferred.ts | 2 +- .../m_selection.strategy.standard.ts | 2 +- .../ui/selection/m_selection.strategy.ts | 2 +- .../js/__internal/ui/slider/m_slider.ts | 18 +- .../__internal/ui/slider/m_slider_tooltip.ts | 2 +- .../m_slider_tooltip_position_controller.ts | 5 +- .../ui/speed_dial_action/m_speed_dial_item.ts | 6 +- .../m_speed_dial_main_item.ts | 2 +- .../__internal/ui/splitter/resize_handle.ts | 12 +- .../js/__internal/ui/splitter/splitter.ts | 2 +- .../js/__internal/ui/splitter/utils/layout.ts | 2 +- .../ui/splitter/utils/layout_default.ts | 2 +- .../ui/splitter/utils/number_comparison.ts | 2 +- .../js/__internal/ui/tabs/m_tabs.ts | 8 +- .../js/__internal/ui/text_box/m_text_box.ts | 2 +- .../ui/text_box/m_text_editor.base.ts | 6 +- .../ui/text_box/m_text_editor.clear.ts | 8 +- .../ui/text_box/m_text_editor.label.ts | 10 +- .../text_box/m_text_editor.mask.strategy.ts | 4 +- .../ui/text_box/m_text_editor.mask.ts | 12 +- .../__internal/ui/text_box/m_utils.scroll.ts | 2 +- .../texteditor_button_collection/m_custom.ts | 6 +- .../js/__internal/ui/toast/m_toast.ts | 4 +- .../__internal/ui/toolbar/m_toolbar.base.ts | 2 +- .../ui/tree_view/m_tree_view.base.ts | 14 +- .../viz/chart_components/m_base_chart.ts | 4 +- .../js/__internal/viz/core/m_base_widget.ts | 2 +- packages/devextreme/js/animation/frame.d.ts | 25 +- packages/devextreme/js/animation/frame.js | 1 + packages/devextreme/js/animation/fx.d.ts | 166 +- packages/devextreme/js/animation/fx.js | 3 + .../devextreme/js/animation/position.d.ts | 125 +- packages/devextreme/js/animation/presets.d.ts | 57 +- packages/devextreme/js/animation/presets.js | 3 + .../js/animation/transition_executor.d.ts | 52 +- .../js/animation/transition_executor.js | 3 + .../devextreme/js/bundles/modules/core.js | 38 +- .../devextreme/js/bundles/modules/data.js | 40 +- .../js/bundles/modules/data.odata.js | 12 +- .../js/bundles/modules/file_management.js | 12 +- .../js/bundles/modules/parts/core.js | 28 +- packages/devextreme/js/common.d.ts | 87 +- packages/devextreme/js/common.js | 3 + .../devextreme/js/common/core/animation.d.ts | 358 ++ .../devextreme/js/common/core/animation.js | 4 + .../js/common/core/animation/easing.js | 2 +- .../js/common/core/animation/frame.js | 4 +- .../devextreme/js/common/core/animation/fx.js | 20 +- .../js/common/core/animation/position.js | 26 +- .../common/core/animation/presets/presets.js | 10 +- .../core/animation/transition_executor.js | 1 + .../transition_executor.js | 14 +- .../js/common/core/animation/translator.js | 6 +- .../js/common/core/environment.d.ts | 178 + .../devextreme/js/common/core/environment.js | 4 + .../js/common/core/environment/devices.js | 2 +- .../core/environment/init_mobile_viewport.js | 1 + .../init_mobile_viewport.js | 18 +- .../core/environment/time_zone_utils.js | 2 +- .../devextreme/js/common/core/events.d.ts | 345 ++ packages/devextreme/js/common/core/events.js | 7 + .../devextreme/js/common/core/events/click.js | 2 +- .../js/common/core/events/contextmenu.js | 2 +- .../core/events/core/emitter.feedback.js | 2 +- .../js/common/core/events/core/emitter.js | 2 +- .../core/events/core/emitter_registrator.js | 2 +- .../core/events/core/event_registrator.js | 2 +- .../core/event_registrator_callbacks.js | 2 +- .../core/events/core/events_engine.d.ts | 2 +- .../common/core/events/core/events_engine.js | 2 +- .../core/events/core/hook_touch_props.js | 2 +- .../core/events/core/keyboard_processor.js | 2 +- .../js/common/core/events/core/wheel.js | 2 +- .../js/common/core/events/double_click.js | 2 +- .../devextreme/js/common/core/events/drag.js | 2 +- .../core/events/gesture/emitter.gesture.js | 2 +- .../events/gesture/emitter.gesture.scroll.js | 2 +- .../common/core/events/gesture/swipeable.js | 2 +- .../devextreme/js/common/core/events/hold.js | 2 +- .../devextreme/js/common/core/events/hover.js | 2 +- .../js/common/core/events/index.d.ts | 347 +- .../js/common/core/events/pointer.js | 2 +- .../js/common/core/events/pointer/base.js | 2 +- .../js/common/core/events/pointer/mouse.js | 2 +- .../core/events/pointer/mouse_and_touch.js | 2 +- .../js/common/core/events/pointer/observer.js | 2 +- .../js/common/core/events/pointer/touch.js | 2 +- .../js/common/core/events/remove.js | 2 +- .../devextreme/js/common/core/events/short.js | 2 +- .../devextreme/js/common/core/events/swipe.js | 2 +- .../js/common/core/events/transform.js | 2 +- .../common/core/events/utils/add_namespace.js | 2 +- .../events/utils/event_nodes_disposing.js | 2 +- .../common/core/events/utils/event_target.js | 2 +- .../js/common/core/events/utils/index.js | 2 +- .../common/core/events/visibility_change.js | 2 +- .../js/common/core/localization.d.ts | 132 + .../js/common/core/localization/core.js | 2 +- .../js/common/core/localization/currency.js | 2 +- .../js/common/core/localization/date.js | 8 +- .../core/localization/default_date_names.js | 2 +- .../core/localization/globalize/currency.js | 2 +- .../core/localization/globalize/date.js | 4 +- .../core/localization/globalize/number.js | 2 +- .../js/common/core/localization/intl/date.js | 2 +- .../common/core/localization/intl/number.js | 2 +- .../core/localization/ldml/date.parser.js | 4 +- .../common/core/localization/ldml/number.js | 2 +- .../js/common/core/localization/message.js | 8 +- .../js/common/core/localization/number.js | 12 +- .../js/common/core/localization/utils.js | 2 +- packages/devextreme/js/common/data.d.ts | 1653 ++++++ packages/devextreme/js/common/data.js | 13 + .../js/common/data/abstract_store.d.ts | 18 +- .../js/common/data/abstract_store.js | 2 +- .../devextreme/js/common/data/array_query.js | 2 +- .../devextreme/js/common/data/array_store.js | 2 +- .../devextreme/js/common/data/array_utils.js | 2 +- .../js/common/data/custom-store.d.ts | 69 - .../devextreme/js/common/data/custom-store.js | 18 - .../devextreme/js/common/data/custom_store.js | 21 +- .../devextreme/js/common/data/data_helper.js | 166 + .../devextreme/js/common/data/data_source.js | 1 - .../js/common/data/data_source/data_source.js | 2 +- .../data/data_source/operation_manager.js | 2 +- .../js/common/data/data_source/utils.js | 2 +- .../js/common/data/endpoint_selector.js | 2 +- packages/devextreme/js/common/data/errors.js | 2 +- .../devextreme/js/common/data/local_store.js | 2 +- .../js/common/data/odata/context.js | 2 +- .../js/common/data/odata/query_adapter.js | 2 +- .../common/data/odata/request_dispatcher.js | 2 +- .../devextreme/js/common/data/odata/store.js | 2 +- .../devextreme/js/common/data/odata/utils.js | 2 +- packages/devextreme/js/common/data/query.js | 2 +- .../devextreme/js/common/data/remote_query.js | 2 +- .../devextreme/js/common/data/store_helper.js | 2 +- packages/devextreme/js/common/data/utils.js | 9 +- packages/devextreme/js/common/export.d.ts | 90 +- .../devextreme/js/common/export/excel.d.ts | 8 +- packages/devextreme/js/common/export/excel.js | 4 +- packages/devextreme/js/common/export/pdf.d.ts | 10 +- packages/devextreme/js/common/export/pdf.js | 6 +- .../devextreme/js/common/file_management.d.ts | 442 ++ .../devextreme/js/common/file_management.js | 6 + .../common/file_management/custom_provider.js | 6 +- .../file_management/file_system_item.js | 2 +- .../common/file_management/object_provider.js | 16 +- .../common/file_management/provider_base.js | 14 +- .../common/file_management/remote_provider.js | 20 +- .../js/common/file_management/utils.js | 2 +- packages/devextreme/js/common/grids.d.ts | 21 +- .../js/common/set_template_engine.js | 1 + packages/devextreme/js/core/config.d.ts | 33 +- packages/devextreme/js/core/config.js | 3 + packages/devextreme/js/core/devices.d.ts | 137 +- packages/devextreme/js/core/devices.js | 3 + .../devextreme/js/core/dom_component.d.ts | 2 +- packages/devextreme/js/core/guid.d.ts | 23 +- packages/devextreme/js/core/guid.js | 3 + packages/devextreme/js/core/options.d.ts | 22 +- .../devextreme/js/core/options/utils.d.ts | 2 +- .../js/core/set_template_engine.d.ts | 9 +- .../devextreme/js/core/set_template_engine.js | 1 + .../js/core/templates/template.d.ts | 16 +- .../devextreme/js/core/utils/deferred.d.ts | 18 +- .../devextreme/js/data/abstract_store.d.ts | 21 + packages/devextreme/js/data/abstract_store.js | 1 + .../devextreme/js/data/apply_changes.d.ts | 10 +- packages/devextreme/js/data/apply_changes.js | 3 + packages/devextreme/js/data/array_store.d.ts | 66 +- packages/devextreme/js/data/array_store.js | 3 + packages/devextreme/js/data/custom_store.d.ts | 162 +- packages/devextreme/js/data/custom_store.js | 3 + packages/devextreme/js/data/data_source.d.ts | 474 +- packages/devextreme/js/data/data_source.js | 3 + .../devextreme/js/data/endpoint_selector.d.ts | 16 +- .../devextreme/js/data/endpoint_selector.js | 3 + packages/devextreme/js/data/errors.d.ts | 26 +- packages/devextreme/js/data/errors.js | 2 + packages/devextreme/js/data/index.d.ts | 251 +- packages/devextreme/js/data/load_options.d.ts | 2 +- packages/devextreme/js/data/local_store.d.ts | 70 +- packages/devextreme/js/data/local_store.js | 5 + .../devextreme/js/data/odata/context.d.ts | 120 +- packages/devextreme/js/data/odata/context.js | 3 + packages/devextreme/js/data/odata/store.d.ts | 113 +- packages/devextreme/js/data/odata/store.js | 3 + packages/devextreme/js/data/odata/utils.d.ts | 33 +- packages/devextreme/js/data/odata/utils.js | 1 + packages/devextreme/js/data/query.d.ts | 190 +- packages/devextreme/js/data/query.js | 3 + packages/devextreme/js/data/store.d.ts | 213 +- packages/devextreme/js/data/utils.d.ts | 13 +- packages/devextreme/js/data/utils.js | 1 + packages/devextreme/js/data_helper.d.ts | 15 +- packages/devextreme/js/data_helper.js | 165 +- packages/devextreme/js/events/index.d.ts | 81 + packages/devextreme/js/events/index.js | 7 + packages/devextreme/js/excel_exporter.d.ts | 46 + packages/devextreme/js/excel_exporter.js | 1 + .../js/exporter/common/export_load_panel.js | 2 +- .../js/exporter/exceljs/export_format.js | 10 +- .../js/exporter/export_load_panel.d.ts | 6 + .../js/exporter/jspdf/autotable/export.js | 6 +- .../js/exporter/jspdf/common/export.js | 2 +- .../exporter/jspdf/common/rows_generator.js | 4 +- .../js/file_management/custom_provider.d.ts | 111 +- .../js/file_management/custom_provider.js | 5 + .../devextreme/js/file_management/error.d.ts | 27 +- .../devextreme/js/file_management/error.js | 3 + .../js/file_management/file_system_item.d.ts | 77 +- .../js/file_management/file_system_item.js | 3 + .../js/file_management/object_provider.d.ts | 52 +- .../js/file_management/object_provider.js | 5 + .../js/file_management/provider_base.d.ts | 137 +- .../js/file_management/provider_base.js | 3 + .../js/file_management/remote_provider.d.ts | 67 +- .../js/file_management/remote_provider.js | 5 + .../js/file_management/upload_info.d.ts | 42 +- packages/devextreme/js/format_helper.d.ts | 2 +- packages/devextreme/js/format_helper.js | 6 +- .../devextreme/js/integration/jquery.d.ts | 2 +- .../js/integration/jquery/easing.js | 2 +- .../js/integration/jquery/events.js | 4 +- .../devextreme/js/integration/jquery/hooks.js | 6 +- .../integration/knockout/event_registrator.js | 6 +- packages/devextreme/js/localization.d.ts | 169 +- packages/devextreme/js/localization.js | 9 + .../js/mobile/hide_top_overlay.d.ts | 9 +- .../devextreme/js/mobile/hide_top_overlay.js | 3 + .../js/mobile/init_mobile_viewport.d.ts | 9 +- .../js/mobile/init_mobile_viewport.js | 3 + packages/devextreme/js/pdf_exporter.d.ts | 34 + packages/devextreme/js/pdf_exporter.js | 4 + packages/devextreme/js/time_zone_utils.d.ts | 38 +- packages/devextreme/js/time_zone_utils.js | 1 + packages/devextreme/js/ui/accordion.d.ts | 6 +- packages/devextreme/js/ui/action_sheet.d.ts | 4 +- packages/devextreme/js/ui/autocomplete.d.ts | 2 +- packages/devextreme/js/ui/box.d.ts | 4 +- packages/devextreme/js/ui/button.d.ts | 11 +- packages/devextreme/js/ui/button_group.d.ts | 13 +- packages/devextreme/js/ui/calendar.d.ts | 9 +- packages/devextreme/js/ui/chat.d.ts | 8 +- packages/devextreme/js/ui/check_box.d.ts | 2 +- .../collection/ui.collection_widget.base.d.ts | 6 +- packages/devextreme/js/ui/color_box.d.ts | 9 +- packages/devextreme/js/ui/context_menu.d.ts | 6 +- .../js/ui/context_menu/ui.menu_base.d.ts | 4 +- packages/devextreme/js/ui/data_grid.d.ts | 22 +- packages/devextreme/js/ui/date_box.d.ts | 2 +- packages/devextreme/js/ui/date_range_box.d.ts | 2 +- .../devextreme/js/ui/defer_rendering.d.ts | 4 +- packages/devextreme/js/ui/diagram.d.ts | 15 +- .../js/ui/diagram/diagram.commands_manager.js | 2 +- .../js/ui/diagram/diagram.items_option.js | 2 +- .../js/ui/diagram/diagram.toolbox_manager.js | 2 +- .../ui/diagram/ui.diagram.dialog_manager.js | 2 +- .../js/ui/diagram/ui.diagram.dialogs.js | 2 +- .../devextreme/js/ui/diagram/ui.diagram.js | 10 +- .../js/ui/diagram/ui.diagram.panel.js | 6 +- .../js/ui/diagram/ui.diagram.toolbox.js | 2 +- packages/devextreme/js/ui/draggable.d.ts | 9 +- packages/devextreme/js/ui/drawer.d.ts | 4 +- packages/devextreme/js/ui/drop_down_box.d.ts | 6 +- .../devextreme/js/ui/drop_down_button.d.ts | 9 +- .../drop_down_editor/ui.drop_down_editor.d.ts | 15 +- .../drop_down_editor/ui.drop_down_list.d.ts | 11 +- packages/devextreme/js/ui/editor/editor.d.ts | 2 +- .../js/ui/editor/ui.data_expression.d.ts | 4 +- packages/devextreme/js/ui/file_manager.d.ts | 7 +- .../ui/file_manager/file_items_controller.js | 23 +- .../ui.file_manager.command_manager.js | 2 +- .../ui.file_manager.dialog.delete_item.js | 2 +- .../ui.file_manager.dialog.folder_chooser.js | 2 +- .../ui/file_manager/ui.file_manager.dialog.js | 2 +- .../ui.file_manager.dialog_manager.js | 2 +- .../file_manager/ui.file_manager.editing.js | 2 +- .../ui.file_manager.item_list.details.js | 2 +- .../file_manager/ui.file_manager.item_list.js | 8 +- .../ui.file_manager.item_list.thumbnails.js | 8 +- ..._manager.items_list.thumbnails.list_box.js | 6 +- .../js/ui/file_manager/ui.file_manager.js | 2 +- .../file_manager/ui.file_manager.messages.js | 4 +- ...ile_manager.notification.progress_panel.js | 2 +- .../file_manager/ui.file_manager.toolbar.js | 2 +- packages/devextreme/js/ui/file_uploader.d.ts | 4 +- packages/devextreme/js/ui/filter_builder.d.ts | 11 +- packages/devextreme/js/ui/form.d.ts | 31 +- packages/devextreme/js/ui/gallery.d.ts | 4 +- packages/devextreme/js/ui/gantt.d.ts | 15 +- .../devextreme/js/ui/gantt/ui.gantt.bars.js | 2 +- .../js/ui/gantt/ui.gantt.data.option.js | 2 +- .../js/ui/gantt/ui.gantt.dialogs.js | 4 +- .../js/ui/gantt/ui.gantt.export_helper.js | 4 +- .../devextreme/js/ui/gantt/ui.gantt.helper.js | 2 +- .../js/ui/gantt/ui.gantt.treelist.js | 3 +- .../devextreme/js/ui/gantt/ui.gantt.view.js | 8 +- packages/devextreme/js/ui/html_editor.d.ts | 13 +- packages/devextreme/js/ui/list.d.ts | 17 +- packages/devextreme/js/ui/load_indicator.d.ts | 2 +- packages/devextreme/js/ui/load_panel.d.ts | 7 +- packages/devextreme/js/ui/lookup.d.ts | 11 +- packages/devextreme/js/ui/map.d.ts | 2 +- packages/devextreme/js/ui/menu.d.ts | 4 +- packages/devextreme/js/ui/multi_view.d.ts | 4 +- packages/devextreme/js/ui/number_box.d.ts | 2 +- packages/devextreme/js/ui/overlay.d.ts | 6 +- packages/devextreme/js/ui/pivot_grid.d.ts | 2 +- .../js/ui/pivot_grid/data_source.d.ts | 5 +- .../js/ui/pivot_grid_field_chooser.d.ts | 2 +- packages/devextreme/js/ui/popover.d.ts | 7 +- packages/devextreme/js/ui/popup.d.ts | 18 +- packages/devextreme/js/ui/progress_bar.d.ts | 2 +- packages/devextreme/js/ui/radio_group.d.ts | 4 +- packages/devextreme/js/ui/range_slider.d.ts | 2 +- .../devextreme/js/ui/recurrence_editor.d.ts | 2 +- packages/devextreme/js/ui/resizable.d.ts | 2 +- packages/devextreme/js/ui/responsive_box.d.ts | 4 +- packages/devextreme/js/ui/scheduler.d.ts | 15 +- packages/devextreme/js/ui/scroll_view.d.ts | 2 +- .../js/ui/scroll_view/ui.scrollable.d.ts | 2 +- packages/devextreme/js/ui/select_box.d.ts | 4 +- .../devextreme/js/ui/shared/accessibility.js | 4 +- .../js/ui/shared/ui.editor_factory_mixin.js | 6 +- packages/devextreme/js/ui/slider.d.ts | 2 +- packages/devextreme/js/ui/sortable.d.ts | 11 +- .../devextreme/js/ui/speed_dial_action.d.ts | 2 +- packages/devextreme/js/ui/splitter.d.ts | 4 +- packages/devextreme/js/ui/splitter_control.js | 6 +- packages/devextreme/js/ui/switch.d.ts | 2 +- packages/devextreme/js/ui/tab_panel.d.ts | 15 +- packages/devextreme/js/ui/tabs.d.ts | 4 +- packages/devextreme/js/ui/tag_box.d.ts | 11 +- packages/devextreme/js/ui/text_area.d.ts | 2 +- packages/devextreme/js/ui/text_box.d.ts | 2 +- .../js/ui/text_box/ui.text_editor.base.d.ts | 2 +- packages/devextreme/js/ui/tile_view.d.ts | 4 +- packages/devextreme/js/ui/toast.d.ts | 7 +- packages/devextreme/js/ui/toolbar.d.ts | 13 +- packages/devextreme/js/ui/tooltip.d.ts | 2 +- packages/devextreme/js/ui/tree_list.d.ts | 19 +- packages/devextreme/js/ui/tree_view.d.ts | 4 +- .../devextreme/js/ui/validation_group.d.ts | 2 +- .../devextreme/js/ui/validation_summary.d.ts | 2 +- packages/devextreme/js/ui/validator.d.ts | 2 +- .../devextreme/js/ui/widget/template.d.ts | 5 +- .../js/ui/widget/ui.search_box_mixin.js | 2 +- .../devextreme/js/ui/widget/ui.widget.d.ts | 2 +- packages/devextreme/js/utils.d.ts | 25 +- packages/devextreme/js/utils.js | 8 +- packages/devextreme/js/viz/bar_gauge.d.ts | 4 +- packages/devextreme/js/viz/bullet.d.ts | 2 +- packages/devextreme/js/viz/chart.d.ts | 15 +- .../js/viz/chart_components/base_chart.d.ts | 11 +- .../js/viz/chart_components/scroll_bar.js | 6 +- .../js/viz/chart_components/shutter_zoom.js | 2 +- .../js/viz/chart_components/tracker.js | 8 +- .../js/viz/chart_components/zoom_and_pan.js | 6 +- .../devextreme/js/viz/circular_gauge.d.ts | 4 +- .../devextreme/js/viz/components/tracker.js | 8 +- .../devextreme/js/viz/core/annotations.js | 8 +- .../devextreme/js/viz/core/base_widget.d.ts | 2 +- .../devextreme/js/viz/core/data_source.js | 2 +- packages/devextreme/js/viz/core/export.js | 6 +- .../js/viz/core/renderers/animation.js | 2 +- .../js/viz/core/renderers/renderer.js | 2 +- packages/devextreme/js/viz/funnel.d.ts | 13 +- .../devextreme/js/viz/gauges/base_gauge.d.ts | 13 +- packages/devextreme/js/viz/gauges/tracker.js | 8 +- packages/devextreme/js/viz/linear_gauge.d.ts | 2 +- packages/devextreme/js/viz/pie_chart.d.ts | 4 +- packages/devextreme/js/viz/polar_chart.d.ts | 9 +- .../devextreme/js/viz/range_selector.d.ts | 4 +- .../js/viz/range_selector/tracker.js | 4 +- packages/devextreme/js/viz/sankey.d.ts | 11 +- packages/devextreme/js/viz/sparkline.d.ts | 4 +- .../js/viz/sparklines/base_sparkline.d.ts | 4 +- .../js/viz/sparklines/base_sparkline.js | 6 +- packages/devextreme/js/viz/tree_map.d.ts | 11 +- packages/devextreme/js/viz/vector_map.d.ts | 15 +- .../devextreme/js/viz/vector_map/map_layer.js | 2 +- .../devextreme/js/viz/vector_map/tracker.js | 6 +- packages/devextreme/project.json | 8 +- packages/devextreme/ts/aliases.d.ts | 1309 +++-- packages/devextreme/ts/dx.all.d.ts | 4835 ++++++++--------- 658 files changed, 8823 insertions(+), 8255 deletions(-) create mode 100644 packages/devextreme/js/animation/frame.js create mode 100644 packages/devextreme/js/animation/fx.js create mode 100644 packages/devextreme/js/animation/presets.js create mode 100644 packages/devextreme/js/animation/transition_executor.js create mode 100644 packages/devextreme/js/common.js create mode 100644 packages/devextreme/js/common/core/animation.d.ts create mode 100644 packages/devextreme/js/common/core/animation.js create mode 100644 packages/devextreme/js/common/core/environment.d.ts create mode 100644 packages/devextreme/js/common/core/environment.js create mode 100644 packages/devextreme/js/common/core/events.d.ts create mode 100644 packages/devextreme/js/common/core/events.js create mode 100644 packages/devextreme/js/common/core/localization.d.ts create mode 100644 packages/devextreme/js/common/data.d.ts create mode 100644 packages/devextreme/js/common/data.js delete mode 100644 packages/devextreme/js/common/data/custom-store.d.ts delete mode 100644 packages/devextreme/js/common/data/custom-store.js create mode 100644 packages/devextreme/js/common/data/data_helper.js create mode 100644 packages/devextreme/js/common/file_management.d.ts create mode 100644 packages/devextreme/js/common/file_management.js create mode 100644 packages/devextreme/js/core/config.js create mode 100644 packages/devextreme/js/core/devices.js create mode 100644 packages/devextreme/js/core/guid.js create mode 100644 packages/devextreme/js/core/set_template_engine.js create mode 100644 packages/devextreme/js/data/abstract_store.d.ts create mode 100644 packages/devextreme/js/data/abstract_store.js create mode 100644 packages/devextreme/js/data/apply_changes.js create mode 100644 packages/devextreme/js/data/array_store.js create mode 100644 packages/devextreme/js/data/custom_store.js create mode 100644 packages/devextreme/js/data/data_source.js create mode 100644 packages/devextreme/js/data/endpoint_selector.js create mode 100644 packages/devextreme/js/data/errors.js create mode 100644 packages/devextreme/js/data/local_store.js create mode 100644 packages/devextreme/js/data/odata/context.js create mode 100644 packages/devextreme/js/data/odata/store.js create mode 100644 packages/devextreme/js/data/odata/utils.js create mode 100644 packages/devextreme/js/data/query.js create mode 100644 packages/devextreme/js/data/utils.js create mode 100644 packages/devextreme/js/events/index.d.ts create mode 100644 packages/devextreme/js/events/index.js create mode 100644 packages/devextreme/js/excel_exporter.d.ts create mode 100644 packages/devextreme/js/excel_exporter.js create mode 100644 packages/devextreme/js/exporter/export_load_panel.d.ts create mode 100644 packages/devextreme/js/file_management/custom_provider.js create mode 100644 packages/devextreme/js/file_management/error.js create mode 100644 packages/devextreme/js/file_management/file_system_item.js create mode 100644 packages/devextreme/js/file_management/object_provider.js create mode 100644 packages/devextreme/js/file_management/provider_base.js create mode 100644 packages/devextreme/js/file_management/remote_provider.js create mode 100644 packages/devextreme/js/localization.js create mode 100644 packages/devextreme/js/mobile/hide_top_overlay.js create mode 100644 packages/devextreme/js/mobile/init_mobile_viewport.js create mode 100644 packages/devextreme/js/pdf_exporter.d.ts create mode 100644 packages/devextreme/js/pdf_exporter.js create mode 100644 packages/devextreme/js/time_zone_utils.js diff --git a/packages/devextreme-angular/src/common/data/custom-store/index.ts b/packages/devextreme-angular/src/common/data/custom-store/index.ts index b2cfac7968f9..537eb821f043 100644 --- a/packages/devextreme-angular/src/common/data/custom-store/index.ts +++ b/packages/devextreme-angular/src/common/data/custom-store/index.ts @@ -5,4 +5,4 @@ export { isLoadResultObject, LoadResult, LoadResultObject, -} from 'devextreme/common/data/custom-store'; +} from 'devextreme/common/data'; diff --git a/packages/devextreme-react/src/common/data/custom-store.ts b/packages/devextreme-react/src/common/data/custom-store.ts index 8b01da88d434..e374282d5bf5 100644 --- a/packages/devextreme-react/src/common/data/custom-store.ts +++ b/packages/devextreme-react/src/common/data/custom-store.ts @@ -5,4 +5,4 @@ export { isLoadResultObject, LoadResult, LoadResultObject, -} from "devextreme/common/data/custom-store"; +} from "devextreme/common/data"; diff --git a/packages/devextreme-vue/src/common/data/custom-store.ts b/packages/devextreme-vue/src/common/data/custom-store.ts index 8b01da88d434..e374282d5bf5 100644 --- a/packages/devextreme-vue/src/common/data/custom-store.ts +++ b/packages/devextreme-vue/src/common/data/custom-store.ts @@ -5,4 +5,4 @@ export { isLoadResultObject, LoadResult, LoadResultObject, -} from "devextreme/common/data/custom-store"; +} from "devextreme/common/data"; diff --git a/packages/devextreme/.eslintignore b/packages/devextreme/.eslintignore index 70ca1568cdd2..1a2960b65e26 100644 --- a/packages/devextreme/.eslintignore +++ b/packages/devextreme/.eslintignore @@ -11,5 +11,5 @@ themebuilder-scss/src/data/metadata/* js/bundles/dx.custom.js testing/jest/utils/transformers/* ts/ -js/localization/cldr-data/* -js/localization/default_messages.js +js/common/core/localization/cldr-data/* +js/common/core/localization/default_messages.js diff --git a/packages/devextreme/.gitignore b/packages/devextreme/.gitignore index c5b940a2af46..777c69052a83 100644 --- a/packages/devextreme/.gitignore +++ b/packages/devextreme/.gitignore @@ -5,8 +5,8 @@ node_modules /testing/LastSuiteTime.txt /dotnet_packages /js/bundles/dx.custom.js -/js/localization/default_messages.js -/js/localization/cldr-data +/js/common/core/localization/default_messages.js +/js/common/core/localization/cldr-data /js/renovation/**/*.j.tsx /js/renovation/code_coverage /scss/bundles/*.scss diff --git a/packages/devextreme/build/gulp/localization-template.jst b/packages/devextreme/build/gulp/localization-template.jst index 43dffba193b4..a4d509eaba9d 100644 --- a/packages/devextreme/build/gulp/localization-template.jst +++ b/packages/devextreme/build/gulp/localization-template.jst @@ -1,10 +1,10 @@ (function(root, factory) { if(typeof define === 'function' && define.amd) { define(function(require) { - factory(require("devextreme/localization")); + factory(require("devextreme/common/core/localization")); }); } else if(typeof module === "object" && module.exports) { - factory(require("devextreme/localization")); + factory(require("devextreme/common/core/localization")); } else { factory(DevExpress.localization); } diff --git a/packages/devextreme/build/gulp/localization.js b/packages/devextreme/build/gulp/localization.js index e106422732f0..b55f61901c81 100644 --- a/packages/devextreme/build/gulp/localization.js +++ b/packages/devextreme/build/gulp/localization.js @@ -84,7 +84,7 @@ const accountingFormats = function() { }; const RESULT_PATH = path.join(context.RESULT_JS_PATH, 'localization'); -const DICTIONARY_SOURCE_FOLDER = 'js/localization/messages'; +const DICTIONARY_SOURCE_FOLDER = 'js/common/core/localization/messages'; const getLocales = function(directory) { return fs.readdirSync(directory).map(file => { @@ -110,7 +110,7 @@ const getMessages = function(directory, locale) { }; gulp.task('clean-cldr-data', function() { - return del('js/localization/cldr-data/**', { force: true }); + return del('js/common/core/localization/cldr-data/**', { force: true }); }); gulp.task('generate-community-locales', () => { @@ -119,8 +119,8 @@ gulp.task('generate-community-locales', () => { return gulp .src([ - 'js/localization/messages/*.json', - '!js/localization/messages/en.json' + 'js/common/core/localization/messages/*.json', + '!js/common/core/localization/messages/en.json' ]) .pipe(through.obj(function(file, encoding, callback) { const parsedFile = JSON.parse(file.contents.toString(encoding)); @@ -169,38 +169,38 @@ gulp.task('localization-messages', gulp.parallel(getLocales(DICTIONARY_SOURCE_FO gulp.task('localization-generated-sources', gulp.parallel([ { - data: require('../../js/localization/messages/en.json'), + data: require('../../js/common/core/localization/messages/en.json'), filename: 'default_messages.js', exportName: 'defaultMessages', - destination: 'js/localization' + destination: 'js/common/core/localization' }, { data: parentLocales, filename: 'parent_locales.js', - destination: 'js/localization/cldr-data' + destination: 'js/common/core/localization/cldr-data' }, { data: firstDayOfWeekData(), filename: 'first_day_of_week_data.js', - destination: 'js/localization/cldr-data' + destination: 'js/common/core/localization/cldr-data' }, { data: accountingFormats(), filename: 'accounting_formats.js', - destination: 'js/localization/cldr-data' + destination: 'js/common/core/localization/cldr-data' }, { data: globalizeEnCldr, exportName: 'enCldr', filename: 'en.js', - destination: 'js/localization/cldr-data' + destination: 'js/common/core/localization/cldr-data' }, { data: globalizeSupplementalCldr, exportName: 'supplementalCldr', filename: 'supplemental.js', - destination: 'js/localization/cldr-data' + destination: 'js/common/core/localization/cldr-data' } ].map((source) => Object.assign( function() { diff --git a/packages/devextreme/js/__internal/core/m_element_data.ts b/packages/devextreme/js/__internal/core/m_element_data.ts index 8af4d1935a13..11b9557bf56a 100644 --- a/packages/devextreme/js/__internal/core/m_element_data.ts +++ b/packages/devextreme/js/__internal/core/m_element_data.ts @@ -1,7 +1,7 @@ /* eslint-disable object-shorthand */ +import eventsEngine from '@js/common/core/events/core/events_engine'; import domAdapter from '@js/core/dom_adapter'; import MemorizedCallbacks from '@js/core/memorized_callbacks'; -import eventsEngine from '@js/events/core/events_engine'; const dataMap = new WeakMap(); let strategy; diff --git a/packages/devextreme/js/__internal/core/r1/component_wrapper.ts b/packages/devextreme/js/__internal/core/r1/component_wrapper.ts index a11bbebfb715..95f558df6ac3 100644 --- a/packages/devextreme/js/__internal/core/r1/component_wrapper.ts +++ b/packages/devextreme/js/__internal/core/r1/component_wrapper.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable class-methods-use-this */ -import '@js/events/click'; -import '@js/events/core/emitter.feedback'; -import '@js/events/hover'; +import '@js/common/core/events/click'; +import '@js/common/core/events/core/emitter.feedback'; +import '@js/common/core/events/hover'; import domAdapter from '@js/core/dom_adapter'; import DOMComponent from '@js/core/dom_component'; @@ -21,8 +21,8 @@ import { createRef, } from 'inferno'; +import KeyboardProcessor from '../../../common/core/events/core/keyboard_processor'; import renderer from '../../../core/inferno_renderer'; -import KeyboardProcessor from '../../../events/core/keyboard_processor'; import type { TemplateModel } from './template_wrapper'; import { buildTemplateArgs, TemplateWrapper } from './template_wrapper'; import type { Option, TemplateComponent } from './types'; diff --git a/packages/devextreme/js/__internal/core/r1/utils/resolve_rtl.ts b/packages/devextreme/js/__internal/core/r1/utils/resolve_rtl.ts index 246e558ae571..7c0700be9562 100644 --- a/packages/devextreme/js/__internal/core/r1/utils/resolve_rtl.ts +++ b/packages/devextreme/js/__internal/core/r1/utils/resolve_rtl.ts @@ -1,4 +1,4 @@ -import globalConfig from '../../../../core/config'; +import { config as globalConfig } from '../../../../common'; import { isDefined } from '../../../../core/utils/type'; import type { ConfigContextValue } from '../config_context'; diff --git a/packages/devextreme/js/__internal/core/r1/utils/subscribe_to_event.ts b/packages/devextreme/js/__internal/core/r1/utils/subscribe_to_event.ts index 677c90d89209..7dfc1d9c63b2 100644 --- a/packages/devextreme/js/__internal/core/r1/utils/subscribe_to_event.ts +++ b/packages/devextreme/js/__internal/core/r1/utils/subscribe_to_event.ts @@ -1,8 +1,8 @@ -import * as clickEvent from '../../../../events/click'; -import eventsEngine from '../../../../events/core/events_engine'; -import scrollEvents from '../../../../events/gesture/emitter.gesture.scroll'; -import pointerEvents from '../../../../events/pointer'; -import { addNamespace } from '../../../../events/utils/index'; +import * as clickEvent from '../../../../common/core/events/click'; +import eventsEngine from '../../../../common/core/events/core/events_engine'; +import scrollEvents from '../../../../common/core/events/gesture/emitter.gesture.scroll'; +import pointerEvents from '../../../../common/core/events/pointer'; +import { addNamespace } from '../../../../common/core/events/utils/index'; import type { EffectReturn } from './effect_return'; export function subscribeToEvent(eventName: string) { diff --git a/packages/devextreme/js/__internal/core/r1/widget.tsx b/packages/devextreme/js/__internal/core/r1/widget.tsx index 52b1cf9d11d0..526403080bd6 100644 --- a/packages/devextreme/js/__internal/core/r1/widget.tsx +++ b/packages/devextreme/js/__internal/core/r1/widget.tsx @@ -2,22 +2,22 @@ /* eslint-disable spellcheck/spell-checker */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-explicit-any */ -import '@js/events/click'; -import '@js/events/hover'; +import '@js/common/core/events/click'; +import '@js/common/core/events/hover'; import { createReRenderEffect, InfernoEffect, InfernoWrapperComponent, } from '@devextreme/runtime/inferno'; import type { RefObject } from '@devextreme-generator/declarations'; +import { + dxClick, focus, keyboard, resize, visibility, +} from '@js/common/core/events/short'; import domAdapter from '@js/core/dom_adapter'; import errors from '@js/core/errors'; import { extend } from '@js/core/utils/extend'; import resizeCallbacks from '@js/core/utils/resize_callbacks'; import { normalizeStyleProp } from '@js/core/utils/style'; import { isFunction } from '@js/core/utils/type'; -import { - dxClick, focus, keyboard, resize, visibility, -} from '@js/events/short'; import type { ConfigContextValue } from '@ts/core/r1/config_context'; import { ConfigContext } from '@ts/core/r1/config_context'; import { ConfigProvider } from '@ts/core/r1/config_provider'; diff --git a/packages/devextreme/js/__internal/core/templates/m_bindable_template.ts b/packages/devextreme/js/__internal/core/templates/m_bindable_template.ts index b3239ee92178..5c47e96de8bd 100644 --- a/packages/devextreme/js/__internal/core/templates/m_bindable_template.ts +++ b/packages/devextreme/js/__internal/core/templates/m_bindable_template.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; import $ from '@js/core/renderer'; import { TemplateBase } from '@js/core/templates/template_base'; import { isPrimitive } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; const watchChanges = (function () { const globalWatch = (data, watchMethod, callback) => watchMethod(() => data, callback); diff --git a/packages/devextreme/js/__internal/core/templates/m_template_base.ts b/packages/devextreme/js/__internal/core/templates/m_template_base.ts index e3f84627b56e..31170824a5c2 100644 --- a/packages/devextreme/js/__internal/core/templates/m_template_base.ts +++ b/packages/devextreme/js/__internal/core/templates/m_template_base.ts @@ -1,9 +1,9 @@ +import { triggerShownEvent } from '@js/common/core/events/visibility_change'; import domAdapter from '@js/core/dom_adapter'; import errors from '@js/core/errors'; import $ from '@js/core/renderer'; import Callbacks from '@js/core/utils/callbacks'; import { contains } from '@js/core/utils/dom'; -import { triggerShownEvent } from '@js/events/visibility_change'; export const renderedCallbacks = Callbacks({ syncStrategy: true }); diff --git a/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts b/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts index 09ffd2877370..5b38c0af6aa1 100644 --- a/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts +++ b/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts @@ -1,7 +1,7 @@ +import defaultDateNames from '@js/common/core/localization/default_date_names'; +import { getFormatter as getLDMLFormatter } from '@js/common/core/localization/ldml/date.formatter'; import config from '@js/core/config'; import { isDate, isNumeric as isNumber, isString } from '@js/core/utils/type'; -import defaultDateNames from '@js/localization/default_date_names'; -import { getFormatter as getLDMLFormatter } from '@js/localization/ldml/date.formatter'; const NUMBER_SERIALIZATION_FORMAT = 'number'; const DATE_SERIALIZATION_FORMAT = 'yyyy/MM/dd'; diff --git a/packages/devextreme/js/__internal/core/utils/m_public_component.ts b/packages/devextreme/js/__internal/core/utils/m_public_component.ts index be3be2f12cd1..3501b55626e0 100644 --- a/packages/devextreme/js/__internal/core/utils/m_public_component.ts +++ b/packages/devextreme/js/__internal/core/utils/m_public_component.ts @@ -1,7 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; import { data as elementData } from '@js/core/element_data'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; const COMPONENT_NAMES_DATA_KEY = 'dxComponents'; const ANONYMOUS_COMPONENT_DATA_KEY = 'dxPrivateComponent'; diff --git a/packages/devextreme/js/__internal/core/widget/dom_component.ts b/packages/devextreme/js/__internal/core/widget/dom_component.ts index 2f178dd41f63..16b821f280cf 100644 --- a/packages/devextreme/js/__internal/core/widget/dom_component.ts +++ b/packages/devextreme/js/__internal/core/widget/dom_component.ts @@ -1,3 +1,4 @@ +import { resize as resizeEvent, visibility as visibilityEvents } from '@js/common/core/events/short'; import config from '@js/core/config'; import type { DOMComponentOptions } from '@js/core/dom_component'; import { getPublicElement } from '@js/core/element'; @@ -14,7 +15,6 @@ import windowResizeCallbacks from '@js/core/utils/resize_callbacks'; import { addShadowDomStyles } from '@js/core/utils/shadow_dom'; import { isDefined, isFunction, isString } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { resize as resizeEvent, visibility as visibilityEvents } from '@js/events/short'; import license, { peekValidationPerformed } from '@ts/core/license/license_validation'; import TemplateManagerModule from '@ts/core/m_template_manager'; diff --git a/packages/devextreme/js/__internal/core/widget/widget.ts b/packages/devextreme/js/__internal/core/widget/widget.ts index 7bc01ab41ff0..10fed27edd87 100644 --- a/packages/devextreme/js/__internal/core/widget/widget.ts +++ b/packages/devextreme/js/__internal/core/widget/widget.ts @@ -1,7 +1,10 @@ -import '@js/events/click'; -import '@js/events/core/emitter.feedback'; -import '@js/events/hover'; +import '@js/common/core/events/click'; +import '@js/common/core/events/core/emitter.feedback'; +import '@js/common/core/events/hover'; +import { + active, focus, hover, keyboard, +} from '@js/common/core/events/short'; import Action from '@js/core/action'; import devices from '@js/core/devices'; import type { DefaultOptionsRule } from '@js/core/options/utils'; @@ -13,9 +16,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isPlainObject } from '@js/core/utils/type'; import { compare as compareVersions } from '@js/core/utils/version'; -import { - active, focus, hover, keyboard, -} from '@js/events/short'; import { focusable as focusableSelector } from '@js/ui/widget/selectors'; import type { WidgetOptions } from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/data/data_source/m_data_source.ts b/packages/devextreme/js/__internal/data/data_source/m_data_source.ts index be4f4ea3fd45..be9ab21092f0 100644 --- a/packages/devextreme/js/__internal/data/data_source/m_data_source.ts +++ b/packages/devextreme/js/__internal/data/data_source/m_data_source.ts @@ -1,3 +1,16 @@ +import { CustomStore } from '@js/common/data'; +import { applyBatch } from '@js/common/data/array_utils'; +import OperationManager from '@js/common/data/data_source/operation_manager'; +import { + CANCELED_TOKEN, + isPending, + mapDataRespectingGrouping, + normalizeDataSourceOptions, + normalizeLoadResult, + normalizeStoreLoadOptionAccessorArguments, +} from '@js/common/data/data_source/utils'; +import { errors } from '@js/common/data/errors'; +import { throttleChanges } from '@js/common/data/utils'; import Class from '@js/core/class'; import { EventsStrategy } from '@js/core/events_strategy'; import { Deferred, when } from '@js/core/utils/deferred'; @@ -7,21 +20,6 @@ import { create } from '@js/core/utils/queue'; import { isBoolean, isDefined, isEmptyObject, isNumeric, isObject, isString, } from '@js/core/utils/type'; -import { applyBatch } from '@js/data/array_utils'; -import CustomStore from '@js/data/custom_store'; -import OperationManager from '@js/data/data_source/operation_manager'; -import { - CANCELED_TOKEN, - isPending, - mapDataRespectingGrouping, - normalizeDataSourceOptions, - normalizeLoadResult, - normalizeStoreLoadOptionAccessorArguments, -} from '@js/data/data_source/utils'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -// @ts-expect-error -import { throttleChanges } from '@js/data/utils'; import commonUtils from '@ts/core/utils/m_common'; export const DataSource = Class.inherit({ @@ -354,7 +352,7 @@ export const DataSource = Class.inherit({ const handleDone = (data) => { const isEmptyArray = Array.isArray(data) && !data.length; if (!isDefined(data) || isEmptyArray) { - d.reject(new errors.Error('E4009')); + d.reject(errors.Error('E4009')); } else { if (!Array.isArray(data)) { data = [data]; diff --git a/packages/devextreme/js/__internal/data/data_source/m_operation_manager.ts b/packages/devextreme/js/__internal/data/data_source/m_operation_manager.ts index 2723d076cd8a..cfde35fffb6f 100644 --- a/packages/devextreme/js/__internal/data/data_source/m_operation_manager.ts +++ b/packages/devextreme/js/__internal/data/data_source/m_operation_manager.ts @@ -1,4 +1,4 @@ -import { CANCELED_TOKEN } from '@js/data/data_source/utils'; +import { CANCELED_TOKEN } from '@js/common/data/data_source/utils'; export default class OperationManager { constructor() { diff --git a/packages/devextreme/js/__internal/data/data_source/m_utils.ts b/packages/devextreme/js/__internal/data/data_source/m_utils.ts index dabe7a87573a..c870ac67ad42 100644 --- a/packages/devextreme/js/__internal/data/data_source/m_utils.ts +++ b/packages/devextreme/js/__internal/data/data_source/m_utils.ts @@ -1,12 +1,10 @@ +import { ArrayStore, CustomStore } from '@js/common/data'; +import Store from '@js/common/data/abstract_store'; +import { normalizeSortingInfo } from '@js/common/data/utils'; import ajaxUtils from '@js/core/utils/ajax'; import { extend } from '@js/core/utils/extend'; import { each, map } from '@js/core/utils/iterator'; import { isPlainObject } from '@js/core/utils/type'; -import Store from '@js/data/abstract_store'; -import ArrayStore from '@js/data/array_store'; -import CustomStore from '@js/data/custom_store'; -// @ts-expect-error -import { normalizeSortingInfo } from '@js/data/utils'; export const CANCELED_TOKEN = 'canceled'; diff --git a/packages/devextreme/js/__internal/data/m_abstract_store.ts b/packages/devextreme/js/__internal/data/m_abstract_store.ts index 9e2a8b6fb1a6..ac3fa00acaed 100644 --- a/packages/devextreme/js/__internal/data/m_abstract_store.ts +++ b/packages/devextreme/js/__internal/data/m_abstract_store.ts @@ -1,3 +1,6 @@ +import { errors, handleError } from '@js/common/data/errors'; +import storeHelper from '@js/common/data/store_helper'; +import { processRequestResultLock } from '@js/common/data/utils'; import Class from '@js/core/class'; import { EventsStrategy } from '@js/core/events_strategy'; import { noop } from '@js/core/utils/common'; @@ -5,11 +8,6 @@ import { compileGetter } from '@js/core/utils/data'; import { Deferred, when } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { isEmptyObject } from '@js/core/utils/type'; -// @ts-expect-error -import { errors, handleError } from '@js/data/errors'; -import storeHelper from '@js/data/store_helper'; -// @ts-expect-error -import { processRequestResultLock } from '@js/data/utils'; const { abstract } = Class; const { queryByOptions } = storeHelper; diff --git a/packages/devextreme/js/__internal/data/m_array_query.ts b/packages/devextreme/js/__internal/data/m_array_query.ts index 6c02d4285a66..6bc800f398dc 100644 --- a/packages/devextreme/js/__internal/data/m_array_query.ts +++ b/packages/devextreme/js/__internal/data/m_array_query.ts @@ -1,24 +1,17 @@ -import Class from '@js/core/class'; -import { compileGetter, toComparable } from '@js/core/utils/data'; -import { Deferred } from '@js/core/utils/deferred'; -import { each, map } from '@js/core/utils/iterator'; -import { isDefined, isFunction, isString } from '@js/core/utils/type'; -// @ts-expect-error -import { errors, handleError as handleDataError } from '@js/data/errors'; +import { errors, handleError as handleDataError } from '@js/common/data/errors'; import { - // @ts-expect-error aggregators, - // @ts-expect-error isConjunctiveOperator as isConjunctiveOperatorChecker, - // @ts-expect-error isGroupCriterion, - // @ts-expect-error isUnaryOperation, - // @ts-expect-error isUniformEqualsByOr, - // @ts-expect-error normalizeBinaryCriterion, -} from '@js/data/utils'; +} from '@js/common/data/utils'; +import Class from '@js/core/class'; +import { compileGetter, toComparable } from '@js/core/utils/data'; +import { Deferred } from '@js/core/utils/deferred'; +import { each, map } from '@js/core/utils/iterator'; +import { isDefined, isFunction, isString } from '@js/core/utils/type'; const Iterator = Class.inherit({ @@ -281,7 +274,7 @@ const compileCriteria = (function () { each(crit, function () { if (Array.isArray(this) || isFunction(this)) { if (ops.length > 1 && isConjunctiveOperator !== isConjunctiveNextOperator) { - throw new errors.Error('E4019'); + throw errors.Error('E4019'); } // @ts-expect-error ops.push(compileCriteria(this, langParams)); diff --git a/packages/devextreme/js/__internal/data/m_array_store.ts b/packages/devextreme/js/__internal/data/m_array_store.ts index 2fc03b31d615..1033bed83641 100644 --- a/packages/devextreme/js/__internal/data/m_array_store.ts +++ b/packages/devextreme/js/__internal/data/m_array_store.ts @@ -1,12 +1,10 @@ -import Store from '@js/data/abstract_store'; +import { query as Query } from '@js/common/data'; +import Store from '@js/common/data/abstract_store'; import { applyBatch, indexByKey, insert, remove, update, -} from '@js/data/array_utils'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -import Query from '@js/data/query'; -// @ts-expect-error -import { rejectedPromise, trivialPromise } from '@js/data/utils'; +} from '@js/common/data/array_utils'; +import { errors } from '@js/common/data/errors'; +import { rejectedPromise, trivialPromise } from '@js/common/data/utils'; // @ts-expect-error const ArrayStore = Store.inherit({ @@ -37,9 +35,11 @@ const ArrayStore = Store.inherit({ const index = indexByKey(this, this._array, key); if (index === -1) { + // @ts-expect-error return rejectedPromise(errors.Error('E4009')); } + // @ts-expect-error return trivialPromise(this._array[index]); }, diff --git a/packages/devextreme/js/__internal/data/m_array_utils.ts b/packages/devextreme/js/__internal/data/m_array_utils.ts index 818eb0ee1ff8..4922dc77ef28 100644 --- a/packages/devextreme/js/__internal/data/m_array_utils.ts +++ b/packages/devextreme/js/__internal/data/m_array_utils.ts @@ -1,3 +1,5 @@ +import { errors } from '@js/common/data/errors'; +import { keysEqual, rejectedPromise, trivialPromise } from '@js/common/data/utils'; import config from '@js/core/config'; import Guid from '@js/core/guid'; import { compileGetter } from '@js/core/utils/data'; @@ -6,10 +8,6 @@ import { deepExtendArraySafe } from '@js/core/utils/object'; import { isDefined, isEmptyObject, isObject, isPlainObject, } from '@js/core/utils/type'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -// @ts-expect-error -import { keysEqual, rejectedPromise, trivialPromise } from '@js/data/utils'; function hasKey(target, keyOrKeys) { let key; @@ -143,6 +141,7 @@ function applyBatch({ } function getErrorResult(isBatch, logError, errorCode) { + // @ts-expect-error return !isBatch ? rejectedPromise(errors.Error(errorCode)) : logError && errors.log(errorCode); } @@ -188,6 +187,7 @@ function update(keyInfo, array, key, data, isBatch, immutable, logError) { if (immutable === true && isDefined(target)) { const newTarget = createObjectWithChanges(target, data); array[index] = newTarget; + // @ts-expect-error return !isBatch && trivialPromise(newTarget, key); } } @@ -198,8 +198,10 @@ function update(keyInfo, array, key, data, isBatch, immutable, logError) { deepExtendArraySafe(target, data, extendComplexObject, false, true, true); if (!isBatch) { if (config().useLegacyStoreResult) { + // @ts-expect-error return trivialPromise(key, data); } + // @ts-expect-error return trivialPromise(target, key); } } @@ -232,6 +234,7 @@ function insert(keyInfo, array, data, index, isBatch, logError, skipCopying) { setDataByKeyMapValue(array, keyValue, obj); if (!isBatch) { + // @ts-expect-error return trivialPromise(config().useLegacyStoreResult ? data : obj, keyValue); } } @@ -243,6 +246,7 @@ function remove(keyInfo, array, key, isBatch, logError) { setDataByKeyMapValue(array, key, null); } if (!isBatch) { + // @ts-expect-error return trivialPromise(key); } if (index < 0) { return getErrorResult(isBatch, logError, 'E4009'); diff --git a/packages/devextreme/js/__internal/data/m_custom_store.ts b/packages/devextreme/js/__internal/data/m_custom_store.ts index c36840d51bad..0d00a5eb84e4 100644 --- a/packages/devextreme/js/__internal/data/m_custom_store.ts +++ b/packages/devextreme/js/__internal/data/m_custom_store.ts @@ -1,22 +1,18 @@ +import Store from '@js/common/data/abstract_store'; +import arrayQuery from '@js/common/data/array_query'; +import { applyBatch } from '@js/common/data/array_utils'; +import { errors } from '@js/common/data/errors'; +import storeHelper from '@js/common/data/store_helper'; +import { + errorMessageFromXhr as errorMessageFromXhrUtility, + keysEqual, + XHR_ERROR_UNLOAD, +} from '@js/common/data/utils'; import config from '@js/core/config'; import $ from '@js/core/renderer'; // @ts-expect-error import { Deferred, fromPromise, when } from '@js/core/utils/deferred'; import { isFunction } from '@js/core/utils/type'; -import Store from '@js/data/abstract_store'; -import arrayQuery from '@js/data/array_query'; -import { applyBatch } from '@js/data/array_utils'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -import storeHelper from '@js/data/store_helper'; -import { - // @ts-expect-error - errorMessageFromXhr as errorMessageFromXhrUtility, - // @ts-expect-error - keysEqual, - // @ts-expect-error - XHR_ERROR_UNLOAD, -} from '@js/data/utils'; const TOTAL_COUNT = 'totalCount'; const LOAD = 'load'; diff --git a/packages/devextreme/js/__internal/data/m_local_store.ts b/packages/devextreme/js/__internal/data/m_local_store.ts index 118cea0ecf27..88f176493373 100644 --- a/packages/devextreme/js/__internal/data/m_local_store.ts +++ b/packages/devextreme/js/__internal/data/m_local_store.ts @@ -1,10 +1,9 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { ArrayStore } from '@js/common/data'; +import { errors } from '@js/common/data/errors'; import Class from '@js/core/class'; import domAdapter from '@js/core/dom_adapter'; import { getWindow } from '@js/core/utils/window'; -import ArrayStore from '@js/data/array_store'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -import eventsEngine from '@js/events/core/events_engine'; const window = getWindow(); const { abstract } = Class; diff --git a/packages/devextreme/js/__internal/data/m_query.ts b/packages/devextreme/js/__internal/data/m_query.ts index e308e41f081f..c35f346ae08c 100644 --- a/packages/devextreme/js/__internal/data/m_query.ts +++ b/packages/devextreme/js/__internal/data/m_query.ts @@ -1,4 +1,4 @@ -import { queryImpl } from '@js/data/query_implementation'; +import { queryImpl } from '@js/common/data/query_implementation'; const query = function () { const impl = Array.isArray(arguments[0]) ? 'array' : 'remote'; diff --git a/packages/devextreme/js/__internal/data/m_remote_query.ts b/packages/devextreme/js/__internal/data/m_remote_query.ts index 46b9ad0a6309..53fb79c54c50 100644 --- a/packages/devextreme/js/__internal/data/m_remote_query.ts +++ b/packages/devextreme/js/__internal/data/m_remote_query.ts @@ -1,11 +1,10 @@ /* eslint-disable @typescript-eslint/naming-convention */ +import arrayQueryImpl from '@js/common/data/array_query'; +import { errors, handleError } from '@js/common/data/errors'; +import queryAdapters from '@js/common/data/query_adapters'; import { Deferred } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { isFunction } from '@js/core/utils/type'; -import arrayQueryImpl from '@js/data/array_query'; -// @ts-expect-error -import { errors, handleError } from '@js/data/errors'; -import queryAdapters from '@js/data/query_adapters'; const remoteQueryImpl = function (url, queryOptions, tasks) { tasks = tasks || []; diff --git a/packages/devextreme/js/__internal/data/m_store_helper.ts b/packages/devextreme/js/__internal/data/m_store_helper.ts index 532127da73ae..fda349998c10 100644 --- a/packages/devextreme/js/__internal/data/m_store_helper.ts +++ b/packages/devextreme/js/__internal/data/m_store_helper.ts @@ -1,10 +1,9 @@ +import arrayQuery from '@js/common/data/array_query'; +import { normalizeSortingInfo } from '@js/common/data/utils'; // @ts-expect-error import { grep } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import arrayQuery from '@js/data/array_query'; -// @ts-expect-error -import { normalizeSortingInfo } from '@js/data/utils'; function multiLevelGroup(query, groupInfo) { query = query.groupBy(groupInfo[0].selector); diff --git a/packages/devextreme/js/__internal/data/odata/m_context.ts b/packages/devextreme/js/__internal/data/odata/m_context.ts index 0da972b6b409..5e46acd82570 100644 --- a/packages/devextreme/js/__internal/data/odata/m_context.ts +++ b/packages/devextreme/js/__internal/data/odata/m_context.ts @@ -1,12 +1,12 @@ -import '@js/data/odata/query_adapter'; +import '@js/common/data/odata/query_adapter'; +import { ODataStore } from '@js/common/data'; +import RequestDispatcher from '@js/common/data/odata/request_dispatcher'; import Class from '@js/core/class'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isPlainObject } from '@js/core/utils/type'; -import RequestDispatcher from '@js/data/odata/request_dispatcher'; -import ODataStore from '@js/data/odata/store'; import { errors, handleError } from '../m_errors'; import { escapeServiceOperationParams, formatFunctionInvocationUrl } from './m_utils'; diff --git a/packages/devextreme/js/__internal/data/odata/m_query_adapter.ts b/packages/devextreme/js/__internal/data/odata/m_query_adapter.ts index 95a3eb1e1fbd..8e06ae78e816 100644 --- a/packages/devextreme/js/__internal/data/odata/m_query_adapter.ts +++ b/packages/devextreme/js/__internal/data/odata/m_query_adapter.ts @@ -1,8 +1,8 @@ +import queryAdapters from '@js/common/data/query_adapters'; import config from '@js/core/config'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isFunction } from '@js/core/utils/type'; -import queryAdapters from '@js/data/query_adapters'; import { errors } from '../m_errors'; import { diff --git a/packages/devextreme/js/__internal/data/odata/m_request_dispatcher.ts b/packages/devextreme/js/__internal/data/odata/m_request_dispatcher.ts index 616638cac8bf..c1dbe9f8ca6b 100644 --- a/packages/devextreme/js/__internal/data/odata/m_request_dispatcher.ts +++ b/packages/devextreme/js/__internal/data/odata/m_request_dispatcher.ts @@ -1,7 +1,6 @@ -import '@js/data/odata/query_adapter'; +import '@js/common/data/odata/query_adapter'; -// @ts-expect-error -import { sendRequest } from '@js/data/odata/utils'; +import { sendRequest } from '@js/common/data/odata/utils'; const DEFAULT_PROTOCOL_VERSION = 4; diff --git a/packages/devextreme/js/__internal/data/odata/m_store.ts b/packages/devextreme/js/__internal/data/odata/m_store.ts index 0442335481a6..49c2982e4528 100644 --- a/packages/devextreme/js/__internal/data/odata/m_store.ts +++ b/packages/devextreme/js/__internal/data/odata/m_store.ts @@ -1,13 +1,12 @@ -import '@js/data/odata/query_adapter'; +import '@js/common/data/odata/query_adapter'; +import { query } from '@js/common/data'; +import Store from '@js/common/data/abstract_store'; +import { errors } from '@js/common/data/errors'; +import RequestDispatcher from '@js/common/data/odata/request_dispatcher'; import config from '@js/core/config'; import { Deferred, when } from '@js/core/utils/deferred'; import { isDefined } from '@js/core/utils/type'; -import Store from '@js/data/abstract_store'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -import RequestDispatcher from '@js/data/odata/request_dispatcher'; -import query from '@js/data/query'; import { convertPrimitiveValue, diff --git a/packages/devextreme/js/__internal/data/odata/m_utils.ts b/packages/devextreme/js/__internal/data/odata/m_utils.ts index fcbbd5117c4d..cf043c0de3c9 100644 --- a/packages/devextreme/js/__internal/data/odata/m_utils.ts +++ b/packages/devextreme/js/__internal/data/odata/m_utils.ts @@ -1,3 +1,5 @@ +import { errors } from '@js/common/data/errors'; +import { errorMessageFromXhr, XHR_ERROR_UNLOAD } from '@js/common/data/utils'; import Class from '@js/core/class'; import Guid from '@js/core/guid'; import ajax from '@js/core/utils/ajax'; @@ -10,10 +12,6 @@ import { format as stringFormat } from '@js/core/utils/string'; import { isDefined, isObject, isPlainObject, type, } from '@js/core/utils/type'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -// @ts-expect-error -import { errorMessageFromXhr, XHR_ERROR_UNLOAD } from '@js/data/utils'; const GUID_REGEX = /^(\{{0,1}([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}\}{0,1})$/; @@ -237,7 +235,7 @@ export const sendRequest = (protocolVersion, request, options) => { if (isFinite(count)) { d.resolve(count); } else { - d.reject(new errors.Error('E4018')); + d.reject(errors.Error('E4018')); } } else if (nextUrl && !isPaged) { if (!isAbsoluteUrl(nextUrl)) { diff --git a/packages/devextreme/js/__internal/data_controller.ts b/packages/devextreme/js/__internal/data_controller.ts index 45aaa57acaf9..27d3cc1cd485 100644 --- a/packages/devextreme/js/__internal/data_controller.ts +++ b/packages/devextreme/js/__internal/data_controller.ts @@ -1,10 +1,10 @@ import { Deferred } from '@js/core/utils/deferred'; +import { ArrayStore } from '../common/data'; +import { DataSource } from '../common/data/data_source/data_source'; +import { normalizeDataSourceOptions } from '../common/data/data_source/utils'; import { extend } from '../core/utils/extend'; import { isDefined } from '../core/utils/type'; -import ArrayStore from '../data/array_store'; -import { DataSource } from '../data/data_source/data_source'; -import { normalizeDataSourceOptions } from '../data/data_source/utils'; interface DataSourceType { _userData: unknown; diff --git a/packages/devextreme/js/__internal/events/core/m_emitter.feedback.ts b/packages/devextreme/js/__internal/events/core/m_emitter.feedback.ts index 1649da5afd88..cd2ced59a6df 100644 --- a/packages/devextreme/js/__internal/events/core/m_emitter.feedback.ts +++ b/packages/devextreme/js/__internal/events/core/m_emitter.feedback.ts @@ -1,10 +1,10 @@ +import Emitter from '@js/common/core/events/core/emitter'; +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import pointerEvents from '@js/common/core/events/pointer'; +import { isMouseEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import { ensureDefined, noop } from '@js/core/utils/common'; import { contains } from '@js/core/utils/dom'; -import Emitter from '@js/events/core/emitter'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import pointerEvents from '@js/events/pointer'; -import { isMouseEvent } from '@js/events/utils/index'; import devices from '@ts/core/m_devices'; const ACTIVE_EVENT_NAME = 'dxactive'; diff --git a/packages/devextreme/js/__internal/events/core/m_emitter.ts b/packages/devextreme/js/__internal/events/core/m_emitter.ts index 65d31a3b7aa6..fd09b7c43782 100644 --- a/packages/devextreme/js/__internal/events/core/m_emitter.ts +++ b/packages/devextreme/js/__internal/events/core/m_emitter.ts @@ -1,9 +1,9 @@ +import { fireEvent, hasTouches, isDxMouseWheelEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import $ from '@js/core/renderer'; import Callbacks from '@js/core/utils/callbacks'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; -import { fireEvent, hasTouches, isDxMouseWheelEvent } from '@js/events/utils/index'; const Emitter = Class.inherit({ diff --git a/packages/devextreme/js/__internal/events/core/m_emitter_registrator.ts b/packages/devextreme/js/__internal/events/core/m_emitter_registrator.ts index 48d06a7f38bd..801b84dddb0c 100644 --- a/packages/devextreme/js/__internal/events/core/m_emitter_registrator.ts +++ b/packages/devextreme/js/__internal/events/core/m_emitter_registrator.ts @@ -1,3 +1,8 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as wheelEventName } from '@js/common/core/events/core/wheel'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, isMouseEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import domAdapter from '@js/core/dom_adapter'; import { data as elementData } from '@js/core/element_data'; @@ -5,11 +10,6 @@ import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import readyCallbacks from '@js/core/utils/ready_callbacks'; -import registerEvent from '@js/events/core/event_registrator'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as wheelEventName } from '@js/events/core/wheel'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, isMouseEvent } from '@js/events/utils/index'; const MANAGER_EVENT = 'dxEventManager'; const EMITTER_DATA = 'dxEmitter'; diff --git a/packages/devextreme/js/__internal/events/core/m_event_registrator.ts b/packages/devextreme/js/__internal/events/core/m_event_registrator.ts index 1300b04f4577..b84e875dfc31 100644 --- a/packages/devextreme/js/__internal/events/core/m_event_registrator.ts +++ b/packages/devextreme/js/__internal/events/core/m_event_registrator.ts @@ -1,5 +1,5 @@ +import callbacks from '@js/common/core/events/core/event_registrator_callbacks'; import { each } from '@js/core/utils/iterator'; -import callbacks from '@js/events/core/event_registrator_callbacks'; const registerEvent = function (name, eventObject) { const strategy: any = {}; diff --git a/packages/devextreme/js/__internal/events/core/m_events_engine.ts b/packages/devextreme/js/__internal/events/core/m_events_engine.ts index 53f51b8a8fd8..26730956c6d8 100644 --- a/packages/devextreme/js/__internal/events/core/m_events_engine.ts +++ b/packages/devextreme/js/__internal/events/core/m_events_engine.ts @@ -1,3 +1,6 @@ +import registerEventCallbacks from '@js/common/core/events/core/event_registrator_callbacks'; +import hookTouchProps from '@js/common/core/events/core/hook_touch_props'; +import { getEventTarget } from '@js/common/core/events/utils/event_target'; import domAdapter from '@js/core/dom_adapter'; import errors from '@js/core/errors'; import callOnce from '@js/core/utils/call_once'; @@ -8,9 +11,6 @@ import { isFunction, isObject, isString, isWindow, } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import registerEventCallbacks from '@js/events/core/event_registrator_callbacks'; -import hookTouchProps from '@js/events/core/hook_touch_props'; -import { getEventTarget } from '@js/events/utils/event_target'; const window = getWindow(); diff --git a/packages/devextreme/js/__internal/events/core/m_keyboard_processor.ts b/packages/devextreme/js/__internal/events/core/m_keyboard_processor.ts index bc3194beeda1..6c8cda2690f9 100644 --- a/packages/devextreme/js/__internal/events/core/m_keyboard_processor.ts +++ b/packages/devextreme/js/__internal/events/core/m_keyboard_processor.ts @@ -1,7 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, normalizeKeyName } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import $ from '@js/core/renderer'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, normalizeKeyName } from '@js/events/utils/index'; const COMPOSITION_START_EVENT = 'compositionstart'; const COMPOSITION_END_EVENT = 'compositionend'; diff --git a/packages/devextreme/js/__internal/events/core/m_wheel.ts b/packages/devextreme/js/__internal/events/core/m_wheel.ts index f4f94e27f02a..c579e0ec7856 100644 --- a/packages/devextreme/js/__internal/events/core/m_wheel.ts +++ b/packages/devextreme/js/__internal/events/core/m_wheel.ts @@ -1,7 +1,7 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, fireEvent } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; -import registerEvent from '@js/events/core/event_registrator'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, fireEvent } from '@js/events/utils/index'; const EVENT_NAME = 'dxmousewheel'; const EVENT_NAMESPACE = 'dxWheel'; 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 index abd66c8d2c0d..6edadbe1125b 100644 --- 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,11 +1,11 @@ -import { cancelAnimationFrame, requestAnimationFrame } from '@js/animation/frame'; -import Class from '@js/core/class'; -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 { cancelAnimationFrame, requestAnimationFrame } from '@js/common/core/animation/frame'; +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import GestureEmitter from '@js/common/core/events/gesture/emitter.gesture'; import { addNamespace, eventData, eventDelta, isDxMouseWheelEvent, isMouseEvent, -} from '@js/events/utils/index'; +} from '@js/common/core/events/utils/index'; +import Class from '@js/core/class'; 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 index c507772f7c90..26a9be9ac708 100644 --- a/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.ts +++ b/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.ts @@ -1,3 +1,8 @@ +import Emitter from '@js/common/core/events/core/emitter'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + createEvent, eventData, eventDelta, isDxMouseWheelEvent, isTouchEvent, needSkipEvent, +} from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import callOnce from '@js/core/utils/call_once'; import { noop } from '@js/core/utils/common'; @@ -5,11 +10,6 @@ import { sign } from '@js/core/utils/math'; import readyCallbacks from '@js/core/utils/ready_callbacks'; import { styleProp } from '@js/core/utils/style'; import { isDefined } from '@js/core/utils/type'; -import Emitter from '@js/events/core/emitter'; -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'; diff --git a/packages/devextreme/js/__internal/events/gesture/m_swipeable.ts b/packages/devextreme/js/__internal/events/gesture/m_swipeable.ts index 4ba1540119cd..d321ed8f4a38 100644 --- a/packages/devextreme/js/__internal/events/gesture/m_swipeable.ts +++ b/packages/devextreme/js/__internal/events/gesture/m_swipeable.ts @@ -1,14 +1,14 @@ -import DOMComponent from '@js/core/dom_component'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { name } from '@js/core/utils/public_component'; -import eventsEngine from '@js/events/core/events_engine'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { end as swipeEventEnd, start as swipeEventStart, swipe as swipeEventSwipe, -} from '@js/events/swipe'; -import { addNamespace } from '@js/events/utils/index'; +} from '@js/common/core/events/swipe'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import DOMComponent from '@js/core/dom_component'; +import { extend } from '@js/core/utils/extend'; +import { each } from '@js/core/utils/iterator'; +import { name } from '@js/core/utils/public_component'; const DX_SWIPEABLE = 'dxSwipeable'; const SWIPEABLE_CLASS = 'dx-swipeable'; diff --git a/packages/devextreme/js/__internal/events/m_click.ts b/packages/devextreme/js/__internal/events/m_click.ts index 6b1804bc55e2..03bc4dc7d685 100644 --- a/packages/devextreme/js/__internal/events/m_click.ts +++ b/packages/devextreme/js/__internal/events/m_click.ts @@ -1,13 +1,13 @@ import { cancelAnimationFrame, requestAnimationFrame } from '@js/animation/frame'; +import Emitter from '@js/common/core/events/core/emitter'; +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { subscribeNodesDisposing, unsubscribeNodesDisposing } from '@js/common/core/events/utils/event_nodes_disposing'; +import { getEventTarget } from '@js/common/core/events/utils/event_target'; +import { addNamespace, fireEvent } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; -import Emitter from '@js/events/core/emitter'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import eventsEngine from '@js/events/core/events_engine'; -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'; import domUtils from '@ts/core/utils/m_dom'; diff --git a/packages/devextreme/js/__internal/events/m_contextmenu.ts b/packages/devextreme/js/__internal/events/m_contextmenu.ts index d0816416647c..e4b7c1f54023 100644 --- a/packages/devextreme/js/__internal/events/m_contextmenu.ts +++ b/packages/devextreme/js/__internal/events/m_contextmenu.ts @@ -1,9 +1,9 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import { addNamespace, fireEvent, isMouseEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; 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'; diff --git a/packages/devextreme/js/__internal/events/m_dblclick.ts b/packages/devextreme/js/__internal/events/m_dblclick.ts index 6628b8d0c4fe..646a7793fff9 100644 --- a/packages/devextreme/js/__internal/events/m_dblclick.ts +++ b/packages/devextreme/js/__internal/events/m_dblclick.ts @@ -1,9 +1,9 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, fireEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import domAdapter from '@js/core/dom_adapter'; import { closestCommonParent } from '@js/core/utils/dom'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, fireEvent } from '@js/events/utils/index'; const DBLCLICK_EVENT_NAME = 'dxdblclick'; const DBLCLICK_NAMESPACE = 'dxDblClick'; diff --git a/packages/devextreme/js/__internal/events/m_drag.ts b/packages/devextreme/js/__internal/events/m_drag.ts index 952dd4b7f624..30388f15bff5 100644 --- a/packages/devextreme/js/__internal/events/m_drag.ts +++ b/packages/devextreme/js/__internal/events/m_drag.ts @@ -1,12 +1,12 @@ +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import registerEvent from '@js/common/core/events/core/event_registrator'; +import GestureEmitter from '@js/common/core/events/gesture/emitter.gesture'; +import { eventData as eData, fireEvent } from '@js/common/core/events/utils/index'; import { data as elementData, removeData } from '@js/core/element_data'; import $ from '@js/core/renderer'; import { wrapToArray } from '@js/core/utils/array'; import { contains } from '@js/core/utils/dom'; import * as iteratorUtils from '@js/core/utils/iterator'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import registerEvent from '@js/events/core/event_registrator'; -import GestureEmitter from '@js/events/gesture/emitter.gesture'; -import { eventData as eData, fireEvent } from '@js/events/utils/index'; const DRAG_START_EVENT = 'dxdragstart'; const DRAG_EVENT = 'dxdrag'; diff --git a/packages/devextreme/js/__internal/events/m_hold.ts b/packages/devextreme/js/__internal/events/m_hold.ts index f5fb13543588..3248dc50f4f8 100644 --- a/packages/devextreme/js/__internal/events/m_hold.ts +++ b/packages/devextreme/js/__internal/events/m_hold.ts @@ -1,6 +1,6 @@ -import Emitter from '@js/events/core/emitter'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import { eventData, eventDelta } from '@js/events/utils/index'; +import Emitter from '@js/common/core/events/core/emitter'; +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import { eventData, eventDelta } from '@js/common/core/events/utils/index'; const { abs } = Math; diff --git a/packages/devextreme/js/__internal/events/m_hover.ts b/packages/devextreme/js/__internal/events/m_hover.ts index ef963775cc64..29f764e69be2 100644 --- a/packages/devextreme/js/__internal/events/m_hover.ts +++ b/packages/devextreme/js/__internal/events/m_hover.ts @@ -1,9 +1,9 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, fireEvent, isTouchEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; 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'; diff --git a/packages/devextreme/js/__internal/events/m_pointer.ts b/packages/devextreme/js/__internal/events/m_pointer.ts index e4025dbd0371..2db6c39e3a42 100644 --- a/packages/devextreme/js/__internal/events/m_pointer.ts +++ b/packages/devextreme/js/__internal/events/m_pointer.ts @@ -1,9 +1,9 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import MouseStrategy from '@js/common/core/events/pointer/mouse'; +import MouseAndTouchStrategy from '@js/common/core/events/pointer/mouse_and_touch'; +import TouchStrategy from '@js/common/core/events/pointer/touch'; import GlobalConfig from '@js/core/config'; 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'; diff --git a/packages/devextreme/js/__internal/events/m_remove.ts b/packages/devextreme/js/__internal/events/m_remove.ts index 7db6f04f4725..4131b1b6533c 100644 --- a/packages/devextreme/js/__internal/events/m_remove.ts +++ b/packages/devextreme/js/__internal/events/m_remove.ts @@ -1,7 +1,7 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { beforeCleanData } from '@js/core/element_data'; import $ from '@js/core/renderer'; -import registerEvent from '@js/events/core/event_registrator'; -import eventsEngine from '@js/events/core/events_engine'; export const removeEvent = 'dxremove'; const eventPropName = 'dxRemoveEvent'; diff --git a/packages/devextreme/js/__internal/events/m_short.ts b/packages/devextreme/js/__internal/events/m_short.ts index 4ef502a5058f..b65e4fd4d2c4 100644 --- a/packages/devextreme/js/__internal/events/m_short.ts +++ b/packages/devextreme/js/__internal/events/m_short.ts @@ -1,6 +1,6 @@ -import eventsEngine from '@js/events/core/events_engine'; -import KeyboardProcessor from '@js/events/core/keyboard_processor'; -import { addNamespace as pureAddNamespace } from '@js/events/utils/index'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import KeyboardProcessor from '@js/common/core/events/core/keyboard_processor'; +import { addNamespace as pureAddNamespace } from '@js/common/core/events/utils/index'; function addNamespace(event, namespace) { return namespace ? pureAddNamespace(event, namespace) : event; diff --git a/packages/devextreme/js/__internal/events/m_swipe.ts b/packages/devextreme/js/__internal/events/m_swipe.ts index fbea0dddd200..4b533b43885a 100644 --- a/packages/devextreme/js/__internal/events/m_swipe.ts +++ b/packages/devextreme/js/__internal/events/m_swipe.ts @@ -1,7 +1,7 @@ +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import GestureEmitter from '@js/common/core/events/gesture/emitter.gesture'; +import { eventData } from '@js/common/core/events/utils/index'; import { getHeight, getWidth } from '@js/core/utils/size'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import GestureEmitter from '@js/events/gesture/emitter.gesture'; -import { eventData } from '@js/events/utils/index'; const SWIPE_START_EVENT = 'dxswipestart'; const SWIPE_EVENT = 'dxswipe'; diff --git a/packages/devextreme/js/__internal/events/m_transform.ts b/packages/devextreme/js/__internal/events/m_transform.ts index 6f3ae247bc28..3fea6fd1756c 100644 --- a/packages/devextreme/js/__internal/events/m_transform.ts +++ b/packages/devextreme/js/__internal/events/m_transform.ts @@ -1,8 +1,8 @@ +import Emitter from '@js/common/core/events/core/emitter'; +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import { hasTouches } from '@js/common/core/events/utils/index'; import * as iteratorUtils from '@js/core/utils/iterator'; import { fitIntoRange, sign as mathSign } from '@js/core/utils/math'; -import Emitter from '@js/events/core/emitter'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import { hasTouches } from '@js/events/utils/index'; interface EventAlias { name: string; diff --git a/packages/devextreme/js/__internal/events/m_visibility_change.ts b/packages/devextreme/js/__internal/events/m_visibility_change.ts index 73649aaeb138..278bc4047a3d 100644 --- a/packages/devextreme/js/__internal/events/m_visibility_change.ts +++ b/packages/devextreme/js/__internal/events/m_visibility_change.ts @@ -1,5 +1,5 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import $ from '@js/core/renderer'; -import eventsEngine from '@js/events/core/events_engine'; const triggerVisibilityChangeEvent = function (eventName) { const VISIBILITY_CHANGE_SELECTOR = '.dx-visibility-change-handler'; diff --git a/packages/devextreme/js/__internal/events/pointer/m_base.ts b/packages/devextreme/js/__internal/events/pointer/m_base.ts index 9f09bc77971f..4a74403e2b36 100644 --- a/packages/devextreme/js/__internal/events/pointer/m_base.ts +++ b/packages/devextreme/js/__internal/events/pointer/m_base.ts @@ -1,9 +1,9 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { getEventTarget } from '@js/common/core/events/utils/event_target'; +import { addNamespace, eventSource, fireEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import domAdapter from '@js/core/dom_adapter'; import browser from '@js/core/utils/browser'; -import eventsEngine from '@js/events/core/events_engine'; -import { getEventTarget } from '@js/events/utils/event_target'; -import { addNamespace, eventSource, fireEvent } from '@js/events/utils/index'; const POINTER_EVENTS_NAMESPACE = 'dxPointerEvents'; diff --git a/packages/devextreme/js/__internal/events/pointer/m_mouse.ts b/packages/devextreme/js/__internal/events/pointer/m_mouse.ts index 6923ca95f16e..c5bb04abef0d 100644 --- a/packages/devextreme/js/__internal/events/pointer/m_mouse.ts +++ b/packages/devextreme/js/__internal/events/pointer/m_mouse.ts @@ -1,6 +1,6 @@ +import BaseStrategy from '@js/common/core/events/pointer/base'; +import Observer from '@js/common/core/events/pointer/observer'; import { extend } from '@js/core/utils/extend'; -import BaseStrategy from '@js/events/pointer/base'; -import Observer from '@js/events/pointer/observer'; /* eslint-disable spellcheck/spell-checker */ const eventMap = { diff --git a/packages/devextreme/js/__internal/events/pointer/m_mouse_and_touch.ts b/packages/devextreme/js/__internal/events/pointer/m_mouse_and_touch.ts index ace13e48880c..c4a325233da1 100644 --- a/packages/devextreme/js/__internal/events/pointer/m_mouse_and_touch.ts +++ b/packages/devextreme/js/__internal/events/pointer/m_mouse_and_touch.ts @@ -1,8 +1,8 @@ +import BaseStrategy from '@js/common/core/events/pointer/base'; +import MouseStrategy from '@js/common/core/events/pointer/mouse'; +import TouchStrategy from '@js/common/core/events/pointer/touch'; +import { isMouseEvent } from '@js/common/core/events/utils/index'; import { extend } from '@js/core/utils/extend'; -import BaseStrategy from '@js/events/pointer/base'; -import MouseStrategy from '@js/events/pointer/mouse'; -import TouchStrategy from '@js/events/pointer/touch'; -import { isMouseEvent } from '@js/events/utils/index'; /* eslint-disable spellcheck/spell-checker */ const eventMap = { diff --git a/packages/devextreme/js/__internal/events/pointer/m_touch.ts b/packages/devextreme/js/__internal/events/pointer/m_touch.ts index f6fc7b28f21f..159f8652c595 100644 --- a/packages/devextreme/js/__internal/events/pointer/m_touch.ts +++ b/packages/devextreme/js/__internal/events/pointer/m_touch.ts @@ -1,6 +1,6 @@ +import BaseStrategy from '@js/common/core/events/pointer/base'; 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 */ diff --git a/packages/devextreme/js/__internal/events/utils/index.ts b/packages/devextreme/js/__internal/events/utils/index.ts index 407f3dced19d..ed0d11d30964 100644 --- a/packages/devextreme/js/__internal/events/utils/index.ts +++ b/packages/devextreme/js/__internal/events/utils/index.ts @@ -1,7 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import eventsEngine from '@js/events/core/events_engine'; import { focused } from '@js/ui/widget/selectors'; import mappedAddNamespace from './m_add_namespace'; diff --git a/packages/devextreme/js/__internal/events/utils/m_event_nodes_disposing.ts b/packages/devextreme/js/__internal/events/utils/m_event_nodes_disposing.ts index 3baf9abb34ae..4db01c1452c5 100644 --- a/packages/devextreme/js/__internal/events/utils/m_event_nodes_disposing.ts +++ b/packages/devextreme/js/__internal/events/utils/m_event_nodes_disposing.ts @@ -1,5 +1,5 @@ -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; function nodesByEvent(event) { return event && [ diff --git a/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts b/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts index 992e4395f599..abf302038afd 100644 --- a/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts +++ b/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts @@ -1,4 +1,7 @@ /* eslint-disable max-classes-per-file */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { normalizeKeyName } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import Guid from '@js/core/guid'; @@ -6,9 +9,6 @@ import $ from '@js/core/renderer'; import { when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { normalizeKeyName } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Popup from '@js/ui/popup/ui.popup'; import EditorFactoryMixin from '@js/ui/shared/ui.editor_factory_mixin'; import TreeView from '@js/ui/tree_view'; diff --git a/packages/devextreme/js/__internal/filter_builder/m_utils.ts b/packages/devextreme/js/__internal/filter_builder/m_utils.ts index 600b85c216da..373b1ff2dbf3 100644 --- a/packages/devextreme/js/__internal/filter_builder/m_utils.ts +++ b/packages/devextreme/js/__internal/filter_builder/m_utils.ts @@ -1,14 +1,13 @@ +import messageLocalization from '@js/common/core/localization/message'; +import { DataSource } from '@js/common/data/data_source/data_source'; +import { errors as dataErrors } from '@js/common/data/errors'; import $ from '@js/core/renderer'; import { compileGetter } from '@js/core/utils/data'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { captionize } from '@js/core/utils/inflector'; import { isDefined, isFunction } from '@js/core/utils/type'; -import { DataSource } from '@js/data/data_source/data_source'; -// @ts-expect-error errors.d.ts is badly typed and doesn't contain all exported entities. -import { errors as dataErrors } from '@js/data/errors'; import formatHelper from '@js/format_helper'; -import messageLocalization from '@js/localization/message'; import filterUtils from '@js/ui/shared/filtering'; import errors from '@js/ui/widget/ui.errors'; @@ -142,7 +141,7 @@ function getCriteriaOperation(criteria) { const item = criteria[i]; if (!Array.isArray(item)) { if (value && value !== item) { - throw new dataErrors.Error('E4019'); + throw dataErrors.Error('E4019'); } if (item !== '!') { value = item; diff --git a/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts b/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts index d27e6139b0e9..b3bee519040b 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts @@ -2,13 +2,13 @@ import '@js/ui/button'; import '@js/ui/drop_down_button'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { getDefaultAlignment } from '@js/core/utils/position'; import { format } from '@js/core/utils/string'; import { isDefined, isFunction } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import List from '@js/ui/list_light'; import errors from '@js/ui/widget/ui.errors'; import { prepareItems } from '@ts/grids/grid_core/m_export'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts index 7093eac76a80..921272af50c6 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts @@ -1,12 +1,12 @@ /* eslint-disable max-classes-per-file */ /* eslint-disable @typescript-eslint/method-signature-style */ +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { Deferred, when } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { getHeight } from '@js/core/utils/size'; import { isDefined, isString } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import { restoreFocus, setTabIndex } from '@js/ui/shared/accessibility'; import type { DataController } from '@ts/grids/grid_core/data_controller/m_data_controller'; import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts index 6ab6b600ee71..72613af77893 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts @@ -1,8 +1,7 @@ +import { errors as dataErrors } from '@js/common/data/errors'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -// @ts-expect-error -import { errors as dataErrors } from '@js/data/errors'; import errors from '@js/ui/widget/ui.errors'; import dataGridCore from '../m_core'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts index 1ae9b0b1dc66..b876477b9cde 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts @@ -1,7 +1,6 @@ +import { normalizeSortingInfo } from '@js/common/data/utils'; import $ from '@js/core/renderer'; import { when } from '@js/core/utils/deferred'; -// @ts-expect-error -import { normalizeSortingInfo } from '@js/data/utils'; import gridCore from '../m_core'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts index 77c4f349e578..32dc9e30c3da 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts @@ -1,11 +1,10 @@ +import { query as dataQuery } from '@js/common/data'; +import storeHelper from '@js/common/data/store_helper'; +import { keysEqual } from '@js/common/data/utils'; import { toComparable } from '@js/core/utils/data'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import dataQuery from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; -// @ts-expect-error -import { keysEqual } from '@js/data/utils'; import dataGridCore from '../m_core'; import { createGroupFilter } from '../m_utils'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/m_aggregate_calculator.ts b/packages/devextreme/js/__internal/grids/data_grid/m_aggregate_calculator.ts index 89a0e7cb35d7..4c9f0afb875c 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/m_aggregate_calculator.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/m_aggregate_calculator.ts @@ -1,9 +1,7 @@ +import { errors } from '@js/common/data/errors'; +import { aggregators } from '@js/common/data/utils'; import { compileGetter } from '@js/core/utils/data'; import { isFunction } from '@js/core/utils/type'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -// @ts-expect-error -import { aggregators } from '@js/data/utils'; function depthFirstSearch(i, depth, root, callback) { let j = 0; diff --git a/packages/devextreme/js/__internal/grids/data_grid/m_utils.ts b/packages/devextreme/js/__internal/grids/data_grid/m_utils.ts index cb7600b999ef..0d2a9d97bc6a 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/m_utils.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/m_utils.ts @@ -1,5 +1,4 @@ -// @ts-expect-error -import { normalizeSortingInfo } from '@js/data/utils'; +import { normalizeSortingInfo } from '@js/common/data/utils'; import gridCoreUtils from '@ts/grids/grid_core/m_utils'; export function createGroupFilter(path, storeLoadOptions) { diff --git a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts index 2374ed7fb45b..ee73a2917d83 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts @@ -1,4 +1,8 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; +import { query as dataQuery } from '@js/common/data'; +import storeHelper from '@js/common/data/store_helper'; +import { normalizeSortingInfo } from '@js/common/data/utils'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { compileGetter } from '@js/core/utils/data'; @@ -8,11 +12,6 @@ import { isDefined, isEmptyObject, isFunction, isPlainObject, isString, } from '@js/core/utils/type'; -import dataQuery from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; -// @ts-expect-error -import { normalizeSortingInfo } from '@js/data/utils'; -import messageLocalization from '@js/localization/message'; import errors from '@js/ui/widget/ui.errors'; import type { DataController } from '@ts/grids/grid_core/data_controller/m_data_controller'; import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts index 2397d606f47d..f4b44409b835 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts @@ -1,5 +1,10 @@ /* eslint-disable @typescript-eslint/method-signature-style */ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import Guid from '@js/core/guid'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -10,11 +15,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getWidth } from '@js/core/utils/size'; import { isDefined, isString } from '@js/core/utils/type'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Form from '@js/ui/form'; import { isMaterial } from '@js/ui/themes'; import type { ResizingController } from '@ts/grids/grid_core/views/m_grid_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts b/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts index 009f18226d47..e36d2a2cb89d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts @@ -1,4 +1,5 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { deferUpdate } from '@js/core/utils/common'; @@ -6,7 +7,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getOuterHeight, getOuterWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import Popup from '@js/ui/popup/ui.popup'; // @ts-expect-error diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts index 7e5c3b6e8a85..10d20bad13ea 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts @@ -1,7 +1,10 @@ /* eslint-disable max-classes-per-file */ // TODO Move DataGrid's summary methods to the DataGrid // TODO Move virtual scrolling related methods to the virtual_scrolling -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as wheelEventName } from '@js/common/core/events/core/wheel'; +import messageLocalization from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import browser from '@js/core/utils/browser'; @@ -11,9 +14,6 @@ import { getBoundingRect } from '@js/core/utils/position'; import { getOuterWidth } from '@js/core/utils/size'; import { setWidth } from '@js/core/utils/style'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as wheelEventName } from '@js/events/core/wheel'; -import messageLocalization from '@js/localization/message'; import Scrollable from '@js/ui/scroll_view/ui.scrollable'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts b/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts index bbd921c1439e..b3b267cbc9a7 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts @@ -1,3 +1,5 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -5,8 +7,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getHeight } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import messageLocalization from '@js/localization/message'; import type { HeaderFilterController } from '@ts/grids/grid_core/header_filter/m_header_filter'; import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts index 9c656763152e..b1105d2c36a6 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts @@ -1,4 +1,9 @@ /* eslint-disable prefer-destructuring */ +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; +import Store from '@js/common/data/abstract_store'; +import { DataSource } from '@js/common/data/data_source/data_source'; +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; import type { ColumnBase } from '@js/common/grids'; import config from '@js/core/config'; import $ from '@js/core/renderer'; @@ -13,11 +18,6 @@ import { isString, } from '@js/core/utils/type'; import variableWrapper from '@js/core/utils/variable_wrapper'; -import Store from '@js/data/abstract_store'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import filterUtils from '@js/ui/shared/filtering'; import errors from '@js/ui/widget/ui.errors'; import inflector from '@ts/core/utils/m_inflector'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller_utils.ts index ca081854f989..8753c2518ede 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller_utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller_utils.ts @@ -1,4 +1,5 @@ /* eslint-disable prefer-destructuring */ +import numberLocalization from '@js/common/core/localization/number'; import { normalizeIndexes } from '@js/core/utils/array'; import { equalByValue } from '@js/core/utils/common'; import { compileGetter, compileSetter } from '@js/core/utils/data'; @@ -11,7 +12,6 @@ import { isDefined, isFunction, isNumeric, isObject, isString, type, } from '@js/core/utils/type'; import variableWrapper from '@js/core/utils/variable_wrapper'; -import numberLocalization from '@js/localization/number'; import { HIDDEN_COLUMNS_WIDTH } from '../adaptivity/const'; import gridCoreUtils from '../m_utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts index e51c32750e9f..be6be7f5cd72 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts @@ -1,5 +1,13 @@ /* eslint-disable max-classes-per-file */ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + end as dragEventEnd, + move as dragEventMove, + start as dragEventStart, +} from '@js/common/core/events/drag'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, eventData as getEventData, isTouchEvent } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -12,14 +20,6 @@ import { setHeight, setWidth, } from '@js/core/utils/size'; import { isDefined, isObject, isString } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { - end as dragEventEnd, - move as dragEventMove, - start as dragEventStart, -} from '@js/events/drag'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, eventData as getEventData, isTouchEvent } from '@js/events/utils/index'; import swatchContainer from '@js/ui/widget/swatch_container'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; import type { ModuleType } from '@ts/grids/grid_core/m_types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts index 1512ba48ea41..dec26e1f58d0 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/method-signature-style */ +import { ArrayStore, CustomStore } from '@js/common/data'; import $ from '@js/core/renderer'; import { findChanges } from '@js/core/utils/array_compare'; import { deferRender, equalByValue } from '@js/core/utils/common'; @@ -6,8 +7,6 @@ import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isObject } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import CustomStore from '@js/data/custom_store'; import errors from '@js/ui/widget/ui.errors'; import type { EditingController } from '@ts/grids/grid_core/editing/m_editing'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_helper_mixin.ts b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_helper_mixin.ts index 50c95f81ed83..b05b335e9fdd 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_helper_mixin.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_helper_mixin.ts @@ -1,6 +1,6 @@ +import { DataSource } from '@js/common/data/data_source/data_source'; +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; import { extend } from '@js/core/utils/extend'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; import DataController from '@ts/ui/collection/m_data_controller'; import type { Controller } from '../m_modules'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts index abc0466823e5..6e327b7d403e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/no-dynamic-delete */ +import { ArrayStore } from '@js/common/data'; +import { applyBatch } from '@js/common/data/array_utils'; import Callbacks from '@js/core/utils/callbacks'; import { getKeyHash } from '@js/core/utils/common'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isFunction, isPlainObject } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import { applyBatch } from '@js/data/array_utils'; import modules from '../m_modules'; import gridCoreUtils from '../m_utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts index a8a4617bc2aa..f2b311cfa752 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts @@ -1,4 +1,11 @@ /* eslint-disable @typescript-eslint/no-unused-vars, max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { removeEvent } from '@js/common/core/events/remove'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; +import { createObjectWithChanges } from '@js/common/data/array_utils'; import type { GridsEditMode } from '@js/common/grids'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -17,13 +24,6 @@ import { isDefined, isEmptyObject, isFunction, isObject, } from '@js/core/utils/type'; -import { createObjectWithChanges } from '@js/data/array_utils'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { removeEvent } from '@js/events/remove'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import { confirm } from '@js/ui/dialog'; import { current, isFluent } from '@js/ui/themes'; import domUtils from '@ts/core/utils/m_dom'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts index ce2c2a1936c0..f6a407840b87 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts @@ -1,4 +1,10 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import { createObjectWithChanges } from '@js/common/data/array_utils'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { deferRender } from '@js/core/utils/common'; @@ -6,12 +12,6 @@ import type { DeferredObj } from '@js/core/utils/deferred'; import { Deferred, when } from '@js/core/utils/deferred'; import { isElementInDom } from '@js/core/utils/dom'; import { isDefined, isString } from '@js/core/utils/type'; -import { createObjectWithChanges } from '@js/data/array_utils'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts index 640d8e1c773c..05a530e0f618 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts @@ -1,4 +1,6 @@ /* eslint-disable max-classes-per-file */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; import devices from '@js/core/devices'; import Guid from '@js/core/guid'; import type { dxElementWrapper } from '@js/core/renderer'; @@ -9,8 +11,6 @@ import { isElementInDom } from '@js/core/utils/dom'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isString } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; import Button from '@js/ui/button'; import Form from '@js/ui/form'; import Popup from '@js/ui/popup/ui.popup'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts b/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts index 3eb1bf61695e..61c2c2ec7a26 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts @@ -1,5 +1,9 @@ /* eslint-disable @typescript-eslint/method-signature-style */ -import positionUtils from '@js/animation/position'; +import positionUtils from '@js/common/core/animation/position'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, normalizeKeyName } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -10,10 +14,6 @@ import { getOuterHeight, getOuterWidth, setOuterHeight, setOuterWidth, } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, normalizeKeyName } from '@js/events/utils/index'; import EditorFactoryMixin from '@js/ui/shared/ui.editor_factory_mixin'; import type { ColumnsResizerViewController, @@ -194,7 +194,6 @@ export class EditorFactory extends ViewControllerWithMixin { protected updateFocusOverlaySize($element, position): void { $element.hide(); - // @ts-expect-error const location = positionUtils.calculate($element, extend({ collision: 'fit' }, position)); if (location.h.oversize > 0) { @@ -254,7 +253,6 @@ export class EditorFactory extends ViewControllerWithMixin { }; this.updateFocusOverlaySize(this._$focusOverlay, focusOverlayPosition); - // @ts-expect-error positionUtils.setup(this._$focusOverlay, focusOverlayPosition); this._$focusOverlay.css('visibility', 'visible'); // for ios diff --git a/packages/devextreme/js/__internal/grids/grid_core/error_handling/m_error_handling.ts b/packages/devextreme/js/__internal/grids/grid_core/error_handling/m_error_handling.ts index e3130f6ba24f..d73f533a203c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/error_handling/m_error_handling.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/error_handling/m_error_handling.ts @@ -1,9 +1,9 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { each } from '@js/core/utils/iterator'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import messageLocalization from '@js/localization/message'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/m_columns_controller'; import type { ResizingController } from '@ts/grids/grid_core/views/m_grid_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_builder.ts b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_builder.ts index da01a1164d22..ba331eaf8860 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_builder.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_builder.ts @@ -1,6 +1,6 @@ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import messageLocalization from '@js/localization/message'; import FilterBuilder from '@js/ui/filter_builder'; import Popup from '@js/ui/popup/ui.popup'; import ScrollView from '@js/ui/scroll_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_custom_operations.ts b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_custom_operations.ts index b852a5466d81..9a64587d5845 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_custom_operations.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_custom_operations.ts @@ -1,8 +1,8 @@ +import messageLocalization from '@js/common/core/localization/message'; +import { DataSource } from '@js/common/data/data_source/data_source'; import $ from '@js/core/renderer'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import { DataSource } from '@js/data/data_source/data_source'; -import messageLocalization from '@js/localization/message'; import errors from '@js/ui/widget/ui.errors'; import { getFilterExpression, isCondition, isGroup, renderValueText, diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts index 28085ef378dd..f103c2486d24 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts @@ -1,10 +1,10 @@ /* eslint-disable max-classes-per-file */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import messageLocalization from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { Deferred, when } from '@js/core/utils/deferred'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import messageLocalization from '@js/localization/message'; import CheckBox from '@js/ui/check_box'; import inflector from '@ts/core/utils/m_inflector'; import { diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_row.ts b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_row.ts index 55bc1642dd67..496779c3de95 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_row.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_row.ts @@ -1,13 +1,13 @@ /* eslint-disable max-classes-per-file */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { normalizeKeyName } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { equalByValue } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { each, map } from '@js/core/utils/iterator'; import { getOuterWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { normalizeKeyName } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Editor from '@js/ui/editor/editor'; import Menu from '@js/ui/menu'; import Overlay from '@js/ui/overlay/ui.overlay'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts index 8e93098c9c74..be85d2b8b756 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts @@ -1,17 +1,17 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; +import { query as dataQuery } from '@js/common/data'; +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; +import storeHelper from '@js/common/data/store_helper'; import { compileGetter } from '@js/core/utils/data'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getDefaultAlignment } from '@js/core/utils/position'; import { isDefined, isFunction, isObject } from '@js/core/utils/type'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; -import dataQuery from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import { restoreFocus, saveFocusedElementInfo } from '@js/ui/shared/accessibility'; import filterUtils from '@js/ui/shared/filtering'; import type { ColumnHeadersView } from '@ts/grids/grid_core/column_headers/m_column_headers'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts index 56b1eed01234..4eaa86385eb8 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts @@ -2,11 +2,11 @@ import '@ts/ui/list/modules/m_search'; import '@ts/ui/list/modules/m_selection'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isFunction } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import List from '@js/ui/list_light'; import Popup from '@js/ui/popup/ui.popup'; import TreeView from '@js/ui/tree_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts b/packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts index 9a0565cb7b7d..b89733dfe7f3 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts @@ -1,9 +1,9 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { getPathParts } from '@js/core/utils/data'; import { extend } from '@js/core/utils/extend'; import { isDefined, isString } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import type { Properties as ToolbarProperties } from '@js/ui/toolbar'; import Toolbar from '@js/ui/toolbar'; import type { EditingController } from '@ts/grids/grid_core/editing/m_editing'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts index 96222c594410..ea93d5a8d7c1 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts @@ -1,4 +1,13 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { keyboard } from '@js/common/core/events/short'; +import { + addNamespace, + createEvent, + isCommandKeyPressed, +} from '@js/common/core/events/utils/index'; import { noop } from '@js/core//utils/common'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -13,15 +22,6 @@ import { getWidth, } from '@js/core/utils/size'; import { isDeferred, isDefined, isEmptyObject } from '@js/core/utils/type'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { keyboard } from '@js/events/short'; -import { - addNamespace, - createEvent, - isCommandKeyPressed, -} from '@js/events/utils/index'; import * as accessibility from '@js/ui/shared/accessibility'; import { focused } from '@js/ui/widget/selectors'; import type { AdaptiveColumnsController } from '@ts/grids/grid_core/adaptivity/m_adaptivity'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_modules.ts b/packages/devextreme/js/__internal/grids/grid_core/m_modules.ts index 33c4b6202543..98b7a1b77786 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/m_modules.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/m_modules.ts @@ -1,6 +1,7 @@ /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */ /* eslint-disable max-classes-per-file */ /* eslint-disable @typescript-eslint/method-signature-style */ +import messageLocalization from '@js/common/core/localization/message'; import type { Component } from '@js/core/component'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -10,7 +11,6 @@ import { grep } from '@js/core/utils/common'; import { each } from '@js/core/utils/iterator'; import { isFunction } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import errors from '@js/ui/widget/ui.errors'; import type { diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts index ed1b02a6e6f8..8b3916fd8a25 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts @@ -1,5 +1,9 @@ // @ts-check +import eventsEngine from '@js/common/core/events/core/events_engine'; +import DataSource from '@js/common/data/data_source'; +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; +import { normalizeSortingInfo as normalizeSortingInfoUtility } from '@js/common/data/utils'; import $ from '@js/core/renderer'; import { equalByValue } from '@js/core/utils/common'; import { toComparable } from '@js/core/utils/data'; @@ -12,11 +16,6 @@ import { format } from '@js/core/utils/string'; import { isDefined, isFunction, isString } from '@js/core/utils/type'; import variableWrapper from '@js/core/utils/variable_wrapper'; import { getWindow } from '@js/core/utils/window'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; -// @ts-expect-error -import { normalizeSortingInfo as normalizeSortingInfoUtility } from '@js/data/utils'; -import eventsEngine from '@js/events/core/events_engine'; import formatHelper from '@js/format_helper'; import LoadPanel from '@js/ui/load_panel'; import sharedFiltering from '@js/ui/shared/filtering'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts b/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts index b8c03fb566b3..abfb08354af7 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts @@ -1,4 +1,5 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; // @ts-expect-error @@ -7,7 +8,6 @@ import { Deferred, when } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { getHeight, getWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/m_columns_controller'; import type { DataController } from '@ts/grids/grid_core/data_controller/m_data_controller'; import type { ModuleType } from '@ts/grids/grid_core/m_types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/pager/m_pager.ts b/packages/devextreme/js/__internal/grids/grid_core/pager/m_pager.ts index 7f7a91c8d8c8..3aa5a32261dc 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/pager/m_pager.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/pager/m_pager.ts @@ -1,6 +1,6 @@ +import messageLocalization from '@js/common/core/localization/message'; import { isDefined } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import Pagination from '@ts/pagination/wrappers/pagination'; import modules from '../m_modules'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts b/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts index f88bd74c25cc..68b333b53419 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts @@ -1,10 +1,10 @@ /* eslint-disable max-classes-per-file */ /* eslint-disable @typescript-eslint/method-signature-style */ +import messageLocalization from '@js/common/core/localization/message'; +import { query as dataQuery } from '@js/common/data'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { compileGetter, toComparable } from '@js/core/utils/data'; -import dataQuery from '@js/data/query'; -import messageLocalization from '@js/localization/message'; import type { Column } from '../columns_controller/m_columns_controller'; import type { DataController, Filter } from '../data_controller/m_data_controller'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts b/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts index f285d250cc38..0c91b098fa77 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts @@ -1,4 +1,10 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; +import { applyBatch } from '@js/common/data/array_utils'; import $ from '@js/core/renderer'; import { equalByValue } from '@js/core/utils/common'; import type { DeferredObj } from '@js/core/utils/deferred'; @@ -6,12 +12,6 @@ import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined } from '@js/core/utils/type'; -import { applyBatch } from '@js/data/array_utils'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import { addNamespace, isCommandKeyPressed } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import errors from '@js/ui/widget/ui.errors'; import supportUtils from '@ts/core/utils/m_support'; import type { ColumnHeadersView } from '@ts/grids/grid_core/column_headers/m_column_headers'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts b/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts index 9bdd1b6867c7..a9c53b297c68 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts @@ -1,10 +1,10 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, isCommandKeyPressed } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import type { ColumnHeadersView } from '@ts/grids/grid_core/column_headers/m_column_headers'; import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; import type { ModuleType } from '@ts/grids/grid_core/m_types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting_mixin.ts b/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting_mixin.ts index 089620c6a2db..6e47646043a8 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting_mixin.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting_mixin.ts @@ -1,6 +1,6 @@ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import type { ModuleType } from '@ts/grids/grid_core/m_types'; const SORT_CLASS = 'dx-sort'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing_core.ts b/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing_core.ts index 62a492635cf6..81e653e05061 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing_core.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing_core.ts @@ -1,3 +1,4 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; // @ts-expect-error import { fromPromise } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; @@ -5,7 +6,6 @@ import { each } from '@js/core/utils/iterator'; import { sessionStorage } from '@js/core/utils/storage'; import { isDefined, isEmptyObject, isPlainObject } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; import errors from '@js/ui/widget/ui.errors'; import type { ExportController } from '@ts/grids/data_grid/export/m_export'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/m_columns_controller'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts b/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts index e57de7fe8e24..5cdf2905f603 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts @@ -1,5 +1,9 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ /* eslint-disable max-classes-per-file */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import messageLocalization from '@js/common/core/localization/message'; +import { createObjectWithChanges } from '@js/common/data/array_utils'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import browser from '@js/core/utils/browser'; @@ -14,10 +18,6 @@ import { } from '@js/core/utils/size'; import { encodeHtml } from '@js/core/utils/string'; import { isDefined, isEmptyObject, isObject } from '@js/core/utils/type'; -import { createObjectWithChanges } from '@js/data/array_utils'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import LoadIndicator from '@js/ui/load_indicator'; import Overlay from '@js/ui/overlay/ui.overlay'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/m_columns_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/m_columns_view.ts index 3f660fd3ec58..29a24973e8bd 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/m_columns_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/m_columns_view.ts @@ -1,4 +1,9 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as dblclickEvent } from '@js/common/core/events/double_click'; +import pointerEvents from '@js/common/core/events/pointer'; +import { removeEvent } from '@js/common/core/events/remove'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; import { data as elementData } from '@js/core/element_data'; @@ -21,11 +26,6 @@ import { isRenderer, isString, } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as dblclickEvent } from '@js/events/double_click'; -import pointerEvents from '@js/events/pointer'; -import { removeEvent } from '@js/events/remove'; import supportUtils from '@ts/core/utils/m_support'; import type { AdaptiveColumnsController } from '@ts/grids/grid_core/adaptivity/m_adaptivity'; import type { ColumnChooserController, ColumnChooserView } from '@ts/grids/grid_core/column_chooser/m_column_chooser'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/m_grid_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/m_grid_view.ts index 85818fb3a0ef..738fcdf312b7 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/m_grid_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/m_grid_view.ts @@ -1,4 +1,5 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -11,7 +12,6 @@ import { getBoundingRect } from '@js/core/utils/position'; import { getHeight, getWidth } from '@js/core/utils/size'; import { isDefined, isNumeric, isString } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import * as accessibility from '@js/ui/shared/accessibility'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; import { A11yStatusContainerComponent } from '@ts/grids/grid_core/views/a11y_status_container_component'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/m_rows_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/m_rows_view.ts index 4fead939fd26..58645a2fb7e5 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/m_rows_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/m_rows_view.ts @@ -1,5 +1,8 @@ /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */ /* eslint-disable @typescript-eslint/no-unused-vars */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; +import messageLocalization from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import browser from '@js/core/utils/browser'; @@ -13,9 +16,6 @@ import { isEmpty } from '@js/core/utils/string'; import { setHeight } from '@js/core/utils/style'; import { isDefined, isNumeric, isString } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; -import messageLocalization from '@js/localization/message'; import Scrollable from '@js/ui/scroll_view/ui.scrollable'; import type { ColumnHeadersView } from '@ts/grids/grid_core/column_headers/m_column_headers'; import type { diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts index 94c528bfed7f..6126c458ccc9 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts @@ -1,4 +1,5 @@ -import positionUtils from '@js/animation/position'; +import positionUtils from '@js/common/core/animation/position'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import $ from '@js/core/renderer'; import browser from '@js/core/utils/browser'; import Callbacks from '@js/core/utils/callbacks'; @@ -6,7 +7,6 @@ import { Deferred } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { isDefined } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; import gridCoreUtils from '../m_utils'; import { VirtualDataLoader } from '../virtual_data_loader/m_virtual_data_loader'; @@ -27,7 +27,6 @@ function subscribeToExternalScrollers($element, scrollChangedHandler, $targetEle function getElementOffset(scrollable) { const $scrollableElement = scrollable.element ? scrollable.$element() : scrollable; - // @ts-expect-error const scrollableOffset = positionUtils.offset($scrollableElement); if (!scrollableOffset) { diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts b/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts index e918861e9f53..1e0dfc4edce2 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts @@ -1,3 +1,5 @@ +import Store from '@js/common/data/abstract_store'; +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; import Class from '@js/core/class'; import { EventsStrategy } from '@js/core/events_strategy'; import { normalizeIndexes } from '@js/core/utils/array'; @@ -8,8 +10,6 @@ import { isDefined, isFunction, isNumeric, isPlainObject, isString, } from '@js/core/utils/type'; -import Store from '@js/data/abstract_store'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; import commonUtils from '@ts/core/utils/m_common'; import inflector from '@ts/core/utils/m_inflector'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts b/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts index 2eb856688eaa..62779c70e2be 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts @@ -1,3 +1,4 @@ +import localizationNumber from '@js/common/core/localization/number'; import Class from '@js/core/class'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; @@ -6,7 +7,6 @@ import { getDefaultAlignment } from '@js/core/utils/position'; import { isDefined, isFunction } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; import formatHelper from '@js/format_helper'; -import localizationNumber from '@js/localization/number'; import { prepareItems } from '@ts/grids/grid_core/m_export'; const DEFAULT_DATA_TYPE = 'string'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts index 8de13c1f0cf1..91a449e64ae4 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts @@ -1,5 +1,6 @@ import '../data_source/m_data_source'; +import localizationMessage from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; @@ -7,7 +8,6 @@ import { getImageContainer } from '@js/core/utils/icon'; import { each } from '@js/core/utils/iterator'; import { isDefined } from '@js/core/utils/type'; import { hasWindow as hasWindowFn } from '@js/core/utils/window'; -import localizationMessage from '@js/localization/message'; import ContextMenu from '@js/ui/context_menu'; import TreeView from '@js/ui/tree_view'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts index f5529b5637a7..97457a57e1e8 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts @@ -1,14 +1,14 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import localizationMessage from '@js/common/core/localization/message'; +import { ArrayStore } from '@js/common/data'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each, map } from '@js/core/utils/iterator'; import { isDefined } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import localizationMessage from '@js/localization/message'; import Widget from '@js/ui/widget/ui.widget'; import columnStateMixin from '@ts/grids/grid_core/column_state_mixin/m_column_state_mixin'; import { diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts b/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts index 8bf174c771ab..8c40d6bcc4a6 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts @@ -1,3 +1,7 @@ +import { ArrayStore, CustomStore, query as dataQuery } from '@js/common/data'; +import { DataSource } from '@js/common/data/data_source/data_source'; +// eslint-disable-next-line import/extensions +import { aggregators } from '@js/common/data/utils'; import Class from '@js/core/class'; import { noop } from '@js/core/utils/common'; import { compileGetter, toComparable } from '@js/core/utils/data'; @@ -5,13 +9,6 @@ import dateSerialization from '@js/core/utils/date_serialization'; import { Deferred, when } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { isDefined, isNumeric, isString } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import CustomStore from '@js/data/custom_store'; -import { DataSource } from '@js/data/data_source/data_source'; -import dataQuery from '@js/data/query'; -// eslint-disable-next-line import/extensions -// @ts-expect-error -import { aggregators } from '@js/data/utils'; import { discoverObjectFields, diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts index 3253b006ca7a..903711ff9f93 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts @@ -1,3 +1,7 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import localizationMessage from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; @@ -12,10 +16,6 @@ import { import { format as formatString } from '@js/core/utils/string'; import { isDefined } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import localizationMessage from '@js/localization/message'; import type { Properties } from '@js/ui/button'; import Button from '@js/ui/button'; import ContextMenu from '@js/ui/context_menu'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts index 697ddbd57e77..74032611b459 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts @@ -1,3 +1,6 @@ +import localizationDate from '@js/common/core/localization/date'; +import { ArrayStore } from '@js/common/data'; +import { DataSource } from '@js/common/data/data_source/data_source'; import domAdapter from '@js/core/dom_adapter'; import coreAjaxUtils from '@js/core/utils/ajax'; import callOnce from '@js/core/utils/call_once'; @@ -6,10 +9,7 @@ import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each, map } from '@js/core/utils/iterator'; import { isDefined, isNumeric, type } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import { DataSource } from '@js/data/data_source/data_source'; import formatHelper from '@js/format_helper'; -import localizationDate from '@js/localization/date'; import { CLASSES } from './const'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store.ts b/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store.ts index 6e480b6e7a35..2ad0119a8873 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store.ts @@ -1,11 +1,11 @@ +import { DataSource } from '@js/common/data/data_source/data_source'; +import { normalizeLoadResult } from '@js/common/data/data_source/utils'; import Class from '@js/core/class'; import dateSerialization from '@js/core/utils/date_serialization'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isString } from '@js/core/utils/type'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeLoadResult } from '@js/data/data_source/utils'; import pivotGridUtils, { capitalizeFirstLetter, diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/sortable/m_sortable.ts b/packages/devextreme/js/__internal/grids/pivot_grid/sortable/m_sortable.ts index 9b2599eb8b60..b8d8acbac108 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/sortable/m_sortable.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/sortable/m_sortable.ts @@ -1,3 +1,13 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + drop as dragEventDrop, + end as dragEventEnd, + enter as dragEventEnter, + leave as dragEventLeave, + move as dragEventMove, + start as dragEventStart, +} from '@js/common/core/events/drag'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import DOMComponent from '@js/core/dom_component'; @@ -9,16 +19,6 @@ import { setWidth, } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { - drop as dragEventDrop, - end as dragEventEnd, - enter as dragEventEnter, - leave as dragEventLeave, - move as dragEventMove, - start as dragEventStart, -} from '@js/events/drag'; -import { addNamespace } from '@js/events/utils/index'; import swatchContainer from '@js/ui/widget/swatch_container'; const { getSwatchContainer } = swatchContainer; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts b/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts index 0c169ba4ca76..fffca92b9638 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts @@ -1,3 +1,5 @@ +import { getLanguageId } from '@js/common/core/localization/language_codes'; +import { errors } from '@js/common/data/errors'; import Class from '@js/core/class'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; @@ -9,9 +11,6 @@ import { isDefined, isFunction, isNumeric, isString, } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -import { getLanguageId } from '@js/localization/language_codes'; import pivotGridUtils, { foreachTree, @@ -70,7 +69,7 @@ const XmlaStore = Class.inherit((function () { xml = undefined; } if (!xml || xml.getElementsByTagName('parsererror').length || xml.childNodes.length === 0) { - throw new errors.Error('E4023', text); + throw errors.Error('E4023', text); } } catch (e: any) { deferred.reject({ @@ -833,7 +832,7 @@ const XmlaStore = Class.inherit((function () { if (errorElement.length) { const description = errorElement.attr('Description'); - const error = new errors.Error('E4000', description); + const error = errors.Error('E4000', description); errors.log('E4000', description); return error; } diff --git a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts index 68c1d7fef938..22142820ca32 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts @@ -1,13 +1,13 @@ +import { query } from '@js/common/data'; +import ArrayStore from '@js/common/data/array_store'; +import { createObjectWithChanges } from '@js/common/data/array_utils'; +import storeHelper from '@js/common/data/store_helper'; import { equalByValue } from '@js/core/utils/common'; import { compileGetter, compileSetter } from '@js/core/utils/data'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isFunction } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import { createObjectWithChanges } from '@js/data/array_utils'; -import query from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; import errors from '@js/ui/widget/ui.errors'; import DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; import gridCoreUtils from '@ts/grids/grid_core/m_utils'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts index 2bf1d2d645c0..3473089fbc3a 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts @@ -1,11 +1,11 @@ /* eslint-disable max-classes-per-file */ import '../module_not_extended/editor_factory'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { isDefined } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import errors from '@js/ui/widget/ui.errors'; import type { DataController } from '@ts/grids/grid_core/data_controller/m_data_controller'; import { dataControllerEditingExtenderMixin, editingModule } from '@ts/grids/grid_core/editing/m_editing'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts b/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts index 359bad272b51..d6dee9e48511 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts @@ -1,7 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; import { rowsModule, RowsView } from '@ts/grids/grid_core/views/m_rows_view'; import treeListCore from '../m_core'; diff --git a/packages/devextreme/js/__internal/m_draggable.ts b/packages/devextreme/js/__internal/m_draggable.ts index 0b9dddc299f6..effe2a324beb 100644 --- a/packages/devextreme/js/__internal/m_draggable.ts +++ b/packages/devextreme/js/__internal/m_draggable.ts @@ -1,5 +1,15 @@ -import positionUtils from '@js/animation/position'; -import { locate, move } from '@js/animation/translator'; +import positionUtils from '@js/common/core/animation/position'; +import { locate, move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + end as dragEventEnd, + enter as dragEventEnter, + leave as dragEventLeave, + move as dragEventMove, + start as dragEventStart, +} from '@js/common/core/events/drag'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, needSkipEvent } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import DOMComponent from '@js/core/dom_component'; @@ -22,16 +32,6 @@ import { quadToObject } from '@js/core/utils/string'; import { isFunction, isNumeric, isObject } from '@js/core/utils/type'; import { value as viewPort } from '@js/core/utils/view_port'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { - end as dragEventEnd, - enter as dragEventEnter, - leave as dragEventLeave, - move as dragEventMove, - start as dragEventStart, -} from '@js/events/drag'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, needSkipEvent } from '@js/events/utils/index'; import Animator from './ui/scroll_view/m_animator'; diff --git a/packages/devextreme/js/__internal/m_sortable.ts b/packages/devextreme/js/__internal/m_sortable.ts index 781a83d89ebf..32c3ec3737a3 100644 --- a/packages/devextreme/js/__internal/m_sortable.ts +++ b/packages/devextreme/js/__internal/m_sortable.ts @@ -1,5 +1,6 @@ -import fx from '@js/animation/fx'; -import { resetPosition } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { resetPosition } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import registerComponent from '@js/core/component_registrator'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; @@ -10,7 +11,6 @@ import { getHeight, getOuterHeight, getOuterWidth, getWidth, } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; import Draggable from '@ts/m_draggable'; import { isDefined } from '../core/utils/type'; diff --git a/packages/devextreme/js/__internal/pagination/common/base_pagination_props.ts b/packages/devextreme/js/__internal/pagination/common/base_pagination_props.ts index 7e2b48c1b369..bddc0fa54a79 100644 --- a/packages/devextreme/js/__internal/pagination/common/base_pagination_props.ts +++ b/packages/devextreme/js/__internal/pagination/common/base_pagination_props.ts @@ -2,7 +2,7 @@ import type { DisplayMode } from '@js/common'; import type { PageSize } from '@js/ui/pagination_types'; import { BaseWidgetDefaultProps, type BaseWidgetProps } from '@ts/core/r1/base_props'; -import messageLocalization from '../../../localization/message'; +import messageLocalization from '../../../common/core/localization/message'; import type { EventCallback } from '../../core/r1/event_callback'; export interface BasePaginationProps extends BaseWidgetProps { diff --git a/packages/devextreme/js/__internal/pagination/drop_down_editors/select_box.tsx b/packages/devextreme/js/__internal/pagination/drop_down_editors/select_box.tsx index bce6e0ee9111..2e3a63db9898 100644 --- a/packages/devextreme/js/__internal/pagination/drop_down_editors/select_box.tsx +++ b/packages/devextreme/js/__internal/pagination/drop_down_editors/select_box.tsx @@ -1,9 +1,8 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { BaseInfernoComponent } from '@devextreme/runtime/inferno'; -import type Store from '../../../data/abstract_store'; -import type DataSource from '../../../data/data_source'; -import type { Options as DataSourceOptions } from '../../../data/data_source'; +import type { DataSource, DataSourceOptions } from '../../../common/data'; +import type Store from '../../../common/data/abstract_store'; import LegacySelectBox from '../../../ui/select_box'; import { DomComponentWrapper } from '../../core/r1/dom_component_wrapper'; import type { EventCallback } from '../../core/r1/event_callback'; diff --git a/packages/devextreme/js/__internal/pagination/utils/compatibility_utils.ts b/packages/devextreme/js/__internal/pagination/utils/compatibility_utils.ts index 4881cc6d2d46..74328d9776ca 100644 --- a/packages/devextreme/js/__internal/pagination/utils/compatibility_utils.ts +++ b/packages/devextreme/js/__internal/pagination/utils/compatibility_utils.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-unsafe-return */ -import messageLocalization from '@js/localization/message'; +import messageLocalization from '@js/common/core/localization/message'; import type { PaginationConfigContextValue } from '../common/pagination_config_context'; import { PaginationConfigContext } from '../common/pagination_config_context'; diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts index a96877ded246..9b04d677e6e4 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts +++ b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts @@ -4,13 +4,13 @@ import '@js/ui/tag_box'; import '@js/ui/switch'; import '@js/ui/select_box'; +import messageLocalization from '@js/common/core/localization/message'; +import { DataSource } from '@js/common/data'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import dateSerialization from '@js/core/utils/date_serialization'; import { extend } from '@js/core/utils/extend'; -import DataSource from '@js/data/data_source'; -import messageLocalization from '@js/localization/message'; import Form from '@js/ui/form'; import { current, isFluent } from '@js/ui/themes'; import { ExpressionUtils } from '@ts/scheduler/m_expression_utils'; diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts index 356c12fa726e..3fc42a2e4135 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts +++ b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts @@ -1,9 +1,9 @@ +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import { Deferred, when } from '@js/core/utils/deferred'; -import { triggerResizeEvent } from '@js/events/visibility_change'; -import messageLocalization from '@js/localization/message'; +import messageLocalization from '@js/common/core/localization/message'; import Popup from '@js/ui/popup/ui.popup'; import { ExpressionUtils } from '@ts/scheduler/m_expression_utils'; import { diff --git a/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts b/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts index f3cc15047a10..fd8871d1ef2b 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts @@ -1,9 +1,9 @@ /* eslint-disable max-classes-per-file */ +import { query } from '@js/common/data'; import { wrapToArray } from '@js/core/utils/array'; import dateUtils from '@js/core/utils/date'; import { each, map } from '@js/core/utils/iterator'; import { isDefined, isFunction } from '@js/core/utils/type'; -import query from '@js/data/query'; import { dateUtilsTs } from '@ts/core/utils/date'; import { getAppointmentTakesAllDay, getDatesWithoutTime, hasResourceValue, isDateAndTimeView, diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment.ts index ec15fd4ff892..a2467934c892 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment.ts @@ -1,5 +1,10 @@ /* eslint-disable max-classes-per-file */ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import DOMComponent from '@js/core/dom_component'; import type { dxElementWrapper } from '@js/core/renderer'; @@ -7,11 +12,6 @@ import $ from '@js/core/renderer'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import Resizable from '@js/ui/resizable'; import { hide, show } from '@ts/ui/tooltip/m_tooltip'; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts index e93f891be91f..17b729cb88d8 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts @@ -1,5 +1,8 @@ /* eslint-disable spellcheck/spell-checker */ -import { locate, move } from '@js/animation/translator'; +import { locate, move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as dblclickEvent } from '@js/common/core/events/double_click'; +import { addNamespace, isFakeClickEvent } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -19,9 +22,6 @@ import { setOuterHeight, setOuterWidth } from '@js/core/utils/size'; import { isDeferred, isDefined, isPlainObject, isString, } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as dblclickEvent } from '@js/events/double_click'; -import { addNamespace, isFakeClickEvent } from '@js/events/utils/index'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.edit'; import { dateUtilsTs } from '@ts/core/utils/date'; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_layout.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_layout.ts index 460f0fbd9ca7..7d19d23b76d8 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_layout.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_layout.ts @@ -1,6 +1,6 @@ +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; -import messageLocalization from '@js/localization/message'; import { APPOINTMENT_CONTENT_CLASSES } from '../m_classes'; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_text_utils.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_text_utils.ts index b9298006d4ed..066513962ec9 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/m_text_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/m_text_utils.ts @@ -1,5 +1,5 @@ +import dateLocalization from '@js/common/core/localization/date'; import dateUtils from '@js/core/utils/date'; -import dateLocalization from '@js/localization/date'; export const createFormattedDateText = (options) => { const { diff --git a/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts b/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts index a39a230f7211..fff21cf6d952 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts @@ -1,5 +1,5 @@ +import { query } from '@js/common/data'; import dateUtils from '@js/core/utils/date'; -import query from '@js/data/query'; import { sortAppointmentsByStartDate } from '../data_provider/m_utils'; import HorizontalAppointmentsStrategy from './m_strategy_horizontal'; diff --git a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts b/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts index a97f263a1ff0..826640e86704 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts +++ b/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts @@ -1,5 +1,5 @@ +import messageLocalization from '@js/common/core/localization/message'; import dateUtils from '@js/core/utils/date'; -import messageLocalization from '@js/localization/message'; import { isMaterialBased } from '@js/ui/themes'; const { trimTime } = dateUtils; diff --git a/packages/devextreme/js/__internal/scheduler/header/m_utils.ts b/packages/devextreme/js/__internal/scheduler/header/m_utils.ts index 11a2a6b0deb7..fef9f566e07d 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/header/m_utils.ts @@ -1,9 +1,9 @@ +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import errors from '@js/core/errors'; import dateUtils from '@js/core/utils/date'; import { camelize } from '@js/core/utils/inflector'; import { isFunction, isObject } from '@js/core/utils/type'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import { VIEWS } from '../m_constants'; diff --git a/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts b/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts index c43e764f13c9..2c9fa2d270e0 100644 --- a/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts +++ b/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts @@ -1,8 +1,8 @@ -import { locate, move } from '@js/animation/translator'; +import { locate, move } from '@js/common/core/animation/translator'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { FunctionTemplate } from '@js/core/templates/function_template'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import { createAppointmentAdapter } from './m_appointment_adapter'; diff --git a/packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts b/packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts index c656bfbf4069..b08fc871d1ef 100644 --- a/packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts +++ b/packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts @@ -1,14 +1,14 @@ /* eslint-disable max-classes-per-file, spellcheck/spell-checker */ import '@js/ui/radio_group'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import Guid from '@js/core/guid'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import { extend } from '@js/core/utils/extend'; import { isDefined } from '@js/core/utils/type'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import ButtonGroup from '@js/ui/button_group'; import DateBox from '@js/ui/date_box'; import Editor from '@js/ui/editor/editor'; diff --git a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts index 6e02a87edf87..7d425480f2eb 100644 --- a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts +++ b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts @@ -1,3 +1,7 @@ +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; +import DataHelperMixin from '@js/common/data/data_helper'; import registerComponent from '@js/core/component_registrator'; import config from '@js/core/config'; import devices from '@js/core/devices'; @@ -26,10 +30,6 @@ import { isString, } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import DataHelperMixin from '@js/data_helper'; -import { triggerResizeEvent } from '@js/events/visibility_change'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import { custom as customDialog } from '@js/ui/dialog'; import type { AppointmentTooltipShowingEvent, ViewType } from '@js/ui/scheduler'; import { isMaterial, isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/scheduler/r1/appointment_popup/config.ts b/packages/devextreme/js/__internal/scheduler/r1/appointment_popup/config.ts index c8bd33cec9a2..39d5b62a65f2 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/appointment_popup/config.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/appointment_popup/config.ts @@ -1,8 +1,8 @@ -import type { AnimationConfig } from '@js/animation/fx'; +import type { AnimationConfig } from '@js/common/core/animation'; +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import { getWidth } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import type { IToolbarButtonConfig } from './types'; diff --git a/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_title.tsx b/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_title.tsx index bdc5b4b08aaa..13a65b2279e5 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_title.tsx +++ b/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_title.tsx @@ -1,6 +1,6 @@ import type { InfernoEffect } from '@devextreme/runtime/inferno'; import { createReRenderEffect, InfernoWrapperComponent } from '@devextreme/runtime/inferno'; -import messageLocalization from '@js/localization/message'; +import messageLocalization from '@js/common/core/localization/message'; export class AllDayPanelTitle extends InfernoWrapperComponent { createEffects(): InfernoEffect[] { diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts index e6d62b3559bc..623b80ddeb20 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts @@ -1,7 +1,7 @@ +import dateLocalization from '@js/common/core/localization/date'; import { equalByValue } from '@js/core/utils/common'; import dateUtils from '@js/core/utils/date'; import { isDefined } from '@js/core/utils/type'; -import dateLocalization from '@js/localization/date'; import { dateUtilsTs } from '@ts/core/utils/date'; import { VERTICAL_GROUP_COUNT_CLASSES } from '../../m_classes'; diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/format_weekday.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/format_weekday.ts index eabb46e6e8de..d70223d06c11 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/format_weekday.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/format_weekday.ts @@ -1,4 +1,4 @@ -import dateLocalization from '@js/localization/date'; +import dateLocalization from '@js/common/core/localization/date'; export const formatWeekday = (date: Date): string => dateLocalization .getDayNames('abbreviated')[date.getDay()]; diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/month.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/month.ts index 564312f12709..3a6f01562b6f 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/month.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/month.ts @@ -1,5 +1,5 @@ +import dateLocalization from '@js/common/core/localization/date'; import dateUtils from '@js/core/utils/date'; -import dateLocalization from '@js/localization/date'; import type { CalculateCellIndex } from '../types'; import { diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/week.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/week.ts index 9ccd7560fced..720780d027b0 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/week.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/week.ts @@ -1,5 +1,5 @@ +import dateLocalization from '@js/common/core/localization/date'; import dateUtils from '@js/core/utils/date'; -import dateLocalization from '@js/localization/date'; import type { CalculateStartViewDate } from '../types'; import { diff --git a/packages/devextreme/js/__internal/scheduler/resources/m_utils.ts b/packages/devextreme/js/__internal/scheduler/resources/m_utils.ts index a6950525075d..1fc8c59c2ca7 100644 --- a/packages/devextreme/js/__internal/scheduler/resources/m_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/resources/m_utils.ts @@ -1,3 +1,5 @@ +import { DataSource } from '@js/common/data/data_source/data_source'; +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; import { wrapToArray } from '@js/core/utils/array'; import { equalByValue } from '@js/core/utils/common'; import { compileGetter, compileSetter } from '@js/core/utils/data'; @@ -6,8 +8,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { deepExtendArraySafe } from '@js/core/utils/object'; import { isDefined } from '@js/core/utils/type'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; import { current, isFluent } from '@js/ui/themes'; import { getGroupCount, hasResourceValue } from '@ts/scheduler/r1/utils/index'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts index 5f6877a181fd..831a3fcffc8a 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts @@ -1,3 +1,4 @@ +import dateLocalization from '@js/common/core/localization/date'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -7,7 +8,6 @@ import dateUtils from '@js/core/utils/date'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { setHeight, setOuterHeight } from '@js/core/utils/size'; -import dateLocalization from '@js/localization/date'; import { agendaUtils, formatWeekday, getVerticalGroupCountClass } from '@ts/scheduler/r1/utils/index'; import { diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts index 0b80c1148f07..fe016b0bfdcb 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts @@ -1,9 +1,9 @@ /* eslint-disable max-classes-per-file */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import { isDefined } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; const DEFAULT_CELL_HEIGHT = 50; const MIN_CELL_WIDTH = 1; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts index 3c35e4f6b380..638f0589743d 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts @@ -1,4 +1,15 @@ -import { locate, resetPosition } from '@js/animation/translator'; +import { locate, resetPosition } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import { name as contextMenuEventName } from '@js/common/core/events/contextmenu'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + drop as dragEventDrop, + enter as dragEventEnter, + leave as dragEventLeave, +} from '@js/common/core/events/drag'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, isMouseEvent } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; @@ -17,17 +28,6 @@ import { } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import { name as contextMenuEventName } from '@js/events/contextmenu'; -import eventsEngine from '@js/events/core/events_engine'; -import { - drop as dragEventDrop, - enter as dragEventEnter, - leave as dragEventLeave, -} from '@js/events/drag'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, isMouseEvent } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Scrollable from '@js/ui/scroll_view/ui.scrollable'; import errors from '@js/ui/widget/ui.errors'; import { getMemoizeScrollTo } from '@ts/core/utils/scroll'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts index 20b5e5ad5137..64246160bc32 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts @@ -1,5 +1,5 @@ +import dateLocalization from '@js/common/core/localization/date'; import dateUtils from '@js/core/utils/date'; -import dateLocalization from '@js/localization/date'; import { getToday, isFirstCellInMonthWithIntervalCount, monthUtils, setOptionHour, } from '@ts/scheduler/r1/utils/index'; diff --git a/packages/devextreme/js/__internal/ui/button/button.tsx b/packages/devextreme/js/__internal/ui/button/button.tsx index 4c6c01568c63..eca0ce7f4d69 100644 --- a/packages/devextreme/js/__internal/ui/button/button.tsx +++ b/packages/devextreme/js/__internal/ui/button/button.tsx @@ -2,12 +2,12 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { createReRenderEffect, InfernoEffect, InfernoWrapperComponent } from '@devextreme/runtime/inferno'; +import { click } from '@js/common/core/events/short'; +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import { convertRulesToOptions, createDefaultOptionRules } from '@js/core/options/utils'; import { getImageSourceType } from '@js/core/utils/icon'; import { camelize } from '@js/core/utils/inflector'; -import { click } from '@js/events/short'; -import messageLocalization from '@js/localization/message'; import { current, isMaterial } from '@js/ui/themes'; import type { EffectReturn } from '@ts/core/r1/utils/effect_return'; import { getTemplate } from '@ts/core/r1/utils/index'; diff --git a/packages/devextreme/js/__internal/ui/calendar/m_calendar.base_view.ts b/packages/devextreme/js/__internal/ui/calendar/m_calendar.base_view.ts index af12441db9b4..89f9e58d8879 100644 --- a/packages/devextreme/js/__internal/ui/calendar/m_calendar.base_view.ts +++ b/packages/devextreme/js/__internal/ui/calendar/m_calendar.base_view.ts @@ -1,3 +1,9 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { start as hoverStartEventName } from '@js/common/core/events/hover'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; import { data as elementData } from '@js/core/element_data'; @@ -6,12 +12,6 @@ import { noop } from '@js/core/utils/common'; import coreDateUtils from '@js/core/utils/date'; import dateSerialization from '@js/core/utils/date_serialization'; import { extend } from '@js/core/utils/extend'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { start as hoverStartEventName } from '@js/events/hover'; -import { addNamespace } from '@js/events/utils/index'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import Widget from '@js/ui/widget/ui.widget'; // @ts-expect-error diff --git a/packages/devextreme/js/__internal/ui/calendar/m_calendar.ts b/packages/devextreme/js/__internal/ui/calendar/m_calendar.ts index ee851870fc81..ef0b48f5f88c 100644 --- a/packages/devextreme/js/__internal/ui/calendar/m_calendar.ts +++ b/packages/devextreme/js/__internal/ui/calendar/m_calendar.ts @@ -1,5 +1,11 @@ -import fx from '@js/animation/fx'; -import { move } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import Swipeable from '@js/common/core/events/gesture/swipeable'; +import { end as hoverEndEventName } from '@js/common/core/events/hover'; +import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import Guid from '@js/core/guid'; @@ -15,12 +21,6 @@ import { isDefined, isFunction, isNumeric, isString, } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import Swipeable from '@js/events/gesture/swipeable'; -import { end as hoverEndEventName } from '@js/events/hover'; -import { addNamespace, isCommandKeyPressed } from '@js/events/utils/index'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import Editor from '@js/ui/editor/editor'; import { isFluent } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/calendar/m_calendar.views.ts b/packages/devextreme/js/__internal/ui/calendar/m_calendar.views.ts index 87026c6e198f..3a7cca47bd99 100644 --- a/packages/devextreme/js/__internal/ui/calendar/m_calendar.views.ts +++ b/packages/devextreme/js/__internal/ui/calendar/m_calendar.views.ts @@ -1,10 +1,10 @@ +import dateLocalization from '@js/common/core/localization/date'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import dateUtils from '@js/core/utils/date'; import dateSerialization from '@js/core/utils/date_serialization'; import { extend } from '@js/core/utils/extend'; -import dateLocalization from '@js/localization/date'; import BaseView from './m_calendar.base_view'; diff --git a/packages/devextreme/js/__internal/ui/chat/alertlist.ts b/packages/devextreme/js/__internal/ui/chat/alertlist.ts index 34fbcc8cccf1..e241c105b49e 100644 --- a/packages/devextreme/js/__internal/ui/chat/alertlist.ts +++ b/packages/devextreme/js/__internal/ui/chat/alertlist.ts @@ -1,5 +1,5 @@ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; -import messageLocalization from '@js/localization/message'; import type { Alert, } from '@js/ui/chat'; diff --git a/packages/devextreme/js/__internal/ui/chat/avatar.ts b/packages/devextreme/js/__internal/ui/chat/avatar.ts index b794a3904ffe..6ad857a810c2 100644 --- a/packages/devextreme/js/__internal/ui/chat/avatar.ts +++ b/packages/devextreme/js/__internal/ui/chat/avatar.ts @@ -1,7 +1,7 @@ +import messageLocalization from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import type { WidgetOptions } from '@js/ui/widget/ui.widget'; import type { OptionChanged } from '@ts/core/widget/types'; import Widget from '@ts/core/widget/widget'; diff --git a/packages/devextreme/js/__internal/ui/chat/chat.ts b/packages/devextreme/js/__internal/ui/chat/chat.ts index e3db3e2a4ca0..388b0c86af1a 100644 --- a/packages/devextreme/js/__internal/ui/chat/chat.ts +++ b/packages/devextreme/js/__internal/ui/chat/chat.ts @@ -1,11 +1,11 @@ +import { Guid } from '@js/common'; +import messageLocalization from '@js/common/core/localization/message'; +import type { DataSourceOptions } from '@js/common/data'; +import { DataHelperMixin } from '@js/common/data'; import registerComponent from '@js/core/component_registrator'; -import Guid from '@js/core/guid'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import type { Options as DataSourceOptions } from '@js/data/data_source'; -import DataHelperMixin from '@js/data_helper'; -import messageLocalization from '@js/localization/message'; import type { Message, MessageEnteredEvent, diff --git a/packages/devextreme/js/__internal/ui/chat/messagebox.ts b/packages/devextreme/js/__internal/ui/chat/messagebox.ts index 6453cad0ec62..b2c236b368a3 100644 --- a/packages/devextreme/js/__internal/ui/chat/messagebox.ts +++ b/packages/devextreme/js/__internal/ui/chat/messagebox.ts @@ -1,6 +1,6 @@ +import type { NativeEventInfo } from '@js/common/core/events'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; -import type { NativeEventInfo } from '@js/events'; -import messageLocalization from '@js/localization/message'; import type { ClickEvent } from '@js/ui/button'; import Button from '@js/ui/button'; import type { Properties as DOMComponentProperties } from '@ts/core/widget/dom_component'; diff --git a/packages/devextreme/js/__internal/ui/chat/messagegroup.ts b/packages/devextreme/js/__internal/ui/chat/messagegroup.ts index d80ba2d5232d..f4b11e8491c8 100644 --- a/packages/devextreme/js/__internal/ui/chat/messagegroup.ts +++ b/packages/devextreme/js/__internal/ui/chat/messagegroup.ts @@ -1,10 +1,10 @@ +import type { Format } from '@js/common/core/localization'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import dateSerialization from '@js/core/utils/date_serialization'; import { isDate } from '@js/core/utils/type'; -import type { Format } from '@js/localization'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import type { Message } from '@js/ui/chat'; import type { WidgetOptions } from '@js/ui/widget/ui.widget'; import type { OptionChanged } from '@ts/core/widget/types'; diff --git a/packages/devextreme/js/__internal/ui/chat/messagelist.ts b/packages/devextreme/js/__internal/ui/chat/messagelist.ts index bdb3c4f638f6..5dcf26ae454f 100644 --- a/packages/devextreme/js/__internal/ui/chat/messagelist.ts +++ b/packages/devextreme/js/__internal/ui/chat/messagelist.ts @@ -1,4 +1,7 @@ -import Guid from '@js/core/guid'; +import { Guid } from '@js/common'; +import type { Format } from '@js/common/core/localization'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import type { DeepPartial, } from '@js/core/index'; @@ -10,9 +13,6 @@ import dateUtils from '@js/core/utils/date'; import dateSerialization from '@js/core/utils/date_serialization'; import { isElementInDom } from '@js/core/utils/dom'; import { isDate, isDefined } from '@js/core/utils/type'; -import type { Format } from '@js/localization'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import type { Message, User } from '@js/ui/chat'; import ScrollView from '@js/ui/scroll_view'; import type { WidgetOptions } from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/chat/typingindicator.ts b/packages/devextreme/js/__internal/ui/chat/typingindicator.ts index f577fc593706..8914f3510b0c 100644 --- a/packages/devextreme/js/__internal/ui/chat/typingindicator.ts +++ b/packages/devextreme/js/__internal/ui/chat/typingindicator.ts @@ -1,7 +1,7 @@ +import messageLocalization from '@js/common/core/localization/message'; import type { Properties as DOMComponentProperties } from '@js/core/dom_component'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; -import messageLocalization from '@js/localization/message'; import type { User } from '@js/ui/chat'; import DOMComponent from '@ts/core/widget/dom_component'; import type { OptionChanged } from '@ts/core/widget/types'; diff --git a/packages/devextreme/js/__internal/ui/collection/base.ts b/packages/devextreme/js/__internal/ui/collection/base.ts index deb3dd9d0f36..9928a0d14007 100644 --- a/packages/devextreme/js/__internal/ui/collection/base.ts +++ b/packages/devextreme/js/__internal/ui/collection/base.ts @@ -1,5 +1,5 @@ +import type { DataSource } from '@js/common/data'; import type { dxElementWrapper } from '@js/core/renderer'; -import type DataSource from '@js/data/data_source'; import type { CollectionWidgetOptions, ItemLike } from '@js/ui/collection/ui.collection_widget.base'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.base'; diff --git a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts index 0929f7b24f06..b02e0f294113 100644 --- a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts +++ b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts @@ -1,3 +1,11 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import { name as contextMenuEventName } from '@js/common/core/events/contextmenu'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; +import { DataHelperMixin } from '@js/common/data'; import Action from '@js/core/action'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -17,14 +25,6 @@ import { each } from '@js/core/utils/iterator'; import { getOuterHeight, getOuterWidth } from '@js/core/utils/size'; import { findTemplates } from '@js/core/utils/template_manager'; import { isDefined, isFunction, isPlainObject } from '@js/core/utils/type'; -import DataHelperMixin from '@js/data_helper'; -import { name as clickEventName } from '@js/events/click'; -import { name as contextMenuEventName } from '@js/events/contextmenu'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, isCommandKeyPressed } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import { focusable } from '@js/ui/widget/selectors'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.edit.ts b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.edit.ts index 20a164a29af9..2a6f79d24a2e 100644 --- a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.edit.ts +++ b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.edit.ts @@ -1,3 +1,6 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { DataSource } from '@js/common/data/data_source/data_source'; +import { normalizeLoadResult } from '@js/common/data/data_source/utils'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { compileGetter } from '@js/core/utils/data'; @@ -10,9 +13,6 @@ import { import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined } from '@js/core/utils/type'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeLoadResult } from '@js/data/data_source/utils'; -import eventsEngine from '@js/events/core/events_engine'; import errors from '@js/ui/widget/ui.errors'; import Selection from '@ts/ui/selection/m_selection'; diff --git a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.live_update.ts b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.live_update.ts index c25d64b03992..f34d4db5fd94 100644 --- a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.live_update.ts +++ b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.live_update.ts @@ -1,3 +1,5 @@ +import { indexByKey, insert, update } from '@js/common/data/array_utils'; +import { keysEqual } from '@js/common/data/utils'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { findChanges } from '@js/core/utils/array_compare'; @@ -5,9 +7,6 @@ import { noop } from '@js/core/utils/common'; import { when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import { indexByKey, insert, update } from '@js/data/array_utils'; -// @ts-expect-error -import { keysEqual } from '@js/data/utils'; import CollectionWidget from './m_collection_widget.async'; diff --git a/packages/devextreme/js/__internal/ui/color_box/m_color_view.ts b/packages/devextreme/js/__internal/ui/color_box/m_color_view.ts index fa15351f6048..1968b94ee191 100644 --- a/packages/devextreme/js/__internal/ui/color_box/m_color_view.ts +++ b/packages/devextreme/js/__internal/ui/color_box/m_color_view.ts @@ -1,15 +1,15 @@ -import { locate, move } from '@js/animation/translator'; import Color from '@js/color'; +import { locate, move } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import Guid from '@js/core/guid'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getHeight, getOuterHeight, getWidth } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { isCommandKeyPressed } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Draggable from '@js/ui/draggable'; import Editor from '@js/ui/editor/editor'; import NumberBox from '@js/ui/number_box'; diff --git a/packages/devextreme/js/__internal/ui/context_menu/m_context_menu.ts b/packages/devextreme/js/__internal/ui/context_menu/m_context_menu.ts index db6054566a6b..30c11c7f6906 100644 --- a/packages/devextreme/js/__internal/ui/context_menu/m_context_menu.ts +++ b/packages/devextreme/js/__internal/ui/context_menu/m_context_menu.ts @@ -1,7 +1,11 @@ /* eslint-disable max-classes-per-file */ -import fx from '@js/animation/fx'; -import type { PositionConfig } from '@js/animation/position'; -import animationPosition from '@js/animation/position'; +import type { PositionConfig } from '@js/common/core/animation'; +import { fx } from '@js/common/core/animation'; +import animationPosition from '@js/common/core/animation/position'; +import { name as contextMenuEventName } from '@js/common/core/events/contextmenu'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -19,10 +23,6 @@ import { isDefined, isFunction, isObject, isPlainObject, isRenderer, isWindow, } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import { name as contextMenuEventName } from '@js/events/contextmenu'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import { addNamespace } from '@js/events/utils/index'; import type { Item } from '@js/ui/context_menu'; import type { Properties as OverlayProperties } from '@js/ui/overlay'; import type dxOverlay from '@js/ui/overlay'; @@ -716,7 +716,6 @@ class ContextMenu extends MenuBase { this._scrollToElement($item); const submenuPosition = this._getSubmenuPosition($item); - // @ts-expect-error animationPosition.setup($submenu, submenuPosition); }); } @@ -789,7 +788,6 @@ class ContextMenu extends MenuBase { fx.stop($submenu); } - // @ts-expect-error animationPosition.setup($submenu, submenuPosition); if (animation) { diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.base.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.base.ts index b77ceedc7d34..af0d0c18a7e2 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.base.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.base.ts @@ -1,3 +1,5 @@ +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import config from '@js/core/config'; import devices from '@js/core/devices'; import browser from '@js/core/utils/browser'; @@ -9,8 +11,6 @@ import { each } from '@js/core/utils/iterator'; import { inputType } from '@js/core/utils/support'; import { isDate as isDateType, isNumeric, isString } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor'; import Calendar from './m_date_box.strategy.calendar'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.parts.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.parts.ts index f02403eab6ae..f22389d2aeec 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.parts.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.parts.ts @@ -1,7 +1,7 @@ +import { getPatternSetters } from '@js/common/core/localization/ldml/date.parser'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { fitIntoRange } from '@js/core/utils/math'; -import { getPatternSetters } from '@js/localization/ldml/date.parser'; const monthGetter = (date) => date.getMonth() + 1; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.ts index 3cc127de11ac..0d77af4f8eb6 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.ts @@ -1,3 +1,10 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/common/core/events/utils/index'; +import dateLocalization from '@js/common/core/localization/date'; +import defaultDateNames from '@js/common/core/localization/default_date_names'; +import { getFormat } from '@js/common/core/localization/ldml/date.format'; +import { getRegExpInfo } from '@js/common/core/localization/ldml/date.parser'; +import numberLocalization from '@js/common/core/localization/number'; import devices from '@js/core/devices'; import browser from '@js/core/utils/browser'; import { clipboardText } from '@js/core/utils/dom'; @@ -6,13 +13,6 @@ import { fitIntoRange, inRange, sign } from '@js/core/utils/math'; import { isDate, isDefined, isFunction, isString, } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/events/utils/index'; -import dateLocalization from '@js/localization/date'; -import defaultDateNames from '@js/localization/default_date_names'; -import { getFormat } from '@js/localization/ldml/date.format'; -import { getRegExpInfo } from '@js/localization/ldml/date.parser'; -import numberLocalization from '@js/localization/number'; import DateBoxBase from './m_date_box.base'; import { getDatePartIndexByPosition, renderDateParts } from './m_date_box.mask.parts'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar.ts index bec81621a3fc..f8262d92a7fc 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar.ts @@ -1,9 +1,9 @@ +import messageLocalization from '@js/common/core/localization/message'; // @ts-expect-error import { splitPair } from '@js/core/utils/common'; import dateUtils from '@js/core/utils/date'; import { extend } from '@js/core/utils/extend'; import { isEmptyObject, isFunction } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import Calendar from '@js/ui/calendar'; import { isMaterial } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar_with_time.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar_with_time.ts index 44daeef1e3bd..e8dde0f33e23 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar_with_time.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar_with_time.ts @@ -1,9 +1,9 @@ +import dateLocalization from '@js/common/core/localization/date'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import { extend } from '@js/core/utils/extend'; import { getWidth } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; -import dateLocalization from '@js/localization/date'; import Box from '@js/ui/box'; import CalendarStrategy from './m_date_box.strategy.calendar'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.date_view.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.date_view.ts index ce25b0f19ac6..bdaea2cfd82a 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.date_view.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.date_view.ts @@ -1,8 +1,8 @@ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { inputType } from '@js/core/utils/support'; import { getWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import DateBoxStrategy from './m_date_box.strategy'; import dateUtils from './m_date_utils'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.list.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.list.ts index c114e8f99fb0..9c3a104fa91b 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.list.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.list.ts @@ -1,12 +1,12 @@ import '@ts/ui/list/modules/m_selection'; +import dateLocalization from '@js/common/core/localization/date'; import { ensureDefined, noop } from '@js/core/utils/common'; import dateSerialization from '@js/core/utils/date_serialization'; import { extend } from '@js/core/utils/extend'; import { getHeight, getOuterHeight } from '@js/core/utils/size'; import { isDate } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import dateLocalization from '@js/localization/date'; import List from '@js/ui/list_light'; import { getSizeValue } from '@ts/ui/drop_down_editor/m_utils'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.ts index 2dc3574f0859..4928de858ac8 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import dateLocalization from '@js/common/core/localization/date'; import Class from '@js/core/class'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; -import eventsEngine from '@js/events/core/events_engine'; -import dateLocalization from '@js/localization/date'; const { abstract } = Class; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_utils.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_utils.ts index 3e2c68199587..28429841f8b0 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_utils.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_utils.ts @@ -1,8 +1,8 @@ +import dateLocalization from '@js/common/core/localization/date'; import $ from '@js/core/renderer'; import dateSerialization from '@js/core/utils/date_serialization'; import { each } from '@js/core/utils/iterator'; import { isDate } from '@js/core/utils/type'; -import dateLocalization from '@js/localization/date'; const DATE_COMPONENTS = ['year', 'day', 'month', 'day']; const TIME_COMPONENTS = ['hours', 'minutes', 'seconds', 'milliseconds']; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_view.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_view.ts index f67d639bb999..ed2217734bbe 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_view.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_view.ts @@ -1,9 +1,9 @@ +import dateLocalization from '@js/common/core/localization/date'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import dateLocalization from '@js/localization/date'; import Editor from '@js/ui/editor/editor'; import uiDateUtils from './m_date_utils'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_view_roller.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_view_roller.ts index c14f5ee0b266..74ca62286777 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_view_roller.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_view_roller.ts @@ -1,14 +1,14 @@ -import fx from '@js/animation/fx'; -import { resetPosition } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { resetPosition } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getHeight } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import { convertToLocation } from '@ts/ui/scroll_view/utils/convert_location'; import Scrollable from '../scroll_view/m_scrollable'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_time_view.ts b/packages/devextreme/js/__internal/ui/date_box/m_time_view.ts index 3f3205139499..c146f763a4ed 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_time_view.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_time_view.ts @@ -1,7 +1,7 @@ +import dateLocalization from '@js/common/core/localization/date'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import dateLocalization from '@js/localization/date'; import Box from '@js/ui/box'; import Editor from '@js/ui/editor/editor'; import NumberBox from '@js/ui/number_box'; diff --git a/packages/devextreme/js/__internal/ui/date_range_box/m_date_range_box.ts b/packages/devextreme/js/__internal/ui/date_range_box/m_date_range_box.ts index 5261da4a7cef..a9a104d12dd4 100644 --- a/packages/devextreme/js/__internal/ui/date_range_box/m_date_range_box.ts +++ b/packages/devextreme/js/__internal/ui/date_range_box/m_date_range_box.ts @@ -1,4 +1,7 @@ import type { Position } from '@js/common'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import config from '@js/core/config'; import devices from '@js/core/devices'; @@ -11,9 +14,6 @@ import { extend } from '@js/core/utils/extend'; import { getImageContainer } from '@js/core/utils/icon'; import { camelize } from '@js/core/utils/inflector'; import { each } from '@js/core/utils/iterator'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import type { Properties } from '@js/ui/date_range_box'; import Editor from '@js/ui/editor/editor'; import { current, isFluent, isMaterial } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts b/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts index ebaa709861c0..71733688e805 100644 --- a/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts +++ b/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts @@ -1,8 +1,8 @@ // eslint-disable-next-line max-classes-per-file +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils'; import $ from '@js/core/renderer'; import { getWidth } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils'; // eslint-disable-next-line @typescript-eslint/consistent-type-imports import type { DateBoxBase, Properties } from '@js/ui/date_box'; import DateBox from '@js/ui/date_box'; diff --git a/packages/devextreme/js/__internal/ui/date_range_box/strategy/m_rangeCalendar.ts b/packages/devextreme/js/__internal/ui/date_range_box/strategy/m_rangeCalendar.ts index c8137ddf56da..e56696abe042 100644 --- a/packages/devextreme/js/__internal/ui/date_range_box/strategy/m_rangeCalendar.ts +++ b/packages/devextreme/js/__internal/ui/date_range_box/strategy/m_rangeCalendar.ts @@ -1,6 +1,6 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import { extend } from '@js/core/utils/extend'; import { isFunction } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; import type Calendar from '@js/ui/calendar'; import type DateBox from '@js/ui/date_box'; diff --git a/packages/devextreme/js/__internal/ui/drawer/m_drawer.animation.ts b/packages/devextreme/js/__internal/ui/drawer/m_drawer.animation.ts index b4249c6bc0c0..bdd3d9e52b1b 100644 --- a/packages/devextreme/js/__internal/ui/drawer/m_drawer.animation.ts +++ b/packages/devextreme/js/__internal/ui/drawer/m_drawer.animation.ts @@ -1,4 +1,4 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; import { camelize } from '@js/core/utils/inflector'; export const animation = { diff --git a/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.overlap.ts b/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.overlap.ts index 5754cccc4dfc..ffa6c038f006 100644 --- a/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.overlap.ts +++ b/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.overlap.ts @@ -1,4 +1,4 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; import $ from '@js/core/renderer'; import { ensureDefined } from '@js/core/utils/common'; import { camelize } from '@js/core/utils/inflector'; diff --git a/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.push.ts b/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.push.ts index 77520c1e1205..ac51bd026c4a 100644 --- a/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.push.ts +++ b/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.push.ts @@ -1,4 +1,4 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; import $ from '@js/core/renderer'; import { animation } from './m_drawer.animation'; diff --git a/packages/devextreme/js/__internal/ui/drawer/m_drawer.ts b/packages/devextreme/js/__internal/ui/drawer/m_drawer.ts index f1ad55b444c1..1b3692e20630 100644 --- a/packages/devextreme/js/__internal/ui/drawer/m_drawer.ts +++ b/packages/devextreme/js/__internal/ui/drawer/m_drawer.ts @@ -1,4 +1,7 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { name as CLICK_EVENT_NAME } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; import registerComponent from '@js/core/component_registrator'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; @@ -8,9 +11,6 @@ import { extend } from '@js/core/utils/extend'; import { getBoundingRect } from '@js/core/utils/position'; import { isDefined, isFunction } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { name as CLICK_EVENT_NAME } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { triggerResizeEvent } from '@js/events/visibility_change'; import Widget from '@js/ui/widget/ui.widget'; import { animation } from './m_drawer.animation'; diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_button.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_button.ts index 6a85f9d55e71..577e44ea8826 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_button.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_button.ts @@ -1,7 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import eventsEngine from '@js/events/core/events_engine'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import TextEditorButton from '../text_box/texteditor_button_collection/m_button'; diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts index b6d00e1c7216..36b252952a40 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts @@ -1,5 +1,9 @@ -import animationPosition from '@js/animation/position'; -import { locate, move } from '@js/animation/translator'; +import animationPosition from '@js/common/core/animation/position'; +import { locate, move } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -16,10 +20,6 @@ import { each } from '@js/core/utils/iterator'; import { getDefaultAlignment } from '@js/core/utils/position'; import { isDefined } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Popup from '@js/ui/popup/ui.popup'; import TextBox from '@js/ui/text_box'; import { focused } from '@js/ui/widget/selectors'; @@ -731,9 +731,7 @@ const DropDownEditor = TextBox.inherit({ let positionSide = 'bottom'; if (this._popup && this._popup.option('visible')) { - // @ts-expect-error const { top: myTop } = animationPosition.setup(this.$element()); - // @ts-expect-error const { top: popupTop } = animationPosition.setup(this._popup.$content()); positionSide = (myTop + this.option('popupPosition').offset.v) > popupTop ? 'bottom' : 'top'; diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts index 2bc92c415f2b..fedff530d680 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts @@ -1,3 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; +import { query as dataQuery } from '@js/common/data'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import Guid from '@js/core/guid'; @@ -15,10 +19,6 @@ import { each } from '@js/core/utils/iterator'; import { getOuterHeight } from '@js/core/utils/size'; import { isDefined, isObject, isWindow } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import dataQuery from '@js/data/query'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import DataExpressionMixin from '@js/ui/editor/ui.data_expression'; import List from '@js/ui/list_light'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts b/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts index c61e64b46529..e754a1a477eb 100644 --- a/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts +++ b/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts @@ -1,3 +1,4 @@ +import { ArrayStore, DataHelperMixin, DataSource } from '@js/common/data'; import { ensureDefined, noop } from '@js/core/utils/common'; import { compileGetter, @@ -9,9 +10,6 @@ import { isDefined, isFunction, isObject as isObjectType, isString, } from '@js/core/utils/type'; import variableWrapper from '@js/core/utils/variable_wrapper'; -import ArrayStore from '@js/data/array_store'; -import { DataSource } from '@js/data/data_source/data_source'; -import DataHelperMixin from '@js/data_helper'; const DataExpressionMixin = extend({}, DataHelperMixin, { diff --git a/packages/devextreme/js/__internal/ui/editor/m_editor.ts b/packages/devextreme/js/__internal/ui/editor/m_editor.ts index fc2201b1b3e3..ceb25826f671 100644 --- a/packages/devextreme/js/__internal/ui/editor/m_editor.ts +++ b/packages/devextreme/js/__internal/ui/editor/m_editor.ts @@ -1,3 +1,5 @@ +import EventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, normalizeKeyName } from '@js/common/core/events/utils/index'; import { data } from '@js/core/element_data'; import Guid from '@js/core/guid'; import $ from '@js/core/renderer'; @@ -5,8 +7,6 @@ import Callbacks from '@js/core/utils/callbacks'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { hasWindow } from '@js/core/utils/window'; -import EventsEngine from '@js/events/core/events_engine'; -import { addNamespace, normalizeKeyName } from '@js/events/utils/index'; import ValidationEngine from '@js/ui/validation_engine'; import ValidationMessage from '@js/ui/validation_message'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/form/components/m_field_item.ts b/packages/devextreme/js/__internal/ui/form/components/m_field_item.ts index 8a30e848a70b..c54022e26604 100644 --- a/packages/devextreme/js/__internal/ui/form/components/m_field_item.ts +++ b/packages/devextreme/js/__internal/ui/form/components/m_field_item.ts @@ -1,9 +1,9 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; import { captionize } from '@js/core/utils/inflector'; import { format } from '@js/core/utils/string'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; import { isMaterialBased } from '@js/ui/themes'; import Validator from '@js/ui/validator'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/form/m_form.layout_manager.ts b/packages/devextreme/js/__internal/ui/form/m_form.layout_manager.ts index 591a96c1fc71..870f9bfe3735 100644 --- a/packages/devextreme/js/__internal/ui/form/m_form.layout_manager.ts +++ b/packages/devextreme/js/__internal/ui/form/m_form.layout_manager.ts @@ -4,6 +4,9 @@ import '@js/ui/check_box'; import '@js/ui/date_box'; import '@js/ui/button'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { normalizeIndexes } from '@js/core/utils/array'; @@ -17,9 +20,6 @@ import { import variableWrapper from '@js/core/utils/variable_wrapper'; // @ts-expect-error import { getCurrentScreenFactor, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; -import messageLocalization from '@js/localization/message'; import ResponsiveBox from '@js/ui/responsive_box'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/form/m_form.ts b/packages/devextreme/js/__internal/ui/form/m_form.ts index 64e1f0f5463e..fde3b04ae54d 100644 --- a/packages/devextreme/js/__internal/ui/form/m_form.ts +++ b/packages/devextreme/js/__internal/ui/form/m_form.ts @@ -2,6 +2,9 @@ import './m_form.layout_manager'; import '@js/ui/validation_summary'; import '@js/ui/validation_group'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { triggerResizeEvent, triggerShownEvent } from '@js/common/core/events/visibility_change'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import config from '@js/core/config'; import { getPublicElement } from '@js/core/element'; @@ -17,9 +20,6 @@ import { } from '@js/core/utils/type'; // @ts-expect-error import { defaultScreenFactorFunc, getCurrentScreenFactor, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { triggerResizeEvent, triggerShownEvent } from '@js/events/visibility_change'; -import messageLocalization from '@js/localization/message'; import Editor from '@js/ui/editor/editor'; import Scrollable from '@js/ui/scroll_view/ui.scrollable'; import TabPanel from '@js/ui/tab_panel'; diff --git a/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts b/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts index 6825fae3427e..e3af15f04f54 100644 --- a/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts +++ b/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts @@ -1,10 +1,10 @@ +import { query } from '@js/common/data'; +import storeHelper from '@js/common/data/store_helper'; import Class from '@js/core/class'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isFunction } from '@js/core/utils/type'; -import query from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; import TextBox from '@js/ui/text_box'; import errors from '@js/ui/widget/ui.errors'; import uiSearchBoxMixin from '@js/ui/widget/ui.search_box_mixin'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/m_html_editor.ts b/packages/devextreme/js/__internal/ui/html_editor/m_html_editor.ts index bb54fda96c46..c81e312732d8 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/m_html_editor.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/m_html_editor.ts @@ -1,5 +1,11 @@ import './converters/m_delta'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import scrollEvents from '@js/common/core/events/gesture/emitter.gesture.scroll'; +// @ts-expect-error +import { Event as dxEvent } from '@js/common/core/events/index'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import config from '@js/core/config'; import devices from '@js/core/devices'; @@ -16,12 +22,6 @@ import { import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { isDefined, isFunction } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import scrollEvents from '@js/events/gesture/emitter.gesture.scroll'; -// @ts-expect-error -import { Event as dxEvent } from '@js/events/index'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import Editor from '@js/ui/editor/editor'; import { prepareScrollData } from '@ts/ui/text_box/m_utils.scroll'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_dropImage.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_dropImage.ts index 6f8ceef66a34..eb734a59f814 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_dropImage.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_dropImage.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import browser from '@js/core/utils/browser'; import { each } from '@js/core/utils/iterator'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import Quill from 'devextreme-quill'; import BaseModule from './m_base'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageCursor.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageCursor.ts index a8f042f84d32..e3ced1a7faa3 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageCursor.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageCursor.ts @@ -1,5 +1,5 @@ -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import Quill from 'devextreme-quill'; import BaseModule from './m_base'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageUpload.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageUpload.ts index 14b7814d9d4d..ede71155ee4d 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageUpload.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageUpload.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import FileUploader from '@js/ui/file_uploader'; import Quill from 'devextreme-quill'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_mentions.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_mentions.ts index a2499d886156..a388a9a09263 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_mentions.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_mentions.ts @@ -1,9 +1,9 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; import { compileGetter } from '@js/core/utils/data'; import { extend } from '@js/core/utils/extend'; import { isString } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; import type List from '@js/ui/list'; import type Popup from '@js/ui/popup'; import Quill from 'devextreme-quill'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_popup.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_popup.ts index c9c1887b245d..3bd2b87f3245 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_popup.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_popup.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getHeight } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import type ListType from '@js/ui/list'; import List from '@js/ui/list_light'; import Popup from '@js/ui/popup'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_resizing.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_resizing.ts index 886c663b42d9..cde4c424f0f7 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_resizing.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_resizing.ts @@ -1,4 +1,7 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import { name as ClickEvent } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, normalizeKeyName } from '@js/common/core/events/utils/index'; import devices from '@js/core/devices'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -6,9 +9,6 @@ import { getBoundingRect } from '@js/core/utils/position'; import { getHeight, getOuterHeight, getOuterWidth, getWidth, } from '@js/core/utils/size'; -import { name as ClickEvent } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, normalizeKeyName } from '@js/events/utils/index'; import Resizable from '@js/ui/resizable'; import Quill from 'devextreme-quill'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableContextMenu.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableContextMenu.ts index d2311df2fff6..c777642b350d 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableContextMenu.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableContextMenu.ts @@ -1,11 +1,11 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import localizationMessage from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { camelize, titleize } from '@js/core/utils/inflector'; import { each } from '@js/core/utils/iterator'; import { isObject, isString } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import localizationMessage from '@js/localization/message'; import type { Item } from '@js/ui/context_menu'; import ContextMenu from '@js/ui/context_menu'; import Quill from 'devextreme-quill'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableResizing.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableResizing.ts index b5661d37ac40..8b0896f416a5 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableResizing.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableResizing.ts @@ -1,4 +1,6 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; @@ -8,8 +10,6 @@ import _windowResizeCallbacks from '@js/core/utils/resize_callbacks'; import { getHeight, getOuterHeight, getOuterWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import type { Properties } from '@js/ui/draggable'; import Draggable from '@js/ui/draggable'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_toolbar.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_toolbar.ts index 078052d79ab9..5db29446d347 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_toolbar.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_toolbar.ts @@ -2,6 +2,9 @@ import '@js/ui/select_box'; import '@ts/ui/color_box/m_color_view'; import '@js/ui/number_box'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import localizationMessage from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; @@ -10,9 +13,6 @@ import { each } from '@js/core/utils/iterator'; import { isDefined, isEmptyObject, isObject, isString, } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import localizationMessage from '@js/localization/message'; import type { Item } from '@js/ui/toolbar'; import Toolbar from '@js/ui/toolbar'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/ui/m_formDialog.ts b/packages/devextreme/js/__internal/ui/html_editor/ui/m_formDialog.ts index 432b67b44bf6..a0930e02d7de 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/ui/m_formDialog.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/ui/m_formDialog.ts @@ -1,3 +1,4 @@ +import localizationMessage from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import type { DeferredObj } from '@js/core/utils/deferred'; @@ -8,7 +9,6 @@ import { getCurrentScreenFactor, hasWindow, } from '@js/core/utils/window'; -import localizationMessage from '@js/localization/message'; import Form from '@js/ui/form'; import Popup from '@js/ui/popup'; import { isFluent, isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/utils/m_image_uploader_helper.ts b/packages/devextreme/js/__internal/ui/html_editor/utils/m_image_uploader_helper.ts index 5020b1e2365c..0e4b344ece1c 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/utils/m_image_uploader_helper.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/utils/m_image_uploader_helper.ts @@ -1,11 +1,11 @@ /* eslint-disable max-classes-per-file */ +import localizationMessage from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { map } from '@js/core/utils/iterator'; import { getHeight, getWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import localizationMessage from '@js/localization/message'; import ButtonGroup from '@js/ui/button_group'; import FileUploader from '@js/ui/file_uploader'; import TextBox from '@js/ui/text_box'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/utils/m_toolbar_helper.ts b/packages/devextreme/js/__internal/ui/html_editor/utils/m_toolbar_helper.ts index f107910b39a8..fd601a7300c9 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/utils/m_toolbar_helper.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/utils/m_toolbar_helper.ts @@ -1,10 +1,10 @@ +import localizationMessage from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { camelize } from '@js/core/utils/inflector'; import { each } from '@js/core/utils/iterator'; import { getOuterHeight, getOuterWidth, getWidth } from '@js/core/utils/size'; import { isBoolean, isDefined } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import localizationMessage from '@js/localization/message'; import ButtonGroup from '@js/ui/button_group'; import ColorBox from '@js/ui/color_box'; import Form from '@js/ui/form'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.base.ts b/packages/devextreme/js/__internal/ui/list/m_list.base.ts index 42c7cdc16af6..e12df90ab1f8 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.base.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.base.ts @@ -1,4 +1,9 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { end as swipeEventEnd } from '@js/common/core/events/swipe'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; import Guid from '@js/core/guid'; @@ -13,11 +18,6 @@ import { each } from '@js/core/utils/iterator'; import { getHeight, getOuterHeight, setHeight } from '@js/core/utils/size'; import { isDefined, isPlainObject } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { end as swipeEventEnd } from '@js/events/swipe'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.live_update'; import ScrollView from '@js/ui/scroll_view'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.context.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.context.ts index 48ac21a6214d..4844e6a695bf 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.context.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.context.ts @@ -1,6 +1,6 @@ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { getOuterHeight, getOuterWidth } from '@js/core/utils/size'; -import messageLocalization from '@js/localization/message'; import Overlay from '@js/ui/overlay/ui.overlay'; import { ListBase } from './m_list.base'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.reorder.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.reorder.ts index 979bf0e05366..927458f864b5 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.reorder.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.reorder.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { isMouseEvent } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getWidth, setWidth } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; -import { isMouseEvent } from '@js/events/utils/index'; import Sortable from '@js/ui/sortable'; import EditDecorator from './m_list.edit.decorator'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.selection.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.selection.ts index 439109aaafe5..e0a5ff758ec2 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.selection.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.selection.ts @@ -1,10 +1,10 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { Deferred, type DeferredObj } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import CheckBox from '@js/ui/check_box'; import RadioButton from '@js/ui/radio_group/radio_button'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.swipe.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.swipe.ts index 21211b6ce514..92034e437435 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.swipe.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.swipe.ts @@ -1,5 +1,5 @@ -import fx from '@js/animation/fx'; -import { move } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { move } from '@js/common/core/animation/translator'; import { Deferred } from '@js/core/utils/deferred'; import { getWidth } from '@js/core/utils/size'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.button.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.button.ts index 73b27f305daa..dfe55b474bd0 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.button.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.button.ts @@ -1,7 +1,7 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { getOuterWidth, getWidth } from '@js/core/utils/size'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import { isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.slide.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.slide.ts index 06bf94d30bf7..81878f22113c 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.slide.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.slide.ts @@ -1,13 +1,13 @@ -import fx from '@js/animation/fx'; -import { locate, move } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { locate, move } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import { active } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { getOuterWidth, setWidth } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import { active } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import ActionSheet from '@js/ui/action_sheet'; import { isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.ts index 320f64e8804d..c2a2c7cbe771 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.ts @@ -1,10 +1,10 @@ +import { active } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { getOuterHeight, setHeight } from '@js/core/utils/size'; -import { active } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import EditDecorator from './m_list.edit.decorator'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.ts index 6eede70a613f..cf883ae334c3 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.ts @@ -1,14 +1,14 @@ -import Class from '@js/core/class'; -import $ from '@js/core/renderer'; -import { noop } from '@js/core/utils/common'; -import { getWidth } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { end as swipeEventEnd, start as swipeEventStart, swipe as swipeEventSwipe, -} from '@js/events/swipe'; -import { addNamespace } from '@js/events/utils/index'; +} from '@js/common/core/events/swipe'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import Class from '@js/core/class'; +import $ from '@js/core/renderer'; +import { noop } from '@js/core/utils/common'; +import { getWidth } from '@js/core/utils/size'; const LIST_EDIT_DECORATOR = 'dxListEditDecorator'; const SWIPE_START_EVENT_NAME = addNamespace(swipeEventStart, LIST_EDIT_DECORATOR); diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts index a1804e5b7877..72bfa9613cbe 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts @@ -1,8 +1,8 @@ +import { query } from '@js/common/data'; +import storeHelper from '@js/common/data/store_helper'; import $ from '@js/core/renderer'; import { each } from '@js/core/utils/iterator'; import { isNumeric } from '@js/core/utils/type'; -import query from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; import EditStrategy from '@ts/ui/collection/m_collection_widget.edit.strategy.plain'; const LIST_ITEM_CLASS = 'dx-list-item'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.ts index c464c048dcaf..5b8f8d09ec23 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.ts @@ -1,7 +1,7 @@ +import { isTouchEvent } from '@js/common/core/events/utils/index'; +import localizationMessage from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import { isTouchEvent } from '@js/events/utils/index'; -import localizationMessage from '@js/localization/message'; import { ListBase } from './m_list.base'; import EditProvider from './m_list.edit.provider'; diff --git a/packages/devextreme/js/__internal/ui/m_accordion.ts b/packages/devextreme/js/__internal/ui/m_accordion.ts index a1c1f08e94fb..9dff961f85a7 100644 --- a/packages/devextreme/js/__internal/ui/m_accordion.ts +++ b/packages/devextreme/js/__internal/ui/m_accordion.ts @@ -1,4 +1,7 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -12,9 +15,6 @@ import { getImageContainer } from '@js/core/utils/icon'; import * as iteratorUtils from '@js/core/utils/iterator'; import { getHeight, getOuterHeight, setHeight } from '@js/core/utils/size'; import { isDefined, isPlainObject } from '@js/core/utils/type'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.live_update'; import { isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/m_action_sheet.ts b/packages/devextreme/js/__internal/ui/m_action_sheet.ts index bbe997297eac..754c9e6d72eb 100644 --- a/packages/devextreme/js/__internal/ui/m_action_sheet.ts +++ b/packages/devextreme/js/__internal/ui/m_action_sheet.ts @@ -1,3 +1,4 @@ +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { BindableTemplate } from '@js/core/templates/bindable_template'; @@ -5,7 +6,6 @@ import { noop } from '@js/core/utils/common'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { getWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.edit'; import Popover from '@js/ui/popover/ui.popover'; diff --git a/packages/devextreme/js/__internal/ui/m_autocomplete.ts b/packages/devextreme/js/__internal/ui/m_autocomplete.ts index fde9e9388e2e..0d0b5e25b557 100644 --- a/packages/devextreme/js/__internal/ui/m_autocomplete.ts +++ b/packages/devextreme/js/__internal/ui/m_autocomplete.ts @@ -1,9 +1,9 @@ +import { isCommandKeyPressed } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import { isCommandKeyPressed } from '@js/events/utils/index'; import DropDownList from '@js/ui/drop_down_editor/ui.drop_down_list'; const AUTOCOMPLETE_CLASS = 'dx-autocomplete'; diff --git a/packages/devextreme/js/__internal/ui/m_defer_rendering.ts b/packages/devextreme/js/__internal/ui/m_defer_rendering.ts index 1894a410a47d..75ac61edb085 100644 --- a/packages/devextreme/js/__internal/ui/m_defer_rendering.ts +++ b/packages/devextreme/js/__internal/ui/m_defer_rendering.ts @@ -1,4 +1,6 @@ -import { TransitionExecutor } from '@js/animation/transition_executor/transition_executor'; +import { TransitionExecutor } from '@js/common/core/animation/transition_executor/transition_executor'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { triggerShownEvent } from '@js/common/core/events/visibility_change'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; @@ -17,8 +19,6 @@ import { each } from '@js/core/utils/iterator'; import { getBoundingRect } from '@js/core/utils/position'; import { isPromise } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { triggerShownEvent } from '@js/events/visibility_change'; import LoadIndicator from '@js/ui/load_indicator'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/m_dialog.ts b/packages/devextreme/js/__internal/ui/m_dialog.ts index 5bf591ec0c58..05a3ae4c94fe 100644 --- a/packages/devextreme/js/__internal/ui/m_dialog.ts +++ b/packages/devextreme/js/__internal/ui/m_dialog.ts @@ -1,3 +1,5 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import messageLocalization from '@js/common/core/localization/message'; import Action from '@js/core/action'; import config from '@js/core/config'; import devices from '@js/core/devices'; @@ -10,8 +12,6 @@ import { getHeight, getWidth } from '@js/core/utils/size'; import { isPlainObject } from '@js/core/utils/type'; import { value as getViewport } from '@js/core/utils/view_port'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import messageLocalization from '@js/localization/message'; import Popup from '@js/ui/popup/ui.popup'; import { isFluent } from '@js/ui/themes'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/m_drop_down_box.ts b/packages/devextreme/js/__internal/ui/m_drop_down_box.ts index cf6dbb96de22..dbf14e91dd60 100644 --- a/packages/devextreme/js/__internal/ui/m_drop_down_box.ts +++ b/packages/devextreme/js/__internal/ui/m_drop_down_box.ts @@ -1,3 +1,5 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { normalizeKeyName } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -9,8 +11,6 @@ import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { map } from '@js/core/utils/iterator'; import { isDefined, isObject } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { normalizeKeyName } from '@js/events/utils/index'; import DataExpressionMixin from '@js/ui/editor/ui.data_expression'; import { tabbable } from '@js/ui/widget/selectors'; import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor'; diff --git a/packages/devextreme/js/__internal/ui/m_drop_down_button.ts b/packages/devextreme/js/__internal/ui/m_drop_down_button.ts index 0ea068ef0dc2..49ba7ec7a25a 100644 --- a/packages/devextreme/js/__internal/ui/m_drop_down_button.ts +++ b/packages/devextreme/js/__internal/ui/m_drop_down_button.ts @@ -1,3 +1,4 @@ +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import { getPublicElement } from '@js/core/element'; import Guid from '@js/core/guid'; @@ -10,7 +11,6 @@ import { extend } from '@js/core/utils/extend'; import { getImageContainer } from '@js/core/utils/icon'; import { isDefined, isObject, isPlainObject } from '@js/core/utils/type'; import DataController from '@js/data_controller'; -import messageLocalization from '@js/localization/message'; import ButtonGroup from '@js/ui/button_group'; import List from '@js/ui/list_light'; import Popup from '@js/ui/popup/ui.popup'; diff --git a/packages/devextreme/js/__internal/ui/m_file_uploader.ts b/packages/devextreme/js/__internal/ui/m_file_uploader.ts index a40626874bc1..9a18fdc2d69c 100644 --- a/packages/devextreme/js/__internal/ui/m_file_uploader.ts +++ b/packages/devextreme/js/__internal/ui/m_file_uploader.ts @@ -1,4 +1,8 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, isTouchEvent } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -14,10 +18,6 @@ import { each } from '@js/core/utils/iterator'; import { getOffset, getWidth } from '@js/core/utils/size'; import { isDefined, isFunction, isNumeric } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, isTouchEvent } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import type { ButtonStyle, ButtonType } from '@js/ui/button'; import Button from '@js/ui/button'; import type { Properties as PublicProperties } from '@js/ui/file_uploader'; diff --git a/packages/devextreme/js/__internal/ui/m_gallery.ts b/packages/devextreme/js/__internal/ui/m_gallery.ts index 69f20a920198..da1f5b71aff6 100644 --- a/packages/devextreme/js/__internal/ui/m_gallery.ts +++ b/packages/devextreme/js/__internal/ui/m_gallery.ts @@ -1,5 +1,11 @@ -import fx from '@js/animation/fx'; -import { move } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { move } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import Swipeable from '@js/common/core/events/gesture/swipeable'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -13,12 +19,6 @@ import { } from '@js/core/utils/size'; import { isDefined, isPlainObject } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import Swipeable from '@js/events/gesture/swipeable'; -import { addNamespace } from '@js/events/utils/index'; -import { triggerResizeEvent } from '@js/events/visibility_change'; -import messageLocalization from '@js/localization/message'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.edit'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/m_load_indicator.ts b/packages/devextreme/js/__internal/ui/m_load_indicator.ts index fb3f48ba0749..236a336da665 100644 --- a/packages/devextreme/js/__internal/ui/m_load_indicator.ts +++ b/packages/devextreme/js/__internal/ui/m_load_indicator.ts @@ -1,10 +1,10 @@ +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getHeight, getWidth } from '@js/core/utils/size'; import { getNavigator } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; // @ts-expect-error import { current, isGeneric, isMaterialBased } from '@js/ui/themes'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/m_load_panel.ts b/packages/devextreme/js/__internal/ui/m_load_panel.ts index 814d508493e6..2af54f41313a 100644 --- a/packages/devextreme/js/__internal/ui/m_load_panel.ts +++ b/packages/devextreme/js/__internal/ui/m_load_panel.ts @@ -1,9 +1,9 @@ +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import messageLocalization from '@js/localization/message'; import LoadIndicator from '@js/ui/load_indicator'; import Overlay from '@js/ui/overlay/ui.overlay'; import { isFluent, isMaterial } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/m_lookup.ts b/packages/devextreme/js/__internal/ui/m_lookup.ts index 996b610c8ab8..d43b84eb0384 100644 --- a/packages/devextreme/js/__internal/ui/m_lookup.ts +++ b/packages/devextreme/js/__internal/ui/m_lookup.ts @@ -1,4 +1,6 @@ -import { locate, move, resetPosition } from '@js/animation/translator'; +import { locate, move, resetPosition } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -13,8 +15,6 @@ import { } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import messageLocalization from '@js/localization/message'; import DropDownList from '@js/ui/drop_down_editor/ui.drop_down_list'; import Popover from '@js/ui/popover/ui.popover'; import TextBox from '@js/ui/text_box'; diff --git a/packages/devextreme/js/__internal/ui/m_multi_view.ts b/packages/devextreme/js/__internal/ui/m_multi_view.ts index 1eebc72ad25f..7a8ad4f3ae99 100644 --- a/packages/devextreme/js/__internal/ui/m_multi_view.ts +++ b/packages/devextreme/js/__internal/ui/m_multi_view.ts @@ -1,4 +1,7 @@ -import { locate } from '@js/animation/translator'; +import { locate } from '@js/common/core/animation/translator'; +import Swipeable from '@js/common/core/events/gesture/swipeable'; +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -9,9 +12,6 @@ import { extend } from '@js/core/utils/extend'; import { sign } from '@js/core/utils/math'; import { getWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import Swipeable from '@js/events/gesture/swipeable'; -import { triggerResizeEvent } from '@js/events/visibility_change'; -import messageLocalization from '@js/localization/message'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.live_update'; import { _translator, animation } from './multi_view/m_multi_view.animation'; diff --git a/packages/devextreme/js/__internal/ui/m_range_slider.ts b/packages/devextreme/js/__internal/ui/m_range_slider.ts index 8f0501990950..b9fd532e0ae4 100644 --- a/packages/devextreme/js/__internal/ui/m_range_slider.ts +++ b/packages/devextreme/js/__internal/ui/m_range_slider.ts @@ -1,12 +1,12 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { eventData } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; // @ts-expect-error import { applyServerDecimalSeparator } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { getWidth } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; -import { eventData } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Slider from '@js/ui/slider'; import SliderHandle from './slider/m_slider_handle'; diff --git a/packages/devextreme/js/__internal/ui/m_select_box.ts b/packages/devextreme/js/__internal/ui/m_select_box.ts index 7d5db4b74df0..5e3afb659c10 100644 --- a/packages/devextreme/js/__internal/ui/m_select_box.ts +++ b/packages/devextreme/js/__internal/ui/m_select_box.ts @@ -1,5 +1,7 @@ import '@ts/ui/list/modules/m_selection'; +import { normalizeKeyName } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -11,8 +13,6 @@ import { Deferred, fromPromise } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isPromise } from '@js/core/utils/type'; -import { normalizeKeyName } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import DropDownList from '@js/ui/drop_down_editor/ui.drop_down_list'; const DISABLED_STATE_SELECTOR = '.dx-state-disabled'; diff --git a/packages/devextreme/js/__internal/ui/m_switch.ts b/packages/devextreme/js/__internal/ui/m_switch.ts index 184442a4002f..d2de40a8152d 100644 --- a/packages/devextreme/js/__internal/ui/m_switch.ts +++ b/packages/devextreme/js/__internal/ui/m_switch.ts @@ -1,4 +1,10 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { name as clickEventName } from '@js/common/core/events/click'; +import { lock } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import Swipeable from '@js/common/core/events/gesture/swipeable'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; @@ -6,12 +12,6 @@ import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { getBoundingRect } from '@js/core/utils/position'; import { getOuterWidth } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import { lock } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import Swipeable from '@js/events/gesture/swipeable'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Editor from '@js/ui/editor/editor'; const SWITCH_CLASS = 'dx-switch'; diff --git a/packages/devextreme/js/__internal/ui/m_tag_box.ts b/packages/devextreme/js/__internal/ui/m_tag_box.ts index 00a424704b45..52c05ea7045a 100644 --- a/packages/devextreme/js/__internal/ui/m_tag_box.ts +++ b/packages/devextreme/js/__internal/ui/m_tag_box.ts @@ -1,3 +1,8 @@ +import { name as clickEvent } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; +import { normalizeLoadResult } from '@js/common/data/data_source/utils'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -16,11 +21,6 @@ import { SelectionFilterCreator as FilterCreator } from '@js/core/utils/selectio import { getHeight, getOuterWidth } from '@js/core/utils/size'; import { isDefined, isObject, isString } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { normalizeLoadResult } from '@js/data/data_source/utils'; -import { name as clickEvent } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import SelectBox from '@js/ui/select_box'; import errors from '@js/ui/widget/ui.errors'; import caret from '@ts/ui/text_box/m_utils.caret'; diff --git a/packages/devextreme/js/__internal/ui/m_text_area.ts b/packages/devextreme/js/__internal/ui/m_text_area.ts index c44159027e0b..e96b7593b6eb 100644 --- a/packages/devextreme/js/__internal/ui/m_text_area.ts +++ b/packages/devextreme/js/__internal/ui/m_text_area.ts @@ -1,3 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import scrollEvents from '@js/common/core/events/gesture/emitter.gesture.scroll'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, eventData } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { ensureDefined, noop } from '@js/core/utils/common'; @@ -7,10 +11,6 @@ import { } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import scrollEvents from '@js/events/gesture/emitter.gesture.scroll'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, eventData } from '@js/events/utils/index'; import TextBox from '@js/ui/text_box'; import { allowScroll, prepareScrollData } from '@ts/ui/text_box/m_utils.scroll'; diff --git a/packages/devextreme/js/__internal/ui/m_track_bar.ts b/packages/devextreme/js/__internal/ui/m_track_bar.ts index d27ad1547dce..2bd30976db84 100644 --- a/packages/devextreme/js/__internal/ui/m_track_bar.ts +++ b/packages/devextreme/js/__internal/ui/m_track_bar.ts @@ -1,4 +1,4 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; diff --git a/packages/devextreme/js/__internal/ui/m_validation_engine.ts b/packages/devextreme/js/__internal/ui/m_validation_engine.ts index 2e16c4df9e42..35858d1ff3c2 100644 --- a/packages/devextreme/js/__internal/ui/m_validation_engine.ts +++ b/packages/devextreme/js/__internal/ui/m_validation_engine.ts @@ -1,4 +1,6 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; +import numberLocalization from '@js/common/core/localization/number'; import Class from '@js/core/class'; import errors from '@js/core/errors'; import { EventsStrategy } from '@js/core/events_strategy'; @@ -20,8 +22,6 @@ import { isPromise, isString, } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; -import numberLocalization from '@js/localization/number'; const EMAIL_VALIDATION_REGEX = /^[\d\w.+_-]+@[\d\w._-]+\.[\w]+$/i; diff --git a/packages/devextreme/js/__internal/ui/m_validation_summary.ts b/packages/devextreme/js/__internal/ui/m_validation_summary.ts index 1a112152a53f..d3c7ea85d50c 100644 --- a/packages/devextreme/js/__internal/ui/m_validation_summary.ts +++ b/packages/devextreme/js/__internal/ui/m_validation_summary.ts @@ -1,9 +1,9 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import registerComponent from '@js/core/component_registrator'; // @ts-expect-error import { grep } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { each, map } from '@js/core/utils/iterator'; -import eventsEngine from '@js/events/core/events_engine'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.edit'; import ValidationEngine from './m_validation_engine'; diff --git a/packages/devextreme/js/__internal/ui/map/m_map.ts b/packages/devextreme/js/__internal/ui/map/m_map.ts index 0978656a6b6b..1548b3613005 100644 --- a/packages/devextreme/js/__internal/ui/map/m_map.ts +++ b/packages/devextreme/js/__internal/ui/map/m_map.ts @@ -1,3 +1,6 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; @@ -9,9 +12,6 @@ import { extend } from '@js/core/utils/extend'; import { titleize } from '@js/core/utils/inflector'; import { each } from '@js/core/utils/iterator'; import { isNumeric } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import errors from '@js/ui/widget/ui.errors'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/map/m_provider.google_static.ts b/packages/devextreme/js/__internal/ui/map/m_provider.google_static.ts index 6ba8b1315cd9..5a9d38c315d3 100644 --- a/packages/devextreme/js/__internal/ui/map/m_provider.google_static.ts +++ b/packages/devextreme/js/__internal/ui/map/m_provider.google_static.ts @@ -1,8 +1,8 @@ import Color from '@js/color'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { each } from '@js/core/utils/iterator'; import { getHeight, getWidth } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; import Provider from './m_provider'; diff --git a/packages/devextreme/js/__internal/ui/map/m_provider.ts b/packages/devextreme/js/__internal/ui/map/m_provider.ts index c77f1445d9a6..dd34bd4d1bbe 100644 --- a/packages/devextreme/js/__internal/ui/map/m_provider.ts +++ b/packages/devextreme/js/__internal/ui/map/m_provider.ts @@ -1,7 +1,7 @@ +import { addNamespace } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import { map } from '@js/core/utils/iterator'; import { isNumeric, isPlainObject } from '@js/core/utils/type'; -import { addNamespace } from '@js/events/utils/index'; const { abstract } = Class; diff --git a/packages/devextreme/js/__internal/ui/menu/m_menu.ts b/packages/devextreme/js/__internal/ui/menu/m_menu.ts index 6c292099d296..8fb0b99009a9 100644 --- a/packages/devextreme/js/__internal/ui/menu/m_menu.ts +++ b/packages/devextreme/js/__internal/ui/menu/m_menu.ts @@ -1,4 +1,8 @@ -import type { PositionConfig } from '@js/animation/position'; +import type { PositionConfig } from '@js/common/core/animation'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { end as hoverEventEnd } from '@js/common/core/events/hover'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import { getPublicElement } from '@js/core/element'; import type { dxElementWrapper } from '@js/core/renderer'; @@ -8,10 +12,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getOuterWidth } from '@js/core/utils/size'; import { isDefined, isObject, isPlainObject } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { end as hoverEventEnd } from '@js/events/hover'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import Button from '@js/ui/button'; import type { Item } from '@js/ui/menu'; import type { Properties as OverlayProperties } from '@js/ui/overlay'; diff --git a/packages/devextreme/js/__internal/ui/menu/m_submenu.ts b/packages/devextreme/js/__internal/ui/menu/m_submenu.ts index 30ede2cb371e..96aaa27e3f9a 100644 --- a/packages/devextreme/js/__internal/ui/menu/m_submenu.ts +++ b/packages/devextreme/js/__internal/ui/menu/m_submenu.ts @@ -1,7 +1,7 @@ import '@js/ui/context_menu'; -import type { PositionConfig } from '@js/animation/position'; -import animationPosition from '@js/animation/position'; +import type { PositionConfig } from '@js/common/core/animation'; +import animationPosition from '@js/common/core/animation/position'; import { getPublicElement } from '@js/core/element'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -178,7 +178,6 @@ class Submenu extends ContextMenu { position.offset = '2.5 0'; position.at = position.my = 'right bottom'; } - // @ts-expect-error animationPosition.setup(this.$contentDelimiter, position); } diff --git a/packages/devextreme/js/__internal/ui/multi_view/m_multi_view.animation.ts b/packages/devextreme/js/__internal/ui/multi_view/m_multi_view.animation.ts index dd3f3ef4bdfb..efe04ac43cff 100644 --- a/packages/devextreme/js/__internal/ui/multi_view/m_multi_view.animation.ts +++ b/packages/devextreme/js/__internal/ui/multi_view/m_multi_view.animation.ts @@ -1,5 +1,5 @@ -import fx from '@js/animation/fx'; -import { move } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { move } from '@js/common/core/animation/translator'; import type { dxElementWrapper } from '@js/core/renderer'; // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/packages/devextreme/js/__internal/ui/number_box/m_number_box.base.ts b/packages/devextreme/js/__internal/ui/number_box/m_number_box.base.ts index 00f836ade6c6..89609c2545f6 100644 --- a/packages/devextreme/js/__internal/ui/number_box/m_number_box.base.ts +++ b/packages/devextreme/js/__internal/ui/number_box/m_number_box.base.ts @@ -1,3 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + addNamespace, getChar, isCommandKeyPressed, normalizeKeyName, +} from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; @@ -11,11 +16,6 @@ import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { fitIntoRange, inRange } from '@js/core/utils/math'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { - addNamespace, getChar, isCommandKeyPressed, normalizeKeyName, -} from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import TextEditor from '@js/ui/text_box/ui.text_editor'; import SpinButtons from './m_number_box.spins'; diff --git a/packages/devextreme/js/__internal/ui/number_box/m_number_box.caret.ts b/packages/devextreme/js/__internal/ui/number_box/m_number_box.caret.ts index 3373be789bca..88760d7972ff 100644 --- a/packages/devextreme/js/__internal/ui/number_box/m_number_box.caret.ts +++ b/packages/devextreme/js/__internal/ui/number_box/m_number_box.caret.ts @@ -1,6 +1,6 @@ +import number from '@js/common/core/localization/number'; import { escapeRegExp } from '@js/core/utils/common'; import { fitIntoRange } from '@js/core/utils/math'; -import number from '@js/localization/number'; import { getNthOccurrence, getRealSeparatorIndex, splitByIndex } from './m_utils'; diff --git a/packages/devextreme/js/__internal/ui/number_box/m_number_box.mask.ts b/packages/devextreme/js/__internal/ui/number_box/m_number_box.mask.ts index c400b56d2b2a..b5220125bf00 100644 --- a/packages/devextreme/js/__internal/ui/number_box/m_number_box.mask.ts +++ b/packages/devextreme/js/__internal/ui/number_box/m_number_box.mask.ts @@ -1,3 +1,10 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as dxDblClickEvent } from '@js/common/core/events/double_click'; +import { + addNamespace, getChar, isCommandKeyPressed, normalizeKeyName, +} from '@js/common/core/events/utils/index'; +import { getFormat as getLDMLFormat } from '@js/common/core/localization/ldml/number'; +import number from '@js/common/core/localization/number'; import devices from '@js/core/devices'; import { ensureDefined, escapeRegExp } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; @@ -5,13 +12,6 @@ import { fitIntoRange, inRange } from '@js/core/utils/math'; import { isDefined, isFunction, isNumeric, isString, } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as dxDblClickEvent } from '@js/events/double_click'; -import { - addNamespace, getChar, isCommandKeyPressed, normalizeKeyName, -} from '@js/events/utils/index'; -import { getFormat as getLDMLFormat } from '@js/localization/ldml/number'; -import number from '@js/localization/number'; import NumberBoxBase from './m_number_box.base'; import { diff --git a/packages/devextreme/js/__internal/ui/number_box/m_number_box.spin.ts b/packages/devextreme/js/__internal/ui/number_box/m_number_box.spin.ts index e793737c9572..018093e1f112 100644 --- a/packages/devextreme/js/__internal/ui/number_box/m_number_box.spin.ts +++ b/packages/devextreme/js/__internal/ui/number_box/m_number_box.spin.ts @@ -1,12 +1,12 @@ +import { lock } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import { lock } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import Widget from '@js/ui/widget/ui.widget'; const SPIN_CLASS = 'dx-numberbox-spin'; diff --git a/packages/devextreme/js/__internal/ui/number_box/m_number_box.spins.ts b/packages/devextreme/js/__internal/ui/number_box/m_number_box.spins.ts index edd241e304b1..5a4b212f3087 100644 --- a/packages/devextreme/js/__internal/ui/number_box/m_number_box.spins.ts +++ b/packages/devextreme/js/__internal/ui/number_box/m_number_box.spins.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointer from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import eventsEngine from '@js/events/core/events_engine'; -import pointer from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import TextEditorButton from '@ts/ui/text_box/texteditor_button_collection/m_button'; import SpinButton from './m_number_box.spin'; diff --git a/packages/devextreme/js/__internal/ui/overlay/m_overlay.ts b/packages/devextreme/js/__internal/ui/overlay/m_overlay.ts index fff3c3b4bad1..86535626c15b 100644 --- a/packages/devextreme/js/__internal/ui/overlay/m_overlay.ts +++ b/packages/devextreme/js/__internal/ui/overlay/m_overlay.ts @@ -1,4 +1,13 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { hideCallback as hideTopOverlayCallback } from '@js/common/core/environment/hide_callback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + move as dragEventMove, +} from '@js/common/core/events/drag'; +import pointerEvents from '@js/common/core/events/pointer'; +import { keyboard } from '@js/common/core/events/short'; +import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/common/core/events/utils/index'; +import { triggerHidingEvent, triggerResizeEvent, triggerShownEvent } from '@js/common/core/events/visibility_change'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -17,15 +26,6 @@ import { isFunction, isObject, isPromise, isWindow, } from '@js/core/utils/type'; import { changeCallback } from '@js/core/utils/view_port'; -import eventsEngine from '@js/events/core/events_engine'; -import { - move as dragEventMove, -} from '@js/events/drag'; -import pointerEvents from '@js/events/pointer'; -import { keyboard } from '@js/events/short'; -import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/events/utils/index'; -import { triggerHidingEvent, triggerResizeEvent, triggerShownEvent } from '@js/events/visibility_change'; -import { hideCallback as hideTopOverlayCallback } from '@js/mobile/hide_callback'; import type OverlayInstance from '@js/ui/overlay'; import { tabbable } from '@js/ui/widget/selectors'; import uiErrors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/overlay/m_overlay_position_controller.ts b/packages/devextreme/js/__internal/ui/overlay/m_overlay_position_controller.ts index c05b35db1bf7..d14bd3518c32 100644 --- a/packages/devextreme/js/__internal/ui/overlay/m_overlay_position_controller.ts +++ b/packages/devextreme/js/__internal/ui/overlay/m_overlay_position_controller.ts @@ -1,5 +1,5 @@ -import positionUtils from '@js/animation/position'; -import { locate, move, resetPosition } from '@js/animation/translator'; +import positionUtils from '@js/common/core/animation/position'; +import { locate, move, resetPosition } from '@js/common/core/animation/translator'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; @@ -162,7 +162,6 @@ class OverlayPositionController { positionWrapper() { if (this._$visualContainer) { - // @ts-expect-error positionUtils.setup(this._$wrapper, { my: 'top left', at: 'top left', of: this._$visualContainer }); } } @@ -188,7 +187,6 @@ class OverlayPositionController { this._$wrapper.css('overflow', 'hidden'); if (!this._props._skipContentPositioning) { - // @ts-expect-error const resultPosition = positionUtils.setup(this._$content, this._position); this._initialPosition = resultPosition; } diff --git a/packages/devextreme/js/__internal/ui/popover/m_popover.ts b/packages/devextreme/js/__internal/ui/popover/m_popover.ts index a44645739713..b250bf143193 100644 --- a/packages/devextreme/js/__internal/ui/popover/m_popover.ts +++ b/packages/devextreme/js/__internal/ui/popover/m_popover.ts @@ -1,5 +1,7 @@ -import positionUtils from '@js/animation/position'; -import { move } from '@js/animation/translator'; +import positionUtils from '@js/common/core/animation/position'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -12,8 +14,6 @@ import { } from '@js/core/utils/size'; import { isObject, isString } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import Popup from '@js/ui/popup/ui.popup'; import { isMaterial, isMaterialBased } from '@js/ui/themes'; import errors from '@js/ui/widget/ui.errors'; @@ -258,7 +258,6 @@ const Popover = Popup.inherit({ this._updateContentSize(shouldUpdateDimensions); const contentPosition = this._getContainerPosition(); - // @ts-expect-error const resultLocation = positionUtils.setup(this.$overlayContent(), contentPosition); const positionSide = this._getSideByLocation(resultLocation); @@ -288,7 +287,6 @@ const Popover = Popup.inherit({ if (!this.$content() || !shouldUpdateDimensions) { return; } - // @ts-expect-error const containerLocation = positionUtils.calculate(this.$overlayContent(), this._getContainerPosition()); if ((containerLocation.h.oversize > 0) && this._isHorizontalSide() && !containerLocation.h.fit) { @@ -343,13 +341,11 @@ const Popover = Popup.inherit({ const axis = this._isVerticalSide(side) ? 'left' : 'top'; const sizeProperty = this._isVerticalSide(side) ? 'width' : 'height'; const $target = $(this._positionController._position.of); - // @ts-expect-error - const targetOffset = positionUtils.offset($target) || { top: 0, left: 0 }; - // @ts-expect-error + const targetOffset = positionUtils.offset($target) ?? { top: 0, left: 0 }; const contentOffset = positionUtils.offset(this.$overlayContent()); const arrowSize = arrowRect[sizeProperty]; - const contentLocation = contentOffset[axis]; + const contentLocation = contentOffset?.[axis]; const contentSize = getBoundingRect(this.$overlayContent().get(0))[sizeProperty]; const targetLocation = targetOffset[axis]; const targetElement = $target.get(0); diff --git a/packages/devextreme/js/__internal/ui/popover/m_popover_position_controller.ts b/packages/devextreme/js/__internal/ui/popover/m_popover_position_controller.ts index 0d00d2866111..29aa705618c1 100644 --- a/packages/devextreme/js/__internal/ui/popover/m_popover_position_controller.ts +++ b/packages/devextreme/js/__internal/ui/popover/m_popover_position_controller.ts @@ -1,4 +1,4 @@ -import positionUtils from '@js/animation/position'; +import positionUtils from '@js/common/core/animation/position'; import type { dxElementWrapper } from '@js/core/renderer'; // @ts-expect-error import { pairToObject } from '@js/core/utils/common'; @@ -93,9 +93,7 @@ class PopoverPositionController extends OverlayPositionController { } _isPopoverInside(): boolean { - // @ts-expect-error const my = positionUtils.setup.normalizeAlign(this._position.my); - // @ts-expect-error const at = positionUtils.setup.normalizeAlign(this._position.at); return my.h === at.h && my.v === at.v; @@ -110,9 +108,7 @@ class PopoverPositionController extends OverlayPositionController { } _getDisplaySide(position) { - // @ts-expect-error const my = positionUtils.setup.normalizeAlign(position.my); - // @ts-expect-error const at = positionUtils.setup.normalizeAlign(position.at); const weightSign = WEIGHT_OF_SIDES[my.h] === WEIGHT_OF_SIDES[at.h] && WEIGHT_OF_SIDES[my.v] === WEIGHT_OF_SIDES[at.v] ? -1 : 1; diff --git a/packages/devextreme/js/__internal/ui/popup/m_popup.ts b/packages/devextreme/js/__internal/ui/popup/m_popup.ts index 7739ea48e868..fac7d0cc9259 100644 --- a/packages/devextreme/js/__internal/ui/popup/m_popup.ts +++ b/packages/devextreme/js/__internal/ui/popup/m_popup.ts @@ -1,5 +1,7 @@ import '@js/ui/toolbar/ui.toolbar.base'; +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -24,8 +26,6 @@ import { } from '@js/core/utils/size'; import { isDefined, isObject } from '@js/core/utils/type'; import { compare as compareVersions } from '@js/core/utils/version'; -import { triggerResizeEvent } from '@js/events/visibility_change'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import Overlay from '@js/ui/overlay/ui.overlay'; import type { ToolbarItem } from '@js/ui/popup'; diff --git a/packages/devextreme/js/__internal/ui/popup/m_popup_drag.ts b/packages/devextreme/js/__internal/ui/popup/m_popup_drag.ts index 73ce016aa3e8..d984d73c3d58 100644 --- a/packages/devextreme/js/__internal/ui/popup/m_popup_drag.ts +++ b/packages/devextreme/js/__internal/ui/popup/m_popup_drag.ts @@ -1,15 +1,15 @@ -import { locate, move } from '@js/animation/translator'; -import domAdapter from '@js/core/dom_adapter'; -import { fitIntoRange } from '@js/core/utils/math'; -import { getOffset, getOuterHeight, getOuterWidth } from '@js/core/utils/size'; -import { isWindow } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; +import { locate, move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { end as dragEndEvent, move as dragMoveEvent, start as dragStartEvent, -} from '@js/events/drag'; -import { addNamespace } from '@js/events/utils/index'; +} from '@js/common/core/events/drag'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import domAdapter from '@js/core/dom_adapter'; +import { fitIntoRange } from '@js/core/utils/math'; +import { getOffset, getOuterHeight, getOuterWidth } from '@js/core/utils/size'; +import { isWindow } from '@js/core/utils/type'; const KEYBOARD_DRAG_STEP = 5; diff --git a/packages/devextreme/js/__internal/ui/popup/m_popup_position_controller.ts b/packages/devextreme/js/__internal/ui/popup/m_popup_position_controller.ts index 12334b4a5d47..1c0d46fbc48b 100644 --- a/packages/devextreme/js/__internal/ui/popup/m_popup_position_controller.ts +++ b/packages/devextreme/js/__internal/ui/popup/m_popup_position_controller.ts @@ -1,4 +1,4 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { originalViewPort } from '@js/core/utils/view_port'; diff --git a/packages/devextreme/js/__internal/ui/radio_group/m_radio_button.ts b/packages/devextreme/js/__internal/ui/radio_group/m_radio_button.ts index 36ab609b7982..fd31c1302776 100644 --- a/packages/devextreme/js/__internal/ui/radio_group/m_radio_button.ts +++ b/packages/devextreme/js/__internal/ui/radio_group/m_radio_button.ts @@ -1,10 +1,10 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import Editor from '@js/ui/editor/editor'; const RADIO_BUTTON_CLASS = 'dx-radiobutton'; diff --git a/packages/devextreme/js/__internal/ui/resizable/m_resizable.ts b/packages/devextreme/js/__internal/ui/resizable/m_resizable.ts index d02ec6cb39c0..9a3507161565 100644 --- a/packages/devextreme/js/__internal/ui/resizable/m_resizable.ts +++ b/packages/devextreme/js/__internal/ui/resizable/m_resizable.ts @@ -1,4 +1,8 @@ -import { locate, move } from '@js/animation/translator'; +import { locate, move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@js/common/core/events/drag'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; import registerComponent from '@js/core/component_registrator'; import DOMComponent from '@js/core/dom_component'; import $ from '@js/core/renderer'; @@ -12,10 +16,6 @@ import { } from '@js/core/utils/size'; import { isFunction, isPlainObject, isWindow } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@js/events/drag'; -import { addNamespace } from '@js/events/utils/index'; -import { triggerResizeEvent } from '@js/events/visibility_change'; const RESIZABLE = 'dxResizable'; const RESIZABLE_CLASS = 'dx-resizable'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_animator.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_animator.ts index 65a014773612..7aff7918cecc 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_animator.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_animator.ts @@ -1,4 +1,4 @@ -import { cancelAnimationFrame, requestAnimationFrame } from '@js/animation/frame'; +import { cancelAnimationFrame, requestAnimationFrame } from '@js/common/core/animation/frame'; import Class from '@js/core/class'; import { noop } from '@js/core/utils/common'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.pull_down.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.pull_down.ts index 4fa5508758b5..afc0d98a8c8f 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.pull_down.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.pull_down.ts @@ -1,4 +1,4 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; import $ from '@js/core/renderer'; import Callbacks from '@js/core/utils/callbacks'; import { Deferred } from '@js/core/utils/deferred'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.swipe_down.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.swipe_down.ts index 9e1e73395a88..1af57ac7f611 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.swipe_down.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.swipe_down.ts @@ -1,9 +1,9 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import { eventData } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import Callbacks from '@js/core/utils/callbacks'; import { Deferred } from '@js/core/utils/deferred'; import { getOuterHeight } from '@js/core/utils/size'; -import { eventData } from '@js/events/utils/index'; import LoadIndicator from '@js/ui/load_indicator'; import NativeStrategy from './m_scrollable.native'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.ts index d00dff90bf24..57ad746d5bd0 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.ts @@ -1,3 +1,4 @@ +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -5,7 +6,6 @@ import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { hasWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import LoadIndicator from '@js/ui/load_indicator'; import LoadPanel from '@js/ui/load_panel'; import { isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.native.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.native.ts index 429b15cf60ba..9699c39704f4 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.native.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.native.ts @@ -1,11 +1,11 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { isDxMouseWheelEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { each } from '@js/core/utils/iterator'; import { getHeight, getWidth } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; -import { isDxMouseWheelEvent } from '@js/events/utils/index'; import Scrollbar from './m_scrollbar'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.simulated.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.simulated.ts index 46d3d27e2540..66309a045793 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.simulated.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.simulated.ts @@ -1,4 +1,11 @@ -import { locate, move, resetPosition } from '@js/animation/translator'; +import { locate, move, resetPosition } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + addNamespace as addEventNamespace, + isCommandKeyPressed, + isDxMouseWheelEvent, + normalizeKeyName, +} from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; @@ -19,13 +26,6 @@ import { getBoundingRect } from '@js/core/utils/position'; import { getHeight, getWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { - addNamespace as addEventNamespace, - isCommandKeyPressed, - isDxMouseWheelEvent, - normalizeKeyName, -} from '@js/events/utils/index'; import Animator from './m_animator'; import Scrollbar from './m_scrollbar'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.ts index 89f68984aaaf..f781eebb4fc6 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.ts @@ -1,3 +1,6 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import scrollEvents from '@js/common/core/events/gesture/emitter.gesture.scroll'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import DOMComponent from '@js/core/dom_component'; @@ -12,9 +15,6 @@ import { } from '@js/core/utils/size'; import { isDefined, isPlainObject } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import scrollEvents from '@js/events/gesture/emitter.gesture.scroll'; -import { addNamespace } from '@js/events/utils/index'; import { getElementLocationInternal } from '@ts/ui/scroll_view/utils/get_element_location_internal'; import supportUtils from '../../core/utils/m_support'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollbar.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollbar.ts index cdfec30b44c2..8c04a693e1bb 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollbar.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollbar.ts @@ -1,4 +1,7 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; // @ts-expect-error @@ -6,9 +9,6 @@ import { deferRenderer } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import readyCallback from '@js/core/utils/ready_callbacks'; import { isPlainObject } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import Widget from '@js/ui/widget/ui.widget'; const SCROLLBAR = 'dxScrollbar'; diff --git a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts index 617e73cba900..dd7d7d65771b 100644 --- a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts +++ b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts @@ -1,7 +1,7 @@ +import { query as dataQuery } from '@js/common/data'; import type { DeferredObj } from '@js/core/utils/deferred'; import { Deferred } from '@js/core/utils/deferred'; import { isString } from '@js/core/utils/type'; -import dataQuery from '@js/data/query'; import errors from '@js/ui/widget/ui.errors'; import SelectionStrategy from './m_selection.strategy'; diff --git a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts index bafa1b45fa41..e7eadf838005 100644 --- a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts +++ b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts @@ -1,3 +1,4 @@ +import { query as dataQuery } from '@js/common/data'; import { getUniqueValues, removeDuplicates } from '@js/core/utils/array'; import { isKeysEqual } from '@js/core/utils/array_compare'; import { getKeyHash } from '@js/core/utils/common'; @@ -5,7 +6,6 @@ import type { DeferredObj } from '@js/core/utils/deferred'; import { Deferred, when } from '@js/core/utils/deferred'; import { SelectionFilterCreator } from '@js/core/utils/selection_filter'; import { isDefined, isObject } from '@js/core/utils/type'; -import dataQuery from '@js/data/query'; import errors from '@js/ui/widget/ui.errors'; import SelectionStrategy from './m_selection.strategy'; diff --git a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts index 3c8e23cfbeaf..2af464bca86d 100644 --- a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts +++ b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts @@ -1,3 +1,4 @@ +import { query as dataQuery } from '@js/common/data'; import { equalByValue, getKeyHash, @@ -5,7 +6,6 @@ import { } from '@js/core/utils/common'; import { Deferred } from '@js/core/utils/deferred'; import { isObject, isPlainObject, isPromise } from '@js/core/utils/type'; -import dataQuery from '@js/data/query'; export default class SelectionStrategy { options: any; diff --git a/packages/devextreme/js/__internal/ui/slider/m_slider.ts b/packages/devextreme/js/__internal/ui/slider/m_slider.ts index 51f370d60ccc..cbd72f849fa1 100644 --- a/packages/devextreme/js/__internal/ui/slider/m_slider.ts +++ b/packages/devextreme/js/__internal/ui/slider/m_slider.ts @@ -1,3 +1,12 @@ +import { name as clickName } from '@js/common/core/events/click'; +import { lock } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import Swipeable from '@js/common/core/events/gesture/swipeable'; +import pointerEvents from '@js/common/core/events/pointer'; +import { + addNamespace, eventData, isMouseEvent, isTouchEvent, +} from '@js/common/core/events/utils/index'; +import numberLocalization from '@js/common/core/localization/number'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; @@ -7,15 +16,6 @@ import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { getExponentLength, getRemainderByDivision, roundFloatPart } from '@js/core/utils/math'; import { getWidth, setWidth } from '@js/core/utils/size'; -import { name as clickName } from '@js/events/click'; -import { lock } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import Swipeable from '@js/events/gesture/swipeable'; -import pointerEvents from '@js/events/pointer'; -import { - addNamespace, eventData, isMouseEvent, isTouchEvent, -} from '@js/events/utils/index'; -import numberLocalization from '@js/localization/number'; import { current as currentTheme, isMaterial } from '@js/ui/themes'; import { render } from '@js/ui/widget/utils.ink_ripple'; diff --git a/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip.ts b/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip.ts index d51d927804e9..784891de302f 100644 --- a/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip.ts +++ b/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip.ts @@ -1,5 +1,5 @@ +import numberLocalization from '@js/common/core/localization/number'; import { extend } from '@js/core/utils/extend'; -import numberLocalization from '@js/localization/number'; import Tooltip from '@js/ui/tooltip'; import { SliderTooltipPositionController } from './m_slider_tooltip_position_controller'; diff --git a/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip_position_controller.ts b/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip_position_controller.ts index a4b3eeb760fa..3189c9ec6f7c 100644 --- a/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip_position_controller.ts +++ b/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip_position_controller.ts @@ -1,5 +1,5 @@ -import positionUtils from '@js/animation/position'; -import { move } from '@js/animation/translator'; +import positionUtils from '@js/common/core/animation/position'; +import { move } from '@js/common/core/animation/translator'; import { extend } from '@js/core/utils/extend'; import { isString } from '@js/core/utils/type'; import { PopoverPositionController } from '@ts/ui/popover/m_popover_position_controller'; @@ -36,7 +36,6 @@ class SliderTooltipPositionController extends PopoverPositionController { } _fitIntoSlider() { - // @ts-expect-error const { collisionSide, oversize } = positionUtils.calculate(this._$content, this._position).h; const { left } = this._visualPosition; const isLeftSide = collisionSide === 'left'; diff --git a/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_item.ts b/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_item.ts index cc43aca58d0f..3a8b7dd7bbea 100644 --- a/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_item.ts +++ b/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_item.ts @@ -1,11 +1,11 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getImageContainer } from '@js/core/utils/icon'; import { isPlainObject } from '@js/core/utils/type'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import Overlay from '@js/ui/overlay/ui.overlay'; import type { Properties as PublicProperties } from '@js/ui/speed_dial_action'; import { isMaterial } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_main_item.ts b/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_main_item.ts index 15c48196802b..0dda420c847e 100644 --- a/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_main_item.ts +++ b/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_main_item.ts @@ -1,9 +1,9 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import config from '@js/core/config'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getHeight } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; import { isCompact, isFluent, isMaterial } from '@js/ui/themes'; import swatchContainer from '@js/ui/widget/swatch_container'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/splitter/resize_handle.ts b/packages/devextreme/js/__internal/ui/splitter/resize_handle.ts index 6eec1305cf50..9cc1873e1d54 100644 --- a/packages/devextreme/js/__internal/ui/splitter/resize_handle.ts +++ b/packages/devextreme/js/__internal/ui/splitter/resize_handle.ts @@ -1,14 +1,14 @@ import type { DragDirection } from '@js/common'; +import { name as CLICK_EVENT } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as DOUBLE_CLICK_EVENT } from '@js/common/core/events/double_click'; +import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@js/common/core/events/drag'; +import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import Guid from '@js/core/guid'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import type { DxEvent } from '@js/events'; -import { name as CLICK_EVENT } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as DOUBLE_CLICK_EVENT } from '@js/events/double_click'; -import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@js/events/drag'; -import { addNamespace, isCommandKeyPressed } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import type { ItemCollapsedEvent, ItemExpandedEvent, ResizeEndEvent, ResizeEvent, ResizeStartEvent, } from '@js/ui/splitter'; diff --git a/packages/devextreme/js/__internal/ui/splitter/splitter.ts b/packages/devextreme/js/__internal/ui/splitter/splitter.ts index 145ced8108a1..25feb83b1dbc 100644 --- a/packages/devextreme/js/__internal/ui/splitter/splitter.ts +++ b/packages/devextreme/js/__internal/ui/splitter/splitter.ts @@ -1,4 +1,5 @@ import type { Orientation } from '@js/common'; +import { lock } from '@js/common/core/events/core/emitter.feedback'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -15,7 +16,6 @@ import { } from '@js/core/utils/size'; import { isDefined, isObject } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { lock } from '@js/events/core/emitter.feedback'; import type { Item, ItemCollapsedEvent, diff --git a/packages/devextreme/js/__internal/ui/splitter/utils/layout.ts b/packages/devextreme/js/__internal/ui/splitter/utils/layout.ts index a0d846c8b177..27122e2004e5 100644 --- a/packages/devextreme/js/__internal/ui/splitter/utils/layout.ts +++ b/packages/devextreme/js/__internal/ui/splitter/utils/layout.ts @@ -1,4 +1,5 @@ import type { Orientation } from '@js/common'; +import { toFixed } from '@js/common/core/localization/utils'; import type { dxElementWrapper } from '@js/core/renderer'; import { getHeight, @@ -8,7 +9,6 @@ import { normalizeStyleProp, styleProp, } from '@js/core/utils/style'; import { isDefined, isNumeric, isString } from '@js/core/utils/type'; -import { toFixed } from '@js/localization/utils'; import type { Item } from '@js/ui/splitter'; import { compareNumbersWithPrecision, PRECISION } from './number_comparison'; diff --git a/packages/devextreme/js/__internal/ui/splitter/utils/layout_default.ts b/packages/devextreme/js/__internal/ui/splitter/utils/layout_default.ts index 798ee8a0d866..a7fa013f7288 100644 --- a/packages/devextreme/js/__internal/ui/splitter/utils/layout_default.ts +++ b/packages/devextreme/js/__internal/ui/splitter/utils/layout_default.ts @@ -1,5 +1,5 @@ +import { toFixed } from '@js/common/core/localization/utils'; import { isDefined } from '@js/core/utils/type'; -import { toFixed } from '@js/localization/utils'; import { findLastIndexOfVisibleItem, normalizePanelSize } from './layout'; import { compareNumbersWithPrecision, PRECISION } from './number_comparison'; diff --git a/packages/devextreme/js/__internal/ui/splitter/utils/number_comparison.ts b/packages/devextreme/js/__internal/ui/splitter/utils/number_comparison.ts index 670d3307dc62..0416630d991e 100644 --- a/packages/devextreme/js/__internal/ui/splitter/utils/number_comparison.ts +++ b/packages/devextreme/js/__internal/ui/splitter/utils/number_comparison.ts @@ -1,4 +1,4 @@ -import { toFixed } from '@js/localization/utils'; +import { toFixed } from '@js/common/core/localization/utils'; export const PRECISION = 10; diff --git a/packages/devextreme/js/__internal/ui/tabs/m_tabs.ts b/packages/devextreme/js/__internal/ui/tabs/m_tabs.ts index face35ffa494..deb4f7c1d79f 100644 --- a/packages/devextreme/js/__internal/ui/tabs/m_tabs.ts +++ b/packages/devextreme/js/__internal/ui/tabs/m_tabs.ts @@ -1,3 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; @@ -8,10 +12,6 @@ import { each } from '@js/core/utils/iterator'; import { getHeight, getOuterWidth, getWidth } from '@js/core/utils/size'; import { isDefined, isPlainObject } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import Button from '@js/ui/button'; // eslint-disable-next-line import/no-named-default import { default as CollectionWidget } from '@js/ui/collection/ui.collection_widget.live_update'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_box.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_box.ts index 4f6251a9fb85..32bfec720511 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_box.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_box.ts @@ -1,9 +1,9 @@ +import { normalizeKeyName } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getOuterWidth, getWidth } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; -import { normalizeKeyName } from '@js/events/utils/index'; import TextEditor from './m_text_editor'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.base.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.base.ts index 71c712a49748..42e42501905f 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.base.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.base.ts @@ -1,3 +1,6 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, normalizeKeyName } from '@js/common/core/events/utils/index'; import config from '@js/core/config'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -9,9 +12,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, normalizeKeyName } from '@js/events/utils/index'; import Editor from '@js/ui/editor/editor'; import LoadIndicator from '@js/ui/load_indicator'; import { current, isFluent, isMaterial } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.clear.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.clear.ts index 19640aaf9635..98a1b9268b4a 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.clear.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.clear.ts @@ -1,8 +1,8 @@ +import { name as click } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointer from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; -import { name as click } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import pointer from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import TextEditorButton from '@ts/ui/text_box/texteditor_button_collection/m_button'; const pointerDown = pointer.down; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.label.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.label.ts index 5aaed4429ea1..dfc4060b3a6b 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.label.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.label.ts @@ -1,13 +1,13 @@ +import { name as click } from '@js/common/core/events/click'; +import { active } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { start as hoverStart } from '@js/common/core/events/hover'; +import { addNamespace } from '@js/common/core/events/utils/index'; import Guid from '@js/core/guid'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { getWidth } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; -import { name as click } from '@js/events/click'; -import { active } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import { start as hoverStart } from '@js/events/hover'; -import { addNamespace } from '@js/events/utils/index'; const TEXTEDITOR_LABEL_CLASS = 'dx-texteditor-label'; const TEXTEDITOR_WITH_LABEL_CLASS = 'dx-texteditor-with-label'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.strategy.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.strategy.ts index 772fc3a57beb..4832d3a02585 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.strategy.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.strategy.ts @@ -1,7 +1,7 @@ +import EventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import browser from '@js/core/utils/browser'; import { clipboardText as getClipboardText } from '@js/core/utils/dom'; -import EventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; const MASK_EVENT_NAMESPACE = 'dxMask'; const BLUR_EVENT = 'blur beforedeactivate'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.ts index 3441f1c700b7..7d01c93a5bc4 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.ts @@ -1,15 +1,15 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as wheelEventName } from '@js/common/core/events/core/wheel'; +import { + addNamespace, createEvent, isCommandKeyPressed, normalizeKeyName, +} from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isEmpty } from '@js/core/utils/string'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as wheelEventName } from '@js/events/core/wheel'; -import { - addNamespace, createEvent, isCommandKeyPressed, normalizeKeyName, -} from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import { focused } from '@js/ui/widget/selectors'; import TextEditorBase from './m_text_editor.base'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_utils.scroll.ts b/packages/devextreme/js/__internal/ui/text_box/m_utils.scroll.ts index 5ee6e307f364..3adde44c9925 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_utils.scroll.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_utils.scroll.ts @@ -1,5 +1,5 @@ +import { isDxMouseWheelEvent } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; -import { isDxMouseWheelEvent } from '@js/events/utils/index'; // @ts-expect-error const allowScroll = function (container, delta, shiftKey?: boolean) { diff --git a/packages/devextreme/js/__internal/ui/text_box/texteditor_button_collection/m_custom.ts b/packages/devextreme/js/__internal/ui/text_box/texteditor_button_collection/m_custom.ts index 75475fc6559c..e3b4b922030b 100644 --- a/packages/devextreme/js/__internal/ui/text_box/texteditor_button_collection/m_custom.ts +++ b/packages/devextreme/js/__internal/ui/text_box/texteditor_button_collection/m_custom.ts @@ -1,8 +1,8 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { end, start } from '@js/common/core/events/hover'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { end, start } from '@js/events/hover'; import Button from '@js/ui/button'; import TextEditorButton from './m_button'; diff --git a/packages/devextreme/js/__internal/ui/toast/m_toast.ts b/packages/devextreme/js/__internal/ui/toast/m_toast.ts index a6df10c0a7bd..c53cb40caeee 100644 --- a/packages/devextreme/js/__internal/ui/toast/m_toast.ts +++ b/packages/devextreme/js/__internal/ui/toast/m_toast.ts @@ -1,11 +1,11 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import readyCallbacks from '@js/core/utils/ready_callbacks'; import { isString } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; import Overlay from '@js/ui/overlay/ui.overlay'; import { isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/toolbar/m_toolbar.base.ts b/packages/devextreme/js/__internal/ui/toolbar/m_toolbar.base.ts index 36f7ef9bb329..77b2f91b7974 100644 --- a/packages/devextreme/js/__internal/ui/toolbar/m_toolbar.base.ts +++ b/packages/devextreme/js/__internal/ui/toolbar/m_toolbar.base.ts @@ -1,4 +1,4 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; import registerComponent from '@js/core/component_registrator'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; diff --git a/packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts b/packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts index eb1df50f5cec..bab507e26c34 100644 --- a/packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts +++ b/packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts @@ -1,4 +1,10 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as dblclickEvent } from '@js/common/core/events/double_click'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; @@ -14,12 +20,6 @@ import { isDefined, isFunction, isPrimitive, isString, } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as dblclickEvent } from '@js/events/double_click'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import CheckBox from '@js/ui/check_box'; import HierarchicalCollectionWidget from '@js/ui/hierarchical_collection/ui.hierarchical_collection_widget'; import LoadIndicator from '@js/ui/load_indicator'; diff --git a/packages/devextreme/js/__internal/viz/chart_components/m_base_chart.ts b/packages/devextreme/js/__internal/viz/chart_components/m_base_chart.ts index fbc70a2bc258..5a6b1c8382d8 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/m_base_chart.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/m_base_chart.ts @@ -1,10 +1,10 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { isPointerEvent, isTouchEvent } from '@js/common/core/events/utils/index'; // @ts-expect-error import { grep, noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { reverseEach as _reverseEach } from '@js/core/utils/iterator'; import { isDefined as _isDefined, isFunction } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { isPointerEvent, isTouchEvent } from '@js/events/utils/index'; import { LayoutManager } from '@js/viz/chart_components/layout_manager'; import * as trackerModule from '@js/viz/chart_components/tracker'; import { ThemeManager } from '@js/viz/components/chart_theme_manager'; diff --git a/packages/devextreme/js/__internal/viz/core/m_base_widget.ts b/packages/devextreme/js/__internal/viz/core/m_base_widget.ts index bd9c5079613d..511302860a8e 100644 --- a/packages/devextreme/js/__internal/viz/core/m_base_widget.ts +++ b/packages/devextreme/js/__internal/viz/core/m_base_widget.ts @@ -1,3 +1,4 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; import DOMComponent from '@js/core/dom_component'; @@ -11,7 +12,6 @@ import { isDefined, isFunction, isNumeric, isObject as _isObject, type, } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; import { BaseThemeManager } from '@js/viz/core/base_theme_manager'; import { createEventTrigger, diff --git a/packages/devextreme/js/animation/frame.d.ts b/packages/devextreme/js/animation/frame.d.ts index b9bd4438793d..cd553b566da2 100644 --- a/packages/devextreme/js/animation/frame.d.ts +++ b/packages/devextreme/js/animation/frame.d.ts @@ -1,15 +1,10 @@ -/** - * @docid utils.cancelAnimationFrame - * @publicName cancelAnimationFrame(requestID) - * @namespace DevExpress.utils - * @public - */ -export function cancelAnimationFrame(requestID: number): void; - -/** - * @docid utils.requestAnimationFrame - * @publicName requestAnimationFrame(callback) - * @namespace DevExpress.utils - * @public - */ -export function requestAnimationFrame(callback: Function): number; +export { + /** + * @deprecated Use cancelAnimationFrame from common/core/animation instead + */ + cancelAnimationFrame, + /** + * @deprecated Use requestAnimationFrame from common/core/animation instead + */ + requestAnimationFrame, +} from '../common/core/animation'; diff --git a/packages/devextreme/js/animation/frame.js b/packages/devextreme/js/animation/frame.js new file mode 100644 index 000000000000..d2d9b93ca616 --- /dev/null +++ b/packages/devextreme/js/animation/frame.js @@ -0,0 +1 @@ +export { cancelAnimationFrame, requestAnimationFrame } from '../common/core/animation'; diff --git a/packages/devextreme/js/animation/fx.d.ts b/packages/devextreme/js/animation/fx.d.ts index d92b547687a8..9d55d58ee02d 100644 --- a/packages/devextreme/js/animation/fx.d.ts +++ b/packages/devextreme/js/animation/fx.d.ts @@ -1,153 +1,31 @@ -import { DxElement } from '../core/element'; -import { DxPromise } from '../core/utils/deferred'; -import { PositionConfig } from './position'; - -import { - Direction, -} from '../common'; - -export type AnimationType = 'css' | 'fade' | 'fadeIn' | 'fadeOut' | 'pop' | 'slide' | 'slideIn' | 'slideOut'; +import { fx, AnimationConfig } from '../common/core/animation'; + +export { + /** + * @deprecated Use AnimationState from common/core/animation instead + */ + AnimationState, + + /** + * @deprecated Use AnimationConfig from common/core/animation instead + */ + AnimationConfig, +} from '../common/core/animation'; + +export { + /** + * @deprecated Use AnimationType from common/core/animation instead + */ + AnimationType, +} from '../common/core/animation'; /** - * @docid * @public - * @type object - */ -export type AnimationState = string | number | { - /** - * @docid - * @public - */ - opacity: number; -} | { - /** - * @docid - * @public - */ - scale: number; -} | { - /** - * @docid - * @public - */ - position: PositionConfig; -} | { - /** - * @docid - * @public - */ - left: number; -} | { - /** - * @docid - * @public - */ - top: number; -}; - -/** - * @docid - * @namespace DevExpress - * @type object|number|string - * @public - */ -export type AnimationConfig = { - /** - * @docid - * @public - */ - complete?: (($element: DxElement, config: AnimationConfig) => void); - /** - * @docid - * @default 0 - * @public - */ - delay?: number; - /** - * @docid - * @default undefined - * @public - */ - direction?: Direction | undefined; - /** - * @docid - * @default 400 - * @public - */ - duration?: number; - /** - * @docid - * @default 'ease' - * @public - */ - easing?: string; - /** - * @docid - * @default {} - * @public - */ - from?: AnimationState; - /** - * @docid - * @default undefined - * @public - */ - staggerDelay?: number | undefined; - /** - * @docid - * @public - */ - start?: (($element: DxElement, config: AnimationConfig) => void); - /** - * @docid - * @default {} - * @public - */ - to?: AnimationState; - /** - * @docid - * @default 'custom' - * @public - */ - type?: AnimationType; -}; - -/** - * @public - * @deprecated Use the AnimationConfig type instead + * @deprecated Use the AnimationConfig type from common/core/animation instead */ export type animationConfig = AnimationConfig; /** - * @public - * @docid - * @section utils - * @namespace DevExpress + * @deprecated Use fx from common/core/animation instead */ -declare const fx: { - /** - * @docid - * @publicName animate(element, config) - * @return Promise - * @namespace DevExpress.fx - * @public - */ - animate(element: Element, config: AnimationConfig): DxPromise; - - /** - * @docid - * @publicName isAnimating(element) - * @namespace DevExpress.fx - * @public - */ - isAnimating(element: Element): boolean; - - /** - * @docid - * @publicName stop(element, jumpToEnd) - * @namespace DevExpress.fx - * @public - */ - stop(element: Element, jumpToEnd: boolean): void; -}; export default fx; diff --git a/packages/devextreme/js/animation/fx.js b/packages/devextreme/js/animation/fx.js new file mode 100644 index 000000000000..8cbfcfb4bd36 --- /dev/null +++ b/packages/devextreme/js/animation/fx.js @@ -0,0 +1,3 @@ +import { fx } from '../common/core/animation'; + +export default fx; diff --git a/packages/devextreme/js/animation/position.d.ts b/packages/devextreme/js/animation/position.d.ts index bdc714237b6d..14ceb70f0caf 100644 --- a/packages/devextreme/js/animation/position.d.ts +++ b/packages/devextreme/js/animation/position.d.ts @@ -1,115 +1,22 @@ -import { - UserDefinedElement, -} from '../core/element'; +import { PositionConfig } from '../common/core/animation'; -import { - HorizontalAlignment, - PositionAlignment, - VerticalAlignment, -} from '../common'; - -/** @public */ -export type CollisionResolution = 'fit' | 'flip' | 'flipfit' | 'none'; -/** @public */ -export type CollisionResolutionCombination = 'fit' | 'fit flip' | 'fit flipfit' | 'fit none' | 'flip' | 'flip fit' | 'flip none' | 'flipfit' | 'flipfit fit' | 'flipfit none' | 'none' | 'none fit' | 'none flip' | 'none flipfit'; - -/** - * @docid - * @namespace DevExpress - * @type object - * @public - */ -export interface PositionConfig { - /** - * @docid - * @public - */ - at?: PositionAlignment | { - /** - * @docid - */ - x?: HorizontalAlignment; - /** - * @docid - */ - y?: VerticalAlignment; - }; - /** - * @docid - * @public - */ - boundary?: string | UserDefinedElement | Window; - /** - * @docid - * @public - */ - boundaryOffset?: string | { - /** - * @docid - * @default 0 - */ - x?: number; - /** - * @docid - * @default 0 - */ - y?: number; - }; - /** - * @docid - * @public - */ - collision?: CollisionResolutionCombination | { - /** - * @docid - * @default 'none' - */ - x?: CollisionResolution; - /** - * @docid - * @default 'none' - */ - y?: CollisionResolution; - }; - /** - * @docid - * @public - */ - my?: PositionAlignment | { - /** - * @docid - */ - x?: HorizontalAlignment; - /** - * @docid - */ - y?: VerticalAlignment; - }; - /** - * @docid - * @public - */ - of?: string | UserDefinedElement | Window; - /** - * @docid - * @public - */ - offset?: string | { - /** - * @docid - * @default 0 - */ - x?: number; - /** - * @docid - * @default 0 - */ - y?: number; - }; -} +export { + /** + * @deprecated Use CollisionResolution from common/core/animation instead + */ + CollisionResolution, + /** + * @deprecated Use CollisionResolutionCombination from common/core/animation instead + */ + CollisionResolutionCombination, + /** + * @deprecated Use PositionConfig from common/core/animation instead + */ + PositionConfig, +} from '../common/core/animation'; /** * @public - * @deprecated Use the PositionConfig type instead + * @deprecated Use the PositionConfig type from common/core/animation instead */ export interface positionConfig extends PositionConfig { } diff --git a/packages/devextreme/js/animation/presets.d.ts b/packages/devextreme/js/animation/presets.d.ts index bed84b56a128..c71e9502ba89 100644 --- a/packages/devextreme/js/animation/presets.d.ts +++ b/packages/devextreme/js/animation/presets.d.ts @@ -1,59 +1,6 @@ -import { - Device, -} from '../core/devices'; - -import { - AnimationConfig, -} from './fx'; +import { animationPresets } from '../common/core/animation'; /** - * @docid - * @namespace DevExpress - * @public + * @deprecated Use animationPresets from common/core/animation instead */ -declare const animationPresets: { - /** - * @docid - * @publicName applyChanges() - * @public - */ - applyChanges(): void; - /** - * @docid - * @publicName clear() - * @public - */ - clear(): void; - /** - * @docid - * @publicName clear(name) - * @public - */ - clear(name: string): void; - /** - * @docid - * @publicName getPreset(name) - * @public - */ - getPreset(name: string): AnimationConfig; - /** - * @docid - * @publicName registerDefaultPresets() - * @public - */ - registerDefaultPresets(): void; - /** - * @docid - * @publicName registerPreset(name, config) - * @public - */ - registerPreset(name: string, config: { animation: AnimationConfig; device?: Device }): void; - /** - * @docid - * @publicName resetToDefaults() - * @public - */ - resetToDefaults(): void; -}; - export default animationPresets; diff --git a/packages/devextreme/js/animation/presets.js b/packages/devextreme/js/animation/presets.js new file mode 100644 index 000000000000..e6b56dc14e3f --- /dev/null +++ b/packages/devextreme/js/animation/presets.js @@ -0,0 +1,3 @@ +import { animationPresets } from '../common/core/animation'; + +export default animationPresets; diff --git a/packages/devextreme/js/animation/transition_executor.d.ts b/packages/devextreme/js/animation/transition_executor.d.ts index ebfe785da8d4..a6e19d96c443 100644 --- a/packages/devextreme/js/animation/transition_executor.d.ts +++ b/packages/devextreme/js/animation/transition_executor.d.ts @@ -1,52 +1,6 @@ -import { - UserDefinedElementsArray, -} from '../core/element'; - -import { - DxPromise, -} from '../core/utils/deferred'; - -import { - AnimationConfig, -} from './fx'; +import { TransitionExecutor } from '../common/core/animation'; /** - * @docid - * @namespace DevExpress - * @public + * @deprecated Use TransitionExecutor from common/core/animation instead */ -export default class TransitionExecutor { - /** - * @docid - * @publicName enter(elements, animation) - * @param1 elements:jQuery - * @public - */ - enter(elements: UserDefinedElementsArray, animation: AnimationConfig | string): void; - /** - * @docid - * @publicName leave(elements, animation) - * @param1 elements:jQuery - * @public - */ - leave(elements: UserDefinedElementsArray, animation: AnimationConfig | string): void; - /** - * @docid - * @publicName reset() - * @public - */ - reset(): void; - /** - * @docid - * @publicName start() - * @return Promise - * @public - */ - start(): DxPromise; - /** - * @docid - * @publicName stop() - * @public - */ - stop(): void; -} +export default TransitionExecutor; diff --git a/packages/devextreme/js/animation/transition_executor.js b/packages/devextreme/js/animation/transition_executor.js new file mode 100644 index 000000000000..231dbc1b3789 --- /dev/null +++ b/packages/devextreme/js/animation/transition_executor.js @@ -0,0 +1,3 @@ +import { TransitionExecutor } from '../common/core/animation'; + +export default TransitionExecutor; diff --git a/packages/devextreme/js/bundles/modules/core.js b/packages/devextreme/js/bundles/modules/core.js index 6af1b7be42b0..91d94e2657b1 100644 --- a/packages/devextreme/js/bundles/modules/core.js +++ b/packages/devextreme/js/bundles/modules/core.js @@ -12,8 +12,8 @@ if(DevExpress._DEVEXTREME_BUNDLE_INITIALIZED) { DevExpress._DEVEXTREME_BUNDLE_INITIALIZED = true; DevExpress.clientExporter = require('../../exporter'); -DevExpress.excelExporter = require('../../excel_exporter'); -DevExpress.pdfExporter = require('../../pdf_exporter'); +DevExpress.excelExporter = require('../../common/export/excel'); +DevExpress.pdfExporter = require('../../common/export/pdf'); DevExpress.VERSION = require('../../core/version').version; DevExpress.assertDevExtremeVersion = require('../../core/version_check').assertDevExtremeVersion; @@ -24,12 +24,12 @@ DevExpress.DOMComponent = require('../../core/dom_component'); DevExpress.Component = require('../../core/component').Component; DevExpress.registerComponent = require('../../core/component_registrator'); -DevExpress.devices = require('../../core/devices'); +DevExpress.devices = require('../../common/core/environment').devices; DevExpress.trial = require('../../core/trial_panel'); DevExpress.Color = require('../../color'); -const animationFrame = require('../../animation/frame'); +const animationFrame = require('../../common/core/animation/frame'); /** * @name utils @@ -40,14 +40,14 @@ DevExpress.utils = {}; DevExpress.utils.requestAnimationFrame = animationFrame.requestAnimationFrame; DevExpress.utils.cancelAnimationFrame = animationFrame.cancelAnimationFrame; -DevExpress.utils.initMobileViewport = require('../../mobile/init_mobile_viewport/init_mobile_viewport').initMobileViewport; +DevExpress.utils.initMobileViewport = require('../../common/core/environment').initMobileViewport; -DevExpress.utils.getTimeZones = require('../../time_zone_utils').getTimeZones; +DevExpress.utils.getTimeZones = require('../../common/core/environment').getTimeZones; // TODO: MODULARITY: Remove this DevExpress.utils.extendFromObject = require('../../core/utils/extend').extendFromObject; -DevExpress.utils.triggerShownEvent = require('../../events/visibility_change').triggerShownEvent; -DevExpress.utils.triggerHidingEvent = require('../../events/visibility_change').triggerHidingEvent; +DevExpress.utils.triggerShownEvent = require('../../common/core/events/visibility_change').triggerShownEvent; +DevExpress.utils.triggerHidingEvent = require('../../common/core/events/visibility_change').triggerHidingEvent; DevExpress.utils.resetActiveElement = require('../../core/utils/dom').resetActiveElement; DevExpress.utils.findBestMatches = require('../../core/utils/common').findBestMatches; DevExpress.createQueue = require('../../core/utils/queue').create; @@ -66,23 +66,23 @@ DevExpress.utils.ajax = require('../../core/utils/ajax'); DevExpress.viewPort = require('../../core/utils/view_port').value; -DevExpress.hideTopOverlay = require('../../mobile/hide_top_overlay'); +DevExpress.hideTopOverlay = require('../../common/core/environment').hideTopOverlay; DevExpress.formatHelper = require('../../format_helper'); -DevExpress.config = require('../../core/config'); +DevExpress.config = require('../../common').config; -DevExpress.animationPresets = require('../../animation/presets/presets').presets; -DevExpress.fx = require('../../animation/fx'); -DevExpress.TransitionExecutor = require('../../animation/transition_executor/transition_executor').TransitionExecutor; -DevExpress.AnimationPresetCollection = require('../../animation/presets/presets').PresetCollection; +DevExpress.animationPresets = require('../../common/core/animation/presets/presets').presets; +DevExpress.fx = require('../../common/core/animation').fx; +DevExpress.TransitionExecutor = require('../../common/core/animation/transition_executor/transition_executor').TransitionExecutor; +DevExpress.AnimationPresetCollection = require('../../common/core/animation/presets/presets').PresetCollection; -DevExpress.events = require('../../events'); +DevExpress.events = require('../../common/core/events'); -DevExpress.events.click = require('../../events/click'); -DevExpress.events.utils = require('../../events/utils'); -DevExpress.events.GestureEmitter = require('../../events/gesture/emitter.gesture'); +DevExpress.events.click = require('../../common/core/events/click'); +DevExpress.events.utils = require('../../common/core/events/utils'); +DevExpress.events.GestureEmitter = require('../../common/core/events/gesture/emitter.gesture'); -DevExpress.localization = require('../../localization'); +DevExpress.localization = require('../../common/core/localization'); DevExpress.templateRendered = require('../../core/templates/template_base').renderedCallbacks; DevExpress.setTemplateEngine = require('../../core/templates/template_engine_registry').setTemplateEngine; diff --git a/packages/devextreme/js/bundles/modules/data.js b/packages/devextreme/js/bundles/modules/data.js index a1b15cd9d629..fe7a2cfc1937 100644 --- a/packages/devextreme/js/bundles/modules/data.js +++ b/packages/devextreme/js/bundles/modules/data.js @@ -6,34 +6,34 @@ module.exports = DevExpress.data = DevExpress.data || {}; Object.defineProperty(DevExpress.data, 'errorHandler', { get: function() { - return require('../../data/errors').errorHandler; + return require('../../common/data').errorHandler; }, set: function(value) { errors.log('W0003', 'DevExpress.data', 'errorHandler', '21.1', 'Use the \'setErrorHandler\' method instead'); - require('../../data/errors').setErrorHandler(value); + require('../../common/data/errors').setErrorHandler(value); } }); // TODO: try remove (plugins failed without this) Object.defineProperty(DevExpress.data, '_errorHandler', { get: function() { - return require('../../data/errors').handleError; + return require('../../common/data/errors').handleError; }, set: function(value) { errors.log('W0003', 'DevExpress.data', '_errorHandler', '21.1', 'Use the \'setErrorHandler\' method instead'); - require('../../data/errors').setErrorHandler(value); + require('../../common/data/errors').setErrorHandler(value); } }); -DevExpress.data.setErrorHandler = require('../../data/errors').setErrorHandler; -DevExpress.data.DataSource = require('../../data/data_source'); -DevExpress.data.query = require('../../data/query'); -DevExpress.data.Store = require('../../data/abstract_store'); -DevExpress.data.ArrayStore = require('../../data/array_store'); -DevExpress.data.CustomStore = require('../../data/custom_store'); -DevExpress.data.LocalStore = require('../../data/local_store'); -DevExpress.data.base64_encode = require('../../data/utils').base64_encode; -DevExpress.data.applyChanges = require('../../data/apply_changes'); +DevExpress.data.setErrorHandler = require('../../common/data/errors').setErrorHandler; +DevExpress.data.DataSource = require('../../common/data/data_source'); +DevExpress.data.query = require('../../common/data/query'); +DevExpress.data.Store = require('../../common/data/abstract_store'); +DevExpress.data.ArrayStore = require('../../common/data/array_store'); +DevExpress.data.CustomStore = require('../../common/data/custom_store'); +DevExpress.data.LocalStore = require('../../common/data/local_store'); +DevExpress.data.base64_encode = require('../../common/data/utils').base64_encode; +DevExpress.data.applyChanges = require('../../common/data/apply_changes'); DevExpress.data.Guid = require('../../core/guid'); @@ -41,12 +41,12 @@ DevExpress.data.utils = {}; DevExpress.data.utils.compileGetter = require('../../core/utils/data').compileGetter; DevExpress.data.utils.compileSetter = require('../../core/utils/data').compileSetter; -DevExpress.EndpointSelector = require('../../data/endpoint_selector'); +DevExpress.EndpointSelector = require('../../common/data/endpoint_selector'); -DevExpress.data.queryImpl = require('../../data/query_implementation').queryImpl; -DevExpress.data.queryAdapters = require('../../data/query_adapters'); +DevExpress.data.queryImpl = require('../../common/data/query_implementation').queryImpl; +DevExpress.data.queryAdapters = require('../../common/data/query_adapters'); -const dataUtils = require('../../data/utils'); +const dataUtils = require('../../common/data/utils'); DevExpress.data.utils.normalizeBinaryCriterion = dataUtils.normalizeBinaryCriterion; DevExpress.data.utils.normalizeSortingInfo = dataUtils.normalizeSortingInfo; @@ -59,7 +59,7 @@ DevExpress.data.utils.processRequestResultLock = dataUtils.processRequestResultL DevExpress.data.utils.toComparable = require('../../core/utils/data').toComparable; -DevExpress.data.utils.multiLevelGroup = require('../../data/store_helper').multiLevelGroup; -DevExpress.data.utils.arrangeSortingInfo = require('../../data/store_helper').arrangeSortingInfo; +DevExpress.data.utils.multiLevelGroup = require('../../common/data/store_helper').multiLevelGroup; +DevExpress.data.utils.arrangeSortingInfo = require('../../common/data/store_helper').arrangeSortingInfo; -DevExpress.data.utils.normalizeDataSourceOptions = require('../../data/data_source/utils').normalizeDataSourceOptions; +DevExpress.data.utils.normalizeDataSourceOptions = require('../../common/data/data_source/utils').normalizeDataSourceOptions; diff --git a/packages/devextreme/js/bundles/modules/data.odata.js b/packages/devextreme/js/bundles/modules/data.odata.js index d8c83c7cf918..72ae54bc7b18 100644 --- a/packages/devextreme/js/bundles/modules/data.odata.js +++ b/packages/devextreme/js/bundles/modules/data.odata.js @@ -2,16 +2,16 @@ /* eslint-disable import/no-commonjs */ require('./data'); -DevExpress.data.ODataStore = require('../../data/odata/store'); -DevExpress.data.ODataContext = require('../../data/odata/context'); +DevExpress.data.ODataStore = require('../../common/data/odata/store'); +DevExpress.data.ODataContext = require('../../common/data/odata/context'); DevExpress.data.utils = DevExpress.data.utils || {}; DevExpress.data.utils.odata = {}; -DevExpress.data.utils.odata.keyConverters = require('../../data/odata/utils').keyConverters; -DevExpress.data.EdmLiteral = require('../../data/odata/utils').EdmLiteral; +DevExpress.data.utils.odata.keyConverters = require('../../common/data/odata/utils').keyConverters; +DevExpress.data.EdmLiteral = require('../../common/data/odata/utils').EdmLiteral; -const ODataUtilsModule = require('../../data/odata/utils'); +const ODataUtilsModule = require('../../common/data/odata/utils'); DevExpress.data.utils.odata.serializePropName = ODataUtilsModule.serializePropName; DevExpress.data.utils.odata.serializeValue = ODataUtilsModule.serializeValue; DevExpress.data.utils.odata.serializeKey = ODataUtilsModule.serializeKey; @@ -22,4 +22,4 @@ DevExpress.data.OData__internals = ODataUtilsModule.OData__internals; ///#ENDDEBUG DevExpress.data.queryAdapters = DevExpress.data.queryAdapters || {}; -DevExpress.data.queryAdapters.odata = require('../../data/odata/query_adapter').odata; +DevExpress.data.queryAdapters.odata = require('../../common/data/odata/query_adapter').odata; diff --git a/packages/devextreme/js/bundles/modules/file_management.js b/packages/devextreme/js/bundles/modules/file_management.js index c0261198c33d..efad0e8266a5 100644 --- a/packages/devextreme/js/bundles/modules/file_management.js +++ b/packages/devextreme/js/bundles/modules/file_management.js @@ -1,10 +1,12 @@ /* eslint-disable import/no-commonjs */ import DevExpress from './core'; -import FileSystemError from '../../file_management/error'; -import FileSystemItem from '../../file_management/file_system_item'; -import ObjectFileSystemProvider from '../../file_management/object_provider'; -import RemoteFileSystemProvider from '../../file_management/remote_provider'; -import CustomFileSystemProvider from '../../file_management/custom_provider'; +import { + FileSystemError, + FileSystemItem, + ObjectFileSystemProvider, + RemoteFileSystemProvider, + CustomFileSystemProvider, +} from '../../common/file_management'; module.exports = DevExpress.fileManagement = DevExpress.fileManagement || {}; diff --git a/packages/devextreme/js/bundles/modules/parts/core.js b/packages/devextreme/js/bundles/modules/parts/core.js index fa8f8003c335..7a14d9d9ee5f 100644 --- a/packages/devextreme/js/bundles/modules/parts/core.js +++ b/packages/devextreme/js/bundles/modules/parts/core.js @@ -9,23 +9,23 @@ const DevExpress = require('../../../bundles/modules/core'); require('../../../integration/jquery'); require('../../../integration/knockout'); -require('../../../localization/globalize/core'); -require('../../../localization/globalize/message'); -require('../../../localization/globalize/number'); -require('../../../localization/globalize/date'); -require('../../../localization/globalize/currency'); +require('../../../common/core/localization/globalize/core'); +require('../../../common/core/localization/globalize/message'); +require('../../../common/core/localization/globalize/number'); +require('../../../common/core/localization/globalize/date'); +require('../../../common/core/localization/globalize/currency'); /* Events (dx.module-core.js) */ -require('../../../events/click'); -require('../../../events/contextmenu'); -require('../../../events/double_click'); -require('../../../events/drag'); -require('../../../events/hold'); -require('../../../events/hover'); -require('../../../events/pointer'); -require('../../../events/swipe'); -require('../../../events/transform'); +require('../../../common/core/events/click'); +require('../../../common/core/events/contextmenu'); +require('../../../common/core/events/double_click'); +require('../../../common/core/events/drag'); +require('../../../common/core/events/hold'); +require('../../../common/core/events/hover'); +require('../../../common/core/events/pointer'); +require('../../../common/core/events/swipe'); +require('../../../common/core/events/transform'); /// BUNDLER_PARTS_END module.exports = DevExpress; diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index cbacea24eb7c..8cdf6b01a961 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -1,13 +1,22 @@ -import { PositionConfig } from './animation/position'; +import { PositionConfig } from './common/core/animation'; import type { OmitInternal, } from './core'; -import { FloatingActionButtonDirection } from './core/config'; + +import { + Device, +} from './common/core/environment'; + +import { + DeepPartial, +} from './core'; import type dxDraggable from './ui/draggable'; import type dxScrollable from './ui/scroll_view/ui.scrollable'; import type dxSortable from './ui/sortable'; import type { Properties as ButtonProperties } from './ui/button'; +import { PromiseType } from './core/utils/deferred'; +import { UserDefinedElement } from './core/element'; /** * @public @@ -888,3 +897,77 @@ export type PagerBase = { */ label?: string; }; + +/** + * @docid + * @type Promise + * @namespace DevExpress.core.utils + */ +// eslint-disable-next-line @typescript-eslint/no-invalid-void-type +export type DxPromise = {} extends PromiseType ? Promise : PromiseType; + +/** + * @docid + * @namespace DevExpress.data + * @public + */ +export class Guid { + constructor(); + constructor(value: string); + /** + * @docid + * @publicName toString() + * @public + */ + toString(): string; + /** + * @docid + * @publicName valueOf() + * @public + */ + valueOf(): string; +} + +/** +* @docid +* @public +*/ +export type DefaultOptionsRule = { + device?: Device | Device[] | ((device: Device) => boolean); + options: DeepPartial; +}; + +/** @public */ +export type FloatingActionButtonDirection = 'auto' | 'up' | 'down'; + +/** + * @docid + * @publicName config() + * @namespace DevExpress + * @public + */ +export function config(): GlobalConfig; + +/** + * @docid + * @publicName config(config) + * @namespace DevExpress + * @public + */ +// eslint-disable-next-line @typescript-eslint/no-shadow +export function config(config: GlobalConfig): void; + +/** + * @docid + * @section Common + * @public + */ +export type template = string | Function | UserDefinedElement; + +/** + * @docid + * @publicName setTemplateEngine(options) + * @namespace DevExpress + * @public + */ +export function setTemplateEngine(templateEngineOptions: { compile?: Function; render?: Function }): void; diff --git a/packages/devextreme/js/common.js b/packages/devextreme/js/common.js new file mode 100644 index 000000000000..96cc4203e8c8 --- /dev/null +++ b/packages/devextreme/js/common.js @@ -0,0 +1,3 @@ +export { default as config } from './common/config'; +export { default as Guid } from './common/guid'; +export { default as setTemplateEngine } from './common/set_template_engine'; diff --git a/packages/devextreme/js/common/core/animation.d.ts b/packages/devextreme/js/common/core/animation.d.ts new file mode 100644 index 000000000000..dd42bf29cd83 --- /dev/null +++ b/packages/devextreme/js/common/core/animation.d.ts @@ -0,0 +1,358 @@ +import { DxElement, UserDefinedElementsArray, UserDefinedElement } from '../../core/element'; +import { Device } from './environment'; + +import { + HorizontalAlignment, + PositionAlignment, + VerticalAlignment, + Direction, + DxPromise, +} from '../../common'; + +export type AnimationType = 'css' | 'fade' | 'fadeIn' | 'fadeOut' | 'pop' | 'slide' | 'slideIn' | 'slideOut'; + +/** + * @docid utils.cancelAnimationFrame + * @publicName cancelAnimationFrame(requestID) + * @namespace DevExpress.utils + * @public + */ +export function cancelAnimationFrame(requestID: number): void; + +/** + * @docid utils.requestAnimationFrame + * @publicName requestAnimationFrame(callback) + * @namespace DevExpress.utils + * @public + */ +export function requestAnimationFrame(callback: Function): number; + +/** + * @docid + * @public + * @type object + */ +export type AnimationState = string | number | { + /** + * @docid + * @public + */ + opacity: number; +} | { + /** + * @docid + * @public + */ + scale: number; +} | { + /** + * @docid + * @public + */ + position: PositionConfig; +} | { + /** + * @docid + * @public + */ + left: number; +} | { + /** + * @docid + * @public + */ + top: number; +}; + +/** + * @docid + * @namespace DevExpress + * @type object|number|string + * @public + */ +export type AnimationConfig = { + /** + * @docid + * @public + */ + complete?: (($element: DxElement, config: AnimationConfig) => void); + /** + * @docid + * @default 0 + * @public + */ + delay?: number; + /** + * @docid + * @default undefined + * @public + */ + direction?: Direction | undefined; + /** + * @docid + * @default 400 + * @public + */ + duration?: number; + /** + * @docid + * @default 'ease' + * @public + */ + easing?: string; + /** + * @docid + * @default {} + * @public + */ + from?: AnimationState; + /** + * @docid + * @default undefined + * @public + */ + staggerDelay?: number | undefined; + /** + * @docid + * @public + */ + start?: (($element: DxElement, config: AnimationConfig) => void); + /** + * @docid + * @default {} + * @public + */ + to?: AnimationState; + /** + * @docid + * @default 'custom' + * @public + */ + type?: AnimationType; +}; + +/** + * @public + * @docid + * @section utils + * @namespace DevExpress + */ +// eslint-disable-next-line @typescript-eslint/init-declarations +export const fx: { + /** + * @docid + * @publicName animate(element, config) + * @return Promise + * @namespace DevExpress.fx + * @public + */ + animate(element: Element, config: AnimationConfig): DxPromise; + + /** + * @docid + * @publicName isAnimating(element) + * @namespace DevExpress.fx + * @public + */ + isAnimating(element: Element): boolean; + + /** + * @docid + * @publicName stop(element, jumpToEnd) + * @namespace DevExpress.fx + * @public + */ + stop(element: Element, jumpToEnd: boolean): void; +}; + +/** @public */ +export type CollisionResolution = 'fit' | 'flip' | 'flipfit' | 'none'; +/** @public */ +export type CollisionResolutionCombination = 'fit' | 'fit flip' | 'fit flipfit' | 'fit none' | 'flip' | 'flip fit' | 'flip none' | 'flipfit' | 'flipfit fit' | 'flipfit none' | 'none' | 'none fit' | 'none flip' | 'none flipfit'; + +/** + * @docid + * @namespace DevExpress + * @type object + * @public + */ +export interface PositionConfig { + /** + * @docid + * @public + */ + at?: PositionAlignment | { + /** + * @docid + */ + x?: HorizontalAlignment; + /** + * @docid + */ + y?: VerticalAlignment; + }; + /** + * @docid + * @public + */ + boundary?: string | UserDefinedElement | Window; + /** + * @docid + * @public + */ + boundaryOffset?: string | { + /** + * @docid + * @default 0 + */ + x?: number; + /** + * @docid + * @default 0 + */ + y?: number; + }; + /** + * @docid + * @public + */ + collision?: CollisionResolutionCombination | { + /** + * @docid + * @default 'none' + */ + x?: CollisionResolution; + /** + * @docid + * @default 'none' + */ + y?: CollisionResolution; + }; + /** + * @docid + * @public + */ + my?: PositionAlignment | { + /** + * @docid + */ + x?: HorizontalAlignment; + /** + * @docid + */ + y?: VerticalAlignment; + }; + /** + * @docid + * @public + */ + of?: string | UserDefinedElement | Window; + /** + * @docid + * @public + */ + offset?: string | { + /** + * @docid + * @default 0 + */ + x?: number; + /** + * @docid + * @default 0 + */ + y?: number; + }; +} + +/** + * @docid + * @namespace DevExpress + * @public + */ +// eslint-disable-next-line @typescript-eslint/init-declarations +export const animationPresets: { + /** + * @docid + * @publicName applyChanges() + * @public + */ + applyChanges(): void; + /** + * @docid + * @publicName clear() + * @public + */ + clear(): void; + /** + * @docid + * @publicName clear(name) + * @public + */ + clear(name: string): void; + /** + * @docid + * @publicName getPreset(name) + * @public + */ + getPreset(name: string): AnimationConfig; + /** + * @docid + * @publicName registerDefaultPresets() + * @public + */ + registerDefaultPresets(): void; + /** + * @docid + * @publicName registerPreset(name, config) + * @public + */ + registerPreset(name: string, config: { animation: AnimationConfig; device?: Device }): void; + /** + * @docid + * @publicName resetToDefaults() + * @public + */ + resetToDefaults(): void; +}; + +/** + * @docid + * @namespace DevExpress + * @public + */ +export class TransitionExecutor { + /** + * @docid + * @publicName enter(elements, animation) + * @param1 elements:jQuery + * @public + */ + enter(elements: UserDefinedElementsArray, animation: AnimationConfig | string): void; + /** + * @docid + * @publicName leave(elements, animation) + * @param1 elements:jQuery + * @public + */ + leave(elements: UserDefinedElementsArray, animation: AnimationConfig | string): void; + /** + * @docid + * @publicName reset() + * @public + */ + reset(): void; + /** + * @docid + * @publicName start() + * @return Promise + * @public + */ + start(): DxPromise; + /** + * @docid + * @publicName stop() + * @public + */ + stop(): void; +} diff --git a/packages/devextreme/js/common/core/animation.js b/packages/devextreme/js/common/core/animation.js new file mode 100644 index 000000000000..3257df279e74 --- /dev/null +++ b/packages/devextreme/js/common/core/animation.js @@ -0,0 +1,4 @@ +export { requestAnimationFrame, cancelAnimationFrame } from './animation/frame'; +export { default as fx } from './animation/fx'; +export { default as animationPresets } from './animation/presets'; +export { default as TransitionExecutor } from './animation/transition_executor'; diff --git a/packages/devextreme/js/common/core/animation/easing.js b/packages/devextreme/js/common/core/animation/easing.js index a44fbd765536..8c3e7fc7ff88 100644 --- a/packages/devextreme/js/common/core/animation/easing.js +++ b/packages/devextreme/js/common/core/animation/easing.js @@ -1,4 +1,4 @@ -import { isFunction } from '../core/utils/type'; +import { isFunction } from '../../../core/utils/type'; const CSS_TRANSITION_EASING_REGEX = /cubic-bezier\((\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\)/; diff --git a/packages/devextreme/js/common/core/animation/frame.js b/packages/devextreme/js/common/core/animation/frame.js index 85c3847c9ec6..c1142d2775e2 100644 --- a/packages/devextreme/js/common/core/animation/frame.js +++ b/packages/devextreme/js/common/core/animation/frame.js @@ -1,6 +1,6 @@ -import { hasWindow, getWindow } from '../core/utils/window'; +import { hasWindow, getWindow } from '../../../core/utils/window'; const window = hasWindow() ? getWindow() : {}; -import callOnce from '../core/utils/call_once'; +import callOnce from '../../../core/utils/call_once'; const FRAME_ANIMATION_STEP_TIME = 1000 / 60; diff --git a/packages/devextreme/js/common/core/animation/fx.js b/packages/devextreme/js/common/core/animation/fx.js index c6cc7f7898be..6eaac35fca2c 100644 --- a/packages/devextreme/js/common/core/animation/fx.js +++ b/packages/devextreme/js/common/core/animation/fx.js @@ -1,12 +1,12 @@ -import $ from '../core/renderer'; -import { getWindow } from '../core/utils/window'; +import $ from '../../../core/renderer'; +import { getWindow } from '../../../core/utils/window'; const window = getWindow(); import eventsEngine from '../events/core/events_engine'; -import errors from '../core/errors'; -import { getPublicElement } from '../core/element'; -import { extend } from '../core/utils/extend'; -import { isFunction, isPlainObject } from '../core/utils/type'; -import { each, map } from '../core/utils/iterator'; +import errors from '../../../core/errors'; +import { getPublicElement } from '../../../core/element'; +import { extend } from '../../../core/utils/extend'; +import { isFunction, isPlainObject } from '../../../core/utils/type'; +import { each, map } from '../../../core/utils/iterator'; import { getTranslateCss, parseTranslate, @@ -19,13 +19,13 @@ import { getEasing } from './easing'; import { requestAnimationFrame, cancelAnimationFrame } from './frame'; -import supportUtils from '../__internal/core/utils/m_support'; +import supportUtils from '../../../__internal/core/utils/m_support'; import positionUtils from './position'; import { removeEvent } from '../events/remove'; import { addNamespace } from '../events/utils/index'; -import { when, Deferred } from '../core/utils/deferred'; +import { when, Deferred } from '../../../core/utils/deferred'; const removeEventName = addNamespace(removeEvent, 'dxFX'); -import { noop } from '../core/utils/common'; +import { noop } from '../../../core/utils/common'; const RELATIVE_VALUE_REGEX = /^([+-])=(.*)/i; diff --git a/packages/devextreme/js/common/core/animation/position.js b/packages/devextreme/js/common/core/animation/position.js index a0de691c56d0..23f9edc549d4 100644 --- a/packages/devextreme/js/common/core/animation/position.js +++ b/packages/devextreme/js/common/core/animation/position.js @@ -1,19 +1,19 @@ -import { getOuterWidth, getOuterHeight, getWidth, getHeight } from '../core/utils/size'; -import $ from '../core/renderer'; +import { getOuterWidth, getOuterHeight, getWidth, getHeight } from '../../../core/utils/size'; +import $ from '../../../core/renderer'; -import { splitPair, pairToObject } from '../core/utils/common'; -import { each } from '../core/utils/iterator'; -import { getWindow } from '../core/utils/window'; +import { splitPair, pairToObject } from '../../../core/utils/common'; +import { each } from '../../../core/utils/iterator'; +import { getWindow } from '../../../core/utils/window'; const window = getWindow(); -import domAdapter from '../core/dom_adapter'; -import { isWindow, isDefined } from '../core/utils/type'; -import { extend } from '../core/utils/extend'; -import { getBoundingRect } from '../core/utils/position'; -import browser from '../core/utils/browser'; +import domAdapter from '../../../core/dom_adapter'; +import { isWindow, isDefined } from '../../../core/utils/type'; +import { extend } from '../../../core/utils/extend'; +import { getBoundingRect } from '../../../core/utils/position'; +import browser from '../../../core/utils/browser'; import { resetPosition, move } from './translator'; -import { touch } from '../core/utils/support'; -import devices from '../core/devices'; -import { setStyle } from '../core/utils/style'; +import { touch } from '../../../core/utils/support'; +import devices from '../../../core/devices'; +import { setStyle } from '../../../core/utils/style'; const horzRe = /left|right/; const vertRe = /top|bottom/; diff --git a/packages/devextreme/js/common/core/animation/presets/presets.js b/packages/devextreme/js/common/core/animation/presets/presets.js index 7775d572ff57..3b6f2bf23508 100644 --- a/packages/devextreme/js/common/core/animation/presets/presets.js +++ b/packages/devextreme/js/common/core/animation/presets/presets.js @@ -1,8 +1,8 @@ -import { getWidth } from '../../core/utils/size'; -import { Component } from '../../core/component'; -import { each } from '../../core/utils/iterator'; -import { extend } from '../../core/utils/extend'; -import devices from '../../core/devices'; +import { getWidth } from '../../../../core/utils/size'; +import { Component } from '../../../../core/component'; +import { each } from '../../../../core/utils/iterator'; +import { extend } from '../../../../core/utils/extend'; +import devices from '../../environment/devices'; import fx from '../fx'; const directionPostfixes = { diff --git a/packages/devextreme/js/common/core/animation/transition_executor.js b/packages/devextreme/js/common/core/animation/transition_executor.js index 62e969cd574c..2e874294f9a9 100644 --- a/packages/devextreme/js/common/core/animation/transition_executor.js +++ b/packages/devextreme/js/common/core/animation/transition_executor.js @@ -1,2 +1,3 @@ import { TransitionExecutor } from './transition_executor/transition_executor'; + export default TransitionExecutor; diff --git a/packages/devextreme/js/common/core/animation/transition_executor/transition_executor.js b/packages/devextreme/js/common/core/animation/transition_executor/transition_executor.js index c52563030251..abbd1ad22452 100644 --- a/packages/devextreme/js/common/core/animation/transition_executor/transition_executor.js +++ b/packages/devextreme/js/common/core/animation/transition_executor/transition_executor.js @@ -1,12 +1,12 @@ -import $ from '../../core/renderer'; -import Class from '../../core/class'; -import { extend } from '../../core/utils/extend'; -import commonUtils from '../../__internal/core/utils/m_common'; -import { isFunction, isPlainObject } from '../../core/utils/type'; -import { map } from '../../core/utils/iterator'; +import $ from '../../../../core/renderer'; +import Class from '../../../../core/class'; +import { extend } from '../../../../core/utils/extend'; +import commonUtils from '../../../../__internal/core/utils/m_common'; +import { isFunction, isPlainObject } from '../../../../core/utils/type'; +import { map } from '../../../../core/utils/iterator'; import fx from '../fx'; import { presets } from '../presets/presets'; -import { when, Deferred } from '../../core/utils/deferred'; +import { when, Deferred } from '../../../../core/utils/deferred'; const directionPostfixes = { forward: ' dx-forward', diff --git a/packages/devextreme/js/common/core/animation/translator.js b/packages/devextreme/js/common/core/animation/translator.js index d07d84115ffc..6f3cce60d091 100644 --- a/packages/devextreme/js/common/core/animation/translator.js +++ b/packages/devextreme/js/common/core/animation/translator.js @@ -1,6 +1,6 @@ -import $ from '../core/renderer'; -import { data as elementData, removeData } from '../core/element_data'; -import { type } from '../core/utils/type'; +import $ from '../../../core/renderer'; +import { data as elementData, removeData } from '../../../core/element_data'; +import { type } from '../../../core/utils/type'; const TRANSLATOR_DATA_KEY = 'dxTranslator'; const TRANSFORM_MATRIX_REGEX = /matrix(3d)?\((.+?)\)/; diff --git a/packages/devextreme/js/common/core/environment.d.ts b/packages/devextreme/js/common/core/environment.d.ts new file mode 100644 index 000000000000..1f85669b8229 --- /dev/null +++ b/packages/devextreme/js/common/core/environment.d.ts @@ -0,0 +1,178 @@ +/** + * @public + * @docid + * @section commonObjectStructures + * @namespace DevExpress + */ +export type Device = { + /** + * @docid + * @public + */ + android?: boolean; + /** + * @docid + * @public + */ + deviceType?: 'phone' | 'tablet' | 'desktop'; + /** + * @docid + * @public + */ + generic?: boolean; + /** + * @docid + * @public + */ + grade?: 'A' | 'B' | 'C'; + /** + * @docid + * @public + */ + ios?: boolean; + /** + * @docid + * @public + */ + phone?: boolean; + /** + * @docid + * @public + */ + platform?: 'android' | 'ios' | 'generic'; + /** + * @docid + * @public + */ + tablet?: boolean; + /** + * @docid + * @public + */ + version?: Array; +}; + +type EventName = 'orientationChanged'; + +/** +* @docid +* @publicName devices +* @section Utils +* @namespace DevExpress +* @public +*/ +declare class DevicesObject { + constructor(options?: { window?: Window }); + /** + * @docid + * @publicName current() + * @public + */ + current(): Device; + /** + * @docid + * @publicName current(deviceName) + * @public + */ + current(deviceName: string | Device): void; + /** + * @docid + * @publicName off(eventName) + * @param1 eventName:string + * @return this + * @public + */ + off(eventName: EventName): this; + /** + * @docid + * @publicName off(eventName, eventHandler) + * @param1 eventName:string + * @return this + * @public + */ + off(eventName: EventName, eventHandler: Function): this; + /** + * @docid + * @publicName on(eventName, eventHandler) + * @param1 eventName:string + * @return this + * @public + */ + on(eventName: EventName, eventHandler: Function): this; + /** + * @docid + * @publicName on(events) + * @param1 events:object + * @return this + * @public + */ + on(events: { [key in EventName]?: Function }): this; + /** + * @docid + * @publicName orientation() + * @return String + * @public + */ + orientation(): 'portrait' | 'landscape' | undefined; + /** + * @docid + * @publicName real() + * @public + */ + real(): Device; + isSimulator(): boolean; +} + +/** +* @const devices +* @namespace DevExpress +* @hidden +* @public +*/ +// eslint-disable-next-line @typescript-eslint/init-declarations +export const devices: DevicesObject; + +/** + * @docid + * @publicName hideTopOverlay() + * @namespace DevExpress + * @public + */ +export function hideTopOverlay(): boolean; + +/** + * @docid utils.initMobileViewport + * @publicName initMobileViewport(options) + * @namespace DevExpress.utils + * @public + */ +export function initMobileViewport(options: { allowZoom?: boolean; allowPan?: boolean; allowSelection?: boolean }): void; + +/** + * @docid + * @public + */ +export interface dxSchedulerTimeZone { + /** + * @docid + */ + id: string; + /** + * @docid + */ + offset: number; + /** + * @docid + */ + title: string; +} + +/** +* @docid utils.getTimeZones +* @publicName getTimeZones(date) +* @param1 date:Date|undefined +* @namespace DevExpress.utils +* @static +* @public +*/ +export function getTimeZones(date?: Date): Array; diff --git a/packages/devextreme/js/common/core/environment.js b/packages/devextreme/js/common/core/environment.js new file mode 100644 index 000000000000..049d7782b4c6 --- /dev/null +++ b/packages/devextreme/js/common/core/environment.js @@ -0,0 +1,4 @@ +export { default as devices } from './environment/devices'; +export { default as hideTopOverlay } from './environment/hide_top_overlay'; +export { default as initMobileViewport } from './environment/init_mobile_viewport'; +export { getTimeZones } from './environment/time_zone_utils'; diff --git a/packages/devextreme/js/common/core/environment/devices.js b/packages/devextreme/js/common/core/environment/devices.js index 3dec987c04a6..5e7fa24382e6 100644 --- a/packages/devextreme/js/common/core/environment/devices.js +++ b/packages/devextreme/js/common/core/environment/devices.js @@ -5,4 +5,4 @@ * @param1_field1 window:Window * @hidden */ -export { default } from '../__internal/core/m_devices'; +export { default } from '../../../__internal/core/m_devices'; diff --git a/packages/devextreme/js/common/core/environment/init_mobile_viewport.js b/packages/devextreme/js/common/core/environment/init_mobile_viewport.js index e653449b86fb..dcbf6087aa1b 100644 --- a/packages/devextreme/js/common/core/environment/init_mobile_viewport.js +++ b/packages/devextreme/js/common/core/environment/init_mobile_viewport.js @@ -1,2 +1,3 @@ import { initMobileViewport } from './init_mobile_viewport/init_mobile_viewport'; + export default initMobileViewport; diff --git a/packages/devextreme/js/common/core/environment/init_mobile_viewport/init_mobile_viewport.js b/packages/devextreme/js/common/core/environment/init_mobile_viewport/init_mobile_viewport.js index 37b7ccfa47f3..d337bd7dcc8a 100644 --- a/packages/devextreme/js/common/core/environment/init_mobile_viewport/init_mobile_viewport.js +++ b/packages/devextreme/js/common/core/environment/init_mobile_viewport/init_mobile_viewport.js @@ -1,15 +1,15 @@ -import { getWidth, setWidth } from '../../core/utils/size'; -import $ from '../../core/renderer'; -import { getWindow } from '../../core/utils/window'; +import { getWidth, setWidth } from '../../../../core/utils/size'; +import $ from '../../../../core/renderer'; +import { getWindow } from '../../../../core/utils/window'; const window = getWindow(); import eventsEngine from '../../events/core/events_engine'; -import { extend } from '../../core/utils/extend'; -import resizeCallbacks from '../../core/utils/resize_callbacks'; -import { styleProp } from '../../core/utils/style'; +import { extend } from '../../../../core/utils/extend'; +import resizeCallbacks from '../../../../core/utils/resize_callbacks'; +import { styleProp } from '../../../../core/utils/style'; -import devices from '../../__internal/core/m_devices'; -import domAdapter from '../../__internal/core/m_dom_adapter'; -import supportUtils from '../../__internal/core/utils/m_support'; +import devices from '../../../../__internal/core/m_devices'; +import domAdapter from '../../../../__internal/core/m_dom_adapter'; +import supportUtils from '../../../../__internal/core/utils/m_support'; export const initMobileViewport = function(options) { options = extend({}, options); diff --git a/packages/devextreme/js/common/core/environment/time_zone_utils.js b/packages/devextreme/js/common/core/environment/time_zone_utils.js index e959a19f83c2..4bbab0e11a5e 100644 --- a/packages/devextreme/js/common/core/environment/time_zone_utils.js +++ b/packages/devextreme/js/common/core/environment/time_zone_utils.js @@ -1,3 +1,3 @@ -import timeZoneUtils from './__internal/scheduler/m_utils_time_zone'; +import timeZoneUtils from '../../../__internal/scheduler/m_utils_time_zone'; export const getTimeZones = timeZoneUtils.getTimeZones; diff --git a/packages/devextreme/js/common/core/events.d.ts b/packages/devextreme/js/common/core/events.d.ts new file mode 100644 index 000000000000..0df0475dcae7 --- /dev/null +++ b/packages/devextreme/js/common/core/events.d.ts @@ -0,0 +1,345 @@ +import { DxElement } from '../../core/element'; + +/* eslint-disable @typescript-eslint/no-empty-interface */ +export interface EventExtension { } +export interface EventType { } +/* eslint-enable @typescript-eslint/no-empty-interface */ + +/** + * @docid + * @type EventObject|jQuery.Event + */ +export type DxEvent = {} extends EventType ? (EventObject & TNativeEvent) : EventType; + +/** @deprecated EventObject */ +export type dxEvent = EventObject; + +/** + * @docid + * @type EventObject|jQuery.Event + * @hidden + * @deprecated DxEvent + */ +export type event = DxEvent; + +/** + * @docid + * @public + */ +export interface InitializedEventInfo { + /** + * @docid + * @type this + */ + readonly component?: TComponent; + /** @docid */ + readonly element?: DxElement; +} + +/** + * @docid + * @public + */ +export interface EventInfo { + /** + * @docid + * @type this + */ + readonly component: TComponent; + /** @docid */ + readonly element: DxElement; + /** + * @docid + * @hidden + */ + readonly model?: any; +} + +/** +* @docid +* @public +*/ +export interface NativeEventInfo { + /** + * @docid + * @type this + */ + readonly component: TComponent; + /** @docid */ + readonly element: DxElement; + /** + * @docid + * @hidden + */ + readonly model?: any; + /** + * @docid + * @type event + */ + readonly event?: DxEvent; +} + +/** + * @docid + * @public + */ +export interface ChangedOptionInfo { + /** @docid */ + readonly name: string; + /** @docid */ + readonly fullName: string; + /** @docid */ + readonly value?: any; + /** @docid */ + readonly previousValue?: any; +} + +/** +* @docid +* @public +*/ +export interface ItemInfo { + /** + * @docid + * @type object + */ + readonly itemData?: TItemData; + /** @docid */ + readonly itemElement: DxElement; + /** @docid */ + readonly itemIndex: number; +} + +/** + * @docid + * @public + */ +export interface Cancelable { + /** @docid */ + cancel?: boolean; +} + +/** +* @docid +* @public +*/ +export type AsyncCancelable = { + /** + * @docid + * @type boolean|Promise + */ + cancel: boolean | PromiseLike; +}; + +/** + * @docid + * @section commonObjectStructures + * @public + */ +export type EventObject = { + /** + * @docid + * @public + */ + currentTarget: Element; + + /** + * @docid + * @public + */ + data: any; + + /** + * @docid + * @public + */ + delegateTarget: Element; + + /** + * @docid + * @public + */ + target: Element; + /** + * @docid + * @publicName isDefaultPrevented() + * @public + */ + isDefaultPrevented(): boolean; + /** + * @docid + * @publicName isImmediatePropagationStopped() + * @public + */ + isImmediatePropagationStopped(): boolean; + /** + * @docid + * @publicName isPropagationStopped() + * @public + */ + isPropagationStopped(): boolean; + /** + * @docid + * @publicName preventDefault() + * @public + */ + preventDefault(): void; + /** + * @docid + * @publicName stopImmediatePropagation() + * @public + */ + stopImmediatePropagation(): void; + /** + * @docid + * @publicName stopPropagation() + * @public + */ + stopPropagation(): void; +}; + +/** + * @docid eventsMethods.off + * @publicName off(element) + * @namespace DevExpress.events + * @public + */ +export function off(element: Element | Array): void; + +/** + * @docid eventsMethods.off + * @publicName off(element, eventName) + * @namespace DevExpress.events + * @public + */ +export function off(element: Element | Array, eventName: string): void; + +/** + * @docid eventsMethods.off + * @publicName off(element, eventName, handler) + * @namespace DevExpress.events + * @public + */ +export function off(element: Element | Array, eventName: string, handler: Function): void; + +/** + * @docid eventsMethods.off + * @publicName off(element, eventName, selector) + * @namespace DevExpress.events + * @public + */ +export function off(element: Element | Array, eventName: string, selector: string): void; + +/** + * @docid eventsMethods.off + * @publicName off(element, eventName, selector, handler) + * @namespace DevExpress.events + * @public + */ +export function off(element: Element | Array, eventName: string, selector: string, handler: Function): void; + +/** + * @docid eventsMethods.on + * @publicName on(element, eventName, data, handler) + * @namespace DevExpress.events + * @param3 data:object + * @public + */ +export function on(element: Element | Array, eventName: string, data: any, handler: Function): void; + +/** + * @docid eventsMethods.on + * @publicName on(element, eventName, handler) + * @namespace DevExpress.events + * @public + */ +export function on(element: Element | Array, eventName: string, handler: Function): void; + +/** + * @docid eventsMethods.on + * @publicName on(element, eventName, selector, data, handler) + * @namespace DevExpress.events + * @param4 data:object + * @public + */ +export function on(element: Element | Array, eventName: string, selector: string, data: any, handler: Function): void; + +/** + * @docid eventsMethods.on + * @publicName on(element, eventName, selector, handler) + * @namespace DevExpress.events + * @public + */ +export function on(element: Element | Array, eventName: string, selector: string, handler: Function): void; + +/** + * @docid eventsMethods.one + * @publicName one(element, eventName, data, handler) + * @namespace DevExpress.events + * @param3 data:object + * @public + */ +export function one(element: Element | Array, eventName: string, data: any, handler: Function): void; + +/** + * @docid eventsMethods.one + * @publicName one(element, eventName, handler) + * @namespace DevExpress.events + * @public + */ +export function one(element: Element | Array, eventName: string, handler: Function): void; + +/** + * @docid eventsMethods.one + * @publicName one(element, eventName, selector, data, handler) + * @namespace DevExpress.events + * @param4 data:object + * @public + */ +export function one(element: Element | Array, eventName: string, selector: string, data: any, handler: Function): void; + +/** + * @docid eventsMethods.one + * @publicName one(element, eventName, selector, handler) + * @namespace DevExpress.events + * @public + */ +export function one(element: Element | Array, eventName: string, selector: string, handler: Function): void; + +/** + * @docid eventsMethods.trigger + * @publicName trigger(element, event) + * @namespace DevExpress.events + * @param2 event:string|event + * @public + */ +export function trigger(element: Element | Array, event: string | DxEvent): void; + +/** + * @docid eventsMethods.trigger + * @publicName trigger(element, event, extraParameters) + * @namespace DevExpress.events + * @param2 event:string|event + * @param3 extraParameters:object + * @public + */ +export function trigger(element: Element | Array, event: string | DxEvent, extraParameters: any): void; + +/** + * @docid eventsMethods.triggerHandler + * @publicName triggerHandler(element, event) + * @namespace DevExpress.events + * @param2 event:string|event + * @hidden + */ +export function triggerHandler(element: Element | Array, event: string | DxEvent): void; + +/** + * @docid eventsMethods.triggerHandler + * @publicName triggerHandler(element, event, extraParameters) + * @namespace DevExpress.events + * @param2 event:string|event + * @param3 extraParameters:object + * @hidden + */ +export function triggerHandler(element: Element | Array, event: string | DxEvent, extraParameters: any): void; diff --git a/packages/devextreme/js/common/core/events.js b/packages/devextreme/js/common/core/events.js new file mode 100644 index 000000000000..0bb7a9e21c13 --- /dev/null +++ b/packages/devextreme/js/common/core/events.js @@ -0,0 +1,7 @@ +export { + on, + one, + off, + trigger, + triggerHandler, +} from './events/index'; diff --git a/packages/devextreme/js/common/core/events/click.js b/packages/devextreme/js/common/core/events/click.js index b11d13e812b5..e8f6d2b71543 100644 --- a/packages/devextreme/js/common/core/events/click.js +++ b/packages/devextreme/js/common/core/events/click.js @@ -5,4 +5,4 @@ * @module events/click */ -export * from '../__internal/events/m_click'; +export * from '../../../__internal/events/m_click'; diff --git a/packages/devextreme/js/common/core/events/contextmenu.js b/packages/devextreme/js/common/core/events/contextmenu.js index d8c4c5830d05..fbc7d931c96a 100644 --- a/packages/devextreme/js/common/core/events/contextmenu.js +++ b/packages/devextreme/js/common/core/events/contextmenu.js @@ -5,4 +5,4 @@ * @module events/contextmenu */ -export * from '../__internal/events/m_contextmenu'; +export * from '../../../__internal/events/m_contextmenu'; diff --git a/packages/devextreme/js/common/core/events/core/emitter.feedback.js b/packages/devextreme/js/common/core/events/core/emitter.feedback.js index f086130e30a5..f9bd36072953 100644 --- a/packages/devextreme/js/common/core/events/core/emitter.feedback.js +++ b/packages/devextreme/js/common/core/events/core/emitter.feedback.js @@ -1 +1 @@ -export * from '../../__internal/events/core/m_emitter.feedback'; +export * from '../../../../__internal/events/core/m_emitter.feedback'; diff --git a/packages/devextreme/js/common/core/events/core/emitter.js b/packages/devextreme/js/common/core/events/core/emitter.js index 223a042f3077..16a98780423c 100644 --- a/packages/devextreme/js/common/core/events/core/emitter.js +++ b/packages/devextreme/js/common/core/events/core/emitter.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_emitter'; +export { default } from '../../../../__internal/events/core/m_emitter'; diff --git a/packages/devextreme/js/common/core/events/core/emitter_registrator.js b/packages/devextreme/js/common/core/events/core/emitter_registrator.js index c9f061241a98..a58da303773d 100644 --- a/packages/devextreme/js/common/core/events/core/emitter_registrator.js +++ b/packages/devextreme/js/common/core/events/core/emitter_registrator.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_emitter_registrator'; +export { default } from '../../../../__internal/events/core/m_emitter_registrator'; diff --git a/packages/devextreme/js/common/core/events/core/event_registrator.js b/packages/devextreme/js/common/core/events/core/event_registrator.js index 4de26caede8d..79d9f9c3afee 100644 --- a/packages/devextreme/js/common/core/events/core/event_registrator.js +++ b/packages/devextreme/js/common/core/events/core/event_registrator.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_event_registrator'; +export { default } from '../../../../__internal/events/core/m_event_registrator'; diff --git a/packages/devextreme/js/common/core/events/core/event_registrator_callbacks.js b/packages/devextreme/js/common/core/events/core/event_registrator_callbacks.js index fc0c626b1575..186b84d66c72 100644 --- a/packages/devextreme/js/common/core/events/core/event_registrator_callbacks.js +++ b/packages/devextreme/js/common/core/events/core/event_registrator_callbacks.js @@ -1,3 +1,3 @@ -import MemorizedCallbacks from '../../core/memorized_callbacks'; +import MemorizedCallbacks from '../../../../core/memorized_callbacks'; export default new MemorizedCallbacks(); diff --git a/packages/devextreme/js/common/core/events/core/events_engine.d.ts b/packages/devextreme/js/common/core/events/core/events_engine.d.ts index a5f7cd4fadd5..6fa6b862e6d5 100644 --- a/packages/devextreme/js/common/core/events/core/events_engine.d.ts +++ b/packages/devextreme/js/common/core/events/core/events_engine.d.ts @@ -7,5 +7,5 @@ type EventsEngineType = { }; declare const eventsEngine: EventsEngineType; -export declare function set(eventEngine: any): void; +export function set(eventEngine: any): void; export default eventsEngine; diff --git a/packages/devextreme/js/common/core/events/core/events_engine.js b/packages/devextreme/js/common/core/events/core/events_engine.js index a8e5d0c5e304..a054da76531c 100644 --- a/packages/devextreme/js/common/core/events/core/events_engine.js +++ b/packages/devextreme/js/common/core/events/core/events_engine.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_events_engine'; +export { default } from '../../../../__internal/events/core/m_events_engine'; diff --git a/packages/devextreme/js/common/core/events/core/hook_touch_props.js b/packages/devextreme/js/common/core/events/core/hook_touch_props.js index 96daa6e79e09..38903edf8c54 100644 --- a/packages/devextreme/js/common/core/events/core/hook_touch_props.js +++ b/packages/devextreme/js/common/core/events/core/hook_touch_props.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_hook_touch_props'; +export { default } from '../../../../__internal/events/core/m_hook_touch_props'; diff --git a/packages/devextreme/js/common/core/events/core/keyboard_processor.js b/packages/devextreme/js/common/core/events/core/keyboard_processor.js index d7e367d4c144..bcb1a25c2576 100644 --- a/packages/devextreme/js/common/core/events/core/keyboard_processor.js +++ b/packages/devextreme/js/common/core/events/core/keyboard_processor.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_keyboard_processor'; +export { default } from '../../../../__internal/events/core/m_keyboard_processor'; diff --git a/packages/devextreme/js/common/core/events/core/wheel.js b/packages/devextreme/js/common/core/events/core/wheel.js index c9d2e35c81d2..0c94207e4c62 100644 --- a/packages/devextreme/js/common/core/events/core/wheel.js +++ b/packages/devextreme/js/common/core/events/core/wheel.js @@ -1 +1 @@ -export * from '../../__internal/events/core/m_wheel'; +export * from '../../../../__internal/events/core/m_wheel'; diff --git a/packages/devextreme/js/common/core/events/double_click.js b/packages/devextreme/js/common/core/events/double_click.js index 3e0cf4edb96e..6b14a60f2ffb 100644 --- a/packages/devextreme/js/common/core/events/double_click.js +++ b/packages/devextreme/js/common/core/events/double_click.js @@ -1,4 +1,4 @@ -import { name, dblClick } from '../__internal/events/m_dblclick'; +import { name, dblClick } from '../../../__internal/events/m_dblclick'; import registerEvent from './core/event_registrator'; registerEvent(name, dblClick); diff --git a/packages/devextreme/js/common/core/events/drag.js b/packages/devextreme/js/common/core/events/drag.js index c03bdb173853..9a3b67fda0ea 100644 --- a/packages/devextreme/js/common/core/events/drag.js +++ b/packages/devextreme/js/common/core/events/drag.js @@ -42,4 +42,4 @@ * @type_function_param1_field2 cancel:boolean * @module events/drag */ -export * from '../__internal/events/m_drag'; +export * from '../../../__internal/events/m_drag'; diff --git a/packages/devextreme/js/common/core/events/gesture/emitter.gesture.js b/packages/devextreme/js/common/core/events/gesture/emitter.gesture.js index bacdf0ee957e..289513d8018d 100644 --- a/packages/devextreme/js/common/core/events/gesture/emitter.gesture.js +++ b/packages/devextreme/js/common/core/events/gesture/emitter.gesture.js @@ -1 +1 @@ -export { default } from '../../__internal/events/gesture/m_emitter.gesture'; +export { default } from '../../../../__internal/events/gesture/m_emitter.gesture'; diff --git a/packages/devextreme/js/common/core/events/gesture/emitter.gesture.scroll.js b/packages/devextreme/js/common/core/events/gesture/emitter.gesture.scroll.js index d3ae4e160f92..dccab6bcd841 100644 --- a/packages/devextreme/js/common/core/events/gesture/emitter.gesture.scroll.js +++ b/packages/devextreme/js/common/core/events/gesture/emitter.gesture.scroll.js @@ -1 +1 @@ -export { default } from '../../__internal/events/gesture/m_emitter.gesture.scroll'; +export { default } from '../../../../__internal/events/gesture/m_emitter.gesture.scroll'; diff --git a/packages/devextreme/js/common/core/events/gesture/swipeable.js b/packages/devextreme/js/common/core/events/gesture/swipeable.js index e6d44d8d75e9..7ad8476f5ecb 100644 --- a/packages/devextreme/js/common/core/events/gesture/swipeable.js +++ b/packages/devextreme/js/common/core/events/gesture/swipeable.js @@ -1 +1 @@ -export { default } from '../../__internal/events/gesture/m_swipeable'; +export { default } from '../../../../__internal/events/gesture/m_swipeable'; diff --git a/packages/devextreme/js/common/core/events/hold.js b/packages/devextreme/js/common/core/events/hold.js index 2174679ed7e7..f3370e430a6c 100644 --- a/packages/devextreme/js/common/core/events/hold.js +++ b/packages/devextreme/js/common/core/events/hold.js @@ -5,4 +5,4 @@ * @module events/hold */ -export { default } from '../__internal/events/m_hold'; +export { default } from '../../../__internal/events/m_hold'; diff --git a/packages/devextreme/js/common/core/events/hover.js b/packages/devextreme/js/common/core/events/hover.js index e603188362d0..54da4e40155a 100644 --- a/packages/devextreme/js/common/core/events/hover.js +++ b/packages/devextreme/js/common/core/events/hover.js @@ -12,4 +12,4 @@ * @module events/hover */ -export * from '../__internal/events/m_hover'; +export * from '../../../__internal/events/m_hover'; diff --git a/packages/devextreme/js/common/core/events/index.d.ts b/packages/devextreme/js/common/core/events/index.d.ts index 999a80e69b94..57e0ad3b6fbc 100644 --- a/packages/devextreme/js/common/core/events/index.d.ts +++ b/packages/devextreme/js/common/core/events/index.d.ts @@ -1,203 +1,4 @@ -import { - DxElement, -} from '../core/element'; - -/* eslint-disable @typescript-eslint/no-empty-interface */ -export interface EventExtension { } -export interface EventType { } -/* eslint-enable @typescript-eslint/no-empty-interface */ -/** - * @docid - * @type EventObject|jQuery.Event - */ -export type DxEvent = {} extends EventType ? (EventObject & TNativeEvent) : EventType; - -/** - * @docid - * @public - */ -export interface InitializedEventInfo { - /** - * @docid - * @type this - */ - readonly component?: TComponent; - /** @docid */ - readonly element?: DxElement; -} - -/** - * @docid - * @public - */ -export interface EventInfo { - /** - * @docid - * @type this - */ - readonly component: TComponent; - /** @docid */ - readonly element: DxElement; - /** - * @docid - * @hidden - */ - readonly model?: any; -} - -/** - * @docid - * @public - */ -export interface NativeEventInfo { - /** - * @docid - * @type this - */ - readonly component: TComponent; - /** @docid */ - readonly element: DxElement; - /** - * @docid - * @hidden - */ - readonly model?: any; - /** - * @docid - * @type event - */ - readonly event?: DxEvent; -} - -/** - * @docid - * @public - */ -export interface ChangedOptionInfo { - /** @docid */ - readonly name: string; - /** @docid */ - readonly fullName: string; - /** @docid */ - readonly value?: any; - /** @docid */ - readonly previousValue?: any; -} - -/** - * @docid - * @public - */ -export interface ItemInfo { - /** - * @docid - * @type object - */ - readonly itemData?: TItemData; - /** @docid */ - readonly itemElement: DxElement; - /** @docid */ - readonly itemIndex: number; -} - -/** - * @docid - * @public - */ -export interface Cancelable { - /** @docid */ - cancel?: boolean; -} - -/** - * @docid - * @public - */ -export type AsyncCancelable = { - /** - * @docid - * @type boolean|Promise - */ - cancel: boolean | PromiseLike; -}; - -/** @deprecated EventObject */ -export type dxEvent = EventObject; - -/** - * @docid - * @section commonObjectStructures - * @public - */ -export type EventObject = { - /** - * @docid - * @public - */ - currentTarget: Element; - - /** - * @docid - * @public - */ - data: any; - - /** - * @docid - * @public - */ - delegateTarget: Element; - - /** - * @docid - * @public - */ - target: Element; - /** - * @docid - * @publicName isDefaultPrevented() - * @public - */ - isDefaultPrevented(): boolean; - /** - * @docid - * @publicName isImmediatePropagationStopped() - * @public - */ - isImmediatePropagationStopped(): boolean; - /** - * @docid - * @publicName isPropagationStopped() - * @public - */ - isPropagationStopped(): boolean; - /** - * @docid - * @publicName preventDefault() - * @public - */ - preventDefault(): void; - /** - * @docid - * @publicName stopImmediatePropagation() - * @public - */ - stopImmediatePropagation(): void; - /** - * @docid - * @publicName stopPropagation() - * @public - */ - stopPropagation(): void; -}; - -/** - * @docid - * @type EventObject|jQuery.Event - * @hidden - * @deprecated DxEvent - */ -export type event = DxEvent; +import { DxEvent } from '../events'; /** * @docid @@ -206,149 +7,3 @@ export type event = DxEvent; * @hidden */ export function eventsHandler(event: DxEvent, extraParameters: any): boolean; - -/** - * @docid eventsMethods.off - * @publicName off(element) - * @namespace DevExpress.events - * @public - */ -export function off(element: Element | Array): void; - -/** - * @docid eventsMethods.off - * @publicName off(element, eventName) - * @namespace DevExpress.events - * @public - */ -export function off(element: Element | Array, eventName: string): void; - -/** - * @docid eventsMethods.off - * @publicName off(element, eventName, handler) - * @namespace DevExpress.events - * @public - */ -export function off(element: Element | Array, eventName: string, handler: Function): void; - -/** - * @docid eventsMethods.off - * @publicName off(element, eventName, selector) - * @namespace DevExpress.events - * @public - */ -export function off(element: Element | Array, eventName: string, selector: string): void; - -/** - * @docid eventsMethods.off - * @publicName off(element, eventName, selector, handler) - * @namespace DevExpress.events - * @public - */ -export function off(element: Element | Array, eventName: string, selector: string, handler: Function): void; - -/** - * @docid eventsMethods.on - * @publicName on(element, eventName, data, handler) - * @namespace DevExpress.events - * @param3 data:object - * @public - */ -export function on(element: Element | Array, eventName: string, data: any, handler: Function): void; - -/** - * @docid eventsMethods.on - * @publicName on(element, eventName, handler) - * @namespace DevExpress.events - * @public - */ -export function on(element: Element | Array, eventName: string, handler: Function): void; - -/** - * @docid eventsMethods.on - * @publicName on(element, eventName, selector, data, handler) - * @namespace DevExpress.events - * @param4 data:object - * @public - */ -export function on(element: Element | Array, eventName: string, selector: string, data: any, handler: Function): void; - -/** - * @docid eventsMethods.on - * @publicName on(element, eventName, selector, handler) - * @namespace DevExpress.events - * @public - */ -export function on(element: Element | Array, eventName: string, selector: string, handler: Function): void; - -/** - * @docid eventsMethods.one - * @publicName one(element, eventName, data, handler) - * @namespace DevExpress.events - * @param3 data:object - * @public - */ -export function one(element: Element | Array, eventName: string, data: any, handler: Function): void; - -/** - * @docid eventsMethods.one - * @publicName one(element, eventName, handler) - * @namespace DevExpress.events - * @public - */ -export function one(element: Element | Array, eventName: string, handler: Function): void; - -/** - * @docid eventsMethods.one - * @publicName one(element, eventName, selector, data, handler) - * @namespace DevExpress.events - * @param4 data:object - * @public - */ -export function one(element: Element | Array, eventName: string, selector: string, data: any, handler: Function): void; - -/** - * @docid eventsMethods.one - * @publicName one(element, eventName, selector, handler) - * @namespace DevExpress.events - * @public - */ -export function one(element: Element | Array, eventName: string, selector: string, handler: Function): void; - -/** - * @docid eventsMethods.trigger - * @publicName trigger(element, event) - * @namespace DevExpress.events - * @param2 event:string|event - * @public - */ -export function trigger(element: Element | Array, event: string | DxEvent): void; - -/** - * @docid eventsMethods.trigger - * @publicName trigger(element, event, extraParameters) - * @namespace DevExpress.events - * @param2 event:string|event - * @param3 extraParameters:object - * @public - */ -export function trigger(element: Element | Array, event: string | DxEvent, extraParameters: any): void; - -/** - * @docid eventsMethods.triggerHandler - * @publicName triggerHandler(element, event) - * @namespace DevExpress.events - * @param2 event:string|event - * @hidden - */ -export function triggerHandler(element: Element | Array, event: string | DxEvent): void; - -/** - * @docid eventsMethods.triggerHandler - * @publicName triggerHandler(element, event, extraParameters) - * @namespace DevExpress.events - * @param2 event:string|event - * @param3 extraParameters:object - * @hidden - */ -export function triggerHandler(element: Element | Array, event: string | DxEvent, extraParameters: any): void; diff --git a/packages/devextreme/js/common/core/events/pointer.js b/packages/devextreme/js/common/core/events/pointer.js index 76b7978e98d7..6293482e3f40 100644 --- a/packages/devextreme/js/common/core/events/pointer.js +++ b/packages/devextreme/js/common/core/events/pointer.js @@ -55,4 +55,4 @@ * @module events/pointer */ -export { default } from '../__internal/events/m_pointer'; +export { default } from '../../../__internal/events/m_pointer'; diff --git a/packages/devextreme/js/common/core/events/pointer/base.js b/packages/devextreme/js/common/core/events/pointer/base.js index 305dab9967e0..5d381e0b1bd7 100644 --- a/packages/devextreme/js/common/core/events/pointer/base.js +++ b/packages/devextreme/js/common/core/events/pointer/base.js @@ -1 +1 @@ -export { default } from '../../__internal/events/pointer/m_base'; +export { default } from '../../../../__internal/events/pointer/m_base'; diff --git a/packages/devextreme/js/common/core/events/pointer/mouse.js b/packages/devextreme/js/common/core/events/pointer/mouse.js index aaded4766988..ea5914c7618d 100644 --- a/packages/devextreme/js/common/core/events/pointer/mouse.js +++ b/packages/devextreme/js/common/core/events/pointer/mouse.js @@ -1 +1 @@ -export { default } from '../../__internal/events/pointer/m_mouse'; +export { default } from '../../../../__internal/events/pointer/m_mouse'; diff --git a/packages/devextreme/js/common/core/events/pointer/mouse_and_touch.js b/packages/devextreme/js/common/core/events/pointer/mouse_and_touch.js index dde0522c0306..1b08169cfa1b 100644 --- a/packages/devextreme/js/common/core/events/pointer/mouse_and_touch.js +++ b/packages/devextreme/js/common/core/events/pointer/mouse_and_touch.js @@ -1 +1 @@ -export { default } from '../../__internal/events/pointer/m_mouse_and_touch'; +export { default } from '../../../../__internal/events/pointer/m_mouse_and_touch'; diff --git a/packages/devextreme/js/common/core/events/pointer/observer.js b/packages/devextreme/js/common/core/events/pointer/observer.js index 6b5fefe472db..23d7d02347de 100644 --- a/packages/devextreme/js/common/core/events/pointer/observer.js +++ b/packages/devextreme/js/common/core/events/pointer/observer.js @@ -1 +1 @@ -export { default } from '../../__internal/events/pointer/m_observer'; +export { default } from '../../../../__internal/events/pointer/m_observer'; diff --git a/packages/devextreme/js/common/core/events/pointer/touch.js b/packages/devextreme/js/common/core/events/pointer/touch.js index f41aa71ccc75..340b3fea5bbf 100644 --- a/packages/devextreme/js/common/core/events/pointer/touch.js +++ b/packages/devextreme/js/common/core/events/pointer/touch.js @@ -1 +1 @@ -export { default } from '../../__internal/events/pointer/m_touch'; +export { default } from '../../../../__internal/events/pointer/m_touch'; diff --git a/packages/devextreme/js/common/core/events/remove.js b/packages/devextreme/js/common/core/events/remove.js index b475e099cbec..8c8d8ad142d9 100644 --- a/packages/devextreme/js/common/core/events/remove.js +++ b/packages/devextreme/js/common/core/events/remove.js @@ -5,4 +5,4 @@ * @module events/remove */ -export * from '../__internal/events/m_remove'; +export * from '../../../__internal/events/m_remove'; diff --git a/packages/devextreme/js/common/core/events/short.js b/packages/devextreme/js/common/core/events/short.js index 70e38ebf6b7b..0520fdf01641 100644 --- a/packages/devextreme/js/common/core/events/short.js +++ b/packages/devextreme/js/common/core/events/short.js @@ -1 +1 @@ -export * from '../__internal/events/m_short'; +export * from '../../../__internal/events/m_short'; diff --git a/packages/devextreme/js/common/core/events/swipe.js b/packages/devextreme/js/common/core/events/swipe.js index 31e61bbd529e..a65c8d786508 100644 --- a/packages/devextreme/js/common/core/events/swipe.js +++ b/packages/devextreme/js/common/core/events/swipe.js @@ -22,4 +22,4 @@ * @module events/swipe */ -export * from '../__internal/events/m_swipe'; +export * from '../../../__internal/events/m_swipe'; diff --git a/packages/devextreme/js/common/core/events/transform.js b/packages/devextreme/js/common/core/events/transform.js index db22a4cec363..a93e6d82b40b 100644 --- a/packages/devextreme/js/common/core/events/transform.js +++ b/packages/devextreme/js/common/core/events/transform.js @@ -1,4 +1,4 @@ -import { exportNames } from '../__internal/events/m_transform'; +import { exportNames } from '../../../__internal/events/m_transform'; /** * @name UI Events.dxtransformstart diff --git a/packages/devextreme/js/common/core/events/utils/add_namespace.js b/packages/devextreme/js/common/core/events/utils/add_namespace.js index ffa6a046fa06..3adbbc2f4233 100644 --- a/packages/devextreme/js/common/core/events/utils/add_namespace.js +++ b/packages/devextreme/js/common/core/events/utils/add_namespace.js @@ -1 +1 @@ -export { default } from '../../__internal/events/utils/m_add_namespace'; +export { default } from '../../../../__internal/events/utils/m_add_namespace'; diff --git a/packages/devextreme/js/common/core/events/utils/event_nodes_disposing.js b/packages/devextreme/js/common/core/events/utils/event_nodes_disposing.js index 0dd3c94270d2..fee24fce3ef6 100644 --- a/packages/devextreme/js/common/core/events/utils/event_nodes_disposing.js +++ b/packages/devextreme/js/common/core/events/utils/event_nodes_disposing.js @@ -1 +1 @@ -export * from '../../__internal/events/utils/m_event_nodes_disposing'; +export * from '../../../../__internal/events/utils/m_event_nodes_disposing'; diff --git a/packages/devextreme/js/common/core/events/utils/event_target.js b/packages/devextreme/js/common/core/events/utils/event_target.js index 6b0f3d4dd2a0..f384e1acc1a7 100644 --- a/packages/devextreme/js/common/core/events/utils/event_target.js +++ b/packages/devextreme/js/common/core/events/utils/event_target.js @@ -1 +1 @@ -export * from '../../__internal/events/utils/m_event_target'; +export * from '../../../../__internal/events/utils/m_event_target'; diff --git a/packages/devextreme/js/common/core/events/utils/index.js b/packages/devextreme/js/common/core/events/utils/index.js index 4e21a47cee31..a486606d05b0 100644 --- a/packages/devextreme/js/common/core/events/utils/index.js +++ b/packages/devextreme/js/common/core/events/utils/index.js @@ -1 +1 @@ -export * from '../../__internal/events/utils/index'; +export * from '../../../../__internal/events/utils/index'; diff --git a/packages/devextreme/js/common/core/events/visibility_change.js b/packages/devextreme/js/common/core/events/visibility_change.js index eae6f20c886a..93ea077c6d9a 100644 --- a/packages/devextreme/js/common/core/events/visibility_change.js +++ b/packages/devextreme/js/common/core/events/visibility_change.js @@ -1,4 +1,4 @@ -import VisibilityChangeModule from '../__internal/events/m_visibility_change'; +import VisibilityChangeModule from '../../../__internal/events/m_visibility_change'; export const triggerShownEvent = VisibilityChangeModule.triggerShownEvent; export const triggerHidingEvent = VisibilityChangeModule.triggerHidingEvent; diff --git a/packages/devextreme/js/common/core/localization.d.ts b/packages/devextreme/js/common/core/localization.d.ts new file mode 100644 index 000000000000..75f04b23da91 --- /dev/null +++ b/packages/devextreme/js/common/core/localization.d.ts @@ -0,0 +1,132 @@ +import { Format as PredefinedFormat } from '../../common'; + +/** + * @docid localization.formatDate + * @publicName formatDate(value, format) + * @static + * @namespace DevExpress.localization + * @public + */ +export function formatDate(value: Date, format: Format): string; + +/** + * @docid localization.formatMessage + * @publicName formatMessage(key, value) + * @param2 value:string|Array + * @static + * @namespace DevExpress.localization + * @public + */ +export function formatMessage(key: string, ...values: Array): string; + +/** + * @docid localization.formatNumber + * @publicName formatNumber(value, format) + * @static + * @namespace DevExpress.localization + * @public + */ +export function formatNumber(value: number, format: Format): string; + +/** + * @docid localization.loadMessages + * @publicName loadMessages(messages) + * @param1 messages:object + * @static + * @namespace DevExpress.localization + * @public + */ +export function loadMessages(messages: any): void; + +/** + * @docid localization.locale + * @publicName locale() + * @static + * @namespace DevExpress.localization + * @public + */ +export function locale(): string; + +/** + * @docid localization.locale + * @publicName locale(locale) + * @static + * @namespace DevExpress.localization + * @public + */ +// eslint-disable-next-line @typescript-eslint/no-shadow +export function locale(locale: string): void; + +/** + * @docid localization.parseDate + * @publicName parseDate(text, format) + * @static + * @namespace DevExpress.localization + * @public + */ +export function parseDate(text: string, format: Format): Date; + +/** + * @docid localization.parseNumber + * @publicName parseNumber(text, format) + * @static + * @namespace DevExpress.localization + * @public + */ +export function parseNumber(text: string, format: Format): number; + +type ExternalFormat = + Intl.DateTimeFormatOptions | + Intl.NumberFormatOptions; + +/** + * @docid + * @type Object|Enums.Format|string|function + * @default undefined + * @section Common + * @namespace DevExpress.ui + * @public + */ +export type Format = + FormatObject | + PredefinedFormat | + string | + ((value: number | Date) => string) | + ((value: Date) => string) | + ((value: number) => string) | + ExternalFormat | undefined; + +export interface FormatObject { + /** + * @docid Format.currency + * @public + */ + currency?: string; + /** + * @docid Format.useCurrencyAccountingStyle + * @type boolean + * @default true + * @public + */ + useCurrencyAccountingStyle?: boolean; + /** + * @docid Format.formatter + * @public + */ + formatter?: ((value: number | Date) => string); + /** + * @docid Format.parser + * @public + */ + parser?: ((value: string) => number | Date); + /** + * @docid Format.precision + * @public + */ + precision?: number; + /** + * @docid Format.type + * @public + */ + type?: PredefinedFormat | string; +} diff --git a/packages/devextreme/js/common/core/localization/core.js b/packages/devextreme/js/common/core/localization/core.js index 0d096f183a46..7887125559e6 100644 --- a/packages/devextreme/js/common/core/localization/core.js +++ b/packages/devextreme/js/common/core/localization/core.js @@ -1,4 +1,4 @@ -import dependencyInjector from '../core/utils/dependency_injector'; +import dependencyInjector from '../../../core/utils/dependency_injector'; import parentLocales from './cldr-data/parent_locales'; import getParentLocale from './parentLocale'; diff --git a/packages/devextreme/js/common/core/localization/currency.js b/packages/devextreme/js/common/core/localization/currency.js index b469b714666c..9e3cc67301cf 100644 --- a/packages/devextreme/js/common/core/localization/currency.js +++ b/packages/devextreme/js/common/core/localization/currency.js @@ -1,4 +1,4 @@ -import { extend } from '../core/utils/extend'; +import { extend } from '../../../core/utils/extend'; export default { _formatNumberCore: function(value, format, formatConfig) { diff --git a/packages/devextreme/js/common/core/localization/date.js b/packages/devextreme/js/common/core/localization/date.js index abc316d12dd4..4b5a29ed137c 100644 --- a/packages/devextreme/js/common/core/localization/date.js +++ b/packages/devextreme/js/common/core/localization/date.js @@ -1,7 +1,7 @@ -import dependencyInjector from '../core/utils/dependency_injector'; -import { isString } from '../core/utils/type'; -import { each } from '../core/utils/iterator'; -import errors from '../core/errors'; +import dependencyInjector from '../../../core/utils/dependency_injector'; +import { isString } from '../../../core/utils/type'; +import { each } from '../../../core/utils/iterator'; +import errors from '../../../core/errors'; import { getFormatter as getLDMLDateFormatter } from './ldml/date.formatter'; import { getFormat as getLDMLDateFormat } from './ldml/date.format'; import { getParser as getLDMLDateParser } from './ldml/date.parser'; diff --git a/packages/devextreme/js/common/core/localization/default_date_names.js b/packages/devextreme/js/common/core/localization/default_date_names.js index 85bbdaf91fee..8d45246eb399 100644 --- a/packages/devextreme/js/common/core/localization/default_date_names.js +++ b/packages/devextreme/js/common/core/localization/default_date_names.js @@ -1,4 +1,4 @@ -import { map } from '../core/utils/iterator'; +import { map } from '../../../core/utils/iterator'; const MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; const DAYS = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; diff --git a/packages/devextreme/js/common/core/localization/globalize/currency.js b/packages/devextreme/js/common/core/localization/globalize/currency.js index 37b3a818c73d..dbeae744cb6c 100644 --- a/packages/devextreme/js/common/core/localization/globalize/currency.js +++ b/packages/devextreme/js/common/core/localization/globalize/currency.js @@ -6,7 +6,7 @@ import '../currency'; import 'globalize/currency'; // eslint-disable-next-line no-restricted-imports import Globalize from 'globalize'; -import config from '../../core/config'; +import { config } from '../../../../common'; import numberLocalization from '../number'; const CURRENCY_STYLES = ['symbol', 'accounting']; diff --git a/packages/devextreme/js/common/core/localization/globalize/date.js b/packages/devextreme/js/common/core/localization/globalize/date.js index dddeb7827dbb..24f3e4eb5b05 100644 --- a/packages/devextreme/js/common/core/localization/globalize/date.js +++ b/packages/devextreme/js/common/core/localization/globalize/date.js @@ -9,8 +9,8 @@ const RTL_MARKS_REGEX = /[\u200E\u200F]/g; // eslint-disable-next-line no-restricted-imports import Globalize from 'globalize'; import dateLocalization from '../date'; -import { isObject } from '../../core/utils/type'; -import * as iteratorUtils from '../../core/utils/iterator'; +import { isObject } from '../../../../core/utils/type'; +import * as iteratorUtils from '../../../../core/utils/iterator'; if(Globalize && Globalize.formatDate) { diff --git a/packages/devextreme/js/common/core/localization/globalize/number.js b/packages/devextreme/js/common/core/localization/globalize/number.js index 4a3cdda578d8..568d9599cb8b 100644 --- a/packages/devextreme/js/common/core/localization/globalize/number.js +++ b/packages/devextreme/js/common/core/localization/globalize/number.js @@ -2,7 +2,7 @@ import './core'; // eslint-disable-next-line no-restricted-imports import Globalize from 'globalize'; import numberLocalization from '../number'; -import errors from '../../core/errors'; +import errors from '../../../../core/errors'; // eslint-disable-next-line no-restricted-imports, import/no-unresolved import 'globalize/number'; diff --git a/packages/devextreme/js/common/core/localization/intl/date.js b/packages/devextreme/js/common/core/localization/intl/date.js index c75851db4d23..d1bed9a81c3a 100644 --- a/packages/devextreme/js/common/core/localization/intl/date.js +++ b/packages/devextreme/js/common/core/localization/intl/date.js @@ -1,5 +1,5 @@ /* globals Intl */ -import { extend } from '../../core/utils/extend'; +import { extend } from '../../../../core/utils/extend'; import localizationCoreUtils from '../core'; const SYMBOLS_TO_REMOVE_REGEX = /[\u200E\u200F]/g; diff --git a/packages/devextreme/js/common/core/localization/intl/number.js b/packages/devextreme/js/common/core/localization/intl/number.js index 15c172fd1e78..55012d3da52b 100644 --- a/packages/devextreme/js/common/core/localization/intl/number.js +++ b/packages/devextreme/js/common/core/localization/intl/number.js @@ -1,5 +1,5 @@ /* globals Intl */ -import dxConfig from '../../core/config'; +import { config as dxConfig } from '../../../../common'; import localizationCoreUtils from '../core'; import openXmlCurrencyFormat from '../open_xml_currency_format'; import accountingFormats from '../cldr-data/accounting_formats'; diff --git a/packages/devextreme/js/common/core/localization/ldml/date.parser.js b/packages/devextreme/js/common/core/localization/ldml/date.parser.js index b9ad3b6f3ca7..96197a9ee6d5 100644 --- a/packages/devextreme/js/common/core/localization/ldml/date.parser.js +++ b/packages/devextreme/js/common/core/localization/ldml/date.parser.js @@ -1,5 +1,5 @@ -import { escapeRegExp } from '../../core/utils/common'; -import { logger } from '../../core/utils/console'; +import { escapeRegExp } from '../../../../core/utils/common'; +import { logger } from '../../../../core/utils/console'; const FORMAT_TYPES = { '3': 'abbreviated', diff --git a/packages/devextreme/js/common/core/localization/ldml/number.js b/packages/devextreme/js/common/core/localization/ldml/number.js index 180e103fa70d..628a8713d3a0 100644 --- a/packages/devextreme/js/common/core/localization/ldml/number.js +++ b/packages/devextreme/js/common/core/localization/ldml/number.js @@ -1,4 +1,4 @@ -import { fitIntoRange, multiplyInExponentialForm } from '../../core/utils/math'; +import { fitIntoRange, multiplyInExponentialForm } from '../../../../core/utils/math'; import { toFixed } from '../utils'; const DEFAULT_CONFIG = { thousandsSeparator: ',', decimalSeparator: '.' }; diff --git a/packages/devextreme/js/common/core/localization/message.js b/packages/devextreme/js/common/core/localization/message.js index aa0af71f02f5..d0772abe30c0 100644 --- a/packages/devextreme/js/common/core/localization/message.js +++ b/packages/devextreme/js/common/core/localization/message.js @@ -1,7 +1,7 @@ -import dependencyInjector from '../core/utils/dependency_injector'; -import { extend } from '../core/utils/extend'; -import { format as stringFormat } from '../core/utils/string'; -import { humanize } from '../core/utils/inflector'; +import dependencyInjector from '../../../core/utils/dependency_injector'; +import { extend } from '../../../core/utils/extend'; +import { format as stringFormat } from '../../../core/utils/string'; +import { humanize } from '../../../core/utils/inflector'; import coreLocalization from './core'; import { defaultMessages } from './default_messages'; diff --git a/packages/devextreme/js/common/core/localization/number.js b/packages/devextreme/js/common/core/localization/number.js index 4a5a8330b68c..e9db126e1347 100644 --- a/packages/devextreme/js/common/core/localization/number.js +++ b/packages/devextreme/js/common/core/localization/number.js @@ -1,10 +1,10 @@ -import dependencyInjector from '../core/utils/dependency_injector'; -import { escapeRegExp } from '../core/utils/common'; -import { each } from '../core/utils/iterator'; -import { isPlainObject } from '../core/utils/type'; +import dependencyInjector from '../../../core/utils/dependency_injector'; +import { escapeRegExp } from '../../../core/utils/common'; +import { each } from '../../../core/utils/iterator'; +import { isPlainObject } from '../../../core/utils/type'; import { getFormatter } from './ldml/number'; -import config from '../core/config'; -import errors from '../core/errors'; +import config from '../../../core/config'; +import errors from '../../../core/errors'; import { toFixed } from './utils'; import currencyLocalization from './currency'; import intlNumberLocalization from './intl/number'; diff --git a/packages/devextreme/js/common/core/localization/utils.js b/packages/devextreme/js/common/core/localization/utils.js index ca7164e0d1b8..3deba5d56cc6 100644 --- a/packages/devextreme/js/common/core/localization/utils.js +++ b/packages/devextreme/js/common/core/localization/utils.js @@ -1,4 +1,4 @@ -import { sign, multiplyInExponentialForm } from '../core/utils/math'; +import { sign, multiplyInExponentialForm } from '../../../core/utils/math'; const DECIMAL_BASE = 10; diff --git a/packages/devextreme/js/common/data.d.ts b/packages/devextreme/js/common/data.d.ts new file mode 100644 index 000000000000..aa1e53119fd6 --- /dev/null +++ b/packages/devextreme/js/common/data.d.ts @@ -0,0 +1,1653 @@ +/* eslint-disable max-classes-per-file */ +import { DxPromise } from '../common'; +import { DxExtendedPromise } from '../core/utils/deferred'; +import { DeepPartial } from '../core/index'; +import AbstractStore, { AbstractStoreOptions } from './data/abstract_store'; + +/** + * @docid Utils.applyChanges + * @publicName applyChanges(data, changes, options) + * @param3 options?:any + * @namespace DevExpress.data + * @public + */ +export function applyChanges(data: Array, changes: Array, options?: { keyExpr?: string | Array; immutable?: boolean }): Array; + +/** + * @docid StoreOptions + * @namespace DevExpress.data.Store + * @hidden + */ +export type StoreOptionsBase< + TItem = any, + TKey = any, +> = { + /** + * @docid StoreOptions.errorHandler + * @public + */ + errorHandler?: Function; + /** + * @docid StoreOptions.key + * @public + */ + key?: string | Array; + /** + * @docid StoreOptions.onInserted + * @type_function_param1 values:object + * @type_function_param2 key:object|string|number + * @action + * @public + */ + onInserted?: ((values: TItem, key: TKey) => void); + /** + * @docid StoreOptions.onInserting + * @type_function_param1 values:object + * @action + * @public + */ + onInserting?: ((values: TItem) => void); + /** + * @docid StoreOptions.onLoading + * @type_function_param1 loadOptions:LoadOptions + * @action + * @public + */ + onLoading?: ((loadOptions: LoadOptions) => void); + /** + * @docid StoreOptions.onModified + * @action + * @public + */ + onModified?: Function; + /** + * @docid StoreOptions.onModifying + * @action + * @public + */ + onModifying?: Function; + /** + * @docid StoreOptions.onPush + * @action + * @public + */ + onPush?: ((changes: Array) => void); + /** + * @docid StoreOptions.onRemoved + * @type_function_param1 key:object|string|number + * @action + * @public + */ + onRemoved?: ((key: TKey) => void); + /** + * @docid StoreOptions.onRemoving + * @type_function_param1 key:object|string|number + * @action + * @public + */ + onRemoving?: ((key: TKey) => void); + /** + * @docid StoreOptions.onUpdated + * @type_function_param1 key:object|string|number + * @type_function_param2 values:object + * @action + * @public + */ + onUpdated?: ((key: TKey, values: TItem) => void); + /** + * @docid StoreOptions.onUpdating + * @type_function_param1 key:object|string|number + * @type_function_param2 values:object + * @action + * @public + */ + onUpdating?: ((key: TKey, values: TItem) => void); +}; + +type StoreBaseEventName = 'loaded' | 'loading' | 'inserted' | 'inserting' | 'updated' | 'updating' | 'push' | 'removed' | 'removing' | 'modified' | 'modifying'; + +/** + * @docid Store + * @namespace DevExpress.data + * @hidden + * @options StoreOptionsBase + */ +export class StoreBase< + TItem = any, + TKey = any, +> { + constructor(options?: StoreOptionsBase); + /** + * @docid + * @publicName insert(values) + * @param1 values:object + * @return Promise + * @public + */ + insert(values: TItem): DxExtendedPromise; + /** + * @docid + * @publicName key() + * @public + */ + key(): string | Array; + /** + * @docid + * @publicName keyOf(obj) + * @param1 obj:object + * @return any|string|number + * @public + */ + keyOf(obj: TItem): TKey; + /** + * @docid + * @publicName off(eventName) + * @param1 eventName:string + * @return this + * @public + */ + off(eventName: StoreBaseEventName): this; + /** + * @docid + * @publicName off(eventName, eventHandler) + * @param1 eventName:string + * @return this + * @public + */ + off(eventName: StoreBaseEventName, eventHandler: Function): this; + /** + * @docid + * @publicName on(eventName, eventHandler) + * @param1 eventName:string + * @return this + * @public + */ + on(eventName: StoreBaseEventName, eventHandler: Function): this; + /** + * @docid + * @publicName on(events) + * @param1 events:object + * @return this + * @public + */ + on(events: { [key in StoreBaseEventName]?: Function }): this; + /** + * @docid + * @publicName push(changes) + * @param1 changes:Array + * @public + */ + push(changes: Array<{ type: 'insert' | 'update' | 'remove'; data?: DeepPartial; key?: TKey; index?: number }>): void; + /** + * @docid + * @publicName remove(key) + * @param1 key:object|string|number + * @return Promise + * @public + */ + remove(key: TKey): DxPromise; + /** + * @docid + * @publicName totalCount(options) + * @param1_field filter:object + * @param1_field group:object + * @return Promise + * @public + */ + totalCount(obj: { filter?: FilterDescriptor | Array; group?: GroupDescriptor | Array> }): DxPromise; + /** + * @docid + * @publicName update(key, values) + * @param1 key:object|string|number + * @param2 values:object + * @return Promise + * @public + */ + update(key: TKey, values: DeepPartial): DxExtendedPromise; +} + +/** + * @docid + * @namespace DevExpress.data + */ +export interface ArrayStoreOptions< + TItem = any, + TKey = any, +> extends AbstractStoreOptions { + /** + * @docid + * @public + */ + data?: Array; +} + +/** + * @docid + * @inherits Store + * @public + * @options ArrayStoreOptions + */ +export class ArrayStore< + TItem = any, + TKey = any, +> extends AbstractStore { + constructor(options?: ArrayStoreOptions); + /** + * @docid + * @publicName byKey(key) + * @param1 key:object|string|number + * @return Promise + * @public + */ + byKey(key: TKey): DxPromise; + /** + * @docid + * @publicName clear() + * @public + */ + clear(): void; + /** + * @docid + * @publicName createQuery() + * @return object + * @public + */ + createQuery(): Query; +} + +/** + * @docid + * @public + */ +export type GroupItem< + TItem = any, +> = { + /** @docid */ + key: any | string | number; + /** + * @docid + * @type Array|Array|null + */ + items: Array | Array> | null; + /** @docid */ + count?: number; + /** @docid */ + summary?: Array; +}; + +type LoadResultArray = Array | Array>; + +/** + * @docid + * @public + */ +export type LoadResultObject = { + /** + * @docid + * @type Array|Array + */ + data: Array | Array>; + /** @docid */ + totalCount?: number; + /** @docid */ + summary?: Array; + /** @docid */ + groupCount?: number; + }; + +/** + * @docid + * @public + * @type object + */ +export type LoadResult< + TItem = any, +> = + | Object + | LoadResultArray + | LoadResultObject; + +/** + * @docid + * @public + */ +export function isLoadResultObject(res: LoadResult): res is LoadResultObject; + +/** + * @docid + * @public + */ +export function isGroupItemsArray(res: LoadResult): res is Array>; + +/** + * @docid + * @public + */ +export function isItemsArray(res: LoadResult): res is Array; + +type LoadFunctionResult = T | DxPromise | PromiseLike; + +/** + * @docid + * @public + * @type object + * @deprecated Use LoadResult instead + */ +export type ResolvedData = LoadResult; + +/** + * @docid + * @namespace DevExpress.data + */ +export interface CustomStoreOptions< + TItem = any, + TKey = any, +> extends StoreOptionsBase { + /** + * @docid + * @public + * @type_function_param1 key:object|string|number + * @type_function_param2 extraOptions:LoadOptions + * @type_function_return Promise + */ + byKey?: ((key: TKey, extraOptions?: LoadOptions) => PromiseLike); + /** + * @docid + * @default true + * @public + */ + cacheRawData?: boolean; + /** + * @docid + * @type_function_param1 values:object + * @type_function_return Promise + * @public + */ + insert?: ((values: TItem) => PromiseLike); + /** + * @docid + * @type_function_param1 options:LoadOptions + * @type_function_return LoadResult|Promise + * @public + */ + load: (options: LoadOptions) => LoadFunctionResult>; + /** + * @docid + * @default 'processed' + * @public + */ + loadMode?: 'processed' | 'raw'; + /** + * @docid + * @type_function_param1 result:LoadResult + * @type_function_param2 loadOptions:LoadOptions + * @action + * @public + */ + onLoaded?: ((result: LoadResult, loadOptions: LoadOptions) => void); + /** + * @docid + * @type_function_param1 key:object|string|number + * @type_function_return Promise + * @public + */ + remove?: ((key: TKey) => PromiseLike); + /** + * @docid + * @type_function_param1_field filter:object + * @type_function_param1_field group:object + * @type_function_return Promise + * @public + */ + totalCount?: ((loadOptions: { filter?: FilterDescriptor | Array; group?: GroupDescriptor | Array> }) => PromiseLike); + /** + * @docid + * @type_function_param1 key:object|string|number + * @type_function_param2 values:object + * @type_function_return Promise + * @public + */ + update?: ((key: TKey, values: TItem) => PromiseLike); + /** + * @docid + * @default undefined + * @public + */ + useDefaultSearch?: boolean | undefined; +} + +/** + * @docid + * @inherits Store + * @public + * @options CustomStoreOptions + */ +export class CustomStore< + TItem = any, + TKey = any, +> extends StoreBase { + constructor(options?: CustomStoreOptions); + /** + * @docid + * @publicName byKey(key, extraOptions) + * @param1 key:object|string|number + * @param2 extraOptions:LoadOptions + * @return Promise + * @public + */ + byKey(key: TKey, extraOptions?: LoadOptions): DxPromise; + /** + * @docid + * @publicName clearRawDataCache() + * @public + */ + clearRawDataCache(): void; + /** + * @docid + * @publicName load() + * @return Promise + * @public + */ + load(): DxExtendedPromise>; + /** + * @docid + * @publicName load(options) + * @param1 options:LoadOptions + * @return Promise + * @public + */ + load(options: LoadOptions): DxExtendedPromise>; +} + +type DataSourceEventName = 'changed' | 'loadError' | 'loadingChanged'; + +/** + * @namespace DevExpress.data + * @docid + * @type object + */ +export interface DataSourceOptions< + TStoreItem = any, + TMappedItem = TStoreItem, + TItem = TMappedItem, + TKey = any, +> { + /** + * @docid + * @public + */ + customQueryParams?: any; + /** + * @docid + * @public + */ + expand?: Array | string; + /** + * @docid + * @type Filter expression + * @public + */ + filter?: FilterDescriptor | Array; + /** + * @docid + * @type Group expression + * @public + */ + group?: GroupDescriptor | Array>; + /** + * @docid + * @public + */ + // eslint-disable-next-line spellcheck/spell-checker + langParams?: LangParams; + /** + * @docid + * @type_function_param1 dataItem:object + * @type_function_return object + * @public + */ + map?: ((dataItem: TStoreItem) => TMappedItem); + /** + * @docid + * @type_function_param1_field changes:Array + * @action + * @public + */ + onChanged?: ((e: { readonly changes?: Array }) => void); + /** + * @docid + * @action + * @public + */ + onLoadError?: ((error: { readonly message?: string }) => void); + /** + * @docid + * @action + * @public + */ + onLoadingChanged?: ((isLoading: boolean) => void); + /** + * @docid + * @default 20 + * @public + */ + pageSize?: number; + /** + * @docid + * @default undefined + * @public + */ + paginate?: boolean | undefined; + /** + * @docid + * @type_function_param1 data:Array + * @type_function_return Array + * @public + */ + postProcess?: ((data: Array) => Array); + /** + * @docid + * @default undefined + * @public + */ + pushAggregationTimeout?: number | undefined; + /** + * @docid + * @public + */ + requireTotalCount?: boolean; + /** + * @docid + * @default false + * @public + */ + reshapeOnPush?: boolean; + /** + * @docid + * @type getter|Array + * @public + */ + searchExpr?: string | Function | Array; + /** + * @docid + * @default "contains" + * @public + */ + searchOperation?: SearchOperation; + /** + * @docid + * @default null + * @public + */ + searchValue?: any; + /** + * @docid + * @type Select expression + * @public + */ + select?: SelectDescriptor; + /** + * @docid + * @type Sort expression + * @public + */ + sort?: SortDescriptor | Array>; + /** + * @docid + * @public + * @type Store|StoreOptions|Array + */ + store?: Array | Store | StoreOptions; +} + +/** + * @docid + * @public + * @options DataSourceOptions + */ +export class DataSource< + TItem = any, + TKey = any, +> { + constructor(data: Array); + constructor(options: CustomStoreOptions | DataSourceOptions); + constructor(store: Store); + constructor(url: string); + /** + * @docid + * @publicName cancel(operationId) + * @public + */ + cancel(operationId: number): boolean; + /** + * @docid + * @publicName dispose() + * @public + */ + dispose(): void; + /** + * @docid + * @publicName filter() + * @return object + * @public + */ + filter(): FilterDescriptor | Array; + /** + * @docid + * @publicName filter(filterExpr) + * @param1 filterExpr:object + * @public + */ + filter(filterExpr: FilterDescriptor | Array): void; + /** + * @docid + * @publicName group() + * @return object + * @public + */ + group(): GroupDescriptor | Array>; + /** + * @docid + * @publicName group(groupExpr) + * @param1 groupExpr:object + * @public + */ + group(groupExpr: GroupDescriptor | Array>): void; + /** + * @docid + * @publicName isLastPage() + * @public + */ + isLastPage(): boolean; + /** + * @docid + * @publicName isLoaded() + * @public + */ + isLoaded(): boolean; + /** + * @docid + * @publicName isLoading() + * @public + */ + isLoading(): boolean; + /** + * @docid + * @publicName items() + * @public + */ + items(): Array; + /** + * @docid + * @publicName key() + * @public + */ + key(): string | Array; + /** + * @docid + * @publicName load() + * @return Promise + * @public + */ + load(): DxExtendedPromise; + /** + * @docid + * @publicName loadOptions() + * @return object + * @public + */ + loadOptions(): LoadOptions; + /** + * @docid + * @publicName off(eventName) + * @param1 eventName:string + * @return this + * @public + */ + off(eventName: DataSourceEventName): this; + /** + * @docid + * @publicName off(eventName, eventHandler) + * @param1 eventName:string + * @return this + * @public + */ + off(eventName: DataSourceEventName, eventHandler: Function): this; + /** + * @docid + * @publicName on(eventName, eventHandler) + * @param1 eventName:string + * @return this + * @public + */ + on(eventName: DataSourceEventName, eventHandler: Function): this; + /** + * @docid + * @publicName on(events) + * @param1 events:object + * @return this + * @public + */ + on(events: { [key in DataSourceEventName]?: Function }): this; + /** + * @docid + * @publicName pageIndex() + * @return numeric + * @public + */ + pageIndex(): number; + /** + * @docid + * @publicName pageIndex(newIndex) + * @param1 newIndex:numeric + * @public + */ + pageIndex(newIndex: number): void; + /** + * @docid + * @publicName pageSize() + * @return numeric + * @public + */ + pageSize(): number; + /** + * @docid + * @publicName pageSize(value) + * @param1 value:numeric + * @public + */ + pageSize(value: number): void; + /** + * @docid + * @publicName paginate() + * @public + */ + paginate(): boolean; + /** + * @docid + * @publicName paginate(value) + * @public + */ + paginate(value: boolean): void; + /** + * @docid + * @publicName reload() + * @return Promise + * @public + */ + reload(): DxExtendedPromise; + /** + * @docid + * @publicName requireTotalCount() + * @public + */ + requireTotalCount(): boolean; + /** + * @docid + * @publicName requireTotalCount(value) + * @public + */ + requireTotalCount(value: boolean): void; + /** + * @docid + * @publicName searchExpr() + * @return getter|Array + * @public + */ + searchExpr(): string & Function & Array; + /** + * @docid + * @publicName searchExpr(expr) + * @param1 expr:getter|Array + * @public + */ + searchExpr(expr: string | Function | Array): void; + /** + * @docid + * @publicName searchOperation() + * @public + */ + searchOperation(): string; + /** + * @docid + * @publicName searchOperation(op) + * @public + */ + searchOperation(op: string): void; + /** + * @docid + * @publicName searchValue() + * @public + */ + searchValue(): any; + /** + * @docid + * @publicName searchValue(value) + * @public + */ + searchValue(value: any): void; + /** + * @docid + * @publicName select() + * @return any + * @public + */ + select(): SelectDescriptor; + /** + * @docid + * @publicName select(expr) + * @param1 expr:any + * @public + */ + select(expr: SelectDescriptor): void; + /** + * @docid + * @publicName sort() + * @return any + * @public + */ + sort(): SortDescriptor | Array>; + /** + * @docid + * @publicName sort(sortExpr) + * @param1 sortExpr:any + * @public + */ + sort(sortExpr: SortDescriptor | Array>): void; + /** + * @docid + * @publicName store() + * @return object + * @public + */ + store(): Store; + /** + * @docid + * @publicName totalCount() + * @return numeric + * @public + */ + totalCount(): number; +} + +/** + * @docid + * @type Store|DataSource|DataSourceOptions|string|Array|null + */ +export type DataSourceLike = + string | + Array | + Store | + DataSourceOptionsStub | + DataSource; + +interface DataSourceOptionsStub< + TStoreItem = any, + TMappedItem = TStoreItem, + TItem = TMappedItem, +> { + customQueryParams?: any; + expand?: Array | string; + filter?: FilterDescriptor | Array; + group?: GroupDescriptor | Array>; + map?: ((dataItem: TStoreItem) => TMappedItem); + onChanged?: ((e: { readonly changes?: Array }) => void); + onLoadError?: ((error: { readonly message?: string }) => void); + onLoadingChanged?: ((isLoading: boolean) => void); + pageSize?: number; + paginate?: boolean; + postProcess?: ((data: Array) => Array); + pushAggregationTimeout?: number; + requireTotalCount?: boolean; + reshapeOnPush?: boolean; + searchExpr?: string | Function | Array; + searchOperation?: SearchOperation; + searchValue?: any; + select?: SelectDescriptor; + sort?: SortDescriptor | Array>; + store?: Array | Store | StoreOptions; +} + +/** + * @public + */ +export type SearchOperation = '=' | '<>' | '>' | '>=' | '<' | '<=' | 'startswith' | 'endswith' | 'contains' | 'notcontains'; + +/** + * @public + */ +export type GroupingInterval = 'year' | 'quarter' | 'month' | 'day' | 'dayOfWeek' | 'hour' | 'minute' | 'second'; + +type KeySelector = string | ((source: T) => string | number | Date | Object); + +type SelectionDescriptor = { + selector: KeySelector; +}; + +type OrderingDescriptor = SelectionDescriptor & { + desc?: boolean; +}; + +/** + * @docid + * @public + * @type object + * @skip + */ +export type SortDescriptor = KeySelector | OrderingDescriptor; + +/** + * @docid + * @public + * @type object + * @skip + */ +export type GroupDescriptor = KeySelector | (OrderingDescriptor & { + groupInterval?: number | GroupingInterval; + isExpanded?: boolean; +}); + +/** + * @docid + * @public + * @type object + * @skip + */ +export type SelectDescriptor = string | Array | ((source: T) => any); +/** + * @docid + * @public + */ +export type FilterDescriptor = any; +/** + * @docid + * @public + */ +export type LangParams = { + /** + * @docid + * @public + */ + locale: string; + /** + * @docid + * @public + * @type object + */ + collatorOptions?: Intl.CollatorOptions; +}; + + /** + * @docid + * @public + * @type object + */ + export type SummaryDescriptor = KeySelector | SelectionDescriptor & { + summaryType?: 'sum' | 'avg' | 'min' | 'max' | 'count'; +}; + +/** + * @public + * @docid + * @namespace DevExpress.data + * @type object + */ +export interface LoadOptions { + /** + * @docid + * @public + */ + customQueryParams?: any; + /** + * @docid + * @public + */ + startDate?: Date; + /** + * @docid + * @public + */ + endDate?: Date; + /** + * @docid + * @public + */ + expand?: Array; + /** + * @docid + * @public + * @type object + */ + filter?: FilterDescriptor | Array; + /** + * @docid + * @public + * @type object + */ + group?: GroupDescriptor | Array>; + /** + * @docid + * @public + * @type SummaryDescriptor | Array + */ + groupSummary?: SummaryDescriptor | Array>; + /** + * @docid + * @public + */ + parentIds?: Array; + /** + * @docid + * @public + */ + requireGroupCount?: boolean; + /** + * @docid + * @public + */ + requireTotalCount?: boolean; + /** + * @docid + * @type getter|Array + * @public + */ + searchExpr?: string | Function | Array; + /** + * @docid + * @public + */ + searchOperation?: SearchOperation; + /** + * @docid + * @public + */ + searchValue?: any; + /** + * @docid + * @public + * @type object + */ + select?: SelectDescriptor; + /** + * @docid + * @public + */ + skip?: number; + /** + * @docid + * @public + * @type object + */ + sort?: SortDescriptor | Array>; + /** + * @docid + * @public + */ + take?: number; + /** + * @docid + * @public + * @type SummaryDescriptor | Array + */ + totalSummary?: SummaryDescriptor | Array>; + /** + * @docid + * @public + */ + userData?: any; +} + +/** +* @public +* @namespace DevExpress.data.utils +*/ +export type Store = + CustomStore | + ArrayStore | + LocalStore | + ODataStore; + +/** +* @public +* @namespace DevExpress.data.utils +* @type object +*/ +export type StoreOptions = + CustomStoreOptions | + ArrayStoreOptions & { type: 'array' } | + LocalStoreOptions & { type: 'local' } | + ODataStoreOptions & { type: 'odata' }; + +/** + * @docid + * @namespace DevExpress + * @public + */ +export class EndpointSelector { + constructor(options: any); + /** + * @docid + * @publicName urlFor(key) + * @public + */ + urlFor(key: string): string; +} + +/** + * @docid Utils.errorHandler + * @type function(e) + * @namespace DevExpress.data + * @deprecated Utils.setErrorHandler + * @public + */ +export function errorHandler(e: Error): void; + +/** + * @docid Utils.setErrorHandler + * @type function(handler) + * @namespace DevExpress.data + * @public + */ +export function setErrorHandler(handler: (e: Error) => void): void; + +/** + * @docid + * @namespace DevExpress.data + */ +export interface LocalStoreOptions< + TItem = any, + TKey = any, +> extends ArrayStoreOptions { + /** + * @docid + * @default 10000 + * @public + */ + flushInterval?: number; + /** + * @docid + * @default false + * @public + */ + immediate?: boolean; + /** + * @docid + * @public + */ + name?: string; +} + +/** + * @docid + * @inherits ArrayStore + * @public + * @options LocalStoreOptions + */ +export class LocalStore< + TItem = any, + TKey = any, +> extends ArrayStore { + constructor(options?: LocalStoreOptions); + /** + * @docid + * @publicName clear() + * @public + */ + clear(): void; +} + +/** + * @docid + * @type object + * @public + */ +export interface Query { + /** + * @docid + * @publicName aggregate(seed, step, finalize) + * @param1 seed:object + * @return Promise + * @public + */ + aggregate(seed: any, step: Function, finalize: Function): DxPromise; + /** + * @docid + * @publicName aggregate(step) + * @return Promise + * @public + */ + aggregate(step: Function): DxPromise; + /** + * @docid + * @publicName avg() + * @return Promise + * @public + */ + avg(): DxPromise; + /** + * @docid + * @publicName avg(getter) + * @param1 getter:object + * @return Promise + * @public + */ + avg(getter: any): DxPromise; + /** + * @docid + * @publicName count() + * @return Promise + * @public + */ + count(): DxPromise; + /** + * @docid + * @publicName enumerate() + * @return Promise + * @public + */ + enumerate(): DxPromise; + /** + * @docid + * @publicName filter(criteria) + * @public + */ + filter(criteria: Array): Query; + /** + * @docid + * @publicName filter(predicate) + * @public + */ + filter(predicate: Function): Query; + /** + * @docid + * @publicName groupBy(getter) + * @param1 getter:object + * @public + */ + groupBy(getter: any): Query; + /** + * @docid + * @publicName max() + * @return Promise + * @public + */ + max(): DxPromise; + /** + * @docid + * @publicName max(getter) + * @param1 getter:object + * @return Promise + * @public + */ + max(getter: any): DxPromise; + /** + * @docid + * @publicName min() + * @return Promise + * @public + */ + min(): DxPromise; + /** + * @docid + * @publicName min(getter) + * @param1 getter:object + * @return Promise + * @public + */ + min(getter: any): DxPromise; + /** + * @docid + * @publicName select(getter) + * @param1 getter:object|Array + * @public + */ + select(...getters: any[]): Query; + /** + * @docid + * @publicName slice(skip, take) + * @param2 take:number|undefined + * @public + */ + slice(skip: number, take?: number): Query; + /** + * @docid + * @publicName sortBy(getter) + * @param1 getter:object + * @public + */ + sortBy(getter: any): Query; + /** + * @docid + * @publicName sortBy(getter, desc) + * @param1 getter:object + * @public + */ + sortBy(getter: any, desc: boolean): Query; + /** + * @docid + * @publicName sum() + * @return Promise + * @public + */ + sum(): DxPromise; + /** + * @docid + * @publicName sum(getter) + * @param1 getter:object + * @return Promise + * @public + */ + sum(getter: any): DxPromise; + /** + * @docid + * @publicName thenBy(getter) + * @param1 getter:object + * @public + */ + thenBy(getter: any): Query; + /** + * @docid + * @publicName thenBy(getter, desc) + * @param1 getter:object + * @public + */ + thenBy(getter: any, desc: boolean): Query; + /** + * @docid + * @publicName toArray() + * @public + */ + toArray(): Array; +} + +/** + * @docid Utils.query + * @publicName query(array, queryOptions) + * @param2 queryOptions:object + * @namespace DevExpress.data + * @public + */ +export function query(array: Array, queryOptions?: any): Query; + +/** + * @docid Utils.query + * @publicName query(url, queryOptions) + * @param2 queryOptions:object + * @namespace DevExpress.data + * @public + */ +export function query(url: string, queryOptions: any): Query; + +/** + * @docid Utils.base64_encode + * @publicName base64_encode(input) + * @namespace DevExpress.data + * @public + */ +export function base64_encode(input: string | Array): string; + +/** + * @docid Utils.compileGetter + * @publicName compileGetter(expr) + * @namespace DevExpress.data.utils + * @public + */ +export function compileGetter(expr: string | Array): Function; + +/** + * @docid Utils.compileSetter + * @publicName compileSetter(expr) + * @namespace DevExpress.data.utils + * @public + */ +export function compileSetter(expr: string | Array): Function; + +/** + * @docid + * @hidden + */ +export class DataHelperMixin { + /** + * @docid + * @publicName getDataSource() + * @public + */ + getDataSource(): DataSource; +} + +export interface ODataRequestOptions { + accepts: any; + async: boolean; + contentType: string | boolean; + data: any; + dataType: string; + headers: any; + jsonp?: boolean; + method: string; + timeout: number; + url: string; + xhrFields: any; +} + +export type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'MERGE'; + +/** + * @docid + * @namespace DevExpress.data + * @type object + */ +export interface ODataContextOptions { + /** + * @docid + * @type_function_param1_field params:object + * @type_function_param1_field payload:object + * @type_function_param1_field headers:object + * @public + */ + beforeSend?: ((options: { url: string; async: boolean; method: string; timeout: number; params: any; payload: any; headers: any }) => void); + /** + * @docid + * @public + */ + deserializeDates?: boolean; + /** + * @docid + * @public + */ + entities?: any; + /** + * @docid + * @type_function_param1 e:Error + * @type_function_param1_field errorDetails:object + * @type_function_param1_field requestOptions:object + * @public + */ + errorHandler?: ((e: { httpStatus: number; errorDetails: any; requestOptions: ODataRequestOptions }) => void); + /** + * @docid + * @public + */ + filterToLower?: boolean; + /** + * @docid + * @default false + * @public + */ + jsonp?: boolean; + /** + * @docid + * @public + */ + url?: string; + /** + * @docid + * @default 4 + * @acceptValues 2|3|4 + * @public + */ + version?: number; + /** + * @docid + * @default false + * @public + */ + withCredentials?: boolean; +} +/** + * @docid + * @public + * @options ODataContextOptions + */ +export class ODataContext { + constructor(options?: ODataContextOptions); + /** + * @docid + * @publicName get(operationName, params) + * @param2 params:object + * @return Promise + * @public + */ + get(operationName: string, params: any): DxPromise; + /** + * @docid + * @publicName invoke(operationName, params, httpMethod) + * @param2 params:object + * @param3 httpMethod:string + * @return Promise + * @public + */ + invoke(operationName: string, params: any, httpMethod: HttpMethod): DxPromise; + /** + * @docid + * @publicName objectLink(entityAlias, key) + * @param2 key:object|string|number + * @return object + * @public + */ + objectLink(entityAlias: string, key: any | string | number): any; +} + +/** + * @docid + * @namespace DevExpress.data + */ +export interface ODataStoreOptions< + TItem = any, + TKey = any, +> extends StoreOptionsBase { + /** + * @docid + * @type_function_param1_field params:object + * @type_function_param1_field payload:object + * @type_function_param1_field headers:object + * @public + */ + beforeSend?: ((options: { url: string; async: boolean; method: string; timeout: number; params: any; payload: any; headers: any }) => void); + /** + * @docid + * @public + */ + deserializeDates?: boolean; + /** + * @docid + * @type_function_param1 e:Error + * @type_function_param1_field errorDetails:object + * @type_function_param1_field requestOptions:object + * @public + */ + errorHandler?: ((e: { httpStatus: number; errorDetails: any; requestOptions: ODataRequestOptions }) => void); + /** + * @docid + * @default {} + * @public + */ + fieldTypes?: any; + /** + * @docid + * @public + */ + filterToLower?: boolean; + /** + * @docid + * @default false + * @public + */ + jsonp?: boolean; + /** + * @docid + * @type string|object + * @acceptValues "String"|"Int32"|"Int64"|"Guid"|"Boolean"|"Single"|"Decimal" + * @public + */ + keyType?: 'String' | 'Int32' | 'Int64' | 'Guid' | 'Boolean' | 'Single' | 'Decimal' | any; + /** + * @docid + * @public + */ + url?: string; + /** + * @docid + * @default 4 + * @acceptValues 2|3|4 + * @public + */ + version?: number; + /** + * @docid + * @default false + * @public + */ + withCredentials?: boolean; +} + +/** + * @docid + * @inherits Store + * @public + * @options ODataStoreOptions + */ +export class ODataStore< + TItem = any, + TKey = any, +> extends StoreBase { + constructor(options?: ODataStoreOptions); + /** + * @docid + * @publicName byKey(key, extraOptions) + * @param1 key:object|string|number + * @return Promise + * @public + */ + byKey(key: TKey, extraOptions?: { expand?: string | Array; select?: string | Array }): DxPromise; + /** + * @docid + * @publicName createQuery(loadOptions) + * @return object + * @public + */ + createQuery(loadOptions?: { expand?: string | Array; requireTotalCount?: boolean; customQueryParams?: any }): Query; +} + +/** + * @docid + * @namespace DevExpress.data + * @public + */ +export class EdmLiteral { + constructor(value: string); + /** + * @docid + * @publicName valueOf() + * @public + */ + valueOf(): string; +} + +/** + * @const Utils.keyConverters + * @publicName odata.keyConverters + * @namespace DevExpress.data.utils.odata + * @public + */ +// eslint-disable-next-line vars-on-top, import/no-mutable-exports, no-var, @typescript-eslint/init-declarations, @typescript-eslint/no-explicit-any +export var keyConverters: any; diff --git a/packages/devextreme/js/common/data.js b/packages/devextreme/js/common/data.js new file mode 100644 index 000000000000..82f267f97a39 --- /dev/null +++ b/packages/devextreme/js/common/data.js @@ -0,0 +1,13 @@ +export { default as applyChanges } from './data/apply_changes'; +export { default as ArrayStore } from './data/array_store'; +export { default as CustomStore } from './data/custom_store'; +export { default as DataSource } from './data/data_source'; +export { default as EndpointSelector } from './data/endpoint_selector'; +export { errorHandler, setErrorHandler } from './data/errors'; +export { default as LocalStore } from './data/local_store'; +export { default as query } from './data/query'; +export { base64_encode, compileGetter, compileSetter } from './data/utils'; +export { default as DataHelperMixin } from './data/data_helper'; +export { default as ODataContext } from './data/odata/context'; +export { default as ODataStore } from './data/odata/store'; +export { EdmLiteral, keyConverters } from './data/odata/utils'; diff --git a/packages/devextreme/js/common/data/abstract_store.d.ts b/packages/devextreme/js/common/data/abstract_store.d.ts index 98fe86b7122e..f9cd0a1e2126 100644 --- a/packages/devextreme/js/common/data/abstract_store.d.ts +++ b/packages/devextreme/js/common/data/abstract_store.d.ts @@ -1,13 +1,11 @@ import { DxExtendedPromise, -} from '../core/utils/deferred'; -import { - Store as BaseStore, - Options as BaseStoreOptions, -} from './store'; +} from '../../core/utils/deferred'; import { + StoreBase, + StoreOptionsBase, LoadOptions, -} from './index'; +} from '../data'; export type Options< TItem = any, @@ -20,7 +18,7 @@ export type Options< interface AbstractStoreOptions< TItem = any, TKey = any, - > extends BaseStoreOptions { + > extends StoreOptionsBase { /** * @docid StoreOptions.onLoaded * @type_function_param2 loadOptions:LoadOptions @@ -36,7 +34,7 @@ interface AbstractStoreOptions< export default class AbstractStore< TItem = any, TKey = any, - > extends BaseStore { + > extends StoreBase { constructor(options?: Options); /** * @docid Store.load() @@ -59,10 +57,10 @@ export default class AbstractStore< * @namespace DevExpress.data * @deprecated Use Options from data/store instead */ -export type StoreOptions = BaseStoreOptions; +export type StoreOptions = StoreOptionsBase; /** * @namespace DevExpress.data * @deprecated Use Store from data/store instead */ -export type Store = BaseStore; +export type Store = StoreBase; diff --git a/packages/devextreme/js/common/data/abstract_store.js b/packages/devextreme/js/common/data/abstract_store.js index 28ec4a10a01a..a5d02c408838 100644 --- a/packages/devextreme/js/common/data/abstract_store.js +++ b/packages/devextreme/js/common/data/abstract_store.js @@ -1 +1 @@ -export { default } from '../__internal/data/m_abstract_store'; +export { default } from '../../__internal/data/m_abstract_store'; diff --git a/packages/devextreme/js/common/data/array_query.js b/packages/devextreme/js/common/data/array_query.js index eb370819807a..a3877e9bbd98 100644 --- a/packages/devextreme/js/common/data/array_query.js +++ b/packages/devextreme/js/common/data/array_query.js @@ -1 +1 @@ -export { default } from '../__internal/data/m_array_query'; +export { default } from '../../__internal/data/m_array_query'; diff --git a/packages/devextreme/js/common/data/array_store.js b/packages/devextreme/js/common/data/array_store.js index a6a9ab189189..0715f4b3927f 100644 --- a/packages/devextreme/js/common/data/array_store.js +++ b/packages/devextreme/js/common/data/array_store.js @@ -1 +1 @@ -export { default } from '../__internal/data/m_array_store'; +export { default } from '../../__internal/data/m_array_store'; diff --git a/packages/devextreme/js/common/data/array_utils.js b/packages/devextreme/js/common/data/array_utils.js index 7d6bc9402225..74993adf03d4 100644 --- a/packages/devextreme/js/common/data/array_utils.js +++ b/packages/devextreme/js/common/data/array_utils.js @@ -1 +1 @@ -export * from '../__internal/data/m_array_utils'; +export * from '../../__internal/data/m_array_utils'; diff --git a/packages/devextreme/js/common/data/custom-store.d.ts b/packages/devextreme/js/common/data/custom-store.d.ts deleted file mode 100644 index a10801a29fc5..000000000000 --- a/packages/devextreme/js/common/data/custom-store.d.ts +++ /dev/null @@ -1,69 +0,0 @@ -/** - * @docid - * @public - */ -export type GroupItem< - TItem = any, -> = { - /** @docid */ - key: any | string | number; - /** - * @docid - * @type Array|Array|null - */ - items: Array | Array> | null; - /** @docid */ - count?: number; - /** @docid */ - summary?: Array; -}; - -type LoadResultArray = Array | Array>; - -/** - * @docid - * @public - */ -export type LoadResultObject = { - /** - * @docid - * @type Array|Array - */ - data: Array | Array>; - /** @docid */ - totalCount?: number; - /** @docid */ - summary?: Array; - /** @docid */ - groupCount?: number; - }; - -/** - * @docid - * @public - * @type object - */ -export type LoadResult< - TItem = any, -> = - | Object - | LoadResultArray - | LoadResultObject; - -/** - * @docid - * @public - */ -export function isLoadResultObject(res: LoadResult): res is LoadResultObject; - -/** - * @docid - * @public - */ -export function isGroupItemsArray(res: LoadResult): res is Array>; - -/** - * @docid - * @public - */ -export function isItemsArray(res: LoadResult): res is Array; diff --git a/packages/devextreme/js/common/data/custom-store.js b/packages/devextreme/js/common/data/custom-store.js deleted file mode 100644 index 095a86a5b60b..000000000000 --- a/packages/devextreme/js/common/data/custom-store.js +++ /dev/null @@ -1,18 +0,0 @@ -function isGroupItem(item) { - if(item === undefined || item === null || typeof item !== 'object') { - return false; - } - return 'key' in item && 'items' in item; -} - -export function isLoadResultObject(res) { - return !Array.isArray(res) && 'data' in res; -} - -export function isGroupItemsArray(res) { - return Array.isArray(res) && !!res.length && isGroupItem(res[0]); -} - -export function isItemsArray(res) { - return Array.isArray(res) && !isGroupItem(res[0]); -} diff --git a/packages/devextreme/js/common/data/custom_store.js b/packages/devextreme/js/common/data/custom_store.js index ce6176339591..d819e26f5476 100644 --- a/packages/devextreme/js/common/data/custom_store.js +++ b/packages/devextreme/js/common/data/custom_store.js @@ -1 +1,20 @@ -export { default } from '../__internal/data/m_custom_store'; +export { default } from '../../__internal/data/m_custom_store'; + +function isGroupItem(item) { + if(item === undefined || item === null || typeof item !== 'object') { + return false; + } + return 'key' in item && 'items' in item; +} + +export function isLoadResultObject(res) { + return !Array.isArray(res) && 'data' in res; +} + +export function isGroupItemsArray(res) { + return Array.isArray(res) && !!res.length && isGroupItem(res[0]); +} + +export function isItemsArray(res) { + return Array.isArray(res) && !isGroupItem(res[0]); +} diff --git a/packages/devextreme/js/common/data/data_helper.js b/packages/devextreme/js/common/data/data_helper.js new file mode 100644 index 000000000000..998956583371 --- /dev/null +++ b/packages/devextreme/js/common/data/data_helper.js @@ -0,0 +1,166 @@ + +import { DataSource } from './data_source/data_source'; +import { extend } from '../../core/utils/extend'; +import { normalizeDataSourceOptions } from './data_source/utils'; +import DataController from '../../__internal/ui/collection/m_data_controller'; + +const DATA_SOURCE_OPTIONS_METHOD = '_dataSourceOptions'; +const DATA_SOURCE_CHANGED_METHOD = '_dataSourceChangedHandler'; +const DATA_SOURCE_LOAD_ERROR_METHOD = '_dataSourceLoadErrorHandler'; +const DATA_SOURCE_LOADING_CHANGED_METHOD = '_dataSourceLoadingChangedHandler'; +const DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD = '_dataSourceFromUrlLoadMode'; +const SPECIFIC_DATA_SOURCE_OPTION = '_getSpecificDataSourceOption'; +const NORMALIZE_DATA_SOURCE = '_normalizeDataSource'; + + +const DataHelperMixin = { + + postCtor: function() { + this.on('disposing', function() { + this._disposeDataSource(); + }.bind(this)); + }, + + _refreshDataSource: function() { + this._initDataSource(); + this._loadDataSource(); + }, + + _initDataSource: function() { + let dataSourceOptions = (SPECIFIC_DATA_SOURCE_OPTION in this) ? this[SPECIFIC_DATA_SOURCE_OPTION]() : this.option('dataSource'); + let widgetDataSourceOptions; + let dataSourceType; + + this._disposeDataSource(); + + if(dataSourceOptions) { + if(dataSourceOptions instanceof DataSource) { + this._isSharedDataSource = true; + this._dataSource = dataSourceOptions; + } else { + widgetDataSourceOptions = (DATA_SOURCE_OPTIONS_METHOD in this) ? this[DATA_SOURCE_OPTIONS_METHOD]() : {}; + dataSourceType = this._dataSourceType ? this._dataSourceType() : DataSource; + + dataSourceOptions = normalizeDataSourceOptions(dataSourceOptions, { + fromUrlLoadMode: (DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD in this) && this[DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD]() + }); + + this._dataSource = new dataSourceType(extend(true, {}, widgetDataSourceOptions, dataSourceOptions)); + } + + if(NORMALIZE_DATA_SOURCE in this) { + this._dataSource = this[NORMALIZE_DATA_SOURCE](this._dataSource); + } + + this._addDataSourceHandlers(); + this._initDataController(); + } + }, + + _initDataController: function() { + const dataController = this.option?.('_dataController'); + const dataSource = this._dataSource; + + if(dataController) { + this._dataController = dataController; + } else { + this._dataController = new DataController(dataSource); + } + }, + + _addDataSourceHandlers: function() { + if(DATA_SOURCE_CHANGED_METHOD in this) { + this._addDataSourceChangeHandler(); + } + + if(DATA_SOURCE_LOAD_ERROR_METHOD in this) { + this._addDataSourceLoadErrorHandler(); + } + + if(DATA_SOURCE_LOADING_CHANGED_METHOD in this) { + this._addDataSourceLoadingChangedHandler(); + } + + this._addReadyWatcher(); + }, + + _addReadyWatcher: function() { + this.readyWatcher = (function(isLoading) { + this._ready && this._ready(!isLoading); + }).bind(this); + this._dataSource.on('loadingChanged', this.readyWatcher); + }, + + _addDataSourceChangeHandler: function() { + const dataSource = this._dataSource; + this._proxiedDataSourceChangedHandler = (function(e) { + this[DATA_SOURCE_CHANGED_METHOD](dataSource.items(), e); + }).bind(this); + dataSource.on('changed', this._proxiedDataSourceChangedHandler); + }, + + _addDataSourceLoadErrorHandler: function() { + this._proxiedDataSourceLoadErrorHandler = this[DATA_SOURCE_LOAD_ERROR_METHOD].bind(this); + this._dataSource.on('loadError', this._proxiedDataSourceLoadErrorHandler); + }, + + _addDataSourceLoadingChangedHandler: function() { + this._proxiedDataSourceLoadingChangedHandler = this[DATA_SOURCE_LOADING_CHANGED_METHOD].bind(this); + this._dataSource.on('loadingChanged', this._proxiedDataSourceLoadingChangedHandler); + }, + + _loadDataSource: function() { + const dataSource = this._dataSource; + if(dataSource) { + if(dataSource.isLoaded()) { + this._proxiedDataSourceChangedHandler && this._proxiedDataSourceChangedHandler(); + } else { + dataSource.load(); + } + } + }, + + _loadSingle: function(key, value) { + key = key === 'this' ? this._dataSource.key() || 'this' : key; + return this._dataSource.loadSingle(key, value); + }, + + _isLastPage: function() { + return !this._dataSource || this._dataSource.isLastPage() || !this._dataSource._pageSize; + }, + + _isDataSourceLoading: function() { + return this._dataSource && this._dataSource.isLoading(); + }, + + _disposeDataSource: function() { + if(this._dataSource) { + if(this._isSharedDataSource) { + delete this._isSharedDataSource; + + this._proxiedDataSourceChangedHandler && this._dataSource.off('changed', this._proxiedDataSourceChangedHandler); + this._proxiedDataSourceLoadErrorHandler && this._dataSource.off('loadError', this._proxiedDataSourceLoadErrorHandler); + this._proxiedDataSourceLoadingChangedHandler && this._dataSource.off('loadingChanged', this._proxiedDataSourceLoadingChangedHandler); + + if(this._dataSource._eventsStrategy) { + this._dataSource._eventsStrategy.off('loadingChanged', this.readyWatcher); + } + } else { + this._dataSource.dispose(); + } + + delete this._dataSource; + + delete this._proxiedDataSourceChangedHandler; + delete this._proxiedDataSourceLoadErrorHandler; + delete this._proxiedDataSourceLoadingChangedHandler; + } + }, + + getDataSource: function() { + return this._dataSource || null; + } + +}; + +export default DataHelperMixin; diff --git a/packages/devextreme/js/common/data/data_source.js b/packages/devextreme/js/common/data/data_source.js index fcf080056c7a..56ca945f1932 100644 --- a/packages/devextreme/js/common/data/data_source.js +++ b/packages/devextreme/js/common/data/data_source.js @@ -1,3 +1,2 @@ - import { DataSource } from './data_source/data_source'; export default DataSource; diff --git a/packages/devextreme/js/common/data/data_source/data_source.js b/packages/devextreme/js/common/data/data_source/data_source.js index f8d6c50bce74..806ca4198f06 100644 --- a/packages/devextreme/js/common/data/data_source/data_source.js +++ b/packages/devextreme/js/common/data/data_source/data_source.js @@ -26,4 +26,4 @@ * @name DataSourceOptions.store.type * @type Enums.StoreType */ -export * from '../../__internal/data/data_source/m_data_source'; +export * from '../../../__internal/data/data_source/m_data_source'; diff --git a/packages/devextreme/js/common/data/data_source/operation_manager.js b/packages/devextreme/js/common/data/data_source/operation_manager.js index 42f6097f70a8..059f55b8e65f 100644 --- a/packages/devextreme/js/common/data/data_source/operation_manager.js +++ b/packages/devextreme/js/common/data/data_source/operation_manager.js @@ -1 +1 @@ -export { default } from '../../__internal/data/data_source/m_operation_manager'; +export { default } from '../../../__internal/data/data_source/m_operation_manager'; diff --git a/packages/devextreme/js/common/data/data_source/utils.js b/packages/devextreme/js/common/data/data_source/utils.js index 030e499772d0..8b2686832ca6 100644 --- a/packages/devextreme/js/common/data/data_source/utils.js +++ b/packages/devextreme/js/common/data/data_source/utils.js @@ -1 +1 @@ -export * from '../../__internal/data/data_source/m_utils'; +export * from '../../../__internal/data/data_source/m_utils'; diff --git a/packages/devextreme/js/common/data/endpoint_selector.js b/packages/devextreme/js/common/data/endpoint_selector.js index 278737be119a..e613c011c0ce 100644 --- a/packages/devextreme/js/common/data/endpoint_selector.js +++ b/packages/devextreme/js/common/data/endpoint_selector.js @@ -4,4 +4,4 @@ * @param1 options:Object * @hidden */ -export { default } from '../__internal/data/m_endpoint_selector'; +export { default } from '../../__internal/data/m_endpoint_selector'; diff --git a/packages/devextreme/js/common/data/errors.js b/packages/devextreme/js/common/data/errors.js index 73263e080700..f2ad9f675151 100644 --- a/packages/devextreme/js/common/data/errors.js +++ b/packages/devextreme/js/common/data/errors.js @@ -88,4 +88,4 @@ * @name ErrorsData.W4002 */ -export * from '../__internal/data/m_errors'; +export * from '../../__internal/data/m_errors'; diff --git a/packages/devextreme/js/common/data/local_store.js b/packages/devextreme/js/common/data/local_store.js index 4788d4b71d29..2b903d32d98b 100644 --- a/packages/devextreme/js/common/data/local_store.js +++ b/packages/devextreme/js/common/data/local_store.js @@ -1 +1 @@ -export { default } from '../__internal/data/m_local_store'; +export { default } from '../../__internal/data/m_local_store'; diff --git a/packages/devextreme/js/common/data/odata/context.js b/packages/devextreme/js/common/data/odata/context.js index e3621d0b626c..e6d45490192c 100644 --- a/packages/devextreme/js/common/data/odata/context.js +++ b/packages/devextreme/js/common/data/odata/context.js @@ -1 +1 @@ -export { default } from '../../__internal/data/odata/m_context'; +export { default } from '../../../__internal/data/odata/m_context'; diff --git a/packages/devextreme/js/common/data/odata/query_adapter.js b/packages/devextreme/js/common/data/odata/query_adapter.js index 4b6486934b8c..a56104665e6c 100644 --- a/packages/devextreme/js/common/data/odata/query_adapter.js +++ b/packages/devextreme/js/common/data/odata/query_adapter.js @@ -1 +1 @@ -export * from '../../__internal/data/odata/m_query_adapter'; +export * from '../../../__internal/data/odata/m_query_adapter'; diff --git a/packages/devextreme/js/common/data/odata/request_dispatcher.js b/packages/devextreme/js/common/data/odata/request_dispatcher.js index 0aba5a72cb0f..13fc3dc1b4c6 100644 --- a/packages/devextreme/js/common/data/odata/request_dispatcher.js +++ b/packages/devextreme/js/common/data/odata/request_dispatcher.js @@ -1 +1 @@ -export { default } from '../../__internal/data/odata/m_request_dispatcher'; +export { default } from '../../../__internal/data/odata/m_request_dispatcher'; diff --git a/packages/devextreme/js/common/data/odata/store.js b/packages/devextreme/js/common/data/odata/store.js index 8168fdb0262c..75362c160631 100644 --- a/packages/devextreme/js/common/data/odata/store.js +++ b/packages/devextreme/js/common/data/odata/store.js @@ -1 +1 @@ -export { default } from '../../__internal/data/odata/m_store'; +export { default } from '../../../__internal/data/odata/m_store'; diff --git a/packages/devextreme/js/common/data/odata/utils.js b/packages/devextreme/js/common/data/odata/utils.js index c1c0081a98d0..dd6b652bf0b2 100644 --- a/packages/devextreme/js/common/data/odata/utils.js +++ b/packages/devextreme/js/common/data/odata/utils.js @@ -3,4 +3,4 @@ * @publicName ctor(value) * @param1 value:string */ -export * from '../../__internal/data/odata/m_utils'; +export * from '../../../__internal/data/odata/m_utils'; diff --git a/packages/devextreme/js/common/data/query.js b/packages/devextreme/js/common/data/query.js index 9daad5afb660..b1e2c444e038 100644 --- a/packages/devextreme/js/common/data/query.js +++ b/packages/devextreme/js/common/data/query.js @@ -1 +1 @@ -export { default } from '../__internal/data/m_query'; +export { default } from '../../__internal/data/m_query'; diff --git a/packages/devextreme/js/common/data/remote_query.js b/packages/devextreme/js/common/data/remote_query.js index b147929d99c5..592ebfe65d2c 100644 --- a/packages/devextreme/js/common/data/remote_query.js +++ b/packages/devextreme/js/common/data/remote_query.js @@ -1 +1 @@ -export { default } from '../__internal/data/m_remote_query'; +export { default } from '../../__internal/data/m_remote_query'; diff --git a/packages/devextreme/js/common/data/store_helper.js b/packages/devextreme/js/common/data/store_helper.js index b52b1c493c83..bb0fca23c7d1 100644 --- a/packages/devextreme/js/common/data/store_helper.js +++ b/packages/devextreme/js/common/data/store_helper.js @@ -1 +1 @@ -export { default } from '../__internal/data/m_store_helper'; +export { default } from '../../__internal/data/m_store_helper'; diff --git a/packages/devextreme/js/common/data/utils.js b/packages/devextreme/js/common/data/utils.js index f056b6c0caa8..a59212919375 100644 --- a/packages/devextreme/js/common/data/utils.js +++ b/packages/devextreme/js/common/data/utils.js @@ -1,4 +1,11 @@ +import { compileGetter, compileSetter } from '../../core/utils/data'; + /** * @name Utils */ -export * from '../__internal/data/m_utils'; +export * from '../../__internal/data/m_utils'; + +export { + compileGetter, + compileSetter +}; diff --git a/packages/devextreme/js/common/export.d.ts b/packages/devextreme/js/common/export.d.ts index fbe88f9161db..d6ef042f215a 100644 --- a/packages/devextreme/js/common/export.d.ts +++ b/packages/devextreme/js/common/export.d.ts @@ -4,49 +4,49 @@ * @namespace DevExpress */ export interface ExportLoadPanel { - /** - * @docid - * @default true - */ - enabled?: boolean; - /** - * @docid - * @default "Exporting..." - */ - text?: string; - /** - * @docid - * @default 200 - */ - width?: number; - /** - * @docid - * @default 90 - */ - height?: number; - /** - * @docid - * @default true - */ - showIndicator?: boolean; - /** - * @docid - * @default "" - */ - indicatorSrc?: string; - /** - * @docid - * @default true - */ - showPane?: boolean; - /** - * @docid - * @default false - */ - shading?: boolean; - /** - * @docid - * @default '' - */ - shadingColor?: string; + /** + * @docid + * @default true + */ + enabled?: boolean; + /** + * @docid + * @default "Exporting..." + */ + text?: string; + /** + * @docid + * @default 200 + */ + width?: number; + /** + * @docid + * @default 90 + */ + height?: number; + /** + * @docid + * @default true + */ + showIndicator?: boolean; + /** + * @docid + * @default "" + */ + indicatorSrc?: string; + /** + * @docid + * @default true + */ + showPane?: boolean; + /** + * @docid + * @default false + */ + shading?: boolean; + /** + * @docid + * @default '' + */ + shadingColor?: string; } diff --git a/packages/devextreme/js/common/export/excel.d.ts b/packages/devextreme/js/common/export/excel.d.ts index c4cddd182240..1ad66d1ce40e 100644 --- a/packages/devextreme/js/common/export/excel.d.ts +++ b/packages/devextreme/js/common/export/excel.d.ts @@ -1,7 +1,7 @@ -import { DxPromise } from './core/utils/deferred'; -import dxDataGrid, { Column } from './ui/data_grid'; -import dxPivotGrid, { Cell } from './ui/pivot_grid'; -import { ExportLoadPanel } from './exporter/export_load_panel'; +import { DxPromise } from '../../common'; +import dxDataGrid, { Column } from '../../ui/data_grid'; +import dxPivotGrid, { Cell } from '../../ui/pivot_grid'; +import { ExportLoadPanel } from '../export'; /** * @public diff --git a/packages/devextreme/js/common/export/excel.js b/packages/devextreme/js/common/export/excel.js index 811a52494b39..c4ebeb180080 100644 --- a/packages/devextreme/js/common/export/excel.js +++ b/packages/devextreme/js/common/export/excel.js @@ -1,5 +1,5 @@ -import { exportDataGrid } from './exporter/exceljs/export_data_grid'; -import { exportPivotGrid } from './exporter/exceljs/export_pivot_grid'; +import { exportDataGrid } from '../../exporter/exceljs/export_data_grid'; +import { exportPivotGrid } from '../../exporter/exceljs/export_pivot_grid'; /** * @name excelExporter diff --git a/packages/devextreme/js/common/export/pdf.d.ts b/packages/devextreme/js/common/export/pdf.d.ts index c84402838790..737a4d969666 100644 --- a/packages/devextreme/js/common/export/pdf.d.ts +++ b/packages/devextreme/js/common/export/pdf.d.ts @@ -1,13 +1,13 @@ -import { DxPromise } from './core/utils/deferred'; -import dxDataGrid from './ui/data_grid'; -import { ExportLoadPanel } from './exporter/export_load_panel'; +import { DxPromise } from '../../common'; +import dxDataGrid from '../../ui/data_grid'; +import { ExportLoadPanel } from '../export'; import dxGantt, { GanttPdfExportMode, GanttPdfExportDateRange, -} from './ui/gantt'; +} from '../../ui/gantt'; import { DataGridCell as ExcelCell, -} from './excel_exporter'; +} from './excel'; /** * @public diff --git a/packages/devextreme/js/common/export/pdf.js b/packages/devextreme/js/common/export/pdf.js index 47aeeefad84c..efb7c84c2bcd 100644 --- a/packages/devextreme/js/common/export/pdf.js +++ b/packages/devextreme/js/common/export/pdf.js @@ -1,6 +1,6 @@ -import { exportDataGrid } from './exporter/jspdf/export_data_grid'; -import { exportDataGrid as exportDataGridWithAutoTable } from './exporter/jspdf/autotable/export_data_grid'; -import { exportGantt } from './exporter/jspdf/export_gantt'; +import { exportDataGrid } from '../../exporter/jspdf/export_data_grid'; +import { exportDataGrid as exportDataGridWithAutoTable } from '../../exporter/jspdf/autotable/export_data_grid'; +import { exportGantt } from '../../exporter/jspdf/export_gantt'; /** * @name PdfDataGridCell diff --git a/packages/devextreme/js/common/file_management.d.ts b/packages/devextreme/js/common/file_management.d.ts new file mode 100644 index 000000000000..1bf8dca9975e --- /dev/null +++ b/packages/devextreme/js/common/file_management.d.ts @@ -0,0 +1,442 @@ +/* eslint-disable max-classes-per-file */ +import { + DxPromise, +} from '../common'; + +/** + * @docid + * @namespace DevExpress.fileManagement + * @public + */ +export interface UploadInfo { + /** + * @docid + * @public + */ + bytesUploaded: number; + + /** + * @docid + * @public + */ + chunkCount: number; + + /** + * @docid + * @public + */ + customData: any; + + /** + * @docid + * @public + */ + chunkBlob: Blob; + + /** + * @docid + * @public + */ + chunkIndex: number; +} + +/** + * @namespace DevExpress.fileManagement + * @docid + * @type object + */ +// eslint-disable-next-line @typescript-eslint/no-unused-vars +export interface FileSystemProviderBaseOptions { + /** + * @docid + * @public + */ + dateModifiedExpr?: string | Function; + /** + * @docid + * @public + */ + isDirectoryExpr?: string | Function; + /** + * @docid + * @public + */ + keyExpr?: string | Function; + /** + * @docid + * @public + */ + nameExpr?: string | Function; + /** + * @docid + * @public + */ + sizeExpr?: string | Function; + /** + * @docid + * @public + */ + thumbnailExpr?: string | Function; +} + +/** +* @docid +* @namespace DevExpress.fileManagement +* @hidden +* @options FileSystemProviderBaseOptions +*/ +export class FileSystemProviderBase { + constructor(options?: FileSystemProviderBaseOptions); + /** + * @docid + * @publicName getItems() + * @return Promise> + * @public + */ + getItems(parentDirectory: FileSystemItem): DxPromise>; + + /** + * @docid + * @publicName renameItem() + * @return Promise + * @public + */ + renameItem(item: FileSystemItem, newName: string): DxPromise; + + /** + * @docid + * @publicName createDirectory() + * @return Promise + * @public + */ + createDirectory(parentDirectory: FileSystemItem, name: string): DxPromise; + + /** + * @docid + * @publicName deleteItems() + * @return Array> + * @public + */ + deleteItems(items: Array): Array>; + + /** + * @docid + * @publicName moveItems() + * @return Array> + * @public + */ + moveItems(items: Array, destinationDirectory: FileSystemItem): Array>; + + /** + * @docid + * @publicName copyItems() + * @return Array> + * @public + */ + copyItems(items: Array, destinationDirectory: FileSystemItem): Array>; + + /** + * @docid + * @publicName uploadFileChunk() + * @return Promise + * @public + */ + uploadFileChunk(fileData: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem): DxPromise; + + /** + * @docid + * @publicName abortFileUpload() + * @return Promise + * @public + */ + abortFileUpload(fileData: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem): DxPromise; + + /** + * @docid + * @publicName downloadItems() + * @public + */ + downloadItems(items: Array): void; + + /** + * @docid + * @publicName getItemsContent() + * @return Promise + * @public + */ + getItemsContent(items: Array): DxPromise; +} + +/** + * @docid FileSystemItem + * @namespace DevExpress.fileManagement + * @public + */ +export class FileSystemItem { + constructor(path: string, isDirectory: boolean, pathKeys?: Array); + + /** + * @docid FileSystemItem.path + * @public + */ + path: string; + + /** + * @docid FileSystemItem.pathKeys + * @public + */ + pathKeys: Array; + + /** + * @docid FileSystemItem.key + * @public + */ + key: string; + + /** + * @docid FileSystemItem.name + * @public + */ + name: string; + + /** + * @docid FileSystemItem.dateModified + * @public + */ + dateModified: Date; + + /** + * @docid FileSystemItem.size + * @public + */ + size: number; + + /** + * @docid FileSystemItem.isDirectory + * @public + */ + isDirectory: boolean; + + /** + * @docid FileSystemItem.hasSubDirectories + * @public + */ + hasSubDirectories: boolean; + + /** + * @docid FileSystemItem.thumbnail + * @public + */ + thumbnail: string; + + /** + * @docid FileSystemItem.dataItem + * @public + */ + dataItem: any; + + /** + * @docid FileSystemItem.getFileExtension + * @publicName getFileExtension() + * @public + */ + getFileExtension(): string; +} + +/** + * @namespace DevExpress.fileManagement + * @docid + */ +export interface CustomFileSystemProviderOptions extends FileSystemProviderBaseOptions { + /** + * @docid + * @type_function_return Promise|any + * @public + */ + abortFileUpload?: ((file: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem) => PromiseLike | any); + + /** + * @docid + * @type_function_return Promise|any + * @public + */ + copyItem?: ((item: FileSystemItem, destinationDirectory: FileSystemItem) => PromiseLike | any); + + /** + * @docid + * @type_function_return Promise|any + * @public + */ + createDirectory?: ((parentDirectory: FileSystemItem, name: string) => PromiseLike | any); + + /** + * @docid + * @type_function_return Promise|any + * @public + */ + deleteItem?: ((item: FileSystemItem) => PromiseLike | any); + + /** + * @docid + * @public + */ + downloadItems?: ((items: Array) => void); + + /** + * @docid + * @type_function_return Promise>|Array + * @public + */ + getItems?: ((parentDirectory: FileSystemItem) => PromiseLike> | Array); + + /** + * @docid + * @type_function_return Promise|object + * @public + */ + getItemsContent?: ((items: Array) => PromiseLike | any); + + /** + * @docid + * @public + */ + hasSubDirectoriesExpr?: string | Function; + + /** + * @docid + * @type_function_return Promise|any + * @public + */ + moveItem?: ((item: FileSystemItem, destinationDirectory: FileSystemItem) => PromiseLike | any); + + /** + * @docid + * @type_function_return Promise|any + * @public + */ + renameItem?: ((item: FileSystemItem, newName: string) => PromiseLike | any); + + /** + * @docid + * @type_function_return Promise|any + * @public + */ + uploadFileChunk?: ((file: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem) => PromiseLike | any); +} + +/** +* @docid +* @inherits FileSystemProviderBase +* @namespace DevExpress.fileManagement +* @public +* @options CustomFileSystemProviderOptions +*/ +export class CustomFileSystemProvider extends FileSystemProviderBase { + constructor(options?: CustomFileSystemProviderOptions); +} + +/** + * @docid FileSystemError + * @namespace DevExpress.fileManagement + * @public + */ +export class FileSystemError { + constructor(errorCode?: number, fileSystemItem?: FileSystemItem, errorText?: string); + /** + * @docid FileSystemError.fileSystemItem + * @public + */ + fileSystemItem?: FileSystemItem; + + /** + * @docid FileSystemError.errorCode + * @public + */ + errorCode?: number; + + /** + * @docid FileSystemError.errorText + * @public + */ + errorText?: string; +} + +/** + * @namespace DevExpress.fileManagement + * @docid + */ +export interface ObjectFileSystemProviderOptions extends FileSystemProviderBaseOptions { + /** + * @docid + * @public + */ + contentExpr?: string | Function; + /** + * @docid + * @public + */ + data?: Array; + /** + * @docid + * @public + */ + itemsExpr?: string | Function; +} + +/** +* @docid +* @inherits FileSystemProviderBase +* @namespace DevExpress.fileManagement +* @public +* @options ObjectFileSystemProviderOptions +*/ +export class ObjectFileSystemProvider extends FileSystemProviderBase { + constructor(options?: ObjectFileSystemProviderOptions); +} + +/** + * @namespace DevExpress.fileManagement + * @docid + */ +export interface RemoteFileSystemProviderOptions extends FileSystemProviderBaseOptions { + /** + * @docid + * @type_function_param1_field headers:object + * @type_function_param1_field xhrFields:object + * @type_function_param1_field formData:object + * @public + */ + beforeAjaxSend?: ((options: { headers?: any; xhrFields?: any; formData?: any }) => void); + /** + * @docid + * @type_function_param1_field formData:object + * @public + */ + beforeSubmit?: ((options: { formData?: any }) => void); + /** + * @docid + * @public + */ + endpointUrl?: string; + /** + * @docid + * @public + */ + hasSubDirectoriesExpr?: string | Function; + /** + * @docid + * @default {} + * @public + */ + requestHeaders?: any; +} +/** +* @docid +* @inherits FileSystemProviderBase +* @namespace DevExpress.fileManagement +* @public +* @options RemoteFileSystemProviderOptions +*/ +export class RemoteFileSystemProvider extends FileSystemProviderBase { + constructor(options?: RemoteFileSystemProviderOptions); +} diff --git a/packages/devextreme/js/common/file_management.js b/packages/devextreme/js/common/file_management.js new file mode 100644 index 000000000000..6d260b044eac --- /dev/null +++ b/packages/devextreme/js/common/file_management.js @@ -0,0 +1,6 @@ +export { default as CustomFileSystemProvider } from './file_management/custom_provider'; +export { default as FileSystemError } from './file_management/error'; +export { default as FileSystemItem } from './file_management/file_system_item'; +export { default as ObjectFileSystemProvider } from './file_management/object_provider'; +export { default as FileSystemProviderBase } from './file_management/provider_base'; +export { default as RemoteFileSystemProvider } from './file_management/remote_provider'; diff --git a/packages/devextreme/js/common/file_management/custom_provider.js b/packages/devextreme/js/common/file_management/custom_provider.js index e69895dc7da3..27a0eb299f08 100644 --- a/packages/devextreme/js/common/file_management/custom_provider.js +++ b/packages/devextreme/js/common/file_management/custom_provider.js @@ -1,6 +1,6 @@ -import { ensureDefined, noop } from '../core/utils/common'; -import { isFunction } from '../core/utils/type'; -import { compileGetter } from '../core/utils/data'; +import { ensureDefined, noop } from '../../core/utils/common'; +import { isFunction } from '../../core/utils/type'; +import { compileGetter } from '../../core/utils/data'; import FileSystemProviderBase from './provider_base'; diff --git a/packages/devextreme/js/common/file_management/file_system_item.js b/packages/devextreme/js/common/file_management/file_system_item.js index 0e5b9b37aa94..7e5051eb6044 100644 --- a/packages/devextreme/js/common/file_management/file_system_item.js +++ b/packages/devextreme/js/common/file_management/file_system_item.js @@ -1,4 +1,4 @@ -import { isString } from '../core/utils/type'; +import { isString } from '../../core/utils/type'; import { pathCombine, getFileExtension, getPathParts, getName, getEscapedFileName, PATH_SEPARATOR } from './utils'; class FileSystemItem { diff --git a/packages/devextreme/js/common/file_management/object_provider.js b/packages/devextreme/js/common/file_management/object_provider.js index a05ae10457b3..5e6c8e2a87d7 100644 --- a/packages/devextreme/js/common/file_management/object_provider.js +++ b/packages/devextreme/js/common/file_management/object_provider.js @@ -1,12 +1,12 @@ -import { ensureDefined } from '../core/utils/common'; -import { compileGetter, compileSetter } from '../core/utils/data'; -import Guid from '../core/guid'; -import { isFunction } from '../core/utils/type'; +import { ensureDefined } from '../../core/utils/common'; +import { compileGetter, compileSetter } from '../../core/utils/data'; +import Guid from '../../core/guid'; +import { isFunction } from '../../core/utils/type'; import { errors } from '../data/errors'; -import { Deferred } from '../core/utils/deferred'; -import { getWindow } from '../core/utils/window'; -import { fileSaver } from '../exporter/file_saver'; -import Errors from '../ui/widget/ui.errors'; +import { Deferred } from '../../core/utils/deferred'; +import { getWindow } from '../../core/utils/window'; +import { fileSaver } from '../../exporter/file_saver'; +import Errors from '../../ui/widget/ui.errors'; import JSZip from 'jszip'; import FileSystemProviderBase from './provider_base'; diff --git a/packages/devextreme/js/common/file_management/provider_base.js b/packages/devextreme/js/common/file_management/provider_base.js index 667d0484c9cf..1f62dc781bd2 100644 --- a/packages/devextreme/js/common/file_management/provider_base.js +++ b/packages/devextreme/js/common/file_management/provider_base.js @@ -1,10 +1,10 @@ -import { compileGetter } from '../core/utils/data'; -import { ensureDefined } from '../core/utils/common'; -import dateSerialization from '../core/utils/date_serialization'; -import { each } from '../core/utils/iterator'; -import { isPromise } from '../core/utils/type'; -import { Deferred, fromPromise } from '../core/utils/deferred'; -import FileSystemItem from './file_system_item'; +import { compileGetter } from '../../core/utils/data'; +import { ensureDefined } from '../../core/utils/common'; +import dateSerialization from '../../core/utils/date_serialization'; +import { each } from '../../core/utils/iterator'; +import { isPromise } from '../../core/utils/type'; +import { Deferred, fromPromise } from '../../core/utils/deferred'; +import { FileSystemItem } from '../file_management'; const DEFAULT_FILE_UPLOAD_CHUNK_SIZE = 200000; diff --git a/packages/devextreme/js/common/file_management/remote_provider.js b/packages/devextreme/js/common/file_management/remote_provider.js index c1c657ce5c7b..ef0e1c533d41 100644 --- a/packages/devextreme/js/common/file_management/remote_provider.js +++ b/packages/devextreme/js/common/file_management/remote_provider.js @@ -1,15 +1,15 @@ -import $ from '../core/renderer'; -import ajax from '../core/utils/ajax'; -import { ensureDefined, noop } from '../core/utils/common'; -import Guid from '../core/guid'; -import { getWindow } from '../core/utils/window'; -import { each } from '../core/utils/iterator'; -import { Deferred } from '../core/utils/deferred'; -import eventsEngine from '../events/core/events_engine'; +import $ from '../../core/renderer'; +import ajax from '../../core/utils/ajax'; +import { ensureDefined, noop } from '../../core/utils/common'; +import Guid from '../../core/guid'; +import { getWindow } from '../../core/utils/window'; +import { each } from '../../core/utils/iterator'; +import { Deferred } from '../../core/utils/deferred'; +import eventsEngine from '../core/events/core/events_engine'; import FileSystemProviderBase from './provider_base'; -import { compileGetter } from '../core/utils/data'; -import { isDefined, isEmptyObject, isFunction } from '../core/utils/type'; +import { compileGetter } from '../../core/utils/data'; +import { isDefined, isEmptyObject, isFunction } from '../../core/utils/type'; const window = getWindow(); const FILE_CHUNK_BLOB_NAME = 'chunk'; diff --git a/packages/devextreme/js/common/file_management/utils.js b/packages/devextreme/js/common/file_management/utils.js index 763d00575a1f..fdb0ef08b4a3 100644 --- a/packages/devextreme/js/common/file_management/utils.js +++ b/packages/devextreme/js/common/file_management/utils.js @@ -1,4 +1,4 @@ -import { each } from '../core/utils/iterator'; +import { each } from '../../core/utils/iterator'; export const PATH_SEPARATOR = '/'; diff --git a/packages/devextreme/js/common/grids.d.ts b/packages/devextreme/js/common/grids.d.ts index ee1ae422450f..77cb7a0b25ba 100644 --- a/packages/devextreme/js/common/grids.d.ts +++ b/packages/devextreme/js/common/grids.d.ts @@ -14,6 +14,8 @@ import { SortOrder, ValidationRule, PagerBase, + DxPromise, + template, } from '../common'; import { @@ -27,27 +29,20 @@ import { } from '../core/element'; import { - DxPromise, -} from '../core/utils/deferred'; - -import { - template, -} from '../core/templates/template'; - -import DataSource, { - Options as DataSourceOptions, + DataSource, + DataSourceOptions, DataSourceLike, -} from '../data/data_source'; +} from './data'; import { Cancelable, EventInfo, NativeEventInfo, -} from '../events/index'; +} from './core/events'; import { Format, -} from '../localization'; +} from './core/localization'; import { FilterLookupDataSource, @@ -70,7 +65,7 @@ import { import { WidgetOptions, } from '../ui/widget/ui.widget'; -import { PositionConfig } from '../animation/position'; +import { PositionConfig } from './core/animation'; /** * @docid diff --git a/packages/devextreme/js/common/set_template_engine.js b/packages/devextreme/js/common/set_template_engine.js index 31aeacde2545..de327c598a08 100644 --- a/packages/devextreme/js/common/set_template_engine.js +++ b/packages/devextreme/js/common/set_template_engine.js @@ -1,2 +1,3 @@ import { setTemplateEngine } from '../__internal/core/m_set_template_engine'; + export default setTemplateEngine; diff --git a/packages/devextreme/js/core/config.d.ts b/packages/devextreme/js/core/config.d.ts index 51490ed48a42..9f1241d87245 100644 --- a/packages/devextreme/js/core/config.d.ts +++ b/packages/devextreme/js/core/config.d.ts @@ -1,24 +1,14 @@ -import { GlobalConfig } from '../common'; +import { + config, + GlobalConfig, +} from '../common'; -/** @public */ -export type FloatingActionButtonDirection = 'auto' | 'up' | 'down'; - -/** - * @docid - * @publicName config() - * @namespace DevExpress - * @public - */ -declare function config(): GlobalConfig; - -/** - * @docid - * @publicName config(config) - * @namespace DevExpress - * @public - */ -// eslint-disable-next-line @typescript-eslint/no-shadow -declare function config(config: GlobalConfig): void; +export { + /** + * @deprecated Use FloatingActionButtonDirection from /common instead + */ + FloatingActionButtonDirection, +} from '../common'; /** * @namespace DevExpress @@ -26,4 +16,7 @@ declare function config(config: GlobalConfig): void; */ export type globalConfig = GlobalConfig; +/** + * @deprecated Use config from /common instead + */ export default config; diff --git a/packages/devextreme/js/core/config.js b/packages/devextreme/js/core/config.js new file mode 100644 index 000000000000..17d8c0fbf2b9 --- /dev/null +++ b/packages/devextreme/js/core/config.js @@ -0,0 +1,3 @@ +import { config } from '../common'; + +export default config; diff --git a/packages/devextreme/js/core/devices.d.ts b/packages/devextreme/js/core/devices.d.ts index 4ec5b6781d3e..9affb55bcb85 100644 --- a/packages/devextreme/js/core/devices.d.ts +++ b/packages/devextreme/js/core/devices.d.ts @@ -1,134 +1,13 @@ -/** - * @public - * @docid - * @section commonObjectStructures - * @namespace DevExpress - */ -export type Device = { - /** - * @docid - * @public - */ - android?: boolean; - /** - * @docid - * @public - */ - deviceType?: 'phone' | 'tablet' | 'desktop'; - /** - * @docid - * @public - */ - generic?: boolean; - /** - * @docid - * @public - */ - grade?: 'A' | 'B' | 'C'; - /** - * @docid - * @public - */ - ios?: boolean; - /** - * @docid - * @public - */ - phone?: boolean; - /** - * @docid - * @public - */ - platform?: 'android' | 'ios' | 'generic'; - /** - * @docid - * @public - */ - tablet?: boolean; - /** - * @docid - * @public - */ - version?: Array; -}; - -type EventName = 'orientationChanged'; +import { devices } from '../common/core/environment'; -/** - * @docid - * @publicName devices - * @section Utils - * @namespace DevExpress - * @public - */ -declare class DevicesObject { - constructor(options?: { window?: Window }); - /** - * @docid - * @publicName current() - * @public - */ - current(): Device; - /** - * @docid - * @publicName current(deviceName) - * @public - */ - current(deviceName: string | Device): void; - /** - * @docid - * @publicName off(eventName) - * @param1 eventName:string - * @return this - * @public - */ - off(eventName: EventName): this; - /** - * @docid - * @publicName off(eventName, eventHandler) - * @param1 eventName:string - * @return this - * @public - */ - off(eventName: EventName, eventHandler: Function): this; - /** - * @docid - * @publicName on(eventName, eventHandler) - * @param1 eventName:string - * @return this - * @public - */ - on(eventName: EventName, eventHandler: Function): this; - /** - * @docid - * @publicName on(events) - * @param1 events:object - * @return this - * @public - */ - on(events: { [key in EventName]?: Function }): this; - /** - * @docid - * @publicName orientation() - * @return String - * @public - */ - orientation(): 'portrait' | 'landscape' | undefined; - /** - * @docid - * @publicName real() - * @public - */ - real(): Device; - isSimulator(): boolean; -} +export { + /** + * @deprecated Use Device from /common/core/environment instead + */ + Device, +} from '../common/core/environment'; /** - * @const devices - * @namespace DevExpress - * @hidden - * @public + * @deprecated Use devices from /common/core/environment instead */ - -declare const devices: DevicesObject; export default devices; diff --git a/packages/devextreme/js/core/devices.js b/packages/devextreme/js/core/devices.js new file mode 100644 index 000000000000..e069c4e5fb31 --- /dev/null +++ b/packages/devextreme/js/core/devices.js @@ -0,0 +1,3 @@ +import { devices } from '../common/core/environment'; + +export default devices; diff --git a/packages/devextreme/js/core/dom_component.d.ts b/packages/devextreme/js/core/dom_component.d.ts index 7a52aa01534b..1edb6eda8ec6 100644 --- a/packages/devextreme/js/core/dom_component.d.ts +++ b/packages/devextreme/js/core/dom_component.d.ts @@ -12,7 +12,7 @@ import { ChangedOptionInfo, EventInfo, InitializedEventInfo, -} from '../events/index'; +} from '../common/core/events'; import { TemplateManager } from './template_manager'; import { FunctionTemplate } from './templates/function_template'; diff --git a/packages/devextreme/js/core/guid.d.ts b/packages/devextreme/js/core/guid.d.ts index b84c5497c208..640d639b1d82 100644 --- a/packages/devextreme/js/core/guid.d.ts +++ b/packages/devextreme/js/core/guid.d.ts @@ -1,21 +1,6 @@ +import { Guid } from '../common'; + /** - * @docid - * @namespace DevExpress.data - * @public + * @deprecated Use Guid from /common instead */ -export default class Guid { - constructor(); - constructor(value: string); - /** - * @docid - * @publicName toString() - * @public - */ - toString(): string; - /** - * @docid - * @publicName valueOf() - * @public - */ - valueOf(): string; -} +export default Guid; diff --git a/packages/devextreme/js/core/guid.js b/packages/devextreme/js/core/guid.js new file mode 100644 index 000000000000..80747a9917bb --- /dev/null +++ b/packages/devextreme/js/core/guid.js @@ -0,0 +1,3 @@ +import { Guid } from '../common'; + +export default Guid; diff --git a/packages/devextreme/js/core/options.d.ts b/packages/devextreme/js/core/options.d.ts index 3a2aca745d3d..0d433d31595b 100644 --- a/packages/devextreme/js/core/options.d.ts +++ b/packages/devextreme/js/core/options.d.ts @@ -1,16 +1,6 @@ -import { - Device, -} from './devices'; - -import { - DeepPartial, -} from './index'; - -/** - * @docid - * @public - */ -export type DefaultOptionsRule = { - device?: Device | Device[] | ((device: Device) => boolean); - options: DeepPartial; -}; +export { + /** + * @deprecated Use DefaultOptionsRule from /common instead + */ + DefaultOptionsRule, +} from '../common'; diff --git a/packages/devextreme/js/core/options/utils.d.ts b/packages/devextreme/js/core/options/utils.d.ts index cd098f2fc766..327a1e004535 100644 --- a/packages/devextreme/js/core/options/utils.d.ts +++ b/packages/devextreme/js/core/options/utils.d.ts @@ -1,6 +1,6 @@ import { Device, -} from '../devices'; +} from '../../common/core/environment'; import { DefaultOptionsRule, diff --git a/packages/devextreme/js/core/set_template_engine.d.ts b/packages/devextreme/js/core/set_template_engine.d.ts index e0ff4f7dc9a7..2db0dfc8641c 100644 --- a/packages/devextreme/js/core/set_template_engine.d.ts +++ b/packages/devextreme/js/core/set_template_engine.d.ts @@ -1,9 +1,6 @@ +import { setTemplateEngine } from '../common'; + /** - * @docid - * @publicName setTemplateEngine(options) - * @namespace DevExpress - * @public + * @deprecated Use setTemplateEngine from /common instead */ -declare function setTemplateEngine(templateEngineOptions: { compile?: Function; render?: Function }): void; - export default setTemplateEngine; diff --git a/packages/devextreme/js/core/set_template_engine.js b/packages/devextreme/js/core/set_template_engine.js new file mode 100644 index 000000000000..c7d3a1ad5914 --- /dev/null +++ b/packages/devextreme/js/core/set_template_engine.js @@ -0,0 +1 @@ +export { setTemplateEngine as default } from '../common'; diff --git a/packages/devextreme/js/core/templates/template.d.ts b/packages/devextreme/js/core/templates/template.d.ts index 47bc5899f2ce..6a3a2c8c9c6d 100644 --- a/packages/devextreme/js/core/templates/template.d.ts +++ b/packages/devextreme/js/core/templates/template.d.ts @@ -1,6 +1,9 @@ -import { - UserDefinedElement, -} from '../element'; +export type { + /** + * @deprecated Use Template from /common instead + */ + template, +} from '../../common'; /** * @docid @@ -26,10 +29,3 @@ export type dxTemplate = Template; export class Template { constructor(options?: dxTemplateOptions); } - -/** - * @docid - * @section Common - * @public - */ -export type template = string | Function | UserDefinedElement; diff --git a/packages/devextreme/js/core/utils/deferred.d.ts b/packages/devextreme/js/core/utils/deferred.d.ts index 060192b9f3af..813ca0886aaa 100644 --- a/packages/devextreme/js/core/utils/deferred.d.ts +++ b/packages/devextreme/js/core/utils/deferred.d.ts @@ -1,8 +1,17 @@ +import type { DxPromise } from '../../common'; + +export type { + /** + * @deprecated Use DxPromise from /common instead + */ + DxPromise, +} from '../../common'; + interface Callback { // eslint-disable-next-line @typescript-eslint/prefer-function-type (value: T, ...args: T[]): void; } -declare class DeferredObj { +export class DeferredObj { constructor(); state(): 'pending' | 'rejected' | 'resolved'; always(alwaysCallback?: Callback): DeferredObj; @@ -24,13 +33,6 @@ export function Deferred(): DeferredObj; // eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/no-unused-vars export interface PromiseType { } -/** - * @docid - * @type Promise - * @namespace DevExpress.core.utils - */ -// eslint-disable-next-line @typescript-eslint/no-invalid-void-type -export type DxPromise = {} extends PromiseType ? Promise : PromiseType; /** @namespace DevExpress.core.utils */ export type DxExtendedPromise = DxPromise & { diff --git a/packages/devextreme/js/data/abstract_store.d.ts b/packages/devextreme/js/data/abstract_store.d.ts new file mode 100644 index 000000000000..3c81f6a0fcfc --- /dev/null +++ b/packages/devextreme/js/data/abstract_store.d.ts @@ -0,0 +1,21 @@ +import AbstractStore from '../common/data/abstract_store'; + +export { + /** + * @deprecated Use Options from common/data/abstract_store instead + */ + Options, + /** + * @deprecated Use StoreOptions from common/data/abstract_store instead + */ + StoreOptions, + /** + * @deprecated Use Store from common/data/abstract_store instead + */ + Store, +} from '../common/data/abstract_store'; + +/** + * @deprecated Use the default export from common/data/abstract_store instead + */ +export default AbstractStore; diff --git a/packages/devextreme/js/data/abstract_store.js b/packages/devextreme/js/data/abstract_store.js new file mode 100644 index 000000000000..1209bbeb82c1 --- /dev/null +++ b/packages/devextreme/js/data/abstract_store.js @@ -0,0 +1 @@ +export { default } from '../common/data/abstract_store'; diff --git a/packages/devextreme/js/data/apply_changes.d.ts b/packages/devextreme/js/data/apply_changes.d.ts index 8073ae0becbb..90017ffe8313 100644 --- a/packages/devextreme/js/data/apply_changes.d.ts +++ b/packages/devextreme/js/data/apply_changes.d.ts @@ -1,10 +1,6 @@ +import { applyChanges } from '../common/data'; + /** - * @docid Utils.applyChanges - * @publicName applyChanges(data, changes, options) - * @param3 options?:any - * @namespace DevExpress.data - * @public + * @deprecated Use applyChanges from /common/data instead */ -declare function applyChanges(data: Array, changes: Array, options?: { keyExpr?: string | Array; immutable?: boolean }): Array; - export default applyChanges; diff --git a/packages/devextreme/js/data/apply_changes.js b/packages/devextreme/js/data/apply_changes.js new file mode 100644 index 000000000000..29a114fa0de0 --- /dev/null +++ b/packages/devextreme/js/data/apply_changes.js @@ -0,0 +1,3 @@ +import { applyChanges } from '../common/data'; + +export default applyChanges; diff --git a/packages/devextreme/js/data/array_store.d.ts b/packages/devextreme/js/data/array_store.d.ts index 60a69bff9384..3e32dac7582d 100644 --- a/packages/devextreme/js/data/array_store.d.ts +++ b/packages/devextreme/js/data/array_store.d.ts @@ -1,61 +1,23 @@ -import Store, { - Options as StoreOptions, -} from './abstract_store'; -import { Query } from './query'; -import { DxPromise } from '../core/utils/deferred'; +import { ArrayStore, ArrayStoreOptions } from '../common/data'; -/** @public */ -export type Options< - TItem = any, - TKey = any, -> = ArrayStoreOptions; - -/** - * @docid - * @namespace DevExpress.data - * @deprecated Use Options instead - */ -export interface ArrayStoreOptions< - TItem = any, - TKey = any, -> extends StoreOptions { +export { /** - * @docid - * @public + * @deprecated Use ArrayStoreOptions from /common/data instead */ - data?: Array; -} + ArrayStoreOptions, +} from '../common/data'; /** - * @docid - * @inherits Store * @public - * @options ArrayStoreOptions + * @deprecated Use ArrayStoreOptions from /common/data instead + * @namespace DevExpress.data.ArrayStore */ -export default class ArrayStore< +export type Options< TItem = any, TKey = any, -> extends Store { - constructor(options?: Options); - /** - * @docid - * @publicName byKey(key) - * @param1 key:object|string|number - * @return Promise - * @public - */ - byKey(key: TKey): DxPromise; - /** - * @docid - * @publicName clear() - * @public - */ - clear(): void; - /** - * @docid - * @publicName createQuery() - * @return object - * @public - */ - createQuery(): Query; -} +> = ArrayStoreOptions; + +/** + * @deprecated Use ArrayStore from /common/data instead + */ +export default ArrayStore; diff --git a/packages/devextreme/js/data/array_store.js b/packages/devextreme/js/data/array_store.js new file mode 100644 index 000000000000..ce5397786f90 --- /dev/null +++ b/packages/devextreme/js/data/array_store.js @@ -0,0 +1,3 @@ +import { ArrayStore } from '../common/data'; + +export default ArrayStore; diff --git a/packages/devextreme/js/data/custom_store.d.ts b/packages/devextreme/js/data/custom_store.d.ts index 222d495a08d8..505b18d8a0fd 100644 --- a/packages/devextreme/js/data/custom_store.d.ts +++ b/packages/devextreme/js/data/custom_store.d.ts @@ -1,151 +1,31 @@ -import { FilterDescriptor, GroupDescriptor, LoadOptions } from './index'; -import { Store, Options as StoreOptions } from './store'; -import { DxExtendedPromise, DxPromise } from '../core/utils/deferred'; -import { GroupItem as CustomStoreGroupItem, LoadResult } from '../common/data/custom-store'; +import { CustomStore, CustomStoreOptions } from '../common/data'; -/** @public */ -export type Options< - TItem = any, - TKey = any, -> = CustomStoreOptions; +export { + /** + * @deprecated Use GroupItem from /common/data instead + */ + GroupItem, + /** + * @deprecated Use ResolvedData from /common/data instead + */ + ResolvedData, + /** + * @deprecated Use CustomStoreOptions from /common/data instead + */ + CustomStoreOptions, +} from '../common/data'; /** * @public - * @deprecated Use GroupItem from common/data/custom-store instead + * @deprecated Use CustomStoreOptions from /common/data instead + * @namespace DevExpress.data.CustomStore */ -export type GroupItem = CustomStoreGroupItem; - -/** - * @docid - * @public - * @type object - * @deprecated Use LoadResult instead - */ -export type ResolvedData = LoadResult; - -type LoadFunctionResult = T | DxPromise | PromiseLike; - -/** - * @docid - * @namespace DevExpress.data - * @deprecated Use Options instead - */ -export interface CustomStoreOptions< +export type Options< TItem = any, TKey = any, -> extends StoreOptions { - /** - * @docid - * @public - * @type_function_param1 key:object|string|number - * @type_function_param2 extraOptions:LoadOptions - * @type_function_return Promise - */ - byKey?: ((key: TKey, extraOptions?: LoadOptions) => PromiseLike); - /** - * @docid - * @default true - * @public - */ - cacheRawData?: boolean; - /** - * @docid - * @type_function_param1 values:object - * @type_function_return Promise - * @public - */ - insert?: ((values: TItem) => PromiseLike); - /** - * @docid - * @type_function_param1 options:LoadOptions - * @type_function_return LoadResult|Promise - * @public - */ - load: (options: LoadOptions) => LoadFunctionResult>; - /** - * @docid - * @default 'processed' - * @public - */ - loadMode?: 'processed' | 'raw'; - /** - * @docid - * @type_function_param1 result:LoadResult - * @type_function_param2 loadOptions:LoadOptions - * @action - * @public - */ - onLoaded?: ((result: LoadResult, loadOptions: LoadOptions) => void); - /** - * @docid - * @type_function_param1 key:object|string|number - * @type_function_return Promise - * @public - */ - remove?: ((key: TKey) => PromiseLike); - /** - * @docid - * @type_function_param1_field filter:object - * @type_function_param1_field group:object - * @type_function_return Promise - * @public - */ - totalCount?: ((loadOptions: { filter?: FilterDescriptor | Array; group?: GroupDescriptor | Array> }) => PromiseLike); - /** - * @docid - * @type_function_param1 key:object|string|number - * @type_function_param2 values:object - * @type_function_return Promise - * @public - */ - update?: ((key: TKey, values: TItem) => PromiseLike); - /** - * @docid - * @default undefined - * @public - */ - useDefaultSearch?: boolean | undefined; -} +> = CustomStoreOptions; /** - * @docid - * @inherits Store - * @public - * @options CustomStoreOptions + * @deprecated Use CustomStore from /common/data instead */ -export default class CustomStore< - TItem = any, - TKey = any, -> extends Store { - constructor(options?: Options); - /** - * @docid - * @publicName byKey(key, extraOptions) - * @param1 key:object|string|number - * @param2 extraOptions:LoadOptions - * @return Promise - * @public - */ - byKey(key: TKey, extraOptions?: LoadOptions): DxPromise; - /** - * @docid - * @publicName clearRawDataCache() - * @public - */ - clearRawDataCache(): void; - /** - * @docid - * @publicName load() - * @return Promise - * @public - */ - load(): DxExtendedPromise>; - /** - * @docid - * @publicName load(options) - * @param1 options:LoadOptions - * @return Promise - * @public - */ - load(options: LoadOptions): DxExtendedPromise>; -} +export default CustomStore; diff --git a/packages/devextreme/js/data/custom_store.js b/packages/devextreme/js/data/custom_store.js new file mode 100644 index 000000000000..87d450a69c4e --- /dev/null +++ b/packages/devextreme/js/data/custom_store.js @@ -0,0 +1,3 @@ +import { CustomStore } from '../common/data'; + +export default CustomStore; diff --git a/packages/devextreme/js/data/data_source.d.ts b/packages/devextreme/js/data/data_source.d.ts index efc983e6fb13..f89ccb24fd70 100644 --- a/packages/devextreme/js/data/data_source.d.ts +++ b/packages/devextreme/js/data/data_source.d.ts @@ -1,468 +1,28 @@ -import { - FilterDescriptor, - GroupDescriptor, LangParams, - LoadOptions, - SearchOperation, - SelectDescriptor, - SortDescriptor, - Store, - StoreOptions, -} from './index'; -import { DxExtendedPromise } from '../core/utils/deferred'; -import { Options as CustomStoreOptions } from './custom_store'; +import { DataSource, DataSourceOptions } from '../common/data'; -/** @public */ -export type Options< - TStoreItem = any, - TMappedItem = TStoreItem, - TItem = TMappedItem, - TKey = any, -> = DataSourceOptions; +export { + /** + * @deprecated Use DataSourceOptions from /common/data instead + */ + DataSourceOptions, + /** + * @deprecated Use DataSourceLike from /common/data instead + */ + DataSourceLike, +} from '../common/data'; /** - * @namespace DevExpress.data - * @deprecated Use Options instead - * @docid + * @public + * @deprecated Use DataSourceOptions from /common/data instead */ -export interface DataSourceOptions< +export type Options< TStoreItem = any, TMappedItem = TStoreItem, TItem = TMappedItem, TKey = any, -> { - /** - * @docid - * @public - */ - customQueryParams?: any; - /** - * @docid - * @public - */ - expand?: Array | string; - /** - * @docid - * @type Filter expression - * @public - */ - filter?: FilterDescriptor | Array; - /** - * @docid - * @type Group expression - * @public - */ - group?: GroupDescriptor | Array>; - /** - * @docid - * @public - */ - // eslint-disable-next-line spellcheck/spell-checker - langParams?: LangParams; - /** - * @docid - * @type_function_param1 dataItem:object - * @type_function_return object - * @public - */ - map?: ((dataItem: TStoreItem) => TMappedItem); - /** - * @docid - * @type_function_param1_field changes:Array - * @action - * @public - */ - onChanged?: ((e: { readonly changes?: Array }) => void); - /** - * @docid - * @action - * @public - */ - onLoadError?: ((error: { readonly message?: string }) => void); - /** - * @docid - * @action - * @public - */ - onLoadingChanged?: ((isLoading: boolean) => void); - /** - * @docid - * @default 20 - * @public - */ - pageSize?: number; - /** - * @docid - * @default undefined - * @public - */ - paginate?: boolean | undefined; - /** - * @docid - * @type_function_param1 data:Array - * @type_function_return Array - * @public - */ - postProcess?: ((data: Array) => Array); - /** - * @docid - * @default undefined - * @public - */ - pushAggregationTimeout?: number | undefined; - /** - * @docid - * @public - */ - requireTotalCount?: boolean; - /** - * @docid - * @default false - * @public - */ - reshapeOnPush?: boolean; - /** - * @docid - * @type getter|Array - * @public - */ - searchExpr?: string | Function | Array; - /** - * @docid - * @default "contains" - * @public - */ - searchOperation?: SearchOperation; - /** - * @docid - * @default null - * @public - */ - searchValue?: any; - /** - * @docid - * @type Select expression - * @public - */ - select?: SelectDescriptor; - /** - * @docid - * @type Sort expression - * @public - */ - sort?: SortDescriptor | Array>; - /** - * @docid - * @public - * @type Store|StoreOptions|Array - */ - store?: Array | Store | StoreOptions; -} -/** - * @docid - * @public - * @options DataSourceOptions - */ -export default class DataSource< - TItem = any, - TKey = any, -> { - constructor(data: Array); - constructor(options: CustomStoreOptions | Options); - constructor(store: Store); - constructor(url: string); - /** - * @docid - * @publicName cancel(operationId) - * @public - */ - cancel(operationId: number): boolean; - /** - * @docid - * @publicName dispose() - * @public - */ - dispose(): void; - /** - * @docid - * @publicName filter() - * @return object - * @public - */ - filter(): FilterDescriptor | Array; - /** - * @docid - * @publicName filter(filterExpr) - * @param1 filterExpr:object - * @public - */ - filter(filterExpr: FilterDescriptor | Array): void; - /** - * @docid - * @publicName group() - * @return object - * @public - */ - group(): GroupDescriptor | Array>; - /** - * @docid - * @publicName group(groupExpr) - * @param1 groupExpr:object - * @public - */ - group(groupExpr: GroupDescriptor | Array>): void; - /** - * @docid - * @publicName isLastPage() - * @public - */ - isLastPage(): boolean; - /** - * @docid - * @publicName isLoaded() - * @public - */ - isLoaded(): boolean; - /** - * @docid - * @publicName isLoading() - * @public - */ - isLoading(): boolean; - /** - * @docid - * @publicName items() - * @public - */ - items(): Array; - /** - * @docid - * @publicName key() - * @public - */ - key(): string | Array; - /** - * @docid - * @publicName load() - * @return Promise - * @public - */ - load(): DxExtendedPromise; - /** - * @docid - * @publicName loadOptions() - * @return object - * @public - */ - loadOptions(): LoadOptions; - /** - * @docid - * @publicName off(eventName) - * @param1 eventName:string - * @return this - * @public - */ - off(eventName: EventName): this; - /** - * @docid - * @publicName off(eventName, eventHandler) - * @param1 eventName:string - * @return this - * @public - */ - off(eventName: EventName, eventHandler: Function): this; - /** - * @docid - * @publicName on(eventName, eventHandler) - * @param1 eventName:string - * @return this - * @public - */ - on(eventName: EventName, eventHandler: Function): this; - /** - * @docid - * @publicName on(events) - * @param1 events:object - * @return this - * @public - */ - on(events: { [key in EventName]?: Function }): this; - /** - * @docid - * @publicName pageIndex() - * @return numeric - * @public - */ - pageIndex(): number; - /** - * @docid - * @publicName pageIndex(newIndex) - * @param1 newIndex:numeric - * @public - */ - pageIndex(newIndex: number): void; - /** - * @docid - * @publicName pageSize() - * @return numeric - * @public - */ - pageSize(): number; - /** - * @docid - * @publicName pageSize(value) - * @param1 value:numeric - * @public - */ - pageSize(value: number): void; - /** - * @docid - * @publicName paginate() - * @public - */ - paginate(): boolean; - /** - * @docid - * @publicName paginate(value) - * @public - */ - paginate(value: boolean): void; - /** - * @docid - * @publicName reload() - * @return Promise - * @public - */ - reload(): DxExtendedPromise; - /** - * @docid - * @publicName requireTotalCount() - * @public - */ - requireTotalCount(): boolean; - /** - * @docid - * @publicName requireTotalCount(value) - * @public - */ - requireTotalCount(value: boolean): void; - /** - * @docid - * @publicName searchExpr() - * @return getter|Array - * @public - */ - searchExpr(): string & Function & Array; - /** - * @docid - * @publicName searchExpr(expr) - * @param1 expr:getter|Array - * @public - */ - searchExpr(expr: string | Function | Array): void; - /** - * @docid - * @publicName searchOperation() - * @public - */ - searchOperation(): string; - /** - * @docid - * @publicName searchOperation(op) - * @public - */ - searchOperation(op: string): void; - /** - * @docid - * @publicName searchValue() - * @public - */ - searchValue(): any; - /** - * @docid - * @publicName searchValue(value) - * @public - */ - searchValue(value: any): void; - /** - * @docid - * @publicName select() - * @return any - * @public - */ - select(): SelectDescriptor; - /** - * @docid - * @publicName select(expr) - * @param1 expr:any - * @public - */ - select(expr: SelectDescriptor): void; - /** - * @docid - * @publicName sort() - * @return any - * @public - */ - sort(): SortDescriptor | Array>; - /** - * @docid - * @publicName sort(sortExpr) - * @param1 sortExpr:any - * @public - */ - sort(sortExpr: SortDescriptor | Array>): void; - /** - * @docid - * @publicName store() - * @return object - * @public - */ - store(): Store; - /** - * @docid - * @publicName totalCount() - * @return numeric - * @public - */ - totalCount(): number; -} +> = DataSourceOptions; /** - * @docid - * @type Store|DataSource|DataSourceOptions|string|Array|null + * @deprecated Use DataSource from /common/data instead */ -export type DataSourceLike = - string | - Array | - Store | - DataSourceOptionsStub | - DataSource; - -interface DataSourceOptionsStub< - TStoreItem = any, - TMappedItem = TStoreItem, - TItem = TMappedItem, -> { - customQueryParams?: any; - expand?: Array | string; - filter?: FilterDescriptor | Array; - group?: GroupDescriptor | Array>; - map?: ((dataItem: TStoreItem) => TMappedItem); - onChanged?: ((e: { readonly changes?: Array }) => void); - onLoadError?: ((error: { readonly message?: string }) => void); - onLoadingChanged?: ((isLoading: boolean) => void); - pageSize?: number; - paginate?: boolean; - postProcess?: ((data: Array) => Array); - pushAggregationTimeout?: number; - requireTotalCount?: boolean; - reshapeOnPush?: boolean; - searchExpr?: string | Function | Array; - searchOperation?: SearchOperation; - searchValue?: any; - select?: SelectDescriptor; - sort?: SortDescriptor | Array>; - store?: Array | Store | StoreOptions; -} - -type EventName = 'changed' | 'loadError' | 'loadingChanged'; +export default DataSource; diff --git a/packages/devextreme/js/data/data_source.js b/packages/devextreme/js/data/data_source.js new file mode 100644 index 000000000000..3e60483985f1 --- /dev/null +++ b/packages/devextreme/js/data/data_source.js @@ -0,0 +1,3 @@ +import { DataSource } from '../common/data'; + +export default DataSource; diff --git a/packages/devextreme/js/data/endpoint_selector.d.ts b/packages/devextreme/js/data/endpoint_selector.d.ts index 19c601d6eec4..0fbb4d8a718b 100644 --- a/packages/devextreme/js/data/endpoint_selector.d.ts +++ b/packages/devextreme/js/data/endpoint_selector.d.ts @@ -1,14 +1,6 @@ +import { EndpointSelector } from '../common/data'; + /** - * @docid - * @namespace DevExpress - * @public + * @deprecated Use EndpointSelector from /common/data instead */ -export default class EndpointSelector { - constructor(options: any); - /** - * @docid - * @publicName urlFor(key) - * @public - */ - urlFor(key: string): string; -} +export default EndpointSelector; diff --git a/packages/devextreme/js/data/endpoint_selector.js b/packages/devextreme/js/data/endpoint_selector.js new file mode 100644 index 000000000000..868960c2ae4a --- /dev/null +++ b/packages/devextreme/js/data/endpoint_selector.js @@ -0,0 +1,3 @@ +import { EndpointSelector } from '../common/data'; + +export default EndpointSelector; diff --git a/packages/devextreme/js/data/errors.d.ts b/packages/devextreme/js/data/errors.d.ts index a51ecdc208e5..2062b34e7a57 100644 --- a/packages/devextreme/js/data/errors.d.ts +++ b/packages/devextreme/js/data/errors.d.ts @@ -1,16 +1,10 @@ -/** - * @docid Utils.errorHandler - * @type function(e) - * @namespace DevExpress.data - * @deprecated Utils.setErrorHandler - * @public - */ -export function errorHandler(e: Error): void; - -/** - * @docid Utils.setErrorHandler - * @type function(handler) - * @namespace DevExpress.data - * @public - */ -export function setErrorHandler(handler: (e: Error) => void): void; +export { + /** + * @deprecated Use setErrorHandler from /common/data instead + */ + setErrorHandler, + /** + * @deprecated Use errorHandler from /common/data instead + */ + errorHandler, +} from '../common/data'; diff --git a/packages/devextreme/js/data/errors.js b/packages/devextreme/js/data/errors.js new file mode 100644 index 000000000000..bde57eb9729f --- /dev/null +++ b/packages/devextreme/js/data/errors.js @@ -0,0 +1,2 @@ +export { setErrorHandler } from '../common/data'; +export { errorHandler } from '../common/data/errors'; diff --git a/packages/devextreme/js/data/index.d.ts b/packages/devextreme/js/data/index.d.ts index 22ddfbea28bb..2bc3f9dcc3b5 100644 --- a/packages/devextreme/js/data/index.d.ts +++ b/packages/devextreme/js/data/index.d.ts @@ -1,213 +1,46 @@ -import CustomStore, { Options as CustomStoreOptions } from './custom_store'; -import ArrayStore, { Options as ArrayStoreOptions } from './array_store'; -import LocalStore, { Options as LocalStoreOptions } from './local_store'; -import ODataStore, { Options as ODataStoreOptions } from './odata/store'; - -/** - * @public - */ -export type SearchOperation = '=' | '<>' | '>' | '>=' | '<' | '<=' | 'startswith' | 'endswith' | 'contains' | 'notcontains'; - -type KeySelector = string | ((source: T) => string | number | Date | Object); - -type SelectionDescriptor = { - selector: KeySelector; -}; - -type OrderingDescriptor = SelectionDescriptor & { - desc?: boolean; -}; - -/** - * @public - */ -export type GroupingInterval = 'year' | 'quarter' | 'month' | 'day' | 'dayOfWeek' | 'hour' | 'minute' | 'second'; - -/** - * @docid - * @public - * @type object - * @skip - */ -export type GroupDescriptor = KeySelector | (OrderingDescriptor & { - groupInterval?: number | GroupingInterval; - isExpanded?: boolean; -}); - -/** - * @docid - * @public - * @type object - * @skip - */ -export type SortDescriptor = KeySelector | OrderingDescriptor; - -/** - * @docid - * @public - * @type object - * @skip - */ -export type SelectDescriptor = string | Array | ((source: T) => any); -/** - * @docid - * @public - */ -export type FilterDescriptor = any; -/** - * @docid - * @public - */ -export type LangParams = { +export { /** - * @docid - * @public + * @deprecated Use SearchOperation from /common/data instead */ - locale: string; + SearchOperation, /** - * @docid - * @public - * @type object + * @deprecated Use GroupingInterval from /common/data instead */ - collatorOptions?: Intl.CollatorOptions; -}; - /** - * @docid - * @public - * @type object - */ -export type SummaryDescriptor = KeySelector | SelectionDescriptor & { - summaryType?: 'sum' | 'avg' | 'min' | 'max' | 'count'; -}; - -/** - * @public - * @docid - * @namespace DevExpress.data - * @type object - */ -export interface LoadOptions { - /** - * @docid - * @public - */ - customQueryParams?: any; - /** - * @docid - * @public - */ - startDate?: Date; - /** - * @docid - * @public - */ - endDate?: Date; - /** - * @docid - * @public - */ - expand?: Array; - /** - * @docid - * @public - * @type object - */ - filter?: FilterDescriptor | Array; - /** - * @docid - * @public - * @type object - */ - group?: GroupDescriptor | Array>; - /** - * @docid - * @public - * @type SummaryDescriptor | Array - */ - groupSummary?: SummaryDescriptor | Array>; - /** - * @docid - * @public - */ - parentIds?: Array; - /** - * @docid - * @public - */ - requireGroupCount?: boolean; - /** - * @docid - * @public - */ - requireTotalCount?: boolean; - /** - * @docid - * @type getter|Array - * @public - */ - searchExpr?: string | Function | Array; - /** - * @docid - * @public - */ - searchOperation?: SearchOperation; - /** - * @docid - * @public - */ - searchValue?: any; - /** - * @docid - * @public - * @type object - */ - select?: SelectDescriptor; - /** - * @docid - * @public - */ - skip?: number; - /** - * @docid - * @public - * @type object - */ - sort?: SortDescriptor | Array>; - /** - * @docid - * @public - */ - take?: number; - /** - * @docid - * @public - * @type SummaryDescriptor | Array - */ - totalSummary?: SummaryDescriptor | Array>; - /** - * @docid - * @public - */ - userData?: any; -} - -/** - * @public - * @namespace DevExpress.data.utils - */ -export type Store = - CustomStore | - ArrayStore | - LocalStore | - ODataStore; - -/** - * @public - * @namespace DevExpress.data.utils - * @type object - */ -export type StoreOptions = - CustomStoreOptions | - ArrayStoreOptions & { type: 'array' } | - LocalStoreOptions & { type: 'local' } | - ODataStoreOptions & { type: 'odata' }; + GroupingInterval, + /** + * @deprecated Use GroupDescriptor from /common/data instead + */ + GroupDescriptor, + /** + * @deprecated Use SortDescriptor from /common/data instead + */ + SortDescriptor, + /** + * @deprecated Use SelectDescriptor from /common/data instead + */ + SelectDescriptor, + /** + * @deprecated Use FilterDescriptor from /common/data instead + */ + FilterDescriptor, + /** + * @deprecated Use LangParams from /common/data instead + */ + LangParams, + /** + * @deprecated Use SummaryDescriptor from /common/data instead + */ + SummaryDescriptor, + /** + * @deprecated Use LoadOptions from /common/data instead + */ + LoadOptions, + /** + * @deprecated Use Store from /common/data instead + */ + Store, + /** + * @deprecated Use StoreOptions from /common/data instead + */ + StoreOptions, +} from '../common/data'; diff --git a/packages/devextreme/js/data/load_options.d.ts b/packages/devextreme/js/data/load_options.d.ts index 27306760f118..0542d92eef5f 100644 --- a/packages/devextreme/js/data/load_options.d.ts +++ b/packages/devextreme/js/data/load_options.d.ts @@ -1,4 +1,4 @@ -import { LoadOptions as BaseLoadOptions } from './index'; +import { LoadOptions as BaseLoadOptions } from '../common/data'; /** @deprecated Use LoadOptions from 'devextreme/data' instead */ export interface LoadOptions extends BaseLoadOptions { } diff --git a/packages/devextreme/js/data/local_store.d.ts b/packages/devextreme/js/data/local_store.d.ts index 930258b98fba..e9fe4eb14006 100644 --- a/packages/devextreme/js/data/local_store.d.ts +++ b/packages/devextreme/js/data/local_store.d.ts @@ -1,56 +1,26 @@ -import ArrayStore, { - ArrayStoreOptions, -} from './array_store'; +import { + LocalStoreOptions, + LocalStore, +} from '../common/data'; -/** @public */ -export type Options< - TItem = any, - TKey = any, -> = LocalStoreOptions; +export { + /** + * @deprecated Use LocalStoreOptions from /common/data instead + */ + LocalStoreOptions, +} from '../common/data'; /** - * @docid - * @namespace DevExpress.data - * @deprecated Use Options instead + * @deprecated Use LocalStore from /common/data instead */ -export interface LocalStoreOptions< - TItem = any, - TKey = any, -> extends ArrayStoreOptions { - /** - * @docid - * @default 10000 - * @public - */ - flushInterval?: number; - /** - * @docid - * @default false - * @public - */ - immediate?: boolean; - /** - * @docid - * @public - */ - name?: string; -} +export default LocalStore; /** - * @docid - * @inherits ArrayStore - * @public - * @options LocalStoreOptions - */ -export default class LocalStore< - TItem = any, - TKey = any, -> extends ArrayStore { - constructor(options?: Options); - /** - * @docid - * @publicName clear() - * @public - */ - clear(): void; -} +* @public +* @deprecated Use LocalStoreOptions from /common/data instead +* @namespace DevExpress.data.LocalStore +*/ +export type Options< + TItem = any, + TKey = any, +> = LocalStoreOptions; diff --git a/packages/devextreme/js/data/local_store.js b/packages/devextreme/js/data/local_store.js new file mode 100644 index 000000000000..d2b036a6c5ae --- /dev/null +++ b/packages/devextreme/js/data/local_store.js @@ -0,0 +1,5 @@ +import { + LocalStore, +} from '../common/data'; + +export default LocalStore; diff --git a/packages/devextreme/js/data/odata/context.d.ts b/packages/devextreme/js/data/odata/context.d.ts index 08ac14b0028c..517cd5b56d75 100644 --- a/packages/devextreme/js/data/odata/context.d.ts +++ b/packages/devextreme/js/data/odata/context.d.ts @@ -1,115 +1,13 @@ -import { - DxPromise, -} from '../../core/utils/deferred'; +import { ODataContext } from '../../common/data'; -export interface ODataRequestOptions { - accepts: any; - async: boolean; - contentType: string | boolean; - data: any; - dataType: string; - headers: any; - jsonp?: boolean; - method: string; - timeout: number; - url: string; - xhrFields: any; -} +export { + /** + * @deprecated Use ODataContextOptions from /common/data instead + */ + ODataContextOptions, +} from '../../common/data'; /** - * @docid - * @namespace DevExpress.data - * @type object + * @deprecated Use ODataContext from /common/data instead */ -export interface ODataContextOptions { - /** - * @docid - * @type_function_param1_field params:object - * @type_function_param1_field payload:object - * @type_function_param1_field headers:object - * @public - */ - beforeSend?: ((options: { url: string; async: boolean; method: string; timeout: number; params: any; payload: any; headers: any }) => void); - /** - * @docid - * @public - */ - deserializeDates?: boolean; - /** - * @docid - * @public - */ - entities?: any; - /** - * @docid - * @type_function_param1 e:Error - * @type_function_param1_field errorDetails:object - * @type_function_param1_field requestOptions:object - * @public - */ - errorHandler?: ((e: { httpStatus: number; errorDetails: any; requestOptions: ODataRequestOptions }) => void); - /** - * @docid - * @public - */ - filterToLower?: boolean; - /** - * @docid - * @default false - * @public - */ - jsonp?: boolean; - /** - * @docid - * @public - */ - url?: string; - /** - * @docid - * @default 4 - * @acceptValues 2|3|4 - * @public - */ - version?: number; - /** - * @docid - * @default false - * @public - */ - withCredentials?: boolean; -} -/** - * @docid - * @public - * @options ODataContextOptions - */ -export default class ODataContext { - constructor(options?: ODataContextOptions); - /** - * @docid - * @publicName get(operationName, params) - * @param2 params:object - * @return Promise - * @public - */ - get(operationName: string, params: any): DxPromise; - /** - * @docid - * @publicName invoke(operationName, params, httpMethod) - * @param2 params:object - * @param3 httpMethod:string - * @return Promise - * @public - */ - invoke(operationName: string, params: any, httpMethod: HttpMethod): DxPromise; - /** - * @docid - * @publicName objectLink(entityAlias, key) - * @param2 key:object|string|number - * @return object - * @public - */ - objectLink(entityAlias: string, key: any | string | number): any; -} - -type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'MERGE'; +export default ODataContext; diff --git a/packages/devextreme/js/data/odata/context.js b/packages/devextreme/js/data/odata/context.js new file mode 100644 index 000000000000..036f266d0d82 --- /dev/null +++ b/packages/devextreme/js/data/odata/context.js @@ -0,0 +1,3 @@ +import { ODataContext } from '../../common/data'; + +export default ODataContext; diff --git a/packages/devextreme/js/data/odata/store.d.ts b/packages/devextreme/js/data/odata/store.d.ts index 1d493c231314..512c03221279 100644 --- a/packages/devextreme/js/data/odata/store.d.ts +++ b/packages/devextreme/js/data/odata/store.d.ts @@ -1,112 +1,23 @@ -import { DxPromise } from '../../core/utils/deferred'; -import Store, { Options as StoreOptions } from '../abstract_store'; -import { Query } from '../query'; -import { ODataRequestOptions } from './context'; +import { ODataStoreOptions, ODataStore } from '../../common/data'; -/** @public */ +/** + * @public + * @deprecated Use ODataStoreOptions from /common/data instead + * @namespace DevExpress.data.ODataStore + */ export type Options< TItem = any, TKey = any, > = ODataStoreOptions; -/** - * @docid - * @namespace DevExpress.data - * @deprecated Use Options instead - */ -export interface ODataStoreOptions< - TItem = any, - TKey = any, -> extends StoreOptions { - /** - * @docid - * @type_function_param1_field params:object - * @type_function_param1_field payload:object - * @type_function_param1_field headers:object - * @public - */ - beforeSend?: ((options: { url: string; async: boolean; method: string; timeout: number; params: any; payload: any; headers: any }) => void); - /** - * @docid - * @public - */ - deserializeDates?: boolean; - /** - * @docid - * @type_function_param1 e:Error - * @type_function_param1_field errorDetails:object - * @type_function_param1_field requestOptions:object - * @public - */ - errorHandler?: ((e: { httpStatus: number; errorDetails: any; requestOptions: ODataRequestOptions }) => void); - /** - * @docid - * @default {} - * @public - */ - fieldTypes?: any; - /** - * @docid - * @public - */ - filterToLower?: boolean; - /** - * @docid - * @default false - * @public - */ - jsonp?: boolean; - /** - * @docid - * @type string|object - * @acceptValues "String"|"Int32"|"Int64"|"Guid"|"Boolean"|"Single"|"Decimal" - * @public - */ - keyType?: 'String' | 'Int32' | 'Int64' | 'Guid' | 'Boolean' | 'Single' | 'Decimal' | any; - /** - * @docid - * @public - */ - url?: string; - /** - * @docid - * @default 4 - * @acceptValues 2|3|4 - * @public - */ - version?: number; +export { /** - * @docid - * @default false - * @public + * @deprecated Use ODataStoreOptions from /common/data instead */ - withCredentials?: boolean; -} + ODataStoreOptions, +}; /** - * @docid - * @inherits Store - * @public - * @options ODataStoreOptions + * @deprecated Use ODataStore from /common/data instead */ -export default class ODataStore< - TItem = any, - TKey = any, -> extends Store { - constructor(options?: Options); - /** - * @docid - * @publicName byKey(key, extraOptions) - * @param1 key:object|string|number - * @return Promise - * @public - */ - byKey(key: TKey, extraOptions?: { expand?: string | Array; select?: string | Array }): DxPromise; - /** - * @docid - * @publicName createQuery(loadOptions) - * @return object - * @public - */ - createQuery(loadOptions?: { expand?: string | Array; requireTotalCount?: boolean; customQueryParams?: any }): Query; -} +export default ODataStore; diff --git a/packages/devextreme/js/data/odata/store.js b/packages/devextreme/js/data/odata/store.js new file mode 100644 index 000000000000..a7c9ceaf80e8 --- /dev/null +++ b/packages/devextreme/js/data/odata/store.js @@ -0,0 +1,3 @@ +import { ODataStore } from '../../common/data'; + +export default ODataStore; diff --git a/packages/devextreme/js/data/odata/utils.d.ts b/packages/devextreme/js/data/odata/utils.d.ts index 17b6810f4510..5c61cd7c4305 100644 --- a/packages/devextreme/js/data/odata/utils.d.ts +++ b/packages/devextreme/js/data/odata/utils.d.ts @@ -1,23 +1,10 @@ -/** - * @docid - * @namespace DevExpress.data - * @public - */ -export class EdmLiteral { - constructor(value: string); - /** - * @docid - * @publicName valueOf() - * @public - */ - valueOf(): string; -} - -/** - * @const Utils.keyConverters - * @publicName odata.keyConverters - * @namespace DevExpress.data.utils.odata - * @public - */ -// eslint-disable-next-line vars-on-top, import/no-mutable-exports, no-var, @typescript-eslint/init-declarations, @typescript-eslint/no-explicit-any -export var keyConverters: any; +export { + /** + * @deprecated Use EdmLiteral from /common/data instead + */ + EdmLiteral, + /** + * @deprecated Use keyConverters from /common/data instead + */ + keyConverters, +} from '../../common/data'; diff --git a/packages/devextreme/js/data/odata/utils.js b/packages/devextreme/js/data/odata/utils.js new file mode 100644 index 000000000000..14553296f4fe --- /dev/null +++ b/packages/devextreme/js/data/odata/utils.js @@ -0,0 +1 @@ +export { EdmLiteral, keyConverters } from '../../common/data'; diff --git a/packages/devextreme/js/data/query.d.ts b/packages/devextreme/js/data/query.d.ts index 5c009faf1be0..e352c11ad441 100644 --- a/packages/devextreme/js/data/query.d.ts +++ b/packages/devextreme/js/data/query.d.ts @@ -1,187 +1,13 @@ -import { - DxPromise, -} from '../core/utils/deferred'; +import { query } from '../common/data'; -/** - * @docid - * @type object - * @public - */ -export interface Query { - /** - * @docid - * @publicName aggregate(seed, step, finalize) - * @param1 seed:object - * @return Promise - * @public - */ - aggregate(seed: any, step: Function, finalize: Function): DxPromise; - /** - * @docid - * @publicName aggregate(step) - * @return Promise - * @public - */ - aggregate(step: Function): DxPromise; - /** - * @docid - * @publicName avg() - * @return Promise - * @public - */ - avg(): DxPromise; - /** - * @docid - * @publicName avg(getter) - * @param1 getter:object - * @return Promise - * @public - */ - avg(getter: any): DxPromise; - /** - * @docid - * @publicName count() - * @return Promise - * @public - */ - count(): DxPromise; - /** - * @docid - * @publicName enumerate() - * @return Promise - * @public - */ - enumerate(): DxPromise; - /** - * @docid - * @publicName filter(criteria) - * @public - */ - filter(criteria: Array): Query; - /** - * @docid - * @publicName filter(predicate) - * @public - */ - filter(predicate: Function): Query; - /** - * @docid - * @publicName groupBy(getter) - * @param1 getter:object - * @public - */ - groupBy(getter: any): Query; - /** - * @docid - * @publicName max() - * @return Promise - * @public - */ - max(): DxPromise; - /** - * @docid - * @publicName max(getter) - * @param1 getter:object - * @return Promise - * @public - */ - max(getter: any): DxPromise; - /** - * @docid - * @publicName min() - * @return Promise - * @public - */ - min(): DxPromise; - /** - * @docid - * @publicName min(getter) - * @param1 getter:object - * @return Promise - * @public - */ - min(getter: any): DxPromise; - /** - * @docid - * @publicName select(getter) - * @param1 getter:object|Array - * @public - */ - select(...getters: any[]): Query; - /** - * @docid - * @publicName slice(skip, take) - * @param2 take:number|undefined - * @public - */ - slice(skip: number, take?: number): Query; - /** - * @docid - * @publicName sortBy(getter) - * @param1 getter:object - * @public - */ - sortBy(getter: any): Query; - /** - * @docid - * @publicName sortBy(getter, desc) - * @param1 getter:object - * @public - */ - sortBy(getter: any, desc: boolean): Query; - /** - * @docid - * @publicName sum() - * @return Promise - * @public - */ - sum(): DxPromise; - /** - * @docid - * @publicName sum(getter) - * @param1 getter:object - * @return Promise - * @public - */ - sum(getter: any): DxPromise; - /** - * @docid - * @publicName thenBy(getter) - * @param1 getter:object - * @public - */ - thenBy(getter: any): Query; - /** - * @docid - * @publicName thenBy(getter, desc) - * @param1 getter:object - * @public - */ - thenBy(getter: any, desc: boolean): Query; - /** - * @docid - * @publicName toArray() - * @public - */ - toArray(): Array; -} - -/** - * @docid Utils.query - * @publicName query(array, queryOptions) - * @param2 queryOptions:object - * @namespace DevExpress.data - * @public - */ -declare function query(array: Array, queryOptions?: any): Query; +export { + /** + * @deprecated Use Query from /common/data instead + */ + Query, +} from '../common/data'; /** - * @docid Utils.query - * @publicName query(url, queryOptions) - * @param2 queryOptions:object - * @namespace DevExpress.data - * @public + * @deprecated Use query from /common/data instead */ -declare function query(url: string, queryOptions: any): Query; - export default query; diff --git a/packages/devextreme/js/data/query.js b/packages/devextreme/js/data/query.js new file mode 100644 index 000000000000..919279dbfc6b --- /dev/null +++ b/packages/devextreme/js/data/query.js @@ -0,0 +1,3 @@ +import { query } from '../common/data'; + +export default query; diff --git a/packages/devextreme/js/data/store.d.ts b/packages/devextreme/js/data/store.d.ts index b3800fb57a41..fe85e4cd6877 100644 --- a/packages/devextreme/js/data/store.d.ts +++ b/packages/devextreme/js/data/store.d.ts @@ -1,203 +1,10 @@ -import { - DxPromise, - DxExtendedPromise, -} from '../core/utils/deferred'; -import { DeepPartial } from '../core/index'; -import { - FilterDescriptor, - GroupDescriptor, - LoadOptions, -} from './index'; - -/** - * @docid StoreOptions - * @namespace DevExpress.data.Store - * @hidden - */ -export type Options< - TItem = any, - TKey = any, -> = { - /** - * @docid StoreOptions.errorHandler - * @public - */ - errorHandler?: Function; - /** - * @docid StoreOptions.key - * @public - */ - key?: string | Array; - /** - * @docid StoreOptions.onInserted - * @type_function_param1 values:object - * @type_function_param2 key:object|string|number - * @action - * @public - */ - onInserted?: ((values: TItem, key: TKey) => void); - /** - * @docid StoreOptions.onInserting - * @type_function_param1 values:object - * @action - * @public - */ - onInserting?: ((values: TItem) => void); - /** - * @docid StoreOptions.onLoading - * @type_function_param1 loadOptions:LoadOptions - * @action - * @public - */ - onLoading?: ((loadOptions: LoadOptions) => void); - /** - * @docid StoreOptions.onModified - * @action - * @public - */ - onModified?: Function; - /** - * @docid StoreOptions.onModifying - * @action - * @public - */ - onModifying?: Function; - /** - * @docid StoreOptions.onPush - * @action - * @public - */ - onPush?: ((changes: Array) => void); - /** - * @docid StoreOptions.onRemoved - * @type_function_param1 key:object|string|number - * @action - * @public - */ - onRemoved?: ((key: TKey) => void); - /** - * @docid StoreOptions.onRemoving - * @type_function_param1 key:object|string|number - * @action - * @public - */ - onRemoving?: ((key: TKey) => void); - /** - * @docid StoreOptions.onUpdated - * @type_function_param1 key:object|string|number - * @type_function_param2 values:object - * @action - * @public - */ - onUpdated?: ((key: TKey, values: TItem) => void); - /** - * @docid StoreOptions.onUpdating - * @type_function_param1 key:object|string|number - * @type_function_param2 values:object - * @action - * @public - */ - onUpdating?: ((key: TKey, values: TItem) => void); -}; - -type EventName = 'loaded' | 'loading' | 'inserted' | 'inserting' | 'updated' | 'updating' | 'push' | 'removed' | 'removing' | 'modified' | 'modifying'; - -/** - * @docid Store - * @namespace DevExpress.data - * @hidden - * @options Options - */ -export class Store< - TItem = any, - TKey = any, -> { - constructor(options?: Options); - /** - * @docid - * @publicName insert(values) - * @param1 values:object - * @return Promise - * @public - */ - insert(values: TItem): DxExtendedPromise; - /** - * @docid - * @publicName key() - * @public - */ - key(): string | Array; - /** - * @docid - * @publicName keyOf(obj) - * @param1 obj:object - * @return any|string|number - * @public - */ - keyOf(obj: TItem): TKey; - /** - * @docid - * @publicName off(eventName) - * @param1 eventName:string - * @return this - * @public - */ - off(eventName: EventName): this; - /** - * @docid - * @publicName off(eventName, eventHandler) - * @param1 eventName:string - * @return this - * @public - */ - off(eventName: EventName, eventHandler: Function): this; - /** - * @docid - * @publicName on(eventName, eventHandler) - * @param1 eventName:string - * @return this - * @public - */ - on(eventName: EventName, eventHandler: Function): this; - /** - * @docid - * @publicName on(events) - * @param1 events:object - * @return this - * @public - */ - on(events: { [key in EventName]?: Function }): this; - /** - * @docid - * @publicName push(changes) - * @param1 changes:Array - * @public - */ - push(changes: Array<{ type: 'insert' | 'update' | 'remove'; data?: DeepPartial; key?: TKey; index?: number }>): void; - /** - * @docid - * @publicName remove(key) - * @param1 key:object|string|number - * @return Promise - * @public - */ - remove(key: TKey): DxPromise; - /** - * @docid - * @publicName totalCount(options) - * @param1_field filter:object - * @param1_field group:object - * @return Promise - * @public - */ - totalCount(obj: { filter?: FilterDescriptor | Array; group?: GroupDescriptor | Array> }): DxPromise; - /** - * @docid - * @publicName update(key, values) - * @param1 key:object|string|number - * @param2 values:object - * @return Promise - * @public - */ - update(key: TKey, values: DeepPartial): DxExtendedPromise; -} +export { + /** + * @deprecated Use StoreOptionsBase from /common/data instead + */ + StoreOptionsBase as Options, + /** + * @deprecated Use StoreBase from /common/data instead + */ + StoreBase as Store, +} from '../common/data'; diff --git a/packages/devextreme/js/data/utils.d.ts b/packages/devextreme/js/data/utils.d.ts index c32257ed8259..fc6ca7bdd009 100644 --- a/packages/devextreme/js/data/utils.d.ts +++ b/packages/devextreme/js/data/utils.d.ts @@ -1,7 +1,6 @@ -/** - * @docid Utils.base64_encode - * @publicName base64_encode(input) - * @namespace DevExpress.data - * @public - */ -export function base64_encode(input: string | Array): string; +export { + /** + * @deprecated Use base64_encode from /common/data instead + */ + base64_encode, +} from '../common/data'; diff --git a/packages/devextreme/js/data/utils.js b/packages/devextreme/js/data/utils.js new file mode 100644 index 000000000000..28c16d2b39ff --- /dev/null +++ b/packages/devextreme/js/data/utils.js @@ -0,0 +1 @@ +export { base64_encode } from '../common/data'; diff --git a/packages/devextreme/js/data_helper.d.ts b/packages/devextreme/js/data_helper.d.ts index ba00d91f5bc7..6af09beb52ca 100644 --- a/packages/devextreme/js/data_helper.d.ts +++ b/packages/devextreme/js/data_helper.d.ts @@ -1,14 +1,3 @@ -import DataSource from './data/data_source'; +import { DataHelperMixin } from './common/data'; -/** - * @docid - * @hidden - */ -export default class DataHelperMixin { - /** - * @docid - * @publicName getDataSource() - * @public - */ - getDataSource(): DataSource; -} +export default DataHelperMixin; diff --git a/packages/devextreme/js/data_helper.js b/packages/devextreme/js/data_helper.js index 7bff404fea60..6af09beb52ca 100644 --- a/packages/devextreme/js/data_helper.js +++ b/packages/devextreme/js/data_helper.js @@ -1,166 +1,3 @@ - -import { DataSource } from './data/data_source/data_source'; -import { extend } from './core/utils/extend'; -import { normalizeDataSourceOptions } from './data/data_source/utils'; -import DataController from './__internal/ui/collection/m_data_controller'; - -const DATA_SOURCE_OPTIONS_METHOD = '_dataSourceOptions'; -const DATA_SOURCE_CHANGED_METHOD = '_dataSourceChangedHandler'; -const DATA_SOURCE_LOAD_ERROR_METHOD = '_dataSourceLoadErrorHandler'; -const DATA_SOURCE_LOADING_CHANGED_METHOD = '_dataSourceLoadingChangedHandler'; -const DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD = '_dataSourceFromUrlLoadMode'; -const SPECIFIC_DATA_SOURCE_OPTION = '_getSpecificDataSourceOption'; -const NORMALIZE_DATA_SOURCE = '_normalizeDataSource'; - - -const DataHelperMixin = { - - postCtor: function() { - this.on('disposing', function() { - this._disposeDataSource(); - }.bind(this)); - }, - - _refreshDataSource: function() { - this._initDataSource(); - this._loadDataSource(); - }, - - _initDataSource: function() { - let dataSourceOptions = (SPECIFIC_DATA_SOURCE_OPTION in this) ? this[SPECIFIC_DATA_SOURCE_OPTION]() : this.option('dataSource'); - let widgetDataSourceOptions; - let dataSourceType; - - this._disposeDataSource(); - - if(dataSourceOptions) { - if(dataSourceOptions instanceof DataSource) { - this._isSharedDataSource = true; - this._dataSource = dataSourceOptions; - } else { - widgetDataSourceOptions = (DATA_SOURCE_OPTIONS_METHOD in this) ? this[DATA_SOURCE_OPTIONS_METHOD]() : {}; - dataSourceType = this._dataSourceType ? this._dataSourceType() : DataSource; - - dataSourceOptions = normalizeDataSourceOptions(dataSourceOptions, { - fromUrlLoadMode: (DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD in this) && this[DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD]() - }); - - this._dataSource = new dataSourceType(extend(true, {}, widgetDataSourceOptions, dataSourceOptions)); - } - - if(NORMALIZE_DATA_SOURCE in this) { - this._dataSource = this[NORMALIZE_DATA_SOURCE](this._dataSource); - } - - this._addDataSourceHandlers(); - this._initDataController(); - } - }, - - _initDataController: function() { - const dataController = this.option?.('_dataController'); - const dataSource = this._dataSource; - - if(dataController) { - this._dataController = dataController; - } else { - this._dataController = new DataController(dataSource); - } - }, - - _addDataSourceHandlers: function() { - if(DATA_SOURCE_CHANGED_METHOD in this) { - this._addDataSourceChangeHandler(); - } - - if(DATA_SOURCE_LOAD_ERROR_METHOD in this) { - this._addDataSourceLoadErrorHandler(); - } - - if(DATA_SOURCE_LOADING_CHANGED_METHOD in this) { - this._addDataSourceLoadingChangedHandler(); - } - - this._addReadyWatcher(); - }, - - _addReadyWatcher: function() { - this.readyWatcher = (function(isLoading) { - this._ready && this._ready(!isLoading); - }).bind(this); - this._dataSource.on('loadingChanged', this.readyWatcher); - }, - - _addDataSourceChangeHandler: function() { - const dataSource = this._dataSource; - this._proxiedDataSourceChangedHandler = (function(e) { - this[DATA_SOURCE_CHANGED_METHOD](dataSource.items(), e); - }).bind(this); - dataSource.on('changed', this._proxiedDataSourceChangedHandler); - }, - - _addDataSourceLoadErrorHandler: function() { - this._proxiedDataSourceLoadErrorHandler = this[DATA_SOURCE_LOAD_ERROR_METHOD].bind(this); - this._dataSource.on('loadError', this._proxiedDataSourceLoadErrorHandler); - }, - - _addDataSourceLoadingChangedHandler: function() { - this._proxiedDataSourceLoadingChangedHandler = this[DATA_SOURCE_LOADING_CHANGED_METHOD].bind(this); - this._dataSource.on('loadingChanged', this._proxiedDataSourceLoadingChangedHandler); - }, - - _loadDataSource: function() { - const dataSource = this._dataSource; - if(dataSource) { - if(dataSource.isLoaded()) { - this._proxiedDataSourceChangedHandler && this._proxiedDataSourceChangedHandler(); - } else { - dataSource.load(); - } - } - }, - - _loadSingle: function(key, value) { - key = key === 'this' ? this._dataSource.key() || 'this' : key; - return this._dataSource.loadSingle(key, value); - }, - - _isLastPage: function() { - return !this._dataSource || this._dataSource.isLastPage() || !this._dataSource._pageSize; - }, - - _isDataSourceLoading: function() { - return this._dataSource && this._dataSource.isLoading(); - }, - - _disposeDataSource: function() { - if(this._dataSource) { - if(this._isSharedDataSource) { - delete this._isSharedDataSource; - - this._proxiedDataSourceChangedHandler && this._dataSource.off('changed', this._proxiedDataSourceChangedHandler); - this._proxiedDataSourceLoadErrorHandler && this._dataSource.off('loadError', this._proxiedDataSourceLoadErrorHandler); - this._proxiedDataSourceLoadingChangedHandler && this._dataSource.off('loadingChanged', this._proxiedDataSourceLoadingChangedHandler); - - if(this._dataSource._eventsStrategy) { - this._dataSource._eventsStrategy.off('loadingChanged', this.readyWatcher); - } - } else { - this._dataSource.dispose(); - } - - delete this._dataSource; - - delete this._proxiedDataSourceChangedHandler; - delete this._proxiedDataSourceLoadErrorHandler; - delete this._proxiedDataSourceLoadingChangedHandler; - } - }, - - getDataSource: function() { - return this._dataSource || null; - } - -}; +import { DataHelperMixin } from './common/data'; export default DataHelperMixin; diff --git a/packages/devextreme/js/events/index.d.ts b/packages/devextreme/js/events/index.d.ts new file mode 100644 index 000000000000..7659a73b2e36 --- /dev/null +++ b/packages/devextreme/js/events/index.d.ts @@ -0,0 +1,81 @@ +export { + /** + * @deprecated Use on from /common/core/events instead + */ + on, + /** + * @deprecated Use one from /common/core/events instead + */ + one, + /** + * @deprecated Use off from /common/core/events instead + */ + off, + /** + * @deprecated Use trigger from /common/core/events instead + */ + trigger, + /** + * @deprecated Use triggerHandler from /common/core/events instead + */ + triggerHandler, + /** + * @deprecated Use DxEvent from /common/core/events instead + */ + DxEvent, + /** + * @deprecated Use InitializedEventInfo from /common/core/events instead + */ + InitializedEventInfo, + /** + * @deprecated Use EventInfo from /common/core/events instead + */ + EventInfo, + /** + * @deprecated Use NativeEventInfo from /common/core/events instead + */ + NativeEventInfo, + /** + * @deprecated Use ChangedOptionInfo from /common/core/events instead + */ + ChangedOptionInfo, + /** + * @deprecated Use ItemInfo from /common/core/events instead + */ + ItemInfo, + /** + * @deprecated Use Cancelable from /common/core/events instead + */ + Cancelable, + /** + * @deprecated Use AsyncCancelable from /common/core/events instead + */ + AsyncCancelable, + /** + * @deprecated Use EventObject from /common/core/events instead + */ + EventObject, + /** + * @deprecated Use EventExtension from /common/core/events instead + */ + EventExtension, + /** + * @deprecated Use EventType from /common/core/events instead + */ + EventType, + /** + * @deprecated Use dxEvent from /common/core/events/index instead + */ + dxEvent, + /** + * @deprecated Use event from /common/core/events/index instead + */ + event, +} from '../common/core/events'; + +export { + /** + * @deprecated Use eventsHandler from /common/core/events/index instead + */ + eventsHandler, +} from '../common/core/events/index'; diff --git a/packages/devextreme/js/events/index.js b/packages/devextreme/js/events/index.js new file mode 100644 index 000000000000..0de37da44056 --- /dev/null +++ b/packages/devextreme/js/events/index.js @@ -0,0 +1,7 @@ +export { + on, + one, + off, + trigger, + triggerHandler, +} from '../common/core/events'; diff --git a/packages/devextreme/js/excel_exporter.d.ts b/packages/devextreme/js/excel_exporter.d.ts new file mode 100644 index 000000000000..0eb84a9933ef --- /dev/null +++ b/packages/devextreme/js/excel_exporter.d.ts @@ -0,0 +1,46 @@ +export { + /** + * @deprecated Use DataGridCell from common/export/excel instead + */ + DataGridCell, + /** + * @deprecated Use ExcelDataGridCell from common/export/excel instead + */ + ExcelDataGridCell, + /** + * @deprecated Use PivotGridCell from common/export/excel instead + */ + PivotGridCell, + /** + * @deprecated Use ExcelPivotGridCell from common/export/excel instead + */ + ExcelPivotGridCell, + /** + * @deprecated Use CellAddress from common/export/excel instead + */ + CellAddress, + /** + * @deprecated Use CellRange from common/export/excel instead + */ + CellRange, + /** + * @deprecated Use ExcelExportBaseProps from common/export/excel instead + */ + ExcelExportBaseProps, + /** + * @deprecated Use ExcelExportDataGridProps from common/export/excel instead + */ + ExcelExportDataGridProps, + /** + * @deprecated Use ExcelExportPivotGridProps from common/export/excel instead + */ + ExcelExportPivotGridProps, + /** + * @deprecated Use exportDataGrid from common/export/excel instead + */ + exportDataGrid, + /** + * @deprecated Use exportPivotGrid from common/export/excel instead + */ + exportPivotGrid, +} from './common/export/excel'; diff --git a/packages/devextreme/js/excel_exporter.js b/packages/devextreme/js/excel_exporter.js new file mode 100644 index 000000000000..48ace077fbad --- /dev/null +++ b/packages/devextreme/js/excel_exporter.js @@ -0,0 +1 @@ +export { exportDataGrid, exportPivotGrid } from './common/export/excel'; diff --git a/packages/devextreme/js/exporter/common/export_load_panel.js b/packages/devextreme/js/exporter/common/export_load_panel.js index 8d303b1943b6..1f045f5d30a5 100644 --- a/packages/devextreme/js/exporter/common/export_load_panel.js +++ b/packages/devextreme/js/exporter/common/export_load_panel.js @@ -1,6 +1,6 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { isDefined } from '../../core/utils/type'; import LoadPanel from '../../ui/load_panel'; import gridUtils from '../../__internal/grids/grid_core/m_utils'; diff --git a/packages/devextreme/js/exporter/exceljs/export_format.js b/packages/devextreme/js/exporter/exceljs/export_format.js index 1286c1454c15..3389898b69f6 100644 --- a/packages/devextreme/js/exporter/exceljs/export_format.js +++ b/packages/devextreme/js/exporter/exceljs/export_format.js @@ -1,11 +1,11 @@ import { format as stringFormat } from '../../core/utils/string'; -import numberFormatter from '../../localization/number'; -import dateLocalization from '../../localization/date'; +import numberFormatter from '../../common/core/localization/number'; +import dateLocalization from '../../common/core/localization/date'; import { isDefined, isString, isObject, isNumeric } from '../../core/utils/type'; -import { getFormat } from '../../localization/ldml/date.format'; -import { getLanguageId } from '../../localization/language_codes'; +import { getFormat } from '../../common/core/localization/ldml/date.format'; +import { getLanguageId } from '../../common/core/localization/language_codes'; import { extend } from '../../core/utils/extend'; -import '../../localization/currency'; +import '../../common/core/localization/currency'; const ARABIC_ZERO_CODE = 1632; const DEFINED_NUMBER_FORMTATS = { diff --git a/packages/devextreme/js/exporter/export_load_panel.d.ts b/packages/devextreme/js/exporter/export_load_panel.d.ts new file mode 100644 index 000000000000..45817ec0c6d7 --- /dev/null +++ b/packages/devextreme/js/exporter/export_load_panel.d.ts @@ -0,0 +1,6 @@ +export { + /** + * @deprecated Use ExportLoadPanel from /common/export instead + */ + ExportLoadPanel, +} from '../common/export'; diff --git a/packages/devextreme/js/exporter/jspdf/autotable/export.js b/packages/devextreme/js/exporter/jspdf/autotable/export.js index 99da73c8c40f..8de1697c21cc 100644 --- a/packages/devextreme/js/exporter/jspdf/autotable/export.js +++ b/packages/devextreme/js/exporter/jspdf/autotable/export.js @@ -1,8 +1,8 @@ import { isDate, isDefined, isObject, isFunction, isNumeric } from '../../../core/utils/type'; import { extend } from '../../../core/utils/extend'; -import dateLocalization from '../../../localization/date'; -import numberLocalization from '../../../localization/number'; -import messageLocalization from '../../../localization/message'; +import dateLocalization from '../../../common/core/localization/date'; +import numberLocalization from '../../../common/core/localization/number'; +import messageLocalization from '../../../common/core/localization/message'; import { ExportLoadPanel } from '../../common/export_load_panel'; import { hasWindow } from '../../../core/utils/window'; diff --git a/packages/devextreme/js/exporter/jspdf/common/export.js b/packages/devextreme/js/exporter/jspdf/common/export.js index ccd774e6b600..b87e90605629 100644 --- a/packages/devextreme/js/exporter/jspdf/common/export.js +++ b/packages/devextreme/js/exporter/jspdf/common/export.js @@ -7,7 +7,7 @@ import { generateRowsInfo, getBaseTableStyle } from './rows_generator'; import { splitByPages } from './rows_splitting'; import { drawCellsContent, drawCellsLines, drawGridLines, getDocumentStyles, setDocumentStyles, addNewPage } from './draw_utils'; import { applyRtl, applyWordWrap, toPdfUnit } from './pdf_utils'; -import messageLocalization from '../../../localization/message'; +import messageLocalization from '../../../common/core/localization/message'; import { ExportLoadPanel } from '../../common/export_load_panel'; import { hasWindow } from '../../../core/utils/window'; diff --git a/packages/devextreme/js/exporter/jspdf/common/rows_generator.js b/packages/devextreme/js/exporter/jspdf/common/rows_generator.js index 3aac4c886ec6..47f487d48d45 100644 --- a/packages/devextreme/js/exporter/jspdf/common/rows_generator.js +++ b/packages/devextreme/js/exporter/jspdf/common/rows_generator.js @@ -1,6 +1,6 @@ import { isDate, isDefined, isNumeric } from '../../../core/utils/type'; -import dateLocalization from '../../../localization/date'; -import numberLocalization from '../../../localization/number'; +import dateLocalization from '../../../common/core/localization/date'; +import numberLocalization from '../../../common/core/localization/number'; import { toPdfUnit } from './pdf_utils'; const defaultStyles = { diff --git a/packages/devextreme/js/file_management/custom_provider.d.ts b/packages/devextreme/js/file_management/custom_provider.d.ts index ec107e21c6d8..fa76ba771562 100644 --- a/packages/devextreme/js/file_management/custom_provider.d.ts +++ b/packages/devextreme/js/file_management/custom_provider.d.ts @@ -1,102 +1,23 @@ -import FileSystemProviderBase, { - FileSystemProviderBaseOptions, -} from './provider_base'; - -import FileSystemItem from './file_system_item'; -import UploadInfo from './upload_info'; - -/** @public */ -export type Options = CustomFileSystemProviderOptions; +import { + CustomFileSystemProviderOptions, + CustomFileSystemProvider, +} from '../common/file_management'; /** - * @deprecated Use Options instead - * @namespace DevExpress.fileManagement - * @docid + * @public + * @deprecated Use CustomFileSystemProviderOptions from /common/file_management instead + * @namespace DevExpress.fileManagement.CustomFileSystemProvider */ -export interface CustomFileSystemProviderOptions extends FileSystemProviderBaseOptions { - /** - * @docid - * @type_function_return Promise|any - * @public - */ - abortFileUpload?: ((file: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem) => PromiseLike | any); - - /** - * @docid - * @type_function_return Promise|any - * @public - */ - copyItem?: ((item: FileSystemItem, destinationDirectory: FileSystemItem) => PromiseLike | any); - - /** - * @docid - * @type_function_return Promise|any - * @public - */ - createDirectory?: ((parentDirectory: FileSystemItem, name: string) => PromiseLike | any); - - /** - * @docid - * @type_function_return Promise|any - * @public - */ - deleteItem?: ((item: FileSystemItem) => PromiseLike | any); - - /** - * @docid - * @public - */ - downloadItems?: ((items: Array) => void); - - /** - * @docid - * @type_function_return Promise>|Array - * @public - */ - getItems?: ((parentDirectory: FileSystemItem) => PromiseLike> | Array); - - /** - * @docid - * @type_function_return Promise|object - * @public - */ - getItemsContent?: ((items: Array) => PromiseLike | any); - - /** - * @docid - * @public - */ - hasSubDirectoriesExpr?: string | Function; - - /** - * @docid - * @type_function_return Promise|any - * @public - */ - moveItem?: ((item: FileSystemItem, destinationDirectory: FileSystemItem) => PromiseLike | any); - - /** - * @docid - * @type_function_return Promise|any - * @public - */ - renameItem?: ((item: FileSystemItem, newName: string) => PromiseLike | any); +export type Options = CustomFileSystemProviderOptions; - /** - * @docid - * @type_function_return Promise|any - * @public - */ - uploadFileChunk?: ((file: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem) => PromiseLike | any); -} +export { + /** + * @deprecated Use CustomFileSystemProviderOptions from /common/file_management instead + */ + CustomFileSystemProviderOptions, +}; /** - * @docid - * @inherits FileSystemProviderBase - * @namespace DevExpress.fileManagement - * @public - * @options CustomFileSystemProviderOptions + * @deprecated Use CustomFileSystemProvider from /common/file_management instead */ -export default class CustomFileSystemProvider extends FileSystemProviderBase { - constructor(options?: Options); -} +export default CustomFileSystemProvider; diff --git a/packages/devextreme/js/file_management/custom_provider.js b/packages/devextreme/js/file_management/custom_provider.js new file mode 100644 index 000000000000..799cb7a1365e --- /dev/null +++ b/packages/devextreme/js/file_management/custom_provider.js @@ -0,0 +1,5 @@ +import { + CustomFileSystemProvider, +} from '../common/file_management'; + +export default CustomFileSystemProvider; diff --git a/packages/devextreme/js/file_management/error.d.ts b/packages/devextreme/js/file_management/error.d.ts index 7856bb15add7..7458c232bbf9 100644 --- a/packages/devextreme/js/file_management/error.d.ts +++ b/packages/devextreme/js/file_management/error.d.ts @@ -1,27 +1,6 @@ -import FileSystemItem from './file_system_item'; +import { FileSystemError } from '../common/file_management'; /** - * @docid FileSystemError - * @namespace DevExpress.fileManagement - * @public + * @deprecated Use FileSystemError from /common/file_management instead */ -export default class FileSystemError { - constructor(errorCode?: number, fileSystemItem?: FileSystemItem, errorText?: string); - /** - * @docid FileSystemError.fileSystemItem - * @public - */ - fileSystemItem?: FileSystemItem; - - /** - * @docid FileSystemError.errorCode - * @public - */ - errorCode?: number; - - /** - * @docid FileSystemError.errorText - * @public - */ - errorText?: string; -} +export default FileSystemError; diff --git a/packages/devextreme/js/file_management/error.js b/packages/devextreme/js/file_management/error.js new file mode 100644 index 000000000000..bc3a01a67800 --- /dev/null +++ b/packages/devextreme/js/file_management/error.js @@ -0,0 +1,3 @@ +import { FileSystemError } from '../common/file_management'; + +export default FileSystemError; diff --git a/packages/devextreme/js/file_management/file_system_item.d.ts b/packages/devextreme/js/file_management/file_system_item.d.ts index b71fc61a9646..2774f614f7fe 100644 --- a/packages/devextreme/js/file_management/file_system_item.d.ts +++ b/packages/devextreme/js/file_management/file_system_item.d.ts @@ -1,75 +1,6 @@ +import { FileSystemItem } from '../common/file_management'; + /** - * @docid FileSystemItem - * @namespace DevExpress.fileManagement - * @public + * @deprecated Use FileSystemItem from /common/file_management instead */ -export default class FileSystemItem { - constructor(path: string, isDirectory: boolean, pathKeys?: Array); - - /** - * @docid FileSystemItem.path - * @public - */ - path: string; - - /** - * @docid FileSystemItem.pathKeys - * @public - */ - pathKeys: Array; - - /** - * @docid FileSystemItem.key - * @public - */ - key: string; - - /** - * @docid FileSystemItem.name - * @public - */ - name: string; - - /** - * @docid FileSystemItem.dateModified - * @public - */ - dateModified: Date; - - /** - * @docid FileSystemItem.size - * @public - */ - size: number; - - /** - * @docid FileSystemItem.isDirectory - * @public - */ - isDirectory: boolean; - - /** - * @docid FileSystemItem.hasSubDirectories - * @public - */ - hasSubDirectories: boolean; - - /** - * @docid FileSystemItem.thumbnail - * @public - */ - thumbnail: string; - - /** - * @docid FileSystemItem.dataItem - * @public - */ - dataItem: any; - - /** - * @docid FileSystemItem.getFileExtension - * @publicName getFileExtension() - * @public - */ - getFileExtension(): string; -} +export default FileSystemItem; diff --git a/packages/devextreme/js/file_management/file_system_item.js b/packages/devextreme/js/file_management/file_system_item.js new file mode 100644 index 000000000000..390f1ed93b5e --- /dev/null +++ b/packages/devextreme/js/file_management/file_system_item.js @@ -0,0 +1,3 @@ +import { FileSystemItem } from '../common/file_management'; + +export default FileSystemItem; diff --git a/packages/devextreme/js/file_management/object_provider.d.ts b/packages/devextreme/js/file_management/object_provider.d.ts index 9bb5db1c2738..6bdb76a78eff 100644 --- a/packages/devextreme/js/file_management/object_provider.d.ts +++ b/packages/devextreme/js/file_management/object_provider.d.ts @@ -1,39 +1,23 @@ -import FileSystemProviderBase, { - FileSystemProviderBaseOptions, -} from './provider_base'; +import { + ObjectFileSystemProviderOptions, + ObjectFileSystemProvider, +} from '../common/file_management'; -/** @public */ +/** + * @public + * @deprecated Use ObjectFileSystemProviderOptions from /common/file_management instead + * @namespace DevExpress.fileManagement.ObjectFileSystemProvider +*/ export type Options = ObjectFileSystemProviderOptions; +export { + /** + * @deprecated Use ObjectFileSystemProviderOptions from /common/file_management instead + */ + ObjectFileSystemProviderOptions, +}; + /** - * @deprecated Use Options instead - * @namespace DevExpress.fileManagement - * @docid - */ -export interface ObjectFileSystemProviderOptions extends FileSystemProviderBaseOptions { - /** - * @docid - * @public - */ - contentExpr?: string | Function; - /** - * @docid - * @public - */ - data?: Array; - /** - * @docid - * @public - */ - itemsExpr?: string | Function; -} -/** - * @docid - * @inherits FileSystemProviderBase - * @namespace DevExpress.fileManagement - * @public - * @options ObjectFileSystemProviderOptions + * @deprecated Use ObjectFileSystemProvider from /common/file_management instead */ -export default class ObjectFileSystemProvider extends FileSystemProviderBase { - constructor(options?: Options); -} +export default ObjectFileSystemProvider; diff --git a/packages/devextreme/js/file_management/object_provider.js b/packages/devextreme/js/file_management/object_provider.js new file mode 100644 index 000000000000..88ac1779ab7a --- /dev/null +++ b/packages/devextreme/js/file_management/object_provider.js @@ -0,0 +1,5 @@ +import { + ObjectFileSystemProvider, +} from '../common/file_management'; + +export default ObjectFileSystemProvider; diff --git a/packages/devextreme/js/file_management/provider_base.d.ts b/packages/devextreme/js/file_management/provider_base.d.ts index ce7f8f11d911..f551bd8cfbe4 100644 --- a/packages/devextreme/js/file_management/provider_base.d.ts +++ b/packages/devextreme/js/file_management/provider_base.d.ts @@ -1,132 +1,13 @@ -import FileSystemItem from './file_system_item'; -import UploadInfo from './upload_info'; +import { FileSystemProviderBase } from '../common/file_management'; -import { - DxPromise, -} from '../core/utils/deferred'; +export { + /** + * @deprecated Use FileSystemProviderBaseOptions from /common/file_management instead + */ + FileSystemProviderBaseOptions, +} from '../common/file_management'; /** - * @namespace DevExpress.fileManagement - * @docid - * @type object + * @deprecated Use FileSystemProviderBase from /common/file_management instead */ -// eslint-disable-next-line @typescript-eslint/no-unused-vars -export interface FileSystemProviderBaseOptions { - /** - * @docid - * @public - */ - dateModifiedExpr?: string | Function; - /** - * @docid - * @public - */ - isDirectoryExpr?: string | Function; - /** - * @docid - * @public - */ - keyExpr?: string | Function; - /** - * @docid - * @public - */ - nameExpr?: string | Function; - /** - * @docid - * @public - */ - sizeExpr?: string | Function; - /** - * @docid - * @public - */ - thumbnailExpr?: string | Function; -} -/** - * @docid - * @namespace DevExpress.fileManagement - * @hidden - * @options FileSystemProviderBaseOptions - */ -export default class FileSystemProviderBase { - constructor(options?: FileSystemProviderBaseOptions); - /** - * @docid - * @publicName getItems() - * @return Promise> - * @public - */ - getItems(parentDirectory: FileSystemItem): DxPromise>; - - /** - * @docid - * @publicName renameItem() - * @return Promise - * @public - */ - renameItem(item: FileSystemItem, newName: string): DxPromise; - - /** - * @docid - * @publicName createDirectory() - * @return Promise - * @public - */ - createDirectory(parentDirectory: FileSystemItem, name: string): DxPromise; - - /** - * @docid - * @publicName deleteItems() - * @return Array> - * @public - */ - deleteItems(items: Array): Array>; - - /** - * @docid - * @publicName moveItems() - * @return Array> - * @public - */ - moveItems(items: Array, destinationDirectory: FileSystemItem): Array>; - - /** - * @docid - * @publicName copyItems() - * @return Array> - * @public - */ - copyItems(items: Array, destinationDirectory: FileSystemItem): Array>; - - /** - * @docid - * @publicName uploadFileChunk() - * @return Promise - * @public - */ - uploadFileChunk(fileData: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem): DxPromise; - - /** - * @docid - * @publicName abortFileUpload() - * @return Promise - * @public - */ - abortFileUpload(fileData: File, uploadInfo: UploadInfo, destinationDirectory: FileSystemItem): DxPromise; - - /** - * @docid - * @publicName downloadItems() - * @public - */ - downloadItems(items: Array): void; - - /** - * @docid - * @publicName getItemsContent() - * @return Promise - * @public - */ - getItemsContent(items: Array): DxPromise; -} +export default FileSystemProviderBase; diff --git a/packages/devextreme/js/file_management/provider_base.js b/packages/devextreme/js/file_management/provider_base.js new file mode 100644 index 000000000000..668d680e9097 --- /dev/null +++ b/packages/devextreme/js/file_management/provider_base.js @@ -0,0 +1,3 @@ +import { FileSystemProviderBase } from '../common/file_management'; + +export default FileSystemProviderBase; diff --git a/packages/devextreme/js/file_management/remote_provider.d.ts b/packages/devextreme/js/file_management/remote_provider.d.ts index 3a76d61f436d..3f66740e655e 100644 --- a/packages/devextreme/js/file_management/remote_provider.d.ts +++ b/packages/devextreme/js/file_management/remote_provider.d.ts @@ -1,54 +1,23 @@ -import FileSystemProviderBase, { - FileSystemProviderBaseOptions, -} from './provider_base'; - -/** @public */ -export type Options = RemoteFileSystemProviderOptions; +import { + RemoteFileSystemProvider, + RemoteFileSystemProviderOptions, +} from '../common/file_management'; /** - * @deprecated Use Options instead - * @namespace DevExpress.fileManagement - * @docid + * @public + * @deprecated Use RemoteFileSystemProviderOptions from /common/file_management instead + * @namespace DevExpress.fileManagement.RemoteFileSystemProvider */ -export interface RemoteFileSystemProviderOptions extends FileSystemProviderBaseOptions { - /** - * @docid - * @type_function_param1_field headers:object - * @type_function_param1_field xhrFields:object - * @type_function_param1_field formData:object - * @public - */ - beforeAjaxSend?: ((options: { headers?: any; xhrFields?: any; formData?: any }) => void); - /** - * @docid - * @type_function_param1_field formData:object - * @public - */ - beforeSubmit?: ((options: { formData?: any }) => void); - /** - * @docid - * @public - */ - endpointUrl?: string; - /** - * @docid - * @public - */ - hasSubDirectoriesExpr?: string | Function; - /** - * @docid - * @default {} - * @public - */ - requestHeaders?: any; -} +export type Options = RemoteFileSystemProviderOptions; + +export { + /** + * @deprecated Use RemoteFileSystemProviderOptions from /common/file_management instead + */ + RemoteFileSystemProviderOptions, +}; + /** - * @docid - * @inherits FileSystemProviderBase - * @namespace DevExpress.fileManagement - * @public - * @options RemoteFileSystemProviderOptions + * @deprecated Use RemoteFileSystemProvider from /common/file_management instead */ -export default class RemoteFileSystemProvider extends FileSystemProviderBase { - constructor(options?: Options); -} +export default RemoteFileSystemProvider; diff --git a/packages/devextreme/js/file_management/remote_provider.js b/packages/devextreme/js/file_management/remote_provider.js new file mode 100644 index 000000000000..87cb49dceac6 --- /dev/null +++ b/packages/devextreme/js/file_management/remote_provider.js @@ -0,0 +1,5 @@ +import { + RemoteFileSystemProvider, +} from '../common/file_management'; + +export default RemoteFileSystemProvider; diff --git a/packages/devextreme/js/file_management/upload_info.d.ts b/packages/devextreme/js/file_management/upload_info.d.ts index bc5a26146cae..3dda0fbe6c56 100644 --- a/packages/devextreme/js/file_management/upload_info.d.ts +++ b/packages/devextreme/js/file_management/upload_info.d.ts @@ -1,36 +1,6 @@ -/** - * @docid - * @namespace DevExpress.fileManagement - * @public - */ -export default interface UploadInfo { - /** - * @docid - * @public - */ - bytesUploaded: number; - - /** - * @docid - * @public - */ - chunkCount: number; - - /** - * @docid - * @public - */ - customData: any; - - /** - * @docid - * @public - */ - chunkBlob: Blob; - - /** - * @docid - * @public - */ - chunkIndex: number; -} +export { + /** + * @deprecated Use UploadInfo from /common/file_management instead + */ + UploadInfo, +} from '../common/file_management'; diff --git a/packages/devextreme/js/format_helper.d.ts b/packages/devextreme/js/format_helper.d.ts index ed4f1c706830..b92812b5e6cb 100644 --- a/packages/devextreme/js/format_helper.d.ts +++ b/packages/devextreme/js/format_helper.d.ts @@ -1,6 +1,6 @@ import { Format, -} from './localization'; +} from './common/core/localization'; export interface FormatHelper { format( diff --git a/packages/devextreme/js/format_helper.js b/packages/devextreme/js/format_helper.js index f194972695c0..de05bc7ec2a0 100644 --- a/packages/devextreme/js/format_helper.js +++ b/packages/devextreme/js/format_helper.js @@ -7,11 +7,11 @@ import { isPlainObject } from './core/utils/type'; import dateUtils from './core/utils/date'; -import numberLocalization from './localization/number'; -import dateLocalization from './localization/date'; +import numberLocalization from './common/core/localization/number'; +import dateLocalization from './common/core/localization/date'; import dependencyInjector from './core/utils/dependency_injector'; -import './localization/currency'; +import './common/core/localization/currency'; export default dependencyInjector({ format: function(value, format) { diff --git a/packages/devextreme/js/integration/jquery.d.ts b/packages/devextreme/js/integration/jquery.d.ts index ccb50918ffb6..adfc6a505e17 100644 --- a/packages/devextreme/js/integration/jquery.d.ts +++ b/packages/devextreme/js/integration/jquery.d.ts @@ -92,7 +92,7 @@ declare module '../core/utils/deferred' { interface PromiseType extends JQueryPromise { } } -declare module '../events/index' { +declare module '../common/core/events' { interface EventType extends JQueryEventObject { cancel?: boolean; } diff --git a/packages/devextreme/js/integration/jquery/easing.js b/packages/devextreme/js/integration/jquery/easing.js index 8c26bcbb08cf..a569caf2a777 100644 --- a/packages/devextreme/js/integration/jquery/easing.js +++ b/packages/devextreme/js/integration/jquery/easing.js @@ -1,6 +1,6 @@ // eslint-disable-next-line no-restricted-imports import jQuery from 'jquery'; -import { setEasing } from '../../animation/easing'; +import { setEasing } from '../../common/core/animation/easing'; if(jQuery) { setEasing(jQuery.easing); diff --git a/packages/devextreme/js/integration/jquery/events.js b/packages/devextreme/js/integration/jquery/events.js index 1c1368d4fe39..15bd55198735 100644 --- a/packages/devextreme/js/integration/jquery/events.js +++ b/packages/devextreme/js/integration/jquery/events.js @@ -1,8 +1,8 @@ // eslint-disable-next-line no-restricted-imports import jQuery from 'jquery'; -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; import useJQueryFn from './use_jquery'; -import registerEventCallbacks from '../../events/core/event_registrator_callbacks'; +import registerEventCallbacks from '../../common/core/events/core/event_registrator_callbacks'; import domAdapter from '../../core/dom_adapter'; const useJQuery = useJQueryFn(); diff --git a/packages/devextreme/js/integration/jquery/hooks.js b/packages/devextreme/js/integration/jquery/hooks.js index 156ab55a7be0..0b2d0a6a5deb 100644 --- a/packages/devextreme/js/integration/jquery/hooks.js +++ b/packages/devextreme/js/integration/jquery/hooks.js @@ -5,9 +5,9 @@ const useJQuery = useJQueryFn(); import { compare as compareVersion } from '../../core/utils/version'; import { each } from '../../core/utils/iterator'; import { isNumeric } from '../../core/utils/type'; -import { setEventFixMethod } from '../../events/utils/index'; -import registerEvent from '../../events/core/event_registrator'; -import hookTouchProps from '../../events/core/hook_touch_props'; +import { setEventFixMethod } from '../../common/core/events/utils/index'; +import registerEvent from '../../common/core/events/core/event_registrator'; +import hookTouchProps from '../../common/core/events/core/hook_touch_props'; if(useJQuery) { if(compareVersion(jQuery.fn.jquery, [3]) < 0) { diff --git a/packages/devextreme/js/integration/knockout/event_registrator.js b/packages/devextreme/js/integration/knockout/event_registrator.js index 81f23cb31023..38be731ab78b 100644 --- a/packages/devextreme/js/integration/knockout/event_registrator.js +++ b/packages/devextreme/js/integration/knockout/event_registrator.js @@ -1,10 +1,10 @@ import $ from '../../core/renderer'; -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; // eslint-disable-next-line no-restricted-imports import ko from 'knockout'; import { isPlainObject } from '../../core/utils/type'; -import eventRegistratorCallbacks from '../../events/core/event_registrator_callbacks'; -import { addNamespace } from '../../events/utils/index'; +import eventRegistratorCallbacks from '../../common/core/events/core/event_registrator_callbacks'; +import { addNamespace } from '../../common/core/events/utils/index'; if(ko) { eventRegistratorCallbacks.add(function(name) { diff --git a/packages/devextreme/js/localization.d.ts b/packages/devextreme/js/localization.d.ts index 52d0f5343287..108bfcd95ac6 100644 --- a/packages/devextreme/js/localization.d.ts +++ b/packages/devextreme/js/localization.d.ts @@ -1,131 +1,38 @@ -import { Format as PredefinedFormat } from './common'; - -/** - * @docid localization.formatDate - * @publicName formatDate(value, format) - * @static - * @namespace DevExpress.localization - * @public - */ -export function formatDate(value: Date, format: Format): string; - -/** - * @docid localization.formatMessage - * @publicName formatMessage(key, value) - * @param2 value:string|Array - * @static - * @namespace DevExpress.localization - * @public - */ -export function formatMessage(key: string, ...values: Array): string; - -/** - * @docid localization.formatNumber - * @publicName formatNumber(value, format) - * @static - * @namespace DevExpress.localization - * @public - */ -export function formatNumber(value: number, format: Format): string; - -/** - * @docid localization.loadMessages - * @publicName loadMessages(messages) - * @param1 messages:object - * @static - * @namespace DevExpress.localization - * @public - */ -export function loadMessages(messages: any): void; - -/** - * @docid localization.locale - * @publicName locale() - * @static - * @namespace DevExpress.localization - * @public - */ -export function locale(): string; - -/** - * @docid localization.locale - * @publicName locale(locale) - * @static - * @namespace DevExpress.localization - * @public - */ -// eslint-disable-next-line @typescript-eslint/no-shadow -export function locale(locale: string): void; - -/** - * @docid localization.parseDate - * @publicName parseDate(text, format) - * @static - * @namespace DevExpress.localization - * @public - */ -export function parseDate(text: string, format: Format): Date; - -/** - * @docid localization.parseNumber - * @publicName parseNumber(text, format) - * @static - * @namespace DevExpress.localization - * @public - */ -export function parseNumber(text: string, format: Format): number; - -export interface FormatObject { - /** - * @docid Format.currency - * @public - */ - currency?: string; - /** - * @docid Format.useCurrencyAccountingStyle - * @type boolean - * @default true - * @public - */ - useCurrencyAccountingStyle?: boolean; - /** - * @docid Format.formatter - * @public - */ - formatter?: ((value: number | Date) => string); - /** - * @docid Format.parser - * @public - */ - parser?: ((value: string) => number | Date); - /** - * @docid Format.precision - * @public - */ - precision?: number; - /** - * @docid Format.type - * @public - */ - type?: PredefinedFormat | string; -} -type ExternalFormat = - Intl.DateTimeFormatOptions | - Intl.NumberFormatOptions; - -/** - * @docid - * @type Object|Enums.Format|string|function - * @default undefined - * @section Common - * @namespace DevExpress.ui - * @public - */ -export type Format = - FormatObject | - PredefinedFormat | - string | - ((value: number | Date) => string) | - ((value: Date) => string) | - ((value: number) => string) | - ExternalFormat | undefined; +export { + /** + * @deprecated Use formatDate from common/core/localization instead + */ + formatDate, + /** + * @deprecated Use formatMessage from common/core/localization instead + */ + formatMessage, + /** + * @deprecated Use formatNumber from common/core/localization instead + */ + formatNumber, + /** + * @deprecated Use loadMessages from common/core/localization instead + */ + loadMessages, + /** + * @deprecated Use locale from common/core/localization instead + */ + locale, + /** + * @deprecated Use parseDate from common/core/localization instead + */ + parseDate, + /** + * @deprecated Use parseNumber from common/core/localization instead + */ + parseNumber, + /** + * @deprecated Use Format from common/core/localization instead + */ + Format, + /** + * @deprecated Use FormatObject from common/core/localization instead + */ + FormatObject, +} from './common/core/localization'; diff --git a/packages/devextreme/js/localization.js b/packages/devextreme/js/localization.js new file mode 100644 index 000000000000..f184d26ec496 --- /dev/null +++ b/packages/devextreme/js/localization.js @@ -0,0 +1,9 @@ +export { + formatDate, + formatMessage, + formatNumber, + loadMessages, + locale, + parseDate, + parseNumber, +} from './common/core/localization'; diff --git a/packages/devextreme/js/mobile/hide_top_overlay.d.ts b/packages/devextreme/js/mobile/hide_top_overlay.d.ts index a292db6c2e1d..12cca1f8506d 100644 --- a/packages/devextreme/js/mobile/hide_top_overlay.d.ts +++ b/packages/devextreme/js/mobile/hide_top_overlay.d.ts @@ -1,7 +1,6 @@ +import { hideTopOverlay } from '../common/core/environment'; + /** - * @docid - * @publicName hideTopOverlay() - * @namespace DevExpress - * @public + * @deprecated Use hideTopOverlay from /common/core/environment instead */ -export default function hideTopOverlay(): boolean; +export default hideTopOverlay; diff --git a/packages/devextreme/js/mobile/hide_top_overlay.js b/packages/devextreme/js/mobile/hide_top_overlay.js new file mode 100644 index 000000000000..2c333b5ede11 --- /dev/null +++ b/packages/devextreme/js/mobile/hide_top_overlay.js @@ -0,0 +1,3 @@ +import { hideTopOverlay } from '../common/core/environment'; + +export default hideTopOverlay; diff --git a/packages/devextreme/js/mobile/init_mobile_viewport.d.ts b/packages/devextreme/js/mobile/init_mobile_viewport.d.ts index f05a90738bcd..febf3469ff1c 100644 --- a/packages/devextreme/js/mobile/init_mobile_viewport.d.ts +++ b/packages/devextreme/js/mobile/init_mobile_viewport.d.ts @@ -1,7 +1,6 @@ +import { initMobileViewport } from '../common/core/environment'; + /** - * @docid utils.initMobileViewport - * @publicName initMobileViewport(options) - * @namespace DevExpress.utils - * @public + * @deprecated Use initMobileViewport from /common/core/environment instead */ -export default function initMobileViewport(options: { allowZoom?: boolean; allowPan?: boolean; allowSelection?: boolean }): void; +export default initMobileViewport; diff --git a/packages/devextreme/js/mobile/init_mobile_viewport.js b/packages/devextreme/js/mobile/init_mobile_viewport.js new file mode 100644 index 000000000000..337826dd1c1b --- /dev/null +++ b/packages/devextreme/js/mobile/init_mobile_viewport.js @@ -0,0 +1,3 @@ +import { initMobileViewport } from '../common/core/environment'; + +export default initMobileViewport; diff --git a/packages/devextreme/js/pdf_exporter.d.ts b/packages/devextreme/js/pdf_exporter.d.ts new file mode 100644 index 000000000000..b1cdf3f7347e --- /dev/null +++ b/packages/devextreme/js/pdf_exporter.d.ts @@ -0,0 +1,34 @@ +export { + /** + * @deprecated Use DataGridCell from common/export/pdf instead + */ + DataGridCell, + /** + * @deprecated Use PdfDataGridCell from common/export/pdf instead + */ + PdfDataGridCell, + /** + * @deprecated Use Cell from common/export/pdf instead + */ + Cell, + /** + * @deprecated Use PdfExportDataGridProps from common/export/pdf instead + */ + PdfExportDataGridProps, + /** + * @deprecated Use PdfExportGanttProps from common/export/pdf instead + */ + PdfExportGanttProps, + /** + * @deprecated Use PdfExportGanttFont from common/export/pdf instead + */ + PdfExportGanttFont, + /** + * @deprecated Use exportGantt from common/export/pdf instead + */ + exportGantt, + /** + * @deprecated Use exportDataGrid from common/export/pdf instead + */ + exportDataGrid, +} from './common/export/pdf'; diff --git a/packages/devextreme/js/pdf_exporter.js b/packages/devextreme/js/pdf_exporter.js new file mode 100644 index 000000000000..f45868b39e0d --- /dev/null +++ b/packages/devextreme/js/pdf_exporter.js @@ -0,0 +1,4 @@ +export { + exportGantt, + exportDataGrid, +} from './common/export/pdf'; diff --git a/packages/devextreme/js/time_zone_utils.d.ts b/packages/devextreme/js/time_zone_utils.d.ts index 621a32cd4d41..602050f30945 100644 --- a/packages/devextreme/js/time_zone_utils.d.ts +++ b/packages/devextreme/js/time_zone_utils.d.ts @@ -1,28 +1,10 @@ -/** - * @docid - * @public - */ -export interface dxSchedulerTimeZone { - /** - * @docid - */ - id: string; - /** - * @docid - */ - offset: number; - /** - * @docid - */ - title: string; -} - -/** - * @docid utils.getTimeZones - * @publicName getTimeZones(date) - * @param1 date:Date|undefined - * @namespace DevExpress.utils - * @static - * @public - */ -export function getTimeZones(date?: Date): Array; +export { + /** + * @deprecated Use getTimeZones from common/core/environment instead + */ + getTimeZones, + /** + * @deprecated Use dxSchedulerTimeZone from common/core/environment instead + */ + dxSchedulerTimeZone, +} from './common/core/environment'; diff --git a/packages/devextreme/js/time_zone_utils.js b/packages/devextreme/js/time_zone_utils.js new file mode 100644 index 000000000000..b88a0df88d76 --- /dev/null +++ b/packages/devextreme/js/time_zone_utils.js @@ -0,0 +1 @@ +export { getTimeZones } from './common/core/environment'; diff --git a/packages/devextreme/js/ui/accordion.d.ts b/packages/devextreme/js/ui/accordion.d.ts index ccccfa8e8e64..bf8b2fea1efe 100644 --- a/packages/devextreme/js/ui/accordion.d.ts +++ b/packages/devextreme/js/ui/accordion.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { UserDefinedElement, DxElement, @@ -6,7 +6,7 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { DxPromise, @@ -18,7 +18,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/action_sheet.d.ts b/packages/devextreme/js/ui/action_sheet.d.ts index f8415c1c7aca..240091e9b523 100644 --- a/packages/devextreme/js/ui/action_sheet.d.ts +++ b/packages/devextreme/js/ui/action_sheet.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { UserDefinedElement, } from '../core/element'; @@ -14,7 +14,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/autocomplete.d.ts b/packages/devextreme/js/ui/autocomplete.d.ts index b83d05497b9b..f62990b9d195 100644 --- a/packages/devextreme/js/ui/autocomplete.d.ts +++ b/packages/devextreme/js/ui/autocomplete.d.ts @@ -4,7 +4,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import dxDropDownList, { dxDropDownListOptions, diff --git a/packages/devextreme/js/ui/box.d.ts b/packages/devextreme/js/ui/box.d.ts index 2d2dd46f805d..faf437be18cf 100644 --- a/packages/devextreme/js/ui/box.d.ts +++ b/packages/devextreme/js/ui/box.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { EventInfo, @@ -6,7 +6,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/button.d.ts b/packages/devextreme/js/ui/button.d.ts index 6002849771f7..b7ad4e77c1ce 100644 --- a/packages/devextreme/js/ui/button.d.ts +++ b/packages/devextreme/js/ui/button.d.ts @@ -5,24 +5,21 @@ import { import { template, -} from '../core/templates/template'; + ButtonType, + ButtonStyle, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, } from './widget/ui.widget'; -import { - ButtonType, - ButtonStyle, -} from '../common'; - export { ButtonType, ButtonStyle, diff --git a/packages/devextreme/js/ui/button_group.d.ts b/packages/devextreme/js/ui/button_group.d.ts index 9d4ce383459d..c8b256f5b0df 100644 --- a/packages/devextreme/js/ui/button_group.d.ts +++ b/packages/devextreme/js/ui/button_group.d.ts @@ -5,7 +5,10 @@ import { import { template, -} from '../core/templates/template'; + ButtonType, + ButtonStyle, + SingleMultipleOrNone, +} from '../common'; import { EventInfo, @@ -13,7 +16,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import { CollectionWidgetItem, @@ -24,12 +27,6 @@ import Widget, { WidgetOptions, } from './widget/ui.widget'; -import { - ButtonType, - ButtonStyle, - SingleMultipleOrNone, -} from '../common'; - export { ButtonType, ButtonStyle, diff --git a/packages/devextreme/js/ui/calendar.d.ts b/packages/devextreme/js/ui/calendar.d.ts index 36b05d2c476d..a2d626d953cb 100644 --- a/packages/devextreme/js/ui/calendar.d.ts +++ b/packages/devextreme/js/ui/calendar.d.ts @@ -8,21 +8,18 @@ import { EventInfo, InitializedEventInfo, NativeEventInfo, -} from '../events/index'; +} from '../common/core/events'; import { template, -} from '../core/templates/template'; + FirstDayOfWeek, +} from '../common'; import Editor, { ValueChangedInfo, EditorOptions, } from './editor/editor'; -import { - FirstDayOfWeek, -} from '../common'; - export { FirstDayOfWeek, }; diff --git a/packages/devextreme/js/ui/chat.d.ts b/packages/devextreme/js/ui/chat.d.ts index 425befb69287..30ba3654b859 100644 --- a/packages/devextreme/js/ui/chat.d.ts +++ b/packages/devextreme/js/ui/chat.d.ts @@ -1,6 +1,6 @@ import { Format, -} from '../localization'; +} from '../common/core/localization'; import { UserDefinedElement, @@ -9,7 +9,7 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import Widget, { WidgetOptions } from './widget/ui.widget'; import { @@ -17,8 +17,8 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; -import DataSource, { DataSourceLike } from '../data/data_source'; +} from '../common/core/events'; +import { DataSource, DataSourceLike } from '../common/data'; /** * @docid _ui_chat_DisposingEvent diff --git a/packages/devextreme/js/ui/check_box.d.ts b/packages/devextreme/js/ui/check_box.d.ts index 131bc27fcfcb..07eb72bd5d5c 100644 --- a/packages/devextreme/js/ui/check_box.d.ts +++ b/packages/devextreme/js/ui/check_box.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Editor, { EditorOptions, diff --git a/packages/devextreme/js/ui/collection/ui.collection_widget.base.d.ts b/packages/devextreme/js/ui/collection/ui.collection_widget.base.d.ts index ee2df9161cfe..a7906edffdd6 100644 --- a/packages/devextreme/js/ui/collection/ui.collection_widget.base.d.ts +++ b/packages/devextreme/js/ui/collection/ui.collection_widget.base.d.ts @@ -5,16 +5,16 @@ import { import { template, -} from '../../core/templates/template'; +} from '../../common'; -import DataSource, { DataSourceLike } from '../../data/data_source'; +import { DataSource, DataSourceLike } from '../../common/data'; import { EventInfo, NativeEventInfo, ItemInfo, AsyncCancelable, -} from '../../events/index'; +} from '../../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/color_box.d.ts b/packages/devextreme/js/ui/color_box.d.ts index 35b9855eb355..f4c2ab026577 100644 --- a/packages/devextreme/js/ui/color_box.d.ts +++ b/packages/devextreme/js/ui/color_box.d.ts @@ -8,11 +8,12 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { template, -} from '../core/templates/template'; + ApplyValueMode, +} from '../common'; import dxDropDownEditor, { dxDropDownEditorOptions, @@ -27,10 +28,6 @@ import { Properties as PopupProperties, } from './popup'; -import { - ApplyValueMode, -} from '../common'; - /** * @docid _ui_color_box_ChangeEvent * @public diff --git a/packages/devextreme/js/ui/context_menu.d.ts b/packages/devextreme/js/ui/context_menu.d.ts index a84ed0e002b3..c5ec6d579818 100644 --- a/packages/devextreme/js/ui/context_menu.d.ts +++ b/packages/devextreme/js/ui/context_menu.d.ts @@ -1,7 +1,7 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { PositionConfig, -} from '../animation/position'; +} from '../common/core/animation'; import { UserDefinedElement, @@ -19,7 +19,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import dxMenuBase, { dxMenuBaseOptions, diff --git a/packages/devextreme/js/ui/context_menu/ui.menu_base.d.ts b/packages/devextreme/js/ui/context_menu/ui.menu_base.d.ts index aaf33396145e..5437b88da685 100644 --- a/packages/devextreme/js/ui/context_menu/ui.menu_base.d.ts +++ b/packages/devextreme/js/ui/context_menu/ui.menu_base.d.ts @@ -1,7 +1,7 @@ -import { DataSourceLike } from '../../data/data_source'; +import { DataSourceLike } from '../../common/data'; import { AnimationConfig, -} from '../../animation/fx'; +} from '../../common/core/animation'; import HierarchicalCollectionWidget, { HierarchicalCollectionWidgetOptions, diff --git a/packages/devextreme/js/ui/data_grid.d.ts b/packages/devextreme/js/ui/data_grid.d.ts index d6c9816cca23..bd141435d065 100644 --- a/packages/devextreme/js/ui/data_grid.d.ts +++ b/packages/devextreme/js/ui/data_grid.d.ts @@ -1,5 +1,4 @@ -import DataSource, { -} from '../data/data_source'; +import { DataSource } from '../common/data'; import { UserDefinedElement, @@ -13,7 +12,13 @@ import { import { template, -} from '../core/templates/template'; + HorizontalAlignment, + Mode, + Scrollable, + SelectAllMode, + SortOrder, + ToolbarItemLocation, +} from '../common'; import { Cancelable, @@ -21,7 +26,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { dxToolbarItem, @@ -34,15 +39,6 @@ import { Format, } from '../localization'; -import { - HorizontalAlignment, - Mode, - Scrollable, - SelectAllMode, - SortOrder, - ToolbarItemLocation, -} from '../common'; - import { AdaptiveDetailRowPreparingInfo, ColumnBase as ComponentColumnBase, diff --git a/packages/devextreme/js/ui/date_box.d.ts b/packages/devextreme/js/ui/date_box.d.ts index c578f9705e3f..2359b3e439f8 100644 --- a/packages/devextreme/js/ui/date_box.d.ts +++ b/packages/devextreme/js/ui/date_box.d.ts @@ -4,7 +4,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ComponentDisabledDate, diff --git a/packages/devextreme/js/ui/date_range_box.d.ts b/packages/devextreme/js/ui/date_range_box.d.ts index 4e32102d3958..17198fb90abf 100644 --- a/packages/devextreme/js/ui/date_range_box.d.ts +++ b/packages/devextreme/js/ui/date_range_box.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { DxElement, diff --git a/packages/devextreme/js/ui/defer_rendering.d.ts b/packages/devextreme/js/ui/defer_rendering.d.ts index b25c5c73fee7..59fea5aeb387 100644 --- a/packages/devextreme/js/ui/defer_rendering.d.ts +++ b/packages/devextreme/js/ui/defer_rendering.d.ts @@ -1,12 +1,12 @@ import { AnimationConfig, -} from '../animation/fx'; +} from '../common/core/animation'; import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/diagram.d.ts b/packages/devextreme/js/ui/diagram.d.ts index aa19468c161f..b540053309ea 100644 --- a/packages/devextreme/js/ui/diagram.d.ts +++ b/packages/devextreme/js/ui/diagram.d.ts @@ -1,4 +1,4 @@ -import DataSource, { DataSourceLike } from '../data/data_source'; +import { DataSource, DataSourceLike } from '../common/data'; import { DxElement, @@ -6,24 +6,21 @@ import { import { template, -} from '../core/templates/template'; + Orientation, + PageOrientation, + ToolbarItemLocation, +} from '../common'; import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, } from './widget/ui.widget'; -import { - Orientation, - PageOrientation, - ToolbarItemLocation, -} from '../common'; - /** * @public * @namespace DevExpress.ui.dxDiagram diff --git a/packages/devextreme/js/ui/diagram/diagram.commands_manager.js b/packages/devextreme/js/ui/diagram/diagram.commands_manager.js index 8bc38b7db5a5..f629f72ec95d 100644 --- a/packages/devextreme/js/ui/diagram/diagram.commands_manager.js +++ b/packages/devextreme/js/ui/diagram/diagram.commands_manager.js @@ -3,7 +3,7 @@ import { fileSaver } from '../../exporter/file_saver'; import { isFunction } from '../../core/utils/type'; import { getWindow } from '../../core/utils/window'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; const SEPARATOR = 'separator'; const SEPARATOR_COMMAND = { widget: SEPARATOR }; diff --git a/packages/devextreme/js/ui/diagram/diagram.items_option.js b/packages/devextreme/js/ui/diagram/diagram.items_option.js index b1a2bc3c9851..2ae6694bdbe3 100644 --- a/packages/devextreme/js/ui/diagram/diagram.items_option.js +++ b/packages/devextreme/js/ui/diagram/diagram.items_option.js @@ -1,6 +1,6 @@ import { extend } from '../../core/utils/extend'; import { Component } from '../../core/component'; -import DataHelperMixin from '../../data_helper'; +import DataHelperMixin from '../../common/data/data_helper'; const ItemsOptionBase = Component.inherit({}).include(DataHelperMixin); diff --git a/packages/devextreme/js/ui/diagram/diagram.toolbox_manager.js b/packages/devextreme/js/ui/diagram/diagram.toolbox_manager.js index ccc9541dc75f..a63f31fbf31f 100644 --- a/packages/devextreme/js/ui/diagram/diagram.toolbox_manager.js +++ b/packages/devextreme/js/ui/diagram/diagram.toolbox_manager.js @@ -1,4 +1,4 @@ -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; const DiagramToolboxManager = { getDefaultGroups() { diff --git a/packages/devextreme/js/ui/diagram/ui.diagram.dialog_manager.js b/packages/devextreme/js/ui/diagram/ui.diagram.dialog_manager.js index 5142203af7a8..b148918f36cb 100644 --- a/packages/devextreme/js/ui/diagram/ui.diagram.dialog_manager.js +++ b/packages/devextreme/js/ui/diagram/ui.diagram.dialog_manager.js @@ -1,6 +1,6 @@ import $ from '../../core/renderer'; import { getDiagram } from './diagram.importer'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import FileUploader from '../file_uploader'; import { getWindow } from '../../core/utils/window'; diff --git a/packages/devextreme/js/ui/diagram/ui.diagram.dialogs.js b/packages/devextreme/js/ui/diagram/ui.diagram.dialogs.js index d1b45ff7851f..63aed4ebbf5d 100644 --- a/packages/devextreme/js/ui/diagram/ui.diagram.dialogs.js +++ b/packages/devextreme/js/ui/diagram/ui.diagram.dialogs.js @@ -1,6 +1,6 @@ import $ from '../../core/renderer'; import Widget from '../widget/ui.widget'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import Popup from '../popup/ui.popup'; import { extend } from '../../core/utils/extend'; diff --git a/packages/devextreme/js/ui/diagram/ui.diagram.js b/packages/devextreme/js/ui/diagram/ui.diagram.js index d0bb7bfd93a5..d6fcf75e9385 100644 --- a/packages/devextreme/js/ui/diagram/ui.diagram.js +++ b/packages/devextreme/js/ui/diagram/ui.diagram.js @@ -6,14 +6,14 @@ import registerComponent from '../../core/component_registrator'; import { extend } from '../../core/utils/extend'; import { isFunction, isDefined } from '../../core/utils/type'; import { compileSetter, compileGetter } from '../../core/utils/data'; -import positionUtils from '../../animation/position'; +import positionUtils from '../../common/core/animation/position'; import { getDiagram } from './diagram.importer'; import { getWindow, hasWindow } from '../../core/utils/window'; import { getPublicElement } from '../../core/element'; -import eventsEngine from '../../events/core/events_engine'; -import { addNamespace } from '../../events/utils/index'; -import messageLocalization from '../../localization/message'; -import numberLocalization from '../../localization/number'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { addNamespace } from '../../common/core/events/utils/index'; +import messageLocalization from '../../common/core/localization/message'; +import numberLocalization from '../../common/core/localization/number'; import * as zIndexPool from '../../__internal/ui/overlay/m_z_index'; import Overlay from '../overlay/ui.overlay'; diff --git a/packages/devextreme/js/ui/diagram/ui.diagram.panel.js b/packages/devextreme/js/ui/diagram/ui.diagram.panel.js index 1c80f4e69635..437d008446ee 100644 --- a/packages/devextreme/js/ui/diagram/ui.diagram.panel.js +++ b/packages/devextreme/js/ui/diagram/ui.diagram.panel.js @@ -1,8 +1,8 @@ import $ from '../../core/renderer'; import Widget from '../widget/ui.widget'; -import eventsEngine from '../../events/core/events_engine'; -import { addNamespace } from '../../events/utils/index'; -import pointerEvents from '../../events/pointer'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { addNamespace } from '../../common/core/events/utils/index'; +import pointerEvents from '../../common/core/events/pointer'; const POINTERUP_EVENT_NAME = addNamespace(pointerEvents.up, 'dxDiagramPanel'); const PREVENT_REFOCUS_SELECTOR = '.dx-textbox'; diff --git a/packages/devextreme/js/ui/diagram/ui.diagram.toolbox.js b/packages/devextreme/js/ui/diagram/ui.diagram.toolbox.js index 6d2111f7e48b..58c444b77add 100644 --- a/packages/devextreme/js/ui/diagram/ui.diagram.toolbox.js +++ b/packages/devextreme/js/ui/diagram/ui.diagram.toolbox.js @@ -3,7 +3,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { hasWindow } from '../../core/utils/window'; import { Deferred } from '../../core/utils/deferred'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import TextBox from '../text_box'; import Accordion from '../accordion'; import ScrollView from '../scroll_view'; diff --git a/packages/devextreme/js/ui/draggable.d.ts b/packages/devextreme/js/ui/draggable.d.ts index bcc92b2ae0b9..0ef8e6023ce4 100644 --- a/packages/devextreme/js/ui/draggable.d.ts +++ b/packages/devextreme/js/ui/draggable.d.ts @@ -9,7 +9,8 @@ import { import { template, -} from '../core/templates/template'; + DragDirection, +} from '../common'; import { Cancelable, @@ -17,14 +18,10 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxSortable from './sortable'; -import { - DragDirection, -} from '../common'; - /** * @namespace DevExpress.ui * @docid diff --git a/packages/devextreme/js/ui/drawer.d.ts b/packages/devextreme/js/ui/drawer.d.ts index 4581c95ace2e..2118690688fc 100644 --- a/packages/devextreme/js/ui/drawer.d.ts +++ b/packages/devextreme/js/ui/drawer.d.ts @@ -8,14 +8,14 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { DxEvent, EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/drop_down_box.d.ts b/packages/devextreme/js/ui/drop_down_box.d.ts index fbd490fadcc8..ead528604f89 100644 --- a/packages/devextreme/js/ui/drop_down_box.d.ts +++ b/packages/devextreme/js/ui/drop_down_box.d.ts @@ -5,16 +5,16 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; -import DataSource, { DataSourceLike } from '../data/data_source'; +import { DataSource, DataSourceLike } from '../common/data'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxDropDownEditor, { dxDropDownEditorOptions, diff --git a/packages/devextreme/js/ui/drop_down_button.d.ts b/packages/devextreme/js/ui/drop_down_button.d.ts index 0a9b0783e588..64a53e3d250f 100644 --- a/packages/devextreme/js/ui/drop_down_button.d.ts +++ b/packages/devextreme/js/ui/drop_down_button.d.ts @@ -1,6 +1,7 @@ import { ButtonType, ButtonStyle, + template, } from '../common'; import { @@ -12,18 +13,14 @@ import { DxPromise, } from '../core/utils/deferred'; -import { - template, -} from '../core/templates/template'; - -import DataSource, { DataSourceLike } from '../data/data_source'; +import { DataSource, DataSourceLike } from '../common/data'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Item as dxListItem, diff --git a/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_editor.d.ts b/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_editor.d.ts index dd6084994fe5..698bec39036e 100644 --- a/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_editor.d.ts +++ b/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_editor.d.ts @@ -5,7 +5,11 @@ import { import { template, -} from '../../core/templates/template'; + ApplyValueMode, + Mode, + Position, + TextEditorButton, +} from '../../common'; import dxTextBox, { dxTextBoxOptions, @@ -21,14 +25,7 @@ import { import { EventInfo, -} from '../../events/index'; - -import { - ApplyValueMode, - Mode, - Position, - TextEditorButton, -} from '../../common'; +} from '../../common/core/events'; /** @public */ export type DropDownPredefinedButton = 'clear' | 'dropDown'; diff --git a/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_list.d.ts b/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_list.d.ts index 2541e1649b7c..194d825e4613 100644 --- a/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_list.d.ts +++ b/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_list.d.ts @@ -5,15 +5,16 @@ import { import { template, -} from '../../core/templates/template'; + SimplifiedSearchMode, +} from '../../common'; -import DataSource from '../../data/data_source'; +import { DataSource } from '../../common/data'; import { EventInfo, NativeEventInfo, ItemInfo, -} from '../../events/index'; +} from '../../common/core/events'; import { ValueChangedInfo, @@ -27,10 +28,6 @@ import dxDropDownEditor, { dxDropDownEditorOptions, } from './ui.drop_down_editor'; -import { - SimplifiedSearchMode, -} from '../../common'; - /** * @docid _ui_drop_down_editor_ui_drop_down_list_SelectionChangedInfo * @hidden diff --git a/packages/devextreme/js/ui/editor/editor.d.ts b/packages/devextreme/js/ui/editor/editor.d.ts index d73494dde913..2083bbf82587 100644 --- a/packages/devextreme/js/ui/editor/editor.d.ts +++ b/packages/devextreme/js/ui/editor/editor.d.ts @@ -1,6 +1,6 @@ import { NativeEventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/editor/ui.data_expression.d.ts b/packages/devextreme/js/ui/editor/ui.data_expression.d.ts index 49c5c8c1f39c..37569aaf2176 100644 --- a/packages/devextreme/js/ui/editor/ui.data_expression.d.ts +++ b/packages/devextreme/js/ui/editor/ui.data_expression.d.ts @@ -5,9 +5,9 @@ import { import { template, -} from '../../core/templates/template'; +} from '../../common'; -import DataSource, { DataSourceLike } from '../../data/data_source'; +import { DataSource, DataSourceLike } from '../../common/data'; import { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/file_manager.d.ts b/packages/devextreme/js/ui/file_manager.d.ts index a434ab6735d6..a15e6137f8ac 100644 --- a/packages/devextreme/js/ui/file_manager.d.ts +++ b/packages/devextreme/js/ui/file_manager.d.ts @@ -13,9 +13,9 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; -import FileSystemItem from '../file_management/file_system_item'; +import { FileSystemItem } from '../common/file_management'; import { Item as dxContextMenuItem, @@ -31,9 +31,6 @@ import Widget, { import { template, -} from '../core/templates/template'; - -import { DataType, SingleOrMultiple, HorizontalAlignment, diff --git a/packages/devextreme/js/ui/file_manager/file_items_controller.js b/packages/devextreme/js/ui/file_manager/file_items_controller.js index 449bd85be5b8..2ab5a32c8eb8 100644 --- a/packages/devextreme/js/ui/file_manager/file_items_controller.js +++ b/packages/devextreme/js/ui/file_manager/file_items_controller.js @@ -1,11 +1,18 @@ -import FileSystemProviderBase from '../../file_management/provider_base'; -import FileSystemItem from '../../file_management/file_system_item'; -import ObjectFileSystemProvider from '../../file_management/object_provider'; -import RemoteFileSystemProvider from '../../file_management/remote_provider'; -import CustomFileSystemProvider from '../../file_management/custom_provider'; -import FileSystemError from '../../file_management/error'; -import ErrorCode from '../../file_management/error_codes'; -import { pathCombine, getEscapedFileName, getPathParts, getFileExtension } from '../../file_management/utils'; +import { + FileSystemProviderBase, + FileSystemItem, + ObjectFileSystemProvider, + RemoteFileSystemProvider, + CustomFileSystemProvider, + FileSystemError, +} from '../../common/file_management'; +import ErrorCode from '../../common/file_management/error_codes'; +import { + pathCombine, + getEscapedFileName, + getPathParts, + getFileExtension, +} from '../../common/file_management/utils'; import { whenSome } from './ui.file_manager.common'; import { Deferred, when } from '../../core/utils/deferred'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.command_manager.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.command_manager.js index 1237f4116aa8..f36384de22d0 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.command_manager.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.command_manager.js @@ -1,7 +1,7 @@ import { extend } from '../../core/utils/extend'; import { each } from '../../core/utils/iterator'; import { isString } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; export const defaultPermissions = { create: false, diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.delete_item.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.delete_item.js index b0a72f413ed4..506a2a1f6bf5 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.delete_item.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.delete_item.js @@ -1,7 +1,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import ScrollView from '../scroll_view'; import FileManagerDialogBase from './ui.file_manager.dialog'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.folder_chooser.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.folder_chooser.js index 3be7c3c0b8f6..9b65622d2bdb 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.folder_chooser.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.folder_chooser.js @@ -1,7 +1,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { getMapFromObject } from './ui.file_manager.common'; import FileManagerDialogBase from './ui.file_manager.dialog'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.js index bd8d77ee1966..0cc00154b8a1 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.js @@ -1,7 +1,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { isDefined } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import Widget from '../widget/ui.widget'; import Popup from '../popup/ui.popup'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog_manager.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog_manager.js index d731aec0b34f..aae402052bd5 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog_manager.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog_manager.js @@ -1,7 +1,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import FileManagerNameEditorDialog from './ui.file_manager.dialog.name_editor'; import FileManagerFolderChooserDialog from './ui.file_manager.dialog.folder_chooser'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.editing.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.editing.js index 9991c9357a41..6e35258b626f 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.editing.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.editing.js @@ -5,7 +5,7 @@ import { each } from '../../core/utils/iterator'; import { format } from '../../core/utils/string'; import { isDefined } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import Widget from '../widget/ui.widget'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.details.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.details.js index 2fffacec6c98..4a361c39cdd7 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.details.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.details.js @@ -2,7 +2,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { extendAttributes, getDisplayFileSize } from './ui.file_manager.common'; import { isString, isFunction, isDefined } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; // NOTE: Using the "public" export here for the theme-builder deps check import DataGrid from '../../ui/data_grid'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js index 87257e5df141..8985811a3d7a 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js @@ -1,13 +1,13 @@ import { extend } from '../../core/utils/extend'; import { when } from '../../core/utils/deferred'; import { hasWindow } from '../../core/utils/window'; -import { name as dblClickName } from '../../events/double_click'; -import { addNamespace } from '../../events/utils/index'; -import eventsEngine from '../../events/core/events_engine'; +import { name as dblClickName } from '../../common/core/events/double_click'; +import { addNamespace } from '../../common/core/events/utils/index'; +import eventsEngine from '../../common/core/events/core/events_engine'; import { getImageContainer } from '../../core/utils/icon'; import devices from '../../core/devices'; -import CustomStore from '../../data/custom_store'; +import { CustomStore } from '../../common/data'; import Widget from '../widget/ui.widget'; const FILE_MANAGER_FILES_VIEW_CLASS = 'dx-filemanager-files-view'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.thumbnails.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.thumbnails.js index f3ab8a3687f0..3b4cd4ceb621 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.thumbnails.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.thumbnails.js @@ -2,11 +2,11 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { isDefined } from '../../core/utils/type'; import { Deferred } from '../../core/utils/deferred'; -import eventsEngine from '../../events/core/events_engine'; -import { addNamespace } from '../../events/utils/index'; -import { name as contextMenuEventName } from '../../events/contextmenu'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { addNamespace } from '../../common/core/events/utils/index'; +import { name as contextMenuEventName } from '../../common/core/events/contextmenu'; import { getDisplayFileSize } from './ui.file_manager.common'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import FileManagerThumbnailListBox from './ui.file_manager.items_list.thumbnails.list_box'; import FileManagerItemListBase from './ui.file_manager.item_list'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.items_list.thumbnails.list_box.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.items_list.thumbnails.list_box.js index 72a2f9ab816f..72c087b05dd6 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.items_list.thumbnails.list_box.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.items_list.thumbnails.list_box.js @@ -4,9 +4,9 @@ import { extend } from '../../core/utils/extend'; import { isDefined } from '../../core/utils/type'; import { Deferred, when } from '../../core/utils/deferred'; -import holdEvent from '../../events/hold'; -import { addNamespace, isCommandKeyPressed } from '../../events/utils/index'; -import eventsEngine from '../../events/core/events_engine'; +import holdEvent from '../../common/core/events/hold'; +import { addNamespace, isCommandKeyPressed } from '../../common/core/events/utils/index'; +import eventsEngine from '../../common/core/events/core/events_engine'; import { BindableTemplate } from '../../core/templates/bindable_template'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.js index e63c6cbf3421..f10f3472a1df 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.js @@ -4,7 +4,7 @@ import { isDefined, isEmptyObject, isFunction, type } from '../../core/utils/typ import { Deferred, when } from '../../core/utils/deferred'; import { ensureDefined, equalByValue } from '../../core/utils/common'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import registerComponent from '../../core/component_registrator'; import Widget from '../widget/ui.widget'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.messages.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.messages.js index ed2f8e56831f..1fa72bf914e0 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.messages.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.messages.js @@ -1,5 +1,5 @@ -import messageLocalization from '../../localization/message'; -import ErrorCode from '../../file_management/error_codes'; +import messageLocalization from '../../common/core/localization/message'; +import ErrorCode from '../../common/file_management/error_codes'; export const FileManagerMessages = { get: (errorCode, args) => { diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.notification.progress_panel.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.notification.progress_panel.js index e45c45790920..2a5f02aefa4e 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.notification.progress_panel.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.notification.progress_panel.js @@ -2,7 +2,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { ensureDefined } from '../../core/utils/common'; import { getImageContainer } from '../../core/utils/icon'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import Widget from '../widget/ui.widget'; import ProgressBar from '../progress_bar'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.toolbar.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.toolbar.js index 59d87bb01862..79f3efc7c79c 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.toolbar.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.toolbar.js @@ -3,7 +3,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { isDefined, isString } from '../../core/utils/type'; import { ensureDefined } from '../../core/utils/common'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { extendAttributes } from './ui.file_manager.common'; import { isCompact, isFluent, isMaterial } from '../themes'; diff --git a/packages/devextreme/js/ui/file_uploader.d.ts b/packages/devextreme/js/ui/file_uploader.d.ts index b59341e50ac0..31b41558868c 100644 --- a/packages/devextreme/js/ui/file_uploader.d.ts +++ b/packages/devextreme/js/ui/file_uploader.d.ts @@ -8,13 +8,13 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Editor, { EditorOptions, } from './editor/editor'; -import UploadInfo from '../file_management/upload_info'; +import { UploadInfo } from '../common/file_management'; /** @public */ export type FileUploadMode = 'instantly' | 'useButtons' | 'useForm'; diff --git a/packages/devextreme/js/ui/filter_builder.d.ts b/packages/devextreme/js/ui/filter_builder.d.ts index ae356c722c2d..36bb024ac7d4 100644 --- a/packages/devextreme/js/ui/filter_builder.d.ts +++ b/packages/devextreme/js/ui/filter_builder.d.ts @@ -1,4 +1,4 @@ -import DataSource, { DataSourceLike } from '../data/data_source'; +import { DataSource, DataSourceLike } from '../common/data'; import { UserDefinedElement, DxElement, @@ -6,14 +6,15 @@ import { import { template, -} from '../core/templates/template'; + DataType, +} from '../common'; import { Cancelable, EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, @@ -23,10 +24,6 @@ import { Format, } from '../localization'; -import { - DataType, -} from '../common'; - export { DataType, }; diff --git a/packages/devextreme/js/ui/form.d.ts b/packages/devextreme/js/ui/form.d.ts index 09b069daf00b..7224504d8b51 100644 --- a/packages/devextreme/js/ui/form.d.ts +++ b/packages/devextreme/js/ui/form.d.ts @@ -9,13 +9,25 @@ import { import { template, -} from '../core/templates/template'; + AsyncRule, + CompareRule, + CustomRule, + EmailRule, + HorizontalAlignment, + Mode, + NumericRule, + PatternRule, + RangeRule, + RequiredRule, + StringLengthRule, + VerticalAlignment, +} from '../common'; import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxButton, { dxButtonOptions, @@ -35,21 +47,6 @@ import Widget, { WidgetOptions, } from './widget/ui.widget'; -import { - AsyncRule, - CompareRule, - CustomRule, - EmailRule, - HorizontalAlignment, - Mode, - NumericRule, - PatternRule, - RangeRule, - RequiredRule, - StringLengthRule, - VerticalAlignment, -} from '../common'; - export { HorizontalAlignment, Mode, diff --git a/packages/devextreme/js/ui/gallery.d.ts b/packages/devextreme/js/ui/gallery.d.ts index c27e60791265..c10a6ee6cb49 100644 --- a/packages/devextreme/js/ui/gallery.d.ts +++ b/packages/devextreme/js/ui/gallery.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { DxPromise, } from '../core/utils/deferred'; @@ -9,7 +9,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/gantt.d.ts b/packages/devextreme/js/ui/gantt.d.ts index 0782fd0473f6..0d7886ffb9f8 100644 --- a/packages/devextreme/js/ui/gantt.d.ts +++ b/packages/devextreme/js/ui/gantt.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { UserDefinedElement, DxElement, @@ -11,7 +11,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Column as TreeListColumn, @@ -31,18 +31,15 @@ import { import { template, -} from '../core/templates/template'; - -import { - DxPromise, -} from '../core/utils/deferred'; - -import { FirstDayOfWeek, SingleMultipleOrNone, ToolbarItemLocation, } from '../common'; +import { + DxPromise, +} from '../core/utils/deferred'; + import { HeaderFilterSearchConfig, } from '../common/grids'; diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.bars.js b/packages/devextreme/js/ui/gantt/ui.gantt.bars.js index cbb62d2e9031..28d6a889c58c 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.bars.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.bars.js @@ -1,7 +1,7 @@ import $ from '../../core/renderer'; import ToolbarMenu from '../toolbar'; import ContextMenu from '../context_menu'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { extend } from '../../core/utils/extend'; const TOOLBAR_SEPARATOR_CLASS = 'dx-gantt-toolbar-separator'; diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js b/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js index 2e0ded84f6c6..8076b7d23e39 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js @@ -1,5 +1,5 @@ import { Component } from '../../core/component'; -import DataHelperMixin from '../../data_helper'; +import DataHelperMixin from '../../common/data/data_helper'; class DataOption extends Component { constructor(optionName, getLoadPanel, dataSourceChangedCallback) { diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.dialogs.js b/packages/devextreme/js/ui/gantt/ui.gantt.dialogs.js index a76e4335f2d6..390c582e843a 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.dialogs.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.dialogs.js @@ -2,8 +2,8 @@ import Popup from '../popup/ui.popup'; import Form from '../form'; import '../tag_box'; import '../radio_group'; -import dateLocalization from '../../localization/date'; -import messageLocalization from '../../localization/message'; +import dateLocalization from '../../common/core/localization/date'; +import messageLocalization from '../../common/core/localization/message'; import '../list_light'; import '../../__internal/ui/list/modules/m_deleting'; diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.export_helper.js b/packages/devextreme/js/ui/gantt/ui.gantt.export_helper.js index f38c0a3ef829..b69f447846d3 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.export_helper.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.export_helper.js @@ -1,8 +1,8 @@ import { getWindow } from '../../core/utils/window'; import gridCoreUtils from '../../__internal/grids/grid_core/m_utils'; import { isDate, isDefined, isNumeric } from '../../core/utils/type'; -import dateLocalization from '../../localization/date'; -import numberLocalization from '../../localization/number'; +import dateLocalization from '../../common/core/localization/date'; +import numberLocalization from '../../common/core/localization/number'; const window = getWindow(); const TREELIST_EMPTY_SPACE = 'dx-treelist-empty-space'; diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.helper.js b/packages/devextreme/js/ui/gantt/ui.gantt.helper.js index 8fc9506795bf..e9895f0502d6 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.helper.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.helper.js @@ -1,6 +1,6 @@ import { compileGetter, compileSetter } from '../../core/utils/data'; import { isFunction } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; export const GanttHelper = { diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js b/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js index 4e51cb597724..2203e0cf5911 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js @@ -4,8 +4,7 @@ import dxTreeList from '../tree_list'; import { getBoundingRect } from '../../core/utils/position'; import { isDefined } from '../../core/utils/type'; import { GanttHelper } from './ui.gantt.helper'; -import { DataSource } from '../../data/data_source/data_source'; -import ArrayStore from '../../data/array_store'; +import { DataSource, ArrayStore } from '../../common/data'; import { compileGetter } from '../../core/utils/data'; import { GanttTreeListNodesState } from './ui.gantt.treelist.nodes_state'; diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.view.js b/packages/devextreme/js/ui/gantt/ui.gantt.view.js index 837d04d55a18..27fe3aaabde1 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.view.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.view.js @@ -2,12 +2,12 @@ import $ from '../../core/renderer'; import Widget from '../widget/ui.widget'; import { getGanttViewCore } from './gantt_importer'; import { TaskAreaContainer } from './ui.gantt.task.area.container'; -import dateLocalization from '../../localization/date'; +import dateLocalization from '../../common/core/localization/date'; import { isDefined } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { format } from '../../core/utils/string'; -import coreLocalization from '../../localization/core'; -import { requestAnimationFrame, cancelAnimationFrame } from '../../animation/frame'; +import coreLocalization from '../../common/core/localization/core'; +import { requestAnimationFrame, cancelAnimationFrame } from '../../common/core/animation/frame'; const visualStateKey = 'visualState'; diff --git a/packages/devextreme/js/ui/html_editor.d.ts b/packages/devextreme/js/ui/html_editor.d.ts index 4f582708162a..e24f67bc6332 100644 --- a/packages/devextreme/js/ui/html_editor.d.ts +++ b/packages/devextreme/js/ui/html_editor.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { UserDefinedElement, DxElement, @@ -6,19 +6,16 @@ import { import { template, -} from '../core/templates/template'; + EditorStyle, + ToolbarItemLocation, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; - -import { - EditorStyle, - ToolbarItemLocation, -} from '../common'; +} from '../common/core/events'; import Editor, { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/list.d.ts b/packages/devextreme/js/ui/list.d.ts index bebab8fd2f12..9d7d3b6f9f51 100644 --- a/packages/devextreme/js/ui/list.d.ts +++ b/packages/devextreme/js/ui/list.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { UserDefinedElement, DxElement, @@ -6,7 +6,11 @@ import { import { template, -} from '../core/templates/template'; + SelectAllMode, + ScrollbarMode, + PageLoadMode, + SingleMultipleAllOrNone, +} from '../common'; import { DxPromise, @@ -18,7 +22,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, @@ -35,13 +39,6 @@ import { SearchBoxMixinOptions, } from './widget/ui.search_box_mixin'; -import { - SelectAllMode, - ScrollbarMode, - PageLoadMode, - SingleMultipleAllOrNone, -} from '../common'; - export { SelectAllMode, ScrollbarMode, diff --git a/packages/devextreme/js/ui/load_indicator.d.ts b/packages/devextreme/js/ui/load_indicator.d.ts index 59187c5bece3..4836f99b6b8c 100644 --- a/packages/devextreme/js/ui/load_indicator.d.ts +++ b/packages/devextreme/js/ui/load_indicator.d.ts @@ -2,7 +2,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/load_panel.d.ts b/packages/devextreme/js/ui/load_panel.d.ts index 44350522bd43..60b29374ad30 100644 --- a/packages/devextreme/js/ui/load_panel.d.ts +++ b/packages/devextreme/js/ui/load_panel.d.ts @@ -7,15 +7,12 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { AnimationConfig, -} from '../animation/fx'; - -import { PositionConfig, -} from '../animation/position'; +} from '../common/core/animation'; import dxOverlay, { dxOverlayAnimation, diff --git a/packages/devextreme/js/ui/lookup.d.ts b/packages/devextreme/js/ui/lookup.d.ts index 934a12d0c8d7..6da51449f727 100644 --- a/packages/devextreme/js/ui/lookup.d.ts +++ b/packages/devextreme/js/ui/lookup.d.ts @@ -5,7 +5,9 @@ import { import { template, -} from '../core/templates/template'; + ApplyValueMode, + PageLoadMode, +} from '../common'; import { EventInfo, @@ -13,7 +15,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, @@ -36,11 +38,6 @@ import { TitleRenderedInfo, } from './popup'; -import { - ApplyValueMode, - PageLoadMode, -} from '../common'; - export { ApplyValueMode, PageLoadMode, diff --git a/packages/devextreme/js/ui/map.d.ts b/packages/devextreme/js/ui/map.d.ts index 29899a7c5388..159188f2b6a6 100644 --- a/packages/devextreme/js/ui/map.d.ts +++ b/packages/devextreme/js/ui/map.d.ts @@ -7,7 +7,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/menu.d.ts b/packages/devextreme/js/ui/menu.d.ts index 5eda089cabe1..2fc60f73cf8a 100644 --- a/packages/devextreme/js/ui/menu.d.ts +++ b/packages/devextreme/js/ui/menu.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { DxElement, } from '../core/element'; @@ -10,7 +10,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/multi_view.d.ts b/packages/devextreme/js/ui/multi_view.d.ts index 0e08bdbdd4f8..5109770c3349 100644 --- a/packages/devextreme/js/ui/multi_view.d.ts +++ b/packages/devextreme/js/ui/multi_view.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { EventInfo, @@ -6,7 +6,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/number_box.d.ts b/packages/devextreme/js/ui/number_box.d.ts index bc9fb5903a7b..60a423be1d5c 100644 --- a/packages/devextreme/js/ui/number_box.d.ts +++ b/packages/devextreme/js/ui/number_box.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { TextEditorButton, diff --git a/packages/devextreme/js/ui/overlay.d.ts b/packages/devextreme/js/ui/overlay.d.ts index e27a254f215c..b6b105703b54 100644 --- a/packages/devextreme/js/ui/overlay.d.ts +++ b/packages/devextreme/js/ui/overlay.d.ts @@ -1,6 +1,6 @@ import { AnimationConfig, -} from '../animation/fx'; +} from '../common/core/animation'; import { UserDefinedElement, @@ -9,7 +9,7 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { DxPromise, @@ -19,7 +19,7 @@ import { DxEvent, Cancelable, EventInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/pivot_grid.d.ts b/packages/devextreme/js/ui/pivot_grid.d.ts index cda99d3eaed4..9c8840a8b30e 100644 --- a/packages/devextreme/js/ui/pivot_grid.d.ts +++ b/packages/devextreme/js/ui/pivot_grid.d.ts @@ -8,7 +8,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import PivotGridDataSource, { Field, diff --git a/packages/devextreme/js/ui/pivot_grid/data_source.d.ts b/packages/devextreme/js/ui/pivot_grid/data_source.d.ts index ae1f66d4fffd..f6cb506ead28 100644 --- a/packages/devextreme/js/ui/pivot_grid/data_source.d.ts +++ b/packages/devextreme/js/ui/pivot_grid/data_source.d.ts @@ -3,11 +3,10 @@ import { } from '../../core/utils/deferred'; import { + DataSource, Store, StoreOptions, -} from '../../data/index'; - -import DataSource from '../../data/data_source'; +} from '../../common/data'; import { Format, diff --git a/packages/devextreme/js/ui/pivot_grid_field_chooser.d.ts b/packages/devextreme/js/ui/pivot_grid_field_chooser.d.ts index 349e043f27dd..6a29c3621081 100644 --- a/packages/devextreme/js/ui/pivot_grid_field_chooser.d.ts +++ b/packages/devextreme/js/ui/pivot_grid_field_chooser.d.ts @@ -3,7 +3,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import PivotGridDataSource, { Field, diff --git a/packages/devextreme/js/ui/popover.d.ts b/packages/devextreme/js/ui/popover.d.ts index 8b239591f5c0..d93f7b196051 100644 --- a/packages/devextreme/js/ui/popover.d.ts +++ b/packages/devextreme/js/ui/popover.d.ts @@ -1,10 +1,7 @@ import { AnimationConfig, -} from '../animation/fx'; - -import { PositionConfig, -} from '../animation/position'; +} from '../common/core/animation'; import { UserDefinedElement, @@ -20,7 +17,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxPopup, { dxPopupAnimation, diff --git a/packages/devextreme/js/ui/popup.d.ts b/packages/devextreme/js/ui/popup.d.ts index 692a641420fe..c97792d8769c 100644 --- a/packages/devextreme/js/ui/popup.d.ts +++ b/packages/devextreme/js/ui/popup.d.ts @@ -1,10 +1,7 @@ import { AnimationConfig, -} from '../animation/fx'; - -import { PositionConfig, -} from '../animation/position'; +} from '../common/core/animation'; import { UserDefinedElement, @@ -13,7 +10,10 @@ import { import { template, -} from '../core/templates/template'; + PositionAlignment, + ToolbarItemLocation, + ToolbarItemComponent, +} from '../common'; import { Cancelable, @@ -21,18 +21,12 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Item as dxToolbarItem, } from './toolbar'; -import { - PositionAlignment, - ToolbarItemLocation, - ToolbarItemComponent, -} from '../common'; - import dxOverlay, { dxOverlayAnimation, dxOverlayOptions, diff --git a/packages/devextreme/js/ui/progress_bar.d.ts b/packages/devextreme/js/ui/progress_bar.d.ts index e840b6ce2de1..6c308b0c7b12 100644 --- a/packages/devextreme/js/ui/progress_bar.d.ts +++ b/packages/devextreme/js/ui/progress_bar.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/radio_group.d.ts b/packages/devextreme/js/ui/radio_group.d.ts index 699adbdde305..e93f9b414096 100644 --- a/packages/devextreme/js/ui/radio_group.d.ts +++ b/packages/devextreme/js/ui/radio_group.d.ts @@ -1,11 +1,11 @@ -import DataSource from '../data/data_source'; +import { DataSource } from '../common/data'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Editor, { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/range_slider.d.ts b/packages/devextreme/js/ui/range_slider.d.ts index a0e8e4167909..3eef9e2964b3 100644 --- a/packages/devextreme/js/ui/range_slider.d.ts +++ b/packages/devextreme/js/ui/range_slider.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/recurrence_editor.d.ts b/packages/devextreme/js/ui/recurrence_editor.d.ts index dc4fa28f503c..aacb84fefb02 100644 --- a/packages/devextreme/js/ui/recurrence_editor.d.ts +++ b/packages/devextreme/js/ui/recurrence_editor.d.ts @@ -7,7 +7,7 @@ import { InitializedEventInfo, ChangedOptionInfo, NativeEventInfo, -} from '../events/index'; +} from '../common/core/events'; /** * @docid _ui_recurrence_editor_ContentReadyEvent diff --git a/packages/devextreme/js/ui/resizable.d.ts b/packages/devextreme/js/ui/resizable.d.ts index d8f16a6a773a..fdf14ed727a2 100644 --- a/packages/devextreme/js/ui/resizable.d.ts +++ b/packages/devextreme/js/ui/resizable.d.ts @@ -8,7 +8,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; /** @public */ export type ResizeHandle = 'bottom' | 'left' | 'right' | 'top' | 'all'; diff --git a/packages/devextreme/js/ui/responsive_box.d.ts b/packages/devextreme/js/ui/responsive_box.d.ts index ce2723a4af14..b5547d1cc1b8 100644 --- a/packages/devextreme/js/ui/responsive_box.d.ts +++ b/packages/devextreme/js/ui/responsive_box.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { EventInfo, @@ -6,7 +6,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/scheduler.d.ts b/packages/devextreme/js/ui/scheduler.d.ts index 8773c5d31487..eb8dd1e76b82 100644 --- a/packages/devextreme/js/ui/scheduler.d.ts +++ b/packages/devextreme/js/ui/scheduler.d.ts @@ -5,9 +5,12 @@ import { import { template, -} from '../core/templates/template'; + FirstDayOfWeek, + Orientation, + ScrollMode, +} from '../common'; -import DataSource, { DataSourceLike } from '../data/data_source'; +import { DataSource, DataSourceLike } from '../common/data'; import { DxEvent, @@ -16,7 +19,7 @@ import { InitializedEventInfo, ChangedOptionInfo, Cancelable, -} from '../events/index'; +} from '../common/core/events'; import { CollectionWidgetItem, @@ -33,12 +36,6 @@ import Widget, { WidgetOptions, } from './widget/ui.widget'; -import { - FirstDayOfWeek, - Orientation, - ScrollMode, -} from '../common'; - interface AppointmentDraggingEvent { readonly component: dxScheduler; readonly event?: DxEvent; diff --git a/packages/devextreme/js/ui/scroll_view.d.ts b/packages/devextreme/js/ui/scroll_view.d.ts index c108118780e4..00bc3601f549 100644 --- a/packages/devextreme/js/ui/scroll_view.d.ts +++ b/packages/devextreme/js/ui/scroll_view.d.ts @@ -6,7 +6,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxScrollable, { dxScrollableOptions, diff --git a/packages/devextreme/js/ui/scroll_view/ui.scrollable.d.ts b/packages/devextreme/js/ui/scroll_view/ui.scrollable.d.ts index d07682976007..9600f8cc8f27 100644 --- a/packages/devextreme/js/ui/scroll_view/ui.scrollable.d.ts +++ b/packages/devextreme/js/ui/scroll_view/ui.scrollable.d.ts @@ -13,7 +13,7 @@ import { import { NativeEventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import { ScrollDirection, diff --git a/packages/devextreme/js/ui/select_box.d.ts b/packages/devextreme/js/ui/select_box.d.ts index 3c2745db0b62..b226c35c2494 100644 --- a/packages/devextreme/js/ui/select_box.d.ts +++ b/packages/devextreme/js/ui/select_box.d.ts @@ -5,7 +5,7 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { EventInfo, @@ -13,7 +13,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import { DropDownButtonTemplateDataModel, diff --git a/packages/devextreme/js/ui/shared/accessibility.js b/packages/devextreme/js/ui/shared/accessibility.js index ea60e4a209a1..50bde28ff3b1 100644 --- a/packages/devextreme/js/ui/shared/accessibility.js +++ b/packages/devextreme/js/ui/shared/accessibility.js @@ -1,6 +1,6 @@ import $ from '../../core/renderer'; -import eventsEngine from '../../events/core/events_engine'; -import { normalizeKeyName } from '../../events/utils/index'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { normalizeKeyName } from '../../common/core/events/utils/index'; import { extend } from '../../core/utils/extend'; import domAdapter from '../../core/dom_adapter'; import { noop } from '../../core/utils/common'; diff --git a/packages/devextreme/js/ui/shared/ui.editor_factory_mixin.js b/packages/devextreme/js/ui/shared/ui.editor_factory_mixin.js index bc73c09becb3..e2f693daa68c 100644 --- a/packages/devextreme/js/ui/shared/ui.editor_factory_mixin.js +++ b/packages/devextreme/js/ui/shared/ui.editor_factory_mixin.js @@ -1,5 +1,5 @@ import $ from '../../core/renderer'; -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; import { isDefined, isObject, isFunction } from '../../core/utils/type'; import variableWrapper from '../../core/utils/variable_wrapper'; import { compileGetter } from '../../core/utils/data'; @@ -7,8 +7,8 @@ import browser from '../../core/utils/browser'; import { extend } from '../../core/utils/extend'; import devices from '../../core/devices'; import { getPublicElement } from '../../core/element'; -import { normalizeDataSourceOptions } from '../../data/data_source/utils'; -import { normalizeKeyName } from '../../events/utils/index'; +import { normalizeDataSourceOptions } from '../../common/data/data_source/utils'; +import { normalizeKeyName } from '../../common/core/events/utils/index'; const { isWrapped } = variableWrapper; diff --git a/packages/devextreme/js/ui/slider.d.ts b/packages/devextreme/js/ui/slider.d.ts index 8842dffcae6d..42b09d9de9ab 100644 --- a/packages/devextreme/js/ui/slider.d.ts +++ b/packages/devextreme/js/ui/slider.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/sortable.d.ts b/packages/devextreme/js/ui/sortable.d.ts index b203d8994c6f..56cbe640bfa2 100644 --- a/packages/devextreme/js/ui/sortable.d.ts +++ b/packages/devextreme/js/ui/sortable.d.ts @@ -7,7 +7,9 @@ import { import { template, -} from '../core/templates/template'; + DragHighlight, + Orientation, +} from '../common'; import { DxEvent, @@ -16,18 +18,13 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxDraggable, { DraggableBase, DraggableBaseOptions, } from './draggable'; -import { - DragHighlight, - Orientation, -} from '../common'; - export { DragHighlight, Orientation, diff --git a/packages/devextreme/js/ui/speed_dial_action.d.ts b/packages/devextreme/js/ui/speed_dial_action.d.ts index dbf290e61954..b71f1026f344 100644 --- a/packages/devextreme/js/ui/speed_dial_action.d.ts +++ b/packages/devextreme/js/ui/speed_dial_action.d.ts @@ -7,7 +7,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/splitter.d.ts b/packages/devextreme/js/ui/splitter.d.ts index afaeb0d96b12..3f323d7c2f27 100644 --- a/packages/devextreme/js/ui/splitter.d.ts +++ b/packages/devextreme/js/ui/splitter.d.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { Cancelable, @@ -8,7 +8,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/splitter_control.js b/packages/devextreme/js/ui/splitter_control.js index 340a5f9e01d1..1d1a53df352a 100644 --- a/packages/devextreme/js/ui/splitter_control.js +++ b/packages/devextreme/js/ui/splitter_control.js @@ -1,10 +1,10 @@ import $ from '../core/renderer'; import Widget from './widget/ui.widget'; import domAdapter from '../core/dom_adapter'; -import eventsEngine from '../events/core/events_engine'; -import pointerEvents from '../events/pointer'; +import eventsEngine from '../common/core/events/core/events_engine'; +import pointerEvents from '../common/core/events/pointer'; import { getWindow } from '../core/utils/window'; -import { addNamespace } from '../events/utils/index'; +import { addNamespace } from '../common/core/events/utils/index'; import Guid from '../core/guid'; const window = getWindow(); diff --git a/packages/devextreme/js/ui/switch.d.ts b/packages/devextreme/js/ui/switch.d.ts index 4969ab64ef37..0abcc3da551b 100644 --- a/packages/devextreme/js/ui/switch.d.ts +++ b/packages/devextreme/js/ui/switch.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Editor, { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/tab_panel.d.ts b/packages/devextreme/js/ui/tab_panel.d.ts index df996cb013b9..600e54a72aae 100644 --- a/packages/devextreme/js/ui/tab_panel.d.ts +++ b/packages/devextreme/js/ui/tab_panel.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { UserDefinedElement, DxElement, @@ -6,7 +6,10 @@ import { import { template, -} from '../core/templates/template'; + Position, + TabsIconPosition, + TabsStyle, +} from '../common'; import { EventInfo, @@ -14,13 +17,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; - -import { - Position, - TabsIconPosition, - TabsStyle, -} from '../common'; +} from '../common/core/events'; import CollectionWidget, { SelectionChangeInfo, diff --git a/packages/devextreme/js/ui/tabs.d.ts b/packages/devextreme/js/ui/tabs.d.ts index 97decc7aaeed..0c9173246562 100644 --- a/packages/devextreme/js/ui/tabs.d.ts +++ b/packages/devextreme/js/ui/tabs.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { EventInfo, @@ -6,7 +6,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/tag_box.d.ts b/packages/devextreme/js/ui/tag_box.d.ts index 81777a0c0465..bcd65388f928 100644 --- a/packages/devextreme/js/ui/tag_box.d.ts +++ b/packages/devextreme/js/ui/tag_box.d.ts @@ -5,7 +5,9 @@ import { import { template, -} from '../core/templates/template'; + ApplyValueMode, + SelectAllMode, +} from '../common'; import { Cancelable, @@ -14,7 +16,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import { SelectionChangeInfo, @@ -33,11 +35,6 @@ import dxSelectBox, { CustomItemCreatingInfo, } from './select_box'; -import { - ApplyValueMode, - SelectAllMode, -} from '../common'; - /** * @docid _ui_tag_box_ChangeEvent * @public diff --git a/packages/devextreme/js/ui/text_area.d.ts b/packages/devextreme/js/ui/text_area.d.ts index 60ae24793f92..e1409a3a8af4 100644 --- a/packages/devextreme/js/ui/text_area.d.ts +++ b/packages/devextreme/js/ui/text_area.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/text_box.d.ts b/packages/devextreme/js/ui/text_box.d.ts index 853df90583e8..75762ea2ce4c 100644 --- a/packages/devextreme/js/ui/text_box.d.ts +++ b/packages/devextreme/js/ui/text_box.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/text_box/ui.text_editor.base.d.ts b/packages/devextreme/js/ui/text_box/ui.text_editor.base.d.ts index 323cf3ce58ed..4523d23133dc 100644 --- a/packages/devextreme/js/ui/text_box/ui.text_editor.base.d.ts +++ b/packages/devextreme/js/ui/text_box/ui.text_editor.base.d.ts @@ -1,6 +1,6 @@ import { NativeEventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import dxButton from '../button'; diff --git a/packages/devextreme/js/ui/tile_view.d.ts b/packages/devextreme/js/ui/tile_view.d.ts index 14e6acc8d1c2..ecfcb9a5da22 100644 --- a/packages/devextreme/js/ui/tile_view.d.ts +++ b/packages/devextreme/js/ui/tile_view.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { EventInfo, @@ -6,7 +6,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/toast.d.ts b/packages/devextreme/js/ui/toast.d.ts index 7f124dbe5912..38176acf8948 100644 --- a/packages/devextreme/js/ui/toast.d.ts +++ b/packages/devextreme/js/ui/toast.d.ts @@ -1,10 +1,7 @@ import { AnimationConfig, -} from '../animation/fx'; - -import { PositionConfig, -} from '../animation/position'; +} from '../common/core/animation'; import { DxEvent, @@ -12,7 +9,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxOverlay, { dxOverlayAnimation, diff --git a/packages/devextreme/js/ui/toolbar.d.ts b/packages/devextreme/js/ui/toolbar.d.ts index c44b6eaa6a52..333f6d89bf59 100644 --- a/packages/devextreme/js/ui/toolbar.d.ts +++ b/packages/devextreme/js/ui/toolbar.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { UserDefinedElement, DxElement, @@ -6,7 +6,9 @@ import { import { template, -} from '../core/templates/template'; + ToolbarItemLocation, + ToolbarItemComponent, +} from '../common'; import { EventInfo, @@ -14,12 +16,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; - -import { - ToolbarItemLocation, - ToolbarItemComponent, -} from '../common'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/tooltip.d.ts b/packages/devextreme/js/ui/tooltip.d.ts index 2f815b1dbfe0..6397deb27f01 100644 --- a/packages/devextreme/js/ui/tooltip.d.ts +++ b/packages/devextreme/js/ui/tooltip.d.ts @@ -3,7 +3,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxPopover, { dxPopoverOptions, diff --git a/packages/devextreme/js/ui/tree_list.d.ts b/packages/devextreme/js/ui/tree_list.d.ts index 25a8ca704947..65c5509ce3ca 100644 --- a/packages/devextreme/js/ui/tree_list.d.ts +++ b/packages/devextreme/js/ui/tree_list.d.ts @@ -6,13 +6,18 @@ import { import { template, -} from '../core/templates/template'; + DataStructure, + Mode, + ScrollMode, + SingleMultipleOrNone, + ToolbarItemLocation, +} from '../common'; import { DxPromise, } from '../core/utils/deferred'; -import DataSource from '../data/data_source'; +import { DataSource } from '../common/data'; import { Cancelable, @@ -20,15 +25,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; - -import { - DataStructure, - Mode, - ScrollMode, - SingleMultipleOrNone, - ToolbarItemLocation, -} from '../common'; +} from '../common/core/events'; import { AdaptiveDetailRowPreparingInfo, diff --git a/packages/devextreme/js/ui/tree_view.d.ts b/packages/devextreme/js/ui/tree_view.d.ts index c9415f478a43..22da99c8acca 100644 --- a/packages/devextreme/js/ui/tree_view.d.ts +++ b/packages/devextreme/js/ui/tree_view.d.ts @@ -1,4 +1,4 @@ -import { DataSourceLike } from '../data/data_source'; +import { DataSourceLike } from '../common/data'; import { DxElement, } from '../core/element'; @@ -12,7 +12,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/validation_group.d.ts b/packages/devextreme/js/ui/validation_group.d.ts index 5e614e2ba787..4a5a361a1f03 100644 --- a/packages/devextreme/js/ui/validation_group.d.ts +++ b/packages/devextreme/js/ui/validation_group.d.ts @@ -10,7 +10,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { AsyncRule, diff --git a/packages/devextreme/js/ui/validation_summary.d.ts b/packages/devextreme/js/ui/validation_summary.d.ts index 6b51ce56c76a..ed2e75a213ee 100644 --- a/packages/devextreme/js/ui/validation_summary.d.ts +++ b/packages/devextreme/js/ui/validation_summary.d.ts @@ -4,7 +4,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetOptions, diff --git a/packages/devextreme/js/ui/validator.d.ts b/packages/devextreme/js/ui/validator.d.ts index cba624c8287a..8cc8a58c6628 100644 --- a/packages/devextreme/js/ui/validator.d.ts +++ b/packages/devextreme/js/ui/validator.d.ts @@ -10,7 +10,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { AsyncRule, diff --git a/packages/devextreme/js/ui/widget/template.d.ts b/packages/devextreme/js/ui/widget/template.d.ts index 5118abe3c78a..d5f89de338ca 100644 --- a/packages/devextreme/js/ui/widget/template.d.ts +++ b/packages/devextreme/js/ui/widget/template.d.ts @@ -1,11 +1,12 @@ -import { +import type { template, -} from '../../core/templates/template'; +} from '../../common'; /** * @docid ui.template * @namespace DevExpress.ui * @deprecated + * @type object * @public */ export type Template = template; diff --git a/packages/devextreme/js/ui/widget/ui.search_box_mixin.js b/packages/devextreme/js/ui/widget/ui.search_box_mixin.js index c386734ad875..4491d72a5413 100644 --- a/packages/devextreme/js/ui/widget/ui.search_box_mixin.js +++ b/packages/devextreme/js/ui/widget/ui.search_box_mixin.js @@ -1,6 +1,6 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import errors from '../widget/ui.errors'; import { Deferred } from '../../core/utils/deferred'; import { stubComponent } from '../../core/utils/stubs'; diff --git a/packages/devextreme/js/ui/widget/ui.widget.d.ts b/packages/devextreme/js/ui/widget/ui.widget.d.ts index 87fe3bcd01f8..b193f5e45f29 100644 --- a/packages/devextreme/js/ui/widget/ui.widget.d.ts +++ b/packages/devextreme/js/ui/widget/ui.widget.d.ts @@ -5,7 +5,7 @@ import DOMComponent, { import { EventInfo, -} from '../../events/index'; +} from '../../common/core/events'; /** * @namespace DevExpress.ui diff --git a/packages/devextreme/js/utils.d.ts b/packages/devextreme/js/utils.d.ts index 21d9b4461ad5..b1759c3b2cf0 100644 --- a/packages/devextreme/js/utils.d.ts +++ b/packages/devextreme/js/utils.d.ts @@ -1,15 +1,10 @@ -/** - * @docid Utils.compileGetter - * @publicName compileGetter(expr) - * @namespace DevExpress.data.utils - * @public - */ -export function compileGetter(expr: string | Array): Function; - -/** - * @docid Utils.compileSetter - * @publicName compileSetter(expr) - * @namespace DevExpress.data.utils - * @public - */ -export function compileSetter(expr: string | Array): Function; +export { + /** + * @deprecated Use compileGetter from common/data instead + */ + compileGetter, + /** + * @deprecated Use compileSetter from common/data instead + */ + compileSetter, +} from './common/data'; diff --git a/packages/devextreme/js/utils.js b/packages/devextreme/js/utils.js index 1733a2aedeb2..39ce31a3a29a 100644 --- a/packages/devextreme/js/utils.js +++ b/packages/devextreme/js/utils.js @@ -1,7 +1 @@ -import { compileGetter, compileSetter } from './core/utils/data'; - - -export { - compileGetter, - compileSetter -}; +export { compileGetter, compileSetter } from './common/data'; diff --git a/packages/devextreme/js/viz/bar_gauge.d.ts b/packages/devextreme/js/viz/bar_gauge.d.ts index 0b103253c679..197ba14b4044 100644 --- a/packages/devextreme/js/viz/bar_gauge.d.ts +++ b/packages/devextreme/js/viz/bar_gauge.d.ts @@ -5,13 +5,13 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, diff --git a/packages/devextreme/js/viz/bullet.d.ts b/packages/devextreme/js/viz/bullet.d.ts index bcbd6b775051..7f3f9fde76b0 100644 --- a/packages/devextreme/js/viz/bullet.d.ts +++ b/packages/devextreme/js/viz/bullet.d.ts @@ -2,7 +2,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { FileSavingEventInfo, diff --git a/packages/devextreme/js/viz/chart.d.ts b/packages/devextreme/js/viz/chart.d.ts index 6ca37fe59ef4..b31838092ba3 100644 --- a/packages/devextreme/js/viz/chart.d.ts +++ b/packages/devextreme/js/viz/chart.d.ts @@ -9,7 +9,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, @@ -17,7 +17,11 @@ import { import { template, -} from '../core/templates/template'; + SingleOrMultiple, + HorizontalAlignment, + Position, + VerticalAlignment, +} from '../common'; import { BaseChart, @@ -39,13 +43,6 @@ import { IncidentInfo, } from './core/base_widget'; -import { - SingleOrMultiple, - HorizontalAlignment, - Position, - VerticalAlignment, -} from '../common'; - import { ArgumentAxisHoverMode, AxisScaleType, diff --git a/packages/devextreme/js/viz/chart_components/base_chart.d.ts b/packages/devextreme/js/viz/chart_components/base_chart.d.ts index a8f58fe68b74..8e1872b58fdb 100644 --- a/packages/devextreme/js/viz/chart_components/base_chart.d.ts +++ b/packages/devextreme/js/viz/chart_components/base_chart.d.ts @@ -5,14 +5,15 @@ import { import { template, -} from '../../core/templates/template'; + SingleOrMultiple, +} from '../../common'; -import DataSource, { DataSourceLike } from '../../data/data_source'; +import { DataSource, DataSourceLike } from '../../common/data'; import { EventInfo, NativeEventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import { Format, @@ -44,10 +45,6 @@ import { PaletteExtensionMode, } from '../../common/charts'; -import { - SingleOrMultiple, -} from '../../common'; - /** * @docid * @hidden diff --git a/packages/devextreme/js/viz/chart_components/scroll_bar.js b/packages/devextreme/js/viz/chart_components/scroll_bar.js index c94223ce2a0b..cb0a054dfe4b 100644 --- a/packages/devextreme/js/viz/chart_components/scroll_bar.js +++ b/packages/devextreme/js/viz/chart_components/scroll_bar.js @@ -1,10 +1,10 @@ -import eventsEngine from '../../events/core/events_engine'; -import { fireEvent } from '../../events/utils/index'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { fireEvent } from '../../common/core/events/utils/index'; import { extend } from '../../core/utils/extend'; import { Translator2D } from '../translators/translator2d'; import { isDefined } from '../../core/utils/type'; import { noop } from '../../core/utils/common'; -import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../events/drag'; +import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../common/core/events/drag'; const _min = Math.min; const _max = Math.max; diff --git a/packages/devextreme/js/viz/chart_components/shutter_zoom.js b/packages/devextreme/js/viz/chart_components/shutter_zoom.js index 97b0becfb80a..d58f07eacd99 100644 --- a/packages/devextreme/js/viz/chart_components/shutter_zoom.js +++ b/packages/devextreme/js/viz/chart_components/shutter_zoom.js @@ -1,4 +1,4 @@ -import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../events/drag'; +import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../common/core/events/drag'; const SHUTTER_EVENTS_NS = '.shutter-zoom'; const DRAG_START_EVENT_NAME = dragEventStart + SHUTTER_EVENTS_NS; const DRAG_UPDATE_EVENT_NAME = dragEventMove + SHUTTER_EVENTS_NS; diff --git a/packages/devextreme/js/viz/chart_components/tracker.js b/packages/devextreme/js/viz/chart_components/tracker.js index c196126e275b..5a4493c32e7d 100644 --- a/packages/devextreme/js/viz/chart_components/tracker.js +++ b/packages/devextreme/js/viz/chart_components/tracker.js @@ -1,12 +1,12 @@ import domAdapter from '../../core/dom_adapter'; -import eventsEngine from '../../events/core/events_engine'; -import { name as clickEventName } from '../../events/click'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { name as clickEventName } from '../../common/core/events/click'; import { extend } from '../../core/utils/extend'; import { each as _each } from '../../core/utils/iterator'; import consts from '../components/consts'; import { getDistance, pointInCanvas as inCanvas, normalizeEnum as _normalizeEnum } from '../core/utils'; -import pointerEvents from '../../events/pointer'; -import { addNamespace } from '../../events/utils/index'; +import pointerEvents from '../../common/core/events/pointer'; +import { addNamespace } from '../../common/core/events/utils/index'; import { isDefined } from '../../core/utils/type'; import { noop as _noop } from '../../core/utils/common'; import errors from '../../core/errors'; diff --git a/packages/devextreme/js/viz/chart_components/zoom_and_pan.js b/packages/devextreme/js/viz/chart_components/zoom_and_pan.js index 3d9c68eaefeb..c6493f5a425d 100644 --- a/packages/devextreme/js/viz/chart_components/zoom_and_pan.js +++ b/packages/devextreme/js/viz/chart_components/zoom_and_pan.js @@ -2,9 +2,9 @@ import { isDefined } from '../../core/utils/type'; import { extend } from '../../core/utils/extend'; import { normalizeEnum, getVizRangeObject } from '../core/utils'; -import { name as wheelEvent } from '../../events/core/wheel'; -import * as transformEvents from '../../events/transform'; -import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../events/drag'; +import { name as wheelEvent } from '../../common/core/events/core/wheel'; +import * as transformEvents from '../../common/core/events/transform'; +import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../common/core/events/drag'; const EVENTS_NS = '.zoomAndPanNS'; diff --git a/packages/devextreme/js/viz/circular_gauge.d.ts b/packages/devextreme/js/viz/circular_gauge.d.ts index f1805c2f40b2..61bf9b612030 100644 --- a/packages/devextreme/js/viz/circular_gauge.d.ts +++ b/packages/devextreme/js/viz/circular_gauge.d.ts @@ -6,7 +6,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { FileSavingEventInfo, @@ -16,7 +16,7 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { BaseGauge, diff --git a/packages/devextreme/js/viz/components/tracker.js b/packages/devextreme/js/viz/components/tracker.js index 4d586ec57b6d..c08f04c6e8e7 100644 --- a/packages/devextreme/js/viz/components/tracker.js +++ b/packages/devextreme/js/viz/components/tracker.js @@ -1,8 +1,8 @@ -import { eventData as _eventData } from '../../events/utils/index'; +import { eventData as _eventData } from '../../common/core/events/utils/index'; import domAdapter from '../../core/dom_adapter'; -import { name as clickEventName } from '../../events/click'; -import pointer from '../../events/pointer'; -import eventsEngine from '../../events/core/events_engine'; +import { name as clickEventName } from '../../common/core/events/click'; +import pointer from '../../common/core/events/pointer'; +import eventsEngine from '../../common/core/events/core/events_engine'; const downPointerEventName = pointer.down; const movePointerEventName = pointer.move; diff --git a/packages/devextreme/js/viz/core/annotations.js b/packages/devextreme/js/viz/core/annotations.js index cbd5cfcc92fb..100b8afc6d4f 100644 --- a/packages/devextreme/js/viz/core/annotations.js +++ b/packages/devextreme/js/viz/core/annotations.js @@ -4,10 +4,10 @@ import { Tooltip } from '../core/tooltip'; import { extend } from '../../core/utils/extend'; import { patchFontOptions } from './utils'; import { Plaque } from './plaque'; -import pointerEvents from '../../events/pointer'; -import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../events/drag'; -import { addNamespace } from '../../events/utils/index'; -import eventsEngine from '../../events/core/events_engine'; +import pointerEvents from '../../common/core/events/pointer'; +import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../common/core/events/drag'; +import { addNamespace } from '../../common/core/events/utils/index'; +import eventsEngine from '../../common/core/events/core/events_engine'; const getDocument = domAdapter.getDocument; diff --git a/packages/devextreme/js/viz/core/base_widget.d.ts b/packages/devextreme/js/viz/core/base_widget.d.ts index f38d30aedac1..a7fc2975fbec 100644 --- a/packages/devextreme/js/viz/core/base_widget.d.ts +++ b/packages/devextreme/js/viz/core/base_widget.d.ts @@ -10,7 +10,7 @@ import { import { Cancelable, EventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import { Format, diff --git a/packages/devextreme/js/viz/core/data_source.js b/packages/devextreme/js/viz/core/data_source.js index 5f33a3c1ee9c..27518ef780e8 100644 --- a/packages/devextreme/js/viz/core/data_source.js +++ b/packages/devextreme/js/viz/core/data_source.js @@ -1,5 +1,5 @@ import { noop } from '../../core/utils/common'; -import DataHelperMixin from '../../data_helper'; +import DataHelperMixin from '../../common/data/data_helper'; const postCtor = DataHelperMixin.postCtor; let name; const members = { diff --git a/packages/devextreme/js/viz/core/export.js b/packages/devextreme/js/viz/core/export.js index 3cfb800306f7..49add1f9fbe9 100644 --- a/packages/devextreme/js/viz/core/export.js +++ b/packages/devextreme/js/viz/core/export.js @@ -3,11 +3,11 @@ import { getWindow } from '../../core/utils/window'; import { patchFontOptions } from './utils'; import { HIDDEN_FOR_EXPORT } from '../../core/utils/svg'; import { export as _export, image as imageExporter, svg as svgExporter, pdf as pdfExporter } from '../../exporter'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { isDefined } from '../../core/utils/type'; import { getTheme } from '../themes'; -import { start as hoverEventStart, end as hoverEventEnd } from '../../events/hover'; -import pointerEvents from '../../events/pointer'; +import { start as hoverEventStart, end as hoverEventEnd } from '../../common/core/events/hover'; +import pointerEvents from '../../common/core/events/pointer'; import { logger } from '../../core/utils/console'; import { getWidth } from '../../core/utils/size'; import { Renderer } from './renderers/renderer'; diff --git a/packages/devextreme/js/viz/core/renderers/animation.js b/packages/devextreme/js/viz/core/renderers/animation.js index 91e2c79bb021..beea948c287c 100644 --- a/packages/devextreme/js/viz/core/renderers/animation.js +++ b/packages/devextreme/js/viz/core/renderers/animation.js @@ -1,4 +1,4 @@ -import { requestAnimationFrame, cancelAnimationFrame } from '../../../animation/frame'; +import { requestAnimationFrame, cancelAnimationFrame } from '../../../common/core/animation/frame'; const noop = function() { }; export const easingFunctions = { easeOutCubic: function(pos, start, end) { return (pos === 1) ? end : ((1 - Math.pow((1 - pos), 3)) * (end - start) + (+start)); }, diff --git a/packages/devextreme/js/viz/core/renderers/renderer.js b/packages/devextreme/js/viz/core/renderers/renderer.js index 4795d7acbc6d..3317f2c83207 100644 --- a/packages/devextreme/js/viz/core/renderers/renderer.js +++ b/packages/devextreme/js/viz/core/renderers/renderer.js @@ -3,7 +3,7 @@ import domAdapter from '../../../core/dom_adapter'; import { getWindow } from '../../../core/utils/window'; import callOnce from '../../../core/utils/call_once'; -import eventsEngine from '../../../events/core/events_engine'; +import eventsEngine from '../../../common/core/events/core/events_engine'; import { getSvgMarkup } from '../../../core/utils/svg'; import { AnimationController } from './animation'; import { normalizeBBox, rotateBBox, normalizeEnum, normalizeArcParams, getNextDefsSvgId } from '../utils'; diff --git a/packages/devextreme/js/viz/funnel.d.ts b/packages/devextreme/js/viz/funnel.d.ts index 68a3015db7c2..93a94bdd54f5 100644 --- a/packages/devextreme/js/viz/funnel.d.ts +++ b/packages/devextreme/js/viz/funnel.d.ts @@ -1,4 +1,4 @@ -import DataSource, { DataSourceLike } from '../data/data_source'; +import { DataSource, DataSourceLike } from '../common/data'; import { UserDefinedElement, @@ -7,14 +7,16 @@ import { import { template, -} from '../core/templates/template'; + HorizontalEdge, + SingleMultipleOrNone, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, @@ -33,11 +35,6 @@ import BaseWidget, { IncidentInfo, } from './core/base_widget'; -import { - HorizontalEdge, - SingleMultipleOrNone, -} from '../common'; - import { DashStyle, HatchDirection, diff --git a/packages/devextreme/js/viz/gauges/base_gauge.d.ts b/packages/devextreme/js/viz/gauges/base_gauge.d.ts index 9c8db391b798..3d169ef86766 100644 --- a/packages/devextreme/js/viz/gauges/base_gauge.d.ts +++ b/packages/devextreme/js/viz/gauges/base_gauge.d.ts @@ -5,15 +5,17 @@ import { import { template, -} from '../../core/templates/template'; + HorizontalEdge, + VerticalEdge, +} from '../../common'; import { EventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import { Format, -} from '../../localization'; +} from '../../common/core/localization'; import BaseWidget, { BaseWidgetLoadingIndicator, @@ -21,11 +23,6 @@ import BaseWidget, { BaseWidgetTooltip, } from '../core/base_widget'; -import { - HorizontalEdge, - VerticalEdge, -} from '../../common'; - import { AnimationEaseMode, Palette, diff --git a/packages/devextreme/js/viz/gauges/tracker.js b/packages/devextreme/js/viz/gauges/tracker.js index 7c148091735e..48816cd98603 100644 --- a/packages/devextreme/js/viz/gauges/tracker.js +++ b/packages/devextreme/js/viz/gauges/tracker.js @@ -1,10 +1,10 @@ -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; import Class from '../../core/class'; import domAdapter from '../../core/dom_adapter'; -import { name as wheelEventName } from '../../events/core/wheel'; +import { name as wheelEventName } from '../../common/core/events/core/wheel'; import ReadyCallbacks from '../../core/utils/ready_callbacks'; -import { addNamespace } from '../../events/utils/index'; -import pointerEvents from '../../events/pointer'; +import { addNamespace } from '../../common/core/events/utils/index'; +import pointerEvents from '../../common/core/events/pointer'; ///#DEBUG import { debug } from '../../core/utils/console'; ///#ENDDEBUG diff --git a/packages/devextreme/js/viz/linear_gauge.d.ts b/packages/devextreme/js/viz/linear_gauge.d.ts index 0079aa0c4867..06283ea8b9bd 100644 --- a/packages/devextreme/js/viz/linear_gauge.d.ts +++ b/packages/devextreme/js/viz/linear_gauge.d.ts @@ -2,7 +2,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { FileSavingEventInfo, diff --git a/packages/devextreme/js/viz/pie_chart.d.ts b/packages/devextreme/js/viz/pie_chart.d.ts index 2c3096263e98..03a33bd4f755 100644 --- a/packages/devextreme/js/viz/pie_chart.d.ts +++ b/packages/devextreme/js/viz/pie_chart.d.ts @@ -5,14 +5,14 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, diff --git a/packages/devextreme/js/viz/polar_chart.d.ts b/packages/devextreme/js/viz/polar_chart.d.ts index 8490e8b0bd3b..df3467eb1df3 100644 --- a/packages/devextreme/js/viz/polar_chart.d.ts +++ b/packages/devextreme/js/viz/polar_chart.d.ts @@ -9,7 +9,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, @@ -34,7 +34,8 @@ import { import { template, -} from '../core/templates/template'; + SingleOrMultiple, +} from '../common'; import { FileSavingEventInfo, @@ -42,10 +43,6 @@ import { IncidentInfo, } from './core/base_widget'; -import { - SingleOrMultiple, -} from '../common'; - import { ArgumentAxisHoverMode, AxisScaleType, diff --git a/packages/devextreme/js/viz/range_selector.d.ts b/packages/devextreme/js/viz/range_selector.d.ts index ee84c775a622..879844f5a47f 100644 --- a/packages/devextreme/js/viz/range_selector.d.ts +++ b/packages/devextreme/js/viz/range_selector.d.ts @@ -1,11 +1,11 @@ -import DataSource, { DataSourceLike } from '../data/data_source'; +import { DataSource, DataSourceLike } from '../common/data'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, diff --git a/packages/devextreme/js/viz/range_selector/tracker.js b/packages/devextreme/js/viz/range_selector/tracker.js index 4c64a4980ad4..703565ce6823 100644 --- a/packages/devextreme/js/viz/range_selector/tracker.js +++ b/packages/devextreme/js/viz/range_selector/tracker.js @@ -1,5 +1,5 @@ -import eventsEngine from '../../events/core/events_engine'; -import pointerEvents from '../../events/pointer'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import pointerEvents from '../../common/core/events/pointer'; import { getWindow } from '../../core/utils/window'; import domAdapter from '../../core/dom_adapter'; import { each } from '../../core/utils/iterator'; diff --git a/packages/devextreme/js/viz/sankey.d.ts b/packages/devextreme/js/viz/sankey.d.ts index f29a7f0b2047..c9770c92f7f4 100644 --- a/packages/devextreme/js/viz/sankey.d.ts +++ b/packages/devextreme/js/viz/sankey.d.ts @@ -1,4 +1,4 @@ -import DataSource, { DataSourceLike } from '../data/data_source'; +import { DataSource, DataSourceLike } from '../common/data'; import { UserDefinedElement, @@ -7,14 +7,15 @@ import { import { template, -} from '../core/templates/template'; + VerticalAlignment, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import BaseWidget, { BaseWidgetOptions, @@ -24,10 +25,6 @@ import BaseWidget, { IncidentInfo, } from './core/base_widget'; -import { - VerticalAlignment, -} from '../common'; - import { HatchDirection, Palette, diff --git a/packages/devextreme/js/viz/sparkline.d.ts b/packages/devextreme/js/viz/sparkline.d.ts index 94263a5ee38c..eb9333259d22 100644 --- a/packages/devextreme/js/viz/sparkline.d.ts +++ b/packages/devextreme/js/viz/sparkline.d.ts @@ -1,10 +1,10 @@ -import DataSource, { DataSourceLike } from '../data/data_source'; +import { DataSource, DataSourceLike } from '../common/data'; import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { FileSavingEventInfo, diff --git a/packages/devextreme/js/viz/sparklines/base_sparkline.d.ts b/packages/devextreme/js/viz/sparklines/base_sparkline.d.ts index 57e98373fce9..70fe5a8d4cf3 100644 --- a/packages/devextreme/js/viz/sparklines/base_sparkline.d.ts +++ b/packages/devextreme/js/viz/sparklines/base_sparkline.d.ts @@ -5,11 +5,11 @@ import { import { template, -} from '../../core/templates/template'; +} from '../../common'; import { EventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import BaseWidget, { BaseWidgetExport, diff --git a/packages/devextreme/js/viz/sparklines/base_sparkline.js b/packages/devextreme/js/viz/sparklines/base_sparkline.js index f69136bf7669..697fe576ff61 100644 --- a/packages/devextreme/js/viz/sparklines/base_sparkline.js +++ b/packages/devextreme/js/viz/sparklines/base_sparkline.js @@ -1,10 +1,10 @@ -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; import domAdapter from '../../core/dom_adapter'; import { isFunction } from '../../core/utils/type'; import BaseWidget from '../../__internal/viz/core/m_base_widget'; import { extend } from '../../core/utils/extend'; -import { addNamespace } from '../../events/utils/index'; -import pointerEvents from '../../events/pointer'; +import { addNamespace } from '../../common/core/events/utils/index'; +import pointerEvents from '../../common/core/events/pointer'; import { pointInCanvas } from '../core/utils'; import $ from '../../core/renderer'; diff --git a/packages/devextreme/js/viz/tree_map.d.ts b/packages/devextreme/js/viz/tree_map.d.ts index fc80e072c193..a58df04d42f5 100644 --- a/packages/devextreme/js/viz/tree_map.d.ts +++ b/packages/devextreme/js/viz/tree_map.d.ts @@ -1,4 +1,4 @@ -import DataSource, { DataSourceLike } from '../data/data_source'; +import { DataSource, DataSourceLike } from '../common/data'; import { UserDefinedElement, @@ -7,14 +7,15 @@ import { import { template, -} from '../core/templates/template'; + SingleMultipleOrNone, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import BaseWidget, { BaseWidgetMargin, @@ -25,10 +26,6 @@ import BaseWidget, { IncidentInfo, } from './core/base_widget'; -import { - SingleMultipleOrNone, -} from '../common'; - import { Palette, PaletteExtensionMode, diff --git a/packages/devextreme/js/viz/vector_map.d.ts b/packages/devextreme/js/viz/vector_map.d.ts index e6bc4a43adf4..9e0b3986ac3c 100644 --- a/packages/devextreme/js/viz/vector_map.d.ts +++ b/packages/devextreme/js/viz/vector_map.d.ts @@ -1,4 +1,4 @@ -import DataSource, { DataSourceLike } from '../data/data_source'; +import { DataSource, DataSourceLike } from '../common/data'; import { UserDefinedElement, @@ -7,14 +7,17 @@ import { import { template, -} from '../core/templates/template'; + HorizontalAlignment, + SingleMultipleOrNone, + VerticalEdge, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, @@ -45,12 +48,6 @@ import { Font, } from '../common/charts'; -import { - HorizontalAlignment, - SingleMultipleOrNone, - VerticalEdge, -} from '../common'; - export { SingleMultipleOrNone, Palette, diff --git a/packages/devextreme/js/viz/vector_map/map_layer.js b/packages/devextreme/js/viz/vector_map/map_layer.js index a7bb5cffa499..a6b60250c913 100644 --- a/packages/devextreme/js/viz/vector_map/map_layer.js +++ b/packages/devextreme/js/viz/vector_map/map_layer.js @@ -1,7 +1,7 @@ import { noop } from '../../core/utils/common'; import { extend } from '../../core/utils/extend'; import { each } from '../../core/utils/iterator'; -import DataHelperMixin from '../../data_helper'; +import DataHelperMixin from '../../common/data/data_helper'; import { isFunction as _isFunction, isDefined as _isDefined } from '../../core/utils/type'; import { Deferred, when } from '../../core/utils/deferred'; import { parseScalar as _parseScalar, diff --git a/packages/devextreme/js/viz/vector_map/tracker.js b/packages/devextreme/js/viz/vector_map/tracker.js index b6f0a8e241d6..e94fbbb5b31f 100644 --- a/packages/devextreme/js/viz/vector_map/tracker.js +++ b/packages/devextreme/js/viz/vector_map/tracker.js @@ -1,9 +1,9 @@ -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; import { getNavigator, hasProperty } from '../../core/utils/window'; import domAdapter from '../../core/dom_adapter'; import { makeEventEmitter } from './event_emitter'; -import { addNamespace } from '../../events/utils/index'; -import { name as wheelEventName } from '../../events/core/wheel'; +import { addNamespace } from '../../common/core/events/utils/index'; +import { name as wheelEventName } from '../../common/core/events/core/wheel'; import { parseScalar } from '../core/utils'; const navigator = getNavigator(); diff --git a/packages/devextreme/project.json b/packages/devextreme/project.json index 5d2b5674ecaf..e6d99395baf0 100644 --- a/packages/devextreme/project.json +++ b/packages/devextreme/project.json @@ -21,8 +21,8 @@ "{projectRoot}/artifacts", "!{projectRoot}/artifacts/css", "{projectRoot}/js/bundles/dx.custom.js", - "{projectRoot}/js/localization/cldr-data", - "{projectRoot}/js/localization/default_messages.js", + "{projectRoot}/js/common/core/localization/cldr-data", + "{projectRoot}/js/common/core/localization/default_messages.js", "{projectRoot}/js/renovation/**/*.j.tsx", "{projectRoot}/testing/tests/Renovation/widgets.json" ] @@ -64,8 +64,8 @@ "{projectRoot}/artifacts", "!{projectRoot}/artifacts/css", "{projectRoot}/js/bundles/dx.custom.js", - "{projectRoot}/js/localization/cldr-data", - "{projectRoot}/js/localization/default_messages.js", + "{projectRoot}/js/common/core/localization/cldr-data", + "{projectRoot}/js/common/core/localization/default_messages.js", "{projectRoot}/js/renovation/**/*.j.tsx", "{projectRoot}/testing/tests/Renovation/widgets.json" ], diff --git a/packages/devextreme/ts/aliases.d.ts b/packages/devextreme/ts/aliases.d.ts index d75d552c5088..6200a3c1e97e 100644 --- a/packages/devextreme/ts/aliases.d.ts +++ b/packages/devextreme/ts/aliases.d.ts @@ -1,826 +1,825 @@ -declare module DevExpress { - /** @deprecated Use DevExpress.events.EventObject instead */ - export type dxEvent = DevExpress.events.EventObject; - /** @deprecated Use DevExpress.events.event instead */ - export type event = DevExpress.events.event; +declare namespace DevExpress { + /** @deprecated Use DevExpress.common.EventObject instead */ + export type dxEvent = common.EventObject; + /** @deprecated Use DevExpress.common.event instead */ + export type event = common.event; } -declare module DevExpress.viz { - /** @deprecated Use DevExpress.viz.ChartSeries instead */ - export type dxChartSeries = DevExpress.viz.ChartSeries; - /** @deprecated Use DevExpress.viz.PieChartSeries instead */ - export type dxPieChartSeries = DevExpress.viz.PieChartSeries; - /** @deprecated Use DevExpress.viz.PolarChartSeries instead */ - export type dxPolarChartSeries = DevExpress.viz.PolarChartSeries; - - /** @deprecated Use DevExpress.viz instead */ - export module charts { - /** @deprecated */ - export type dxChartOptions = DevExpress.viz.dxChartOptions; - /** @deprecated */ - export type dxChartArgumentAxis = DevExpress.viz.dxChartArgumentAxis; - /** @deprecated */ - export type dxChartArgumentAxisConstantLines = DevExpress.viz.dxChartArgumentAxisConstantLines; - /** @deprecated */ - export type dxChartArgumentAxisConstantLinesLabel = DevExpress.viz.dxChartArgumentAxisConstantLinesLabel; - /** @deprecated */ - export type dxChartArgumentAxisConstantLineStyle = DevExpress.viz.dxChartArgumentAxisConstantLineStyle; - /** @deprecated */ - export type dxChartArgumentAxisConstantLineStyleLabel = DevExpress.viz.dxChartArgumentAxisConstantLineStyleLabel; - /** @deprecated */ - export type dxChartArgumentAxisLabel = DevExpress.viz.dxChartArgumentAxisLabel; - /** @deprecated */ - export type dxChartArgumentAxisStrips = DevExpress.viz.dxChartArgumentAxisStrips; - /** @deprecated */ - export type dxChartArgumentAxisStripsLabel = DevExpress.viz.dxChartArgumentAxisStripsLabel; - /** @deprecated */ - export type dxChartArgumentAxisTitle = DevExpress.viz.dxChartArgumentAxisTitle; - /** @deprecated */ - export type dxChartCommonAxisSettings = DevExpress.viz.dxChartCommonAxisSettings; - /** @deprecated */ - export type dxChartCommonAxisSettingsConstantLineStyle = DevExpress.viz.dxChartCommonAxisSettingsConstantLineStyle; - /** @deprecated */ - export type dxChartCommonAxisSettingsConstantLineStyleLabel = DevExpress.viz.dxChartCommonAxisSettingsConstantLineStyleLabel; - /** @deprecated */ - export type dxChartCommonAxisSettingsLabel = DevExpress.viz.dxChartCommonAxisSettingsLabel; - /** @deprecated */ - export type dxChartCommonAxisSettingsStripStyle = DevExpress.viz.dxChartCommonAxisSettingsStripStyle; - /** @deprecated */ - export type dxChartCommonAxisSettingsStripStyleLabel = DevExpress.viz.dxChartCommonAxisSettingsStripStyleLabel; - /** @deprecated */ - export type dxChartCommonAxisSettingsTitle = DevExpress.viz.dxChartCommonAxisSettingsTitle; - /** @deprecated */ - export type dxChartCommonPaneSettings = DevExpress.viz.dxChartCommonPaneSettings; - /** @deprecated */ - export type dxChartCommonSeriesSettings = DevExpress.viz.dxChartCommonSeriesSettings; - /** @deprecated */ - export type dxChartLegend = DevExpress.viz.dxChartLegend; - /** @deprecated */ - export type dxChartPanes = DevExpress.viz.dxChartPanes; - /** @deprecated */ - export type dxChartSeries = DevExpress.viz.dxChartSeries; - /** @deprecated */ - export type dxChartTooltip = DevExpress.viz.dxChartTooltip; - /** @deprecated */ - export type dxChartValueAxis = DevExpress.viz.dxChartValueAxis; - /** @deprecated */ - export type dxChartValueAxisConstantLines = DevExpress.viz.dxChartValueAxisConstantLines; - /** @deprecated */ - export type dxChartValueAxisConstantLinesLabel = DevExpress.viz.dxChartValueAxisConstantLinesLabel; - /** @deprecated */ - export type dxChartValueAxisConstantLineStyle = DevExpress.viz.dxChartValueAxisConstantLineStyle; - /** @deprecated */ - export type dxChartValueAxisConstantLineStyleLabel = DevExpress.viz.dxChartValueAxisConstantLineStyleLabel; - /** @deprecated */ - export type dxChartValueAxisLabel = DevExpress.viz.dxChartValueAxisLabel; - /** @deprecated */ - export type dxChartValueAxisStrips = DevExpress.viz.dxChartValueAxisStrips; - /** @deprecated */ - export type dxChartValueAxisStripsLabel = DevExpress.viz.dxChartValueAxisStripsLabel; - /** @deprecated */ - export type dxChartValueAxisTitle = DevExpress.viz.dxChartValueAxisTitle; - - /** @deprecated */ - export type dxPieChartOptions = DevExpress.viz.dxPieChartOptions; - /** @deprecated */ - export type dxPieChartAdaptiveLayout = DevExpress.viz.dxPieChartAdaptiveLayout; - /** @deprecated */ - export type dxPieChartLegend = DevExpress.viz.dxPieChartLegend; - /** @deprecated */ - export type dxPieChartSeries = DevExpress.viz.dxPieChartSeries; - - /** @deprecated */ - export type dxPolarChartOptions = DevExpress.viz.dxPolarChartOptions; - /** @deprecated */ - export type dxPolarChartAdaptiveLayout = DevExpress.viz.dxPolarChartAdaptiveLayout; - /** @deprecated */ - export type dxPolarChartArgumentAxis = DevExpress.viz.dxPolarChartArgumentAxis; - /** @deprecated */ - export type dxPolarChartArgumentAxisConstantLines = DevExpress.viz.dxPolarChartArgumentAxisConstantLines; - /** @deprecated */ - export type dxPolarChartArgumentAxisConstantLinesLabel = DevExpress.viz.dxPolarChartArgumentAxisConstantLinesLabel; - /** @deprecated */ - export type dxPolarChartArgumentAxisLabel = DevExpress.viz.dxPolarChartArgumentAxisLabel; - /** @deprecated */ - export type dxPolarChartArgumentAxisStrips = DevExpress.viz.dxPolarChartArgumentAxisStrips; - /** @deprecated */ - export type dxPolarChartArgumentAxisStripsLabel = DevExpress.viz.dxPolarChartArgumentAxisStripsLabel; - /** @deprecated */ - export type dxPolarChartCommonAxisSettings = DevExpress.viz.dxPolarChartCommonAxisSettings; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsConstantLineStyle = DevExpress.viz.dxPolarChartCommonAxisSettingsConstantLineStyle; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsConstantLineStyleLabel = DevExpress.viz.dxPolarChartCommonAxisSettingsConstantLineStyleLabel; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsLabel = DevExpress.viz.dxPolarChartCommonAxisSettingsLabel; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsStripStyle = DevExpress.viz.dxPolarChartCommonAxisSettingsStripStyle; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsStripStyleLabel = DevExpress.viz.dxPolarChartCommonAxisSettingsStripStyleLabel; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsTick = DevExpress.viz.dxPolarChartCommonAxisSettingsTick; - /** @deprecated */ - export type dxPolarChartCommonSeriesSettings = DevExpress.viz.dxPolarChartCommonSeriesSettings; - /** @deprecated */ - export type dxPolarChartLegend = DevExpress.viz.dxPolarChartLegend; - /** @deprecated */ - export type dxPolarChartSeries = DevExpress.viz.dxPolarChartSeries; - /** @deprecated */ - export type dxPolarChartTooltip = DevExpress.viz.dxPolarChartTooltip; - /** @deprecated */ - export type dxPolarChartValueAxis = DevExpress.viz.dxPolarChartValueAxis; - /** @deprecated */ - export type dxPolarChartValueAxisConstantLines = DevExpress.viz.dxPolarChartValueAxisConstantLines; - /** @deprecated */ - export type dxPolarChartValueAxisConstantLinesLabel = DevExpress.viz.dxPolarChartValueAxisConstantLinesLabel; - /** @deprecated */ - export type dxPolarChartValueAxisLabel = DevExpress.viz.dxPolarChartValueAxisLabel; - /** @deprecated */ - export type dxPolarChartValueAxisStrips = DevExpress.viz.dxPolarChartValueAxisStrips; - /** @deprecated */ - export type dxPolarChartValueAxisStripsLabel = DevExpress.viz.dxPolarChartValueAxisStripsLabel; - /** @deprecated */ - export type dxPolarChartValueAxisTick = DevExpress.viz.dxPolarChartValueAxisTick; - } - - /** @deprecated Use DevExpress.viz instead */ - export module funnel { - /** @deprecated */ - export type dxFunnelOptions = DevExpress.viz.dxFunnelOptions; - /** @deprecated */ - export type dxFunnelTooltip = DevExpress.viz.dxFunnelTooltip; - } - - /** @deprecated Use DevExpress.viz instead */ - export module gauges { - /** @deprecated */ - export type dxCircularGaugeOptions = DevExpress.viz.dxCircularGaugeOptions; - /** @deprecated */ - export type dxCircularGaugeRangeContainer = DevExpress.viz.dxCircularGaugeRangeContainer; - /** @deprecated */ - export type dxCircularGaugeScale = DevExpress.viz.dxCircularGaugeScale; - /** @deprecated */ - export type dxCircularGaugeScaleLabel = DevExpress.viz.dxCircularGaugeScaleLabel; - - /** @deprecated */ - export type dxLinearGaugeOptions = DevExpress.viz.dxLinearGaugeOptions; - /** @deprecated */ - export type dxLinearGaugeRangeContainer = DevExpress.viz.dxLinearGaugeRangeContainer; - /** @deprecated */ - export type dxLinearGaugeScale = DevExpress.viz.dxLinearGaugeScale; - /** @deprecated */ - export type dxLinearGaugeScaleLabel = DevExpress.viz.dxLinearGaugeScaleLabel; - - /** @deprecated */ - export type dxBarGaugeOptions = DevExpress.viz.dxBarGaugeOptions; - /** @deprecated */ - export type dxBarGaugeTooltip = DevExpress.viz.dxBarGaugeTooltip; - } - - /** @deprecated Use DevExpress.viz instead */ - export module rangeSelector { - /** @deprecated */ - export type dxRangeSelectorOptions = DevExpress.viz.dxRangeSelectorOptions; - } - - /** @deprecated Use DevExpress.viz instead */ - export module sparklines { - /** @deprecated */ - export type dxSparklineOptions = DevExpress.viz.dxSparklineOptions; - /** @deprecated */ - export type dxBulletOptions = DevExpress.viz.dxBulletOptions; - } - - /** @deprecated Use DevExpress.viz instead */ - export module map { - /** @deprecated */ - export type dxVectorMapOptions = DevExpress.viz.dxVectorMapOptions; - /** @deprecated */ - export type dxVectorMapTooltip = DevExpress.viz.dxVectorMapTooltip; - } - - /** @deprecated Use DevExpress.viz instead */ - export module treeMap { - /** @deprecated */ - export type dxTreeMapOptions = DevExpress.viz.dxTreeMapOptions; - /** @deprecated */ - export type dxTreeMapTooltip = DevExpress.viz.dxTreeMapTooltip; - } +declare namespace DevExpress.viz { + /** @deprecated Use DevExpress.viz.ChartSeries instead */ + export type dxChartSeries = ChartSeries; + /** @deprecated Use DevExpress.viz.PieChartSeries instead */ + export type dxPieChartSeries = PieChartSeries; + /** @deprecated Use DevExpress.viz.PolarChartSeries instead */ + export type dxPolarChartSeries = PolarChartSeries; + + /** @deprecated Use DevExpress.viz instead */ + export namespace charts { + /** @deprecated */ + export type dxChartOptions = viz.dxChartOptions; + /** @deprecated */ + export type dxChartArgumentAxis = viz.dxChartArgumentAxis; + /** @deprecated */ + export type dxChartArgumentAxisConstantLines = viz.dxChartArgumentAxisConstantLines; + /** @deprecated */ + export type dxChartArgumentAxisConstantLinesLabel = viz.dxChartArgumentAxisConstantLinesLabel; + /** @deprecated */ + export type dxChartArgumentAxisConstantLineStyle = viz.dxChartArgumentAxisConstantLineStyle; + /** @deprecated */ + export type dxChartArgumentAxisConstantLineStyleLabel = viz.dxChartArgumentAxisConstantLineStyleLabel; + /** @deprecated */ + export type dxChartArgumentAxisLabel = viz.dxChartArgumentAxisLabel; + /** @deprecated */ + export type dxChartArgumentAxisStrips = viz.dxChartArgumentAxisStrips; + /** @deprecated */ + export type dxChartArgumentAxisStripsLabel = viz.dxChartArgumentAxisStripsLabel; + /** @deprecated */ + export type dxChartArgumentAxisTitle = viz.dxChartArgumentAxisTitle; + /** @deprecated */ + export type dxChartCommonAxisSettings = viz.dxChartCommonAxisSettings; + /** @deprecated */ + export type dxChartCommonAxisSettingsConstantLineStyle = viz.dxChartCommonAxisSettingsConstantLineStyle; + /** @deprecated */ + export type dxChartCommonAxisSettingsConstantLineStyleLabel = viz.dxChartCommonAxisSettingsConstantLineStyleLabel; + /** @deprecated */ + export type dxChartCommonAxisSettingsLabel = viz.dxChartCommonAxisSettingsLabel; + /** @deprecated */ + export type dxChartCommonAxisSettingsStripStyle = viz.dxChartCommonAxisSettingsStripStyle; + /** @deprecated */ + export type dxChartCommonAxisSettingsStripStyleLabel = viz.dxChartCommonAxisSettingsStripStyleLabel; + /** @deprecated */ + export type dxChartCommonAxisSettingsTitle = viz.dxChartCommonAxisSettingsTitle; + /** @deprecated */ + export type dxChartCommonPaneSettings = viz.dxChartCommonPaneSettings; + /** @deprecated */ + export type dxChartCommonSeriesSettings = viz.dxChartCommonSeriesSettings; + /** @deprecated */ + export type dxChartLegend = viz.dxChartLegend; + /** @deprecated */ + export type dxChartPanes = viz.dxChartPanes; + /** @deprecated */ + export type dxChartSeries = viz.dxChartSeries; + /** @deprecated */ + export type dxChartTooltip = viz.dxChartTooltip; + /** @deprecated */ + export type dxChartValueAxis = viz.dxChartValueAxis; + /** @deprecated */ + export type dxChartValueAxisConstantLines = viz.dxChartValueAxisConstantLines; + /** @deprecated */ + export type dxChartValueAxisConstantLinesLabel = viz.dxChartValueAxisConstantLinesLabel; + /** @deprecated */ + export type dxChartValueAxisConstantLineStyle = viz.dxChartValueAxisConstantLineStyle; + /** @deprecated */ + export type dxChartValueAxisConstantLineStyleLabel = viz.dxChartValueAxisConstantLineStyleLabel; + /** @deprecated */ + export type dxChartValueAxisLabel = viz.dxChartValueAxisLabel; + /** @deprecated */ + export type dxChartValueAxisStrips = viz.dxChartValueAxisStrips; + /** @deprecated */ + export type dxChartValueAxisStripsLabel = viz.dxChartValueAxisStripsLabel; + /** @deprecated */ + export type dxChartValueAxisTitle = viz.dxChartValueAxisTitle; + + /** @deprecated */ + export type dxPieChartOptions = viz.dxPieChartOptions; + /** @deprecated */ + export type dxPieChartAdaptiveLayout = viz.dxPieChartAdaptiveLayout; + /** @deprecated */ + export type dxPieChartLegend = viz.dxPieChartLegend; + /** @deprecated */ + export type dxPieChartSeries = viz.dxPieChartSeries; + + /** @deprecated */ + export type dxPolarChartOptions = viz.dxPolarChartOptions; + /** @deprecated */ + export type dxPolarChartAdaptiveLayout = viz.dxPolarChartAdaptiveLayout; + /** @deprecated */ + export type dxPolarChartArgumentAxis = viz.dxPolarChartArgumentAxis; + /** @deprecated */ + export type dxPolarChartArgumentAxisConstantLines = viz.dxPolarChartArgumentAxisConstantLines; + /** @deprecated */ + export type dxPolarChartArgumentAxisConstantLinesLabel = viz.dxPolarChartArgumentAxisConstantLinesLabel; + /** @deprecated */ + export type dxPolarChartArgumentAxisLabel = viz.dxPolarChartArgumentAxisLabel; + /** @deprecated */ + export type dxPolarChartArgumentAxisStrips = viz.dxPolarChartArgumentAxisStrips; + /** @deprecated */ + export type dxPolarChartArgumentAxisStripsLabel = viz.dxPolarChartArgumentAxisStripsLabel; + /** @deprecated */ + export type dxPolarChartCommonAxisSettings = viz.dxPolarChartCommonAxisSettings; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsConstantLineStyle = viz.dxPolarChartCommonAxisSettingsConstantLineStyle; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsConstantLineStyleLabel = viz.dxPolarChartCommonAxisSettingsConstantLineStyleLabel; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsLabel = viz.dxPolarChartCommonAxisSettingsLabel; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsStripStyle = viz.dxPolarChartCommonAxisSettingsStripStyle; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsStripStyleLabel = viz.dxPolarChartCommonAxisSettingsStripStyleLabel; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsTick = viz.dxPolarChartCommonAxisSettingsTick; + /** @deprecated */ + export type dxPolarChartCommonSeriesSettings = viz.dxPolarChartCommonSeriesSettings; + /** @deprecated */ + export type dxPolarChartLegend = viz.dxPolarChartLegend; + /** @deprecated */ + export type dxPolarChartSeries = viz.dxPolarChartSeries; + /** @deprecated */ + export type dxPolarChartTooltip = viz.dxPolarChartTooltip; + /** @deprecated */ + export type dxPolarChartValueAxis = viz.dxPolarChartValueAxis; + /** @deprecated */ + export type dxPolarChartValueAxisConstantLines = viz.dxPolarChartValueAxisConstantLines; + /** @deprecated */ + export type dxPolarChartValueAxisConstantLinesLabel = viz.dxPolarChartValueAxisConstantLinesLabel; + /** @deprecated */ + export type dxPolarChartValueAxisLabel = viz.dxPolarChartValueAxisLabel; + /** @deprecated */ + export type dxPolarChartValueAxisStrips = viz.dxPolarChartValueAxisStrips; + /** @deprecated */ + export type dxPolarChartValueAxisStripsLabel = viz.dxPolarChartValueAxisStripsLabel; + /** @deprecated */ + export type dxPolarChartValueAxisTick = viz.dxPolarChartValueAxisTick; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace funnel { + /** @deprecated */ + export type dxFunnelOptions = viz.dxFunnelOptions; + /** @deprecated */ + export type dxFunnelTooltip = viz.dxFunnelTooltip; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace gauges { + /** @deprecated */ + export type dxCircularGaugeOptions = viz.dxCircularGaugeOptions; + /** @deprecated */ + export type dxCircularGaugeRangeContainer = viz.dxCircularGaugeRangeContainer; + /** @deprecated */ + export type dxCircularGaugeScale = viz.dxCircularGaugeScale; + /** @deprecated */ + export type dxCircularGaugeScaleLabel = viz.dxCircularGaugeScaleLabel; + + /** @deprecated */ + export type dxLinearGaugeOptions = viz.dxLinearGaugeOptions; + /** @deprecated */ + export type dxLinearGaugeRangeContainer = viz.dxLinearGaugeRangeContainer; + /** @deprecated */ + export type dxLinearGaugeScale = viz.dxLinearGaugeScale; + /** @deprecated */ + export type dxLinearGaugeScaleLabel = viz.dxLinearGaugeScaleLabel; + + /** @deprecated */ + export type dxBarGaugeOptions = viz.dxBarGaugeOptions; + /** @deprecated */ + export type dxBarGaugeTooltip = viz.dxBarGaugeTooltip; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace rangeSelector { + /** @deprecated */ + export type dxRangeSelectorOptions = viz.dxRangeSelectorOptions; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace sparklines { + /** @deprecated */ + export type dxSparklineOptions = viz.dxSparklineOptions; + /** @deprecated */ + export type dxBulletOptions = viz.dxBulletOptions; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace map { + /** @deprecated */ + export type dxVectorMapOptions = viz.dxVectorMapOptions; + /** @deprecated */ + export type dxVectorMapTooltip = viz.dxVectorMapTooltip; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace treeMap { + /** @deprecated */ + export type dxTreeMapOptions = viz.dxTreeMapOptions; + /** @deprecated */ + export type dxTreeMapTooltip = viz.dxTreeMapTooltip; + } } -declare module DevExpress.ui { - /** @deprecated Use DevExpress.ui.dxAccordionItem */ - export type dxAccordionItemTemplate = DevExpress.ui.dxAccordionItem; +declare namespace DevExpress.ui { + /** @deprecated Use DevExpress.ui.dxAccordionItem */ + export type dxAccordionItemTemplate = dxAccordionItem; - /** @deprecated Use DevExpress.ui.dxActionSheetItem */ - export type dxActionSheetItemTemplate = DevExpress.ui.dxActionSheetItem; + /** @deprecated Use DevExpress.ui.dxActionSheetItem */ + export type dxActionSheetItemTemplate = dxActionSheetItem; - /** @deprecated Use DevExpress.ui.dxBoxItem */ - export type dxBoxItemTemplate = DevExpress.ui.dxBoxItem; + /** @deprecated Use DevExpress.ui.dxBoxItem */ + export type dxBoxItemTemplate = dxBoxItem; - /** @deprecated Use DevExpress.ui.dxGalleryItem */ - export type dxGalleryItemTemplate = DevExpress.ui.dxGalleryItem; + /** @deprecated Use DevExpress.ui.dxGalleryItem */ + export type dxGalleryItemTemplate = dxGalleryItem; - /** @deprecated Use DevExpress.ui.dxMultiViewItem */ - export type dxMultiViewItemTemplate = DevExpress.ui.dxMultiViewItem; + /** @deprecated Use DevExpress.ui.dxMultiViewItem */ + export type dxMultiViewItemTemplate = dxMultiViewItem; - /** @deprecated Use DevExpress.ui.dxResponsiveBoxItem */ - export type dxResponsiveBoxItemTemplate = DevExpress.ui.dxResponsiveBoxItem; + /** @deprecated Use DevExpress.ui.dxResponsiveBoxItem */ + export type dxResponsiveBoxItemTemplate = dxResponsiveBoxItem; - /** @deprecated Use DevExpress.ui.dxSchedulerAppointment */ - export type dxSchedulerAppointmentTemplate = DevExpress.ui.dxSchedulerAppointment; + /** @deprecated Use DevExpress.ui.dxSchedulerAppointment */ + export type dxSchedulerAppointmentTemplate = dxSchedulerAppointment; - /** @deprecated Use DevExpress.ui.dxTabsItem */ - export type dxTabsItemTemplate = DevExpress.ui.dxTabsItem; + /** @deprecated Use DevExpress.ui.dxTabsItem */ + export type dxTabsItemTemplate = dxTabsItem; - /** @deprecated Use DevExpress.ui.dxTabPanelItem */ - export type dxTabPanelItemTemplate = DevExpress.ui.dxTabPanelItem; + /** @deprecated Use DevExpress.ui.dxTabPanelItem */ + export type dxTabPanelItemTemplate = dxTabPanelItem; - /** @deprecated Use DevExpress.ui.dxTileViewItem */ - export type dxTileViewItemTemplate = DevExpress.ui.dxTileViewItem; + /** @deprecated Use DevExpress.ui.dxTileViewItem */ + export type dxTileViewItemTemplate = dxTileViewItem; - /** @deprecated Use DevExpress.ui.dxToolbarItem */ - export type dxToolbarItemTemplate = DevExpress.ui.dxToolbarItem; + /** @deprecated Use DevExpress.ui.dxToolbarItem */ + export type dxToolbarItemTemplate = dxToolbarItem; - /** @deprecated Use DevExpress.ui.CollectionWidgetItem */ - export type CollectionWidgetItemTemplate = DevExpress.ui.CollectionWidgetItem; + /** @deprecated Use DevExpress.ui.CollectionWidgetItem */ + export type CollectionWidgetItemTemplate = CollectionWidgetItem; - /** @deprecated Use DevExpress.ui.dxContextMenuItem */ - export type dxContextMenuItemTemplate = DevExpress.ui.dxContextMenuItem; + /** @deprecated Use DevExpress.ui.dxContextMenuItem */ + export type dxContextMenuItemTemplate = dxContextMenuItem; - /** @deprecated Use DevExpress.ui.dxMenuBaseItem */ - export type dxMenuBaseItemTemplate = DevExpress.ui.dxMenuBaseItem; + /** @deprecated Use DevExpress.ui.dxMenuBaseItem */ + export type dxMenuBaseItemTemplate = dxMenuBaseItem; - /** @deprecated Use DevExpress.ui.CollectionWidgetItem */ - export type DataExpressionMixinItemTemplate = DevExpress.ui.CollectionWidgetItem; + /** @deprecated Use DevExpress.ui.CollectionWidgetItem */ + export type DataExpressionMixinItemTemplate = CollectionWidgetItem; - /** @deprecated Use DevExpress.ui.dxListItem */ - export type dxListItemTemplate = DevExpress.ui.dxListItem; + /** @deprecated Use DevExpress.ui.dxListItem */ + export type dxListItemTemplate = dxListItem; - /** @deprecated Use DevExpress.ui.dxMenuItem */ - export type dxMenuItemTemplate = DevExpress.ui.dxMenuItem; + /** @deprecated Use DevExpress.ui.dxMenuItem */ + export type dxMenuItemTemplate = dxMenuItem; - /** @deprecated Use DevExpress.ui.dxTreeViewItem */ - export type dxTreeViewItemTemplate = DevExpress.ui.dxTreeViewItem; + /** @deprecated Use DevExpress.ui.dxTreeViewItem */ + export type dxTreeViewItemTemplate = dxTreeViewItem; } - // v22.1 -declare module DevExpress.ui { - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type GridBase = DevExpress.common.grids.GridBase; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type GridBaseOptions, TRowData = any, TKey = any> = DevExpress.common.grids.GridBaseOptions; +declare namespace DevExpress.ui { + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type GridBase = common.grids.GridBase; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type GridBaseOptions, TRowData = any, TKey = any> = common.grids.GridBaseOptions; } -declare module DevExpress.ui.dxDataGrid { - - /** @deprecated Use DevExpress.common.Scrollable */ - export type Scrollable = DevExpress.common.Scrollable; - - /** @deprecated Use DevExpress.common.grids.ColumnChooser instead */ - export type ColumnChooser = DevExpress.common.grids.ColumnChooser; - /** @deprecated Use DevExpress.common.grids.ColumnCustomizeTextArg instead */ - export type ColumnCustomizeTextArg = DevExpress.common.grids.ColumnCustomizeTextArg; - /** @deprecated Use DevExpress.common.grids.ColumnFixing instead */ - export type ColumnFixing = DevExpress.common.grids.ColumnFixing; - /** @deprecated Use DevExpress.common.grids.ColumnFixingTexts instead */ - export type ColumnFixingTexts = DevExpress.common.grids.ColumnFixingTexts; - /** @deprecated Use DevExpress.common.grids.ColumnHeaderFilter instead */ - export type ColumnHeaderFilter = DevExpress.common.grids.ColumnHeaderFilter; - /** @deprecated Use DevExpress.common.grids.ColumnLookup instead */ - export type ColumnLookup = DevExpress.common.grids.ColumnLookup; - /** @deprecated Use DevExpress.common.grids.DataChange instead */ - export type DataChange = DevExpress.common.grids.DataChange; - /** @deprecated Use DevExpress.common.grids.FilterPanelTexts instead */ - export type FilterPanelTexts = DevExpress.common.grids.FilterPanelTexts; - /** @deprecated Use DevExpress.common.grids.FilterRow instead */ - export type FilterRow = DevExpress.common.grids.FilterRow; - /** @deprecated Use DevExpress.common.grids.FilterRowOperationDescriptions instead */ - export type FilterRowOperationDescriptions = DevExpress.common.grids.FilterRowOperationDescriptions; - /** @deprecated Use DevExpress.common.grids.HeaderFilter instead */ - export type HeaderFilter = DevExpress.common.grids.HeaderFilter; - /** @deprecated Use DevExpress.common.grids.HeaderFilterGroupInterval instead */ - export type HeaderFilterGroupInterval = DevExpress.common.grids.HeaderFilterGroupInterval; - /** @deprecated Use DevExpress.common.grids.HeaderFilterTexts instead */ - export type HeaderFilterTexts = DevExpress.common.grids.HeaderFilterTexts; - /** @deprecated Use DevExpress.common.grids.KeyboardNavigation instead */ - export type KeyboardNavigation = DevExpress.common.grids.KeyboardNavigation; - /** @deprecated Use DevExpress.common.grids.LoadPanel instead */ - export type LoadPanel = DevExpress.common.grids.LoadPanel; - /** @deprecated Use DevExpress.common.grids.Pager instead */ - export type Pager = DevExpress.common.grids.Pager; - /** @deprecated Use DevExpress.common.grids.RowDraggingTemplateData instead */ - export type RowDraggingTemplateData = DevExpress.common.grids.RowDraggingTemplateData; - /** @deprecated Use DevExpress.common.grids.RowDraggingTemplateData instead */ - export type RowDraggingTemplateDataModel = DevExpress.common.grids.RowDraggingTemplateData; - /** @deprecated Use DevExpress.common.grids.SearchPanel instead */ - export type SearchPanel = DevExpress.common.grids.SearchPanel; - /** @deprecated Use DevExpress.common.grids.Sorting instead */ - export type Sorting = DevExpress.common.grids.Sorting; - /** @deprecated Use DevExpress.common.grids.StateStoring instead */ - export type StateStoring = DevExpress.common.grids.StateStoring; - - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type AdaptiveDetailRowPreparingInfo = DevExpress.common.grids.AdaptiveDetailRowPreparingInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type DataChangeInfo = DevExpress.common.grids.DataChangeInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type DataErrorOccurredInfo = DevExpress.common.grids.DataErrorOccurredInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type DragDropInfo = DevExpress.common.grids.DragDropInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type DragReorderInfo = DevExpress.common.grids.DragReorderInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type DragStartEventInfo = DevExpress.common.grids.DragStartEventInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type KeyDownInfo = DevExpress.common.grids.KeyDownInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type NewRowInfo = DevExpress.common.grids.NewRowInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type PagingBase = DevExpress.common.grids.PagingBase; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type RowDraggingEventInfo = DevExpress.common.grids.RowDraggingEventInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type RowInsertedInfo = DevExpress.common.grids.RowInsertedInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type RowInsertingInfo = DevExpress.common.grids.RowInsertingInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type RowKeyInfo = DevExpress.common.grids.RowKeyInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type RowRemovedInfo = DevExpress.common.grids.RowRemovedInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type RowRemovingInfo = DevExpress.common.grids.RowRemovingInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type RowUpdatedInfo = DevExpress.common.grids.RowUpdatedInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type RowUpdatingInfo = DevExpress.common.grids.RowUpdatingInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type RowValidatingInfo = DevExpress.common.grids.RowValidatingInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type SavingInfo = DevExpress.common.grids.SavingInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type SelectionChangedInfo = DevExpress.common.grids.SelectionChangedInfo; - /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type ToolbarPreparingInfo = DevExpress.common.grids.ToolbarPreparingInfo; +declare namespace DevExpress.ui.dxDataGrid { + + /** @deprecated Use DevExpress.common.Scrollable */ + export type Scrollable = common.Scrollable; + + /** @deprecated Use DevExpress.common.grids.ColumnChooser instead */ + export type ColumnChooser = common.grids.ColumnChooser; + /** @deprecated Use DevExpress.common.grids.ColumnCustomizeTextArg instead */ + export type ColumnCustomizeTextArg = common.grids.ColumnCustomizeTextArg; + /** @deprecated Use DevExpress.common.grids.ColumnFixing instead */ + export type ColumnFixing = common.grids.ColumnFixing; + /** @deprecated Use DevExpress.common.grids.ColumnFixingTexts instead */ + export type ColumnFixingTexts = common.grids.ColumnFixingTexts; + /** @deprecated Use DevExpress.common.grids.ColumnHeaderFilter instead */ + export type ColumnHeaderFilter = common.grids.ColumnHeaderFilter; + /** @deprecated Use DevExpress.common.grids.ColumnLookup instead */ + export type ColumnLookup = common.grids.ColumnLookup; + /** @deprecated Use DevExpress.common.grids.DataChange instead */ + export type DataChange = common.grids.DataChange; + /** @deprecated Use DevExpress.common.grids.FilterPanelTexts instead */ + export type FilterPanelTexts = common.grids.FilterPanelTexts; + /** @deprecated Use DevExpress.common.grids.FilterRow instead */ + export type FilterRow = common.grids.FilterRow; + /** @deprecated Use DevExpress.common.grids.FilterRowOperationDescriptions instead */ + export type FilterRowOperationDescriptions = common.grids.FilterRowOperationDescriptions; + /** @deprecated Use DevExpress.common.grids.HeaderFilter instead */ + export type HeaderFilter = common.grids.HeaderFilter; + /** @deprecated Use DevExpress.common.grids.HeaderFilterGroupInterval instead */ + export type HeaderFilterGroupInterval = common.grids.HeaderFilterGroupInterval; + /** @deprecated Use DevExpress.common.grids.HeaderFilterTexts instead */ + export type HeaderFilterTexts = common.grids.HeaderFilterTexts; + /** @deprecated Use DevExpress.common.grids.KeyboardNavigation instead */ + export type KeyboardNavigation = common.grids.KeyboardNavigation; + /** @deprecated Use DevExpress.common.grids.LoadPanel instead */ + export type LoadPanel = common.grids.LoadPanel; + /** @deprecated Use DevExpress.common.grids.Pager instead */ + export type Pager = common.grids.Pager; + /** @deprecated Use DevExpress.common.grids.RowDraggingTemplateData instead */ + export type RowDraggingTemplateData = common.grids.RowDraggingTemplateData; + /** @deprecated Use DevExpress.common.grids.RowDraggingTemplateData instead */ + export type RowDraggingTemplateDataModel = common.grids.RowDraggingTemplateData; + /** @deprecated Use DevExpress.common.grids.SearchPanel instead */ + export type SearchPanel = common.grids.SearchPanel; + /** @deprecated Use DevExpress.common.grids.Sorting instead */ + export type Sorting = common.grids.Sorting; + /** @deprecated Use DevExpress.common.grids.StateStoring instead */ + export type StateStoring = common.grids.StateStoring; + + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type AdaptiveDetailRowPreparingInfo = common.grids.AdaptiveDetailRowPreparingInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type DataChangeInfo = common.grids.DataChangeInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type DataErrorOccurredInfo = common.grids.DataErrorOccurredInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type DragDropInfo = common.grids.DragDropInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type DragReorderInfo = common.grids.DragReorderInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type DragStartEventInfo = common.grids.DragStartEventInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type KeyDownInfo = common.grids.KeyDownInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type NewRowInfo = common.grids.NewRowInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type PagingBase = common.grids.PagingBase; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type RowDraggingEventInfo = common.grids.RowDraggingEventInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type RowInsertedInfo = common.grids.RowInsertedInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type RowInsertingInfo = common.grids.RowInsertingInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type RowKeyInfo = common.grids.RowKeyInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type RowRemovedInfo = common.grids.RowRemovedInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type RowRemovingInfo = common.grids.RowRemovingInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type RowUpdatedInfo = common.grids.RowUpdatedInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type RowUpdatingInfo = common.grids.RowUpdatingInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type RowValidatingInfo = common.grids.RowValidatingInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type SavingInfo = common.grids.SavingInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type SelectionChangedInfo = common.grids.SelectionChangedInfo; + /** @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ + export type ToolbarPreparingInfo = common.grids.ToolbarPreparingInfo; } -declare module DevExpress.common.charts { - /** @deprecated Use DevExpress.common.grids.ApplyChangesMode instead */ - export type ApplyChangesMode = DevExpress.common.grids.ApplyChangesMode; - /** @deprecated Use DevExpress.common.grids.ApplyFilterMode instead */ - export type ApplyFilterMode = DevExpress.common.grids.ApplyFilterMode; - /** @deprecated Use DevExpress.common.grids.ColumnChooserMode instead */ - export type ColumnChooserMode = DevExpress.common.grids.ColumnChooserMode; - /** @deprecated Use DevExpress.common.grids.ColumnResizeMode instead */ - export type ColumnResizeMode = DevExpress.common.grids.ColumnResizeMode; - /** @deprecated Use DevExpress.common.grids.DataChangeType instead */ - export type DataChangeType = DevExpress.common.grids.DataChangeType; - /** @deprecated Use DevExpress.common.grids.DataRenderMode instead */ - export type DataRenderMode = DevExpress.common.grids.DataRenderMode; - /** @deprecated Use DevExpress.common.grids.EnterKeyAction instead */ - export type EnterKeyAction = DevExpress.common.grids.EnterKeyAction; - /** @deprecated Use DevExpress.common.grids.EnterKeyDirection instead */ - export type EnterKeyDirection = DevExpress.common.grids.EnterKeyDirection; - /** @deprecated Use DevExpress.common.grids.FilterOperation instead */ - export type FilterOperation = DevExpress.common.grids.FilterOperation; - /** @deprecated Use DevExpress.common.grids.FilterType instead */ - export type FilterType = DevExpress.common.grids.FilterType; - /** @deprecated Use DevExpress.common.grids.GridsEditMode instead */ - export type GridsEditMode = DevExpress.common.grids.GridsEditMode; - /** @deprecated Use DevExpress.common.grids.GridsEditRefreshMode instead */ - export type GridsEditRefreshMode = DevExpress.common.grids.GridsEditRefreshMode; - /** @deprecated Use DevExpress.common.grids.GroupExpandMode instead */ - export type GroupExpandMode = DevExpress.common.grids.GroupExpandMode; - /** @deprecated Use DevExpress.common.grids.NewRowPosition instead */ - export type NewRowPosition = DevExpress.common.grids.NewRowPosition; - /** @deprecated Use DevExpress.common.DisplayMode instead */ - export type PagerDisplayMode = DevExpress.common.DisplayMode; - /** @deprecated Use DevExpress.common.grids.PagerPageSize instead */ - export type PagerPageSize = DevExpress.common.grids.PagerPageSize; - /** @deprecated Use DevExpress.common.grids.SelectedFilterOperation instead */ - export type SelectedFilterOperation = DevExpress.common.grids.SelectedFilterOperation; - /** @deprecated Use DevExpress.common.grids.SelectionColumnDisplayMode instead */ - export type SelectionColumnDisplayMode = DevExpress.common.grids.SelectionColumnDisplayMode; - /** @deprecated Use DevExpress.common.grids.StartEditAction instead */ - export type StartEditAction = DevExpress.common.grids.StartEditAction; - /** @deprecated Use DevExpress.common.grids.StateStoreType instead */ - export type StateStoreType = DevExpress.common.grids.StateStoreType; - /** @deprecated Use DevExpress.common.grids.SummaryType instead */ - export type SummaryType = DevExpress.common.grids.SummaryType; +declare namespace DevExpress.common.charts { + /** @deprecated Use DevExpress.common.grids.ApplyChangesMode instead */ + export type ApplyChangesMode = grids.ApplyChangesMode; + /** @deprecated Use DevExpress.common.grids.ApplyFilterMode instead */ + export type ApplyFilterMode = grids.ApplyFilterMode; + /** @deprecated Use DevExpress.common.grids.ColumnChooserMode instead */ + export type ColumnChooserMode = grids.ColumnChooserMode; + /** @deprecated Use DevExpress.common.grids.ColumnResizeMode instead */ + export type ColumnResizeMode = grids.ColumnResizeMode; + /** @deprecated Use DevExpress.common.grids.DataChangeType instead */ + export type DataChangeType = grids.DataChangeType; + /** @deprecated Use DevExpress.common.grids.DataRenderMode instead */ + export type DataRenderMode = grids.DataRenderMode; + /** @deprecated Use DevExpress.common.grids.EnterKeyAction instead */ + export type EnterKeyAction = grids.EnterKeyAction; + /** @deprecated Use DevExpress.common.grids.EnterKeyDirection instead */ + export type EnterKeyDirection = grids.EnterKeyDirection; + /** @deprecated Use DevExpress.common.grids.FilterOperation instead */ + export type FilterOperation = grids.FilterOperation; + /** @deprecated Use DevExpress.common.grids.FilterType instead */ + export type FilterType = grids.FilterType; + /** @deprecated Use DevExpress.common.grids.GridsEditMode instead */ + export type GridsEditMode = grids.GridsEditMode; + /** @deprecated Use DevExpress.common.grids.GridsEditRefreshMode instead */ + export type GridsEditRefreshMode = grids.GridsEditRefreshMode; + /** @deprecated Use DevExpress.common.grids.GroupExpandMode instead */ + export type GroupExpandMode = grids.GroupExpandMode; + /** @deprecated Use DevExpress.common.grids.NewRowPosition instead */ + export type NewRowPosition = grids.NewRowPosition; + /** @deprecated Use DevExpress.common.DisplayMode instead */ + export type PagerDisplayMode = DisplayMode; + /** @deprecated Use DevExpress.common.grids.PagerPageSize instead */ + export type PagerPageSize = grids.PagerPageSize; + /** @deprecated Use DevExpress.common.grids.SelectedFilterOperation instead */ + export type SelectedFilterOperation = grids.SelectedFilterOperation; + /** @deprecated Use DevExpress.common.grids.SelectionColumnDisplayMode instead */ + export type SelectionColumnDisplayMode = grids.SelectionColumnDisplayMode; + /** @deprecated Use DevExpress.common.grids.StartEditAction instead */ + export type StartEditAction = grids.StartEditAction; + /** @deprecated Use DevExpress.common.grids.StateStoreType instead */ + export type StateStoreType = grids.StateStoreType; + /** @deprecated Use DevExpress.common.grids.SummaryType instead */ + export type SummaryType = grids.SummaryType; } // v22.2 -declare module DevExpress { - /** @deprecated Use DevExpress.GlobalConfig instead */ - export type globalConfig = DevExpress.common.GlobalConfig; +declare namespace DevExpress { + /** @deprecated Use DevExpress.GlobalConfig instead */ + export type globalConfig = common.GlobalConfig; } -declare module DevExpress.ui { - /** @deprecated Use DevExpress.common.AsyncRule instead */ - export type AsyncRule = DevExpress.common.AsyncRule; - /** @deprecated Use DevExpress.common.CompareRule instead */ - export type CompareRule = DevExpress.common.CompareRule; - /** @deprecated Use DevExpress.common.CustomRule instead */ - export type CustomRule = DevExpress.common.CustomRule; - /** @deprecated Use DevExpress.common.EmailRule instead */ - export type EmailRule = DevExpress.common.EmailRule; - /** @deprecated Use DevExpress.common.NumericRule instead */ - export type NumericRule = DevExpress.common.NumericRule; - /** @deprecated Use DevExpress.common.PatternRule instead */ - export type PatternRule = DevExpress.common.PatternRule; - /** @deprecated Use DevExpress.common.RangeRule instead */ - export type RangeRule = DevExpress.common.RangeRule; - /** @deprecated Use DevExpress.common.RequiredRule instead */ - export type RequiredRule = DevExpress.common.RequiredRule; - /** @deprecated Use DevExpress.common.StringLengthRule instead */ - export type StringLengthRule = DevExpress.common.StringLengthRule; - /** @deprecated Use DevExpress.common.ValidationCallbackData instead */ - export type ValidationCallbackData = DevExpress.common.ValidationCallbackData; - /** @deprecated Use DevExpress.common.ValidationRule instead */ - export type ValidationRule = DevExpress.common.ValidationRule; - /** @deprecated Use DevExpress.common.ValidationRuleType instead */ - export type ValidationRuleType = DevExpress.common.ValidationRuleType; +declare namespace DevExpress.ui { + /** @deprecated Use DevExpress.common.AsyncRule instead */ + export type AsyncRule = common.AsyncRule; + /** @deprecated Use DevExpress.common.CompareRule instead */ + export type CompareRule = common.CompareRule; + /** @deprecated Use DevExpress.common.CustomRule instead */ + export type CustomRule = common.CustomRule; + /** @deprecated Use DevExpress.common.EmailRule instead */ + export type EmailRule = common.EmailRule; + /** @deprecated Use DevExpress.common.NumericRule instead */ + export type NumericRule = common.NumericRule; + /** @deprecated Use DevExpress.common.PatternRule instead */ + export type PatternRule = common.PatternRule; + /** @deprecated Use DevExpress.common.RangeRule instead */ + export type RangeRule = common.RangeRule; + /** @deprecated Use DevExpress.common.RequiredRule instead */ + export type RequiredRule = common.RequiredRule; + /** @deprecated Use DevExpress.common.StringLengthRule instead */ + export type StringLengthRule = common.StringLengthRule; + /** @deprecated Use DevExpress.common.ValidationCallbackData instead */ + export type ValidationCallbackData = common.ValidationCallbackData; + /** @deprecated Use DevExpress.common.ValidationRule instead */ + export type ValidationRule = common.ValidationRule; + /** @deprecated Use DevExpress.common.ValidationRuleType instead */ + export type ValidationRuleType = common.ValidationRuleType; } -declare module DevExpress.viz { - /** @deprecated Use DevExpress.common.charts.ScaleBreak instead */ - export type ScaleBreak = DevExpress.common.charts.ScaleBreak - /** @deprecated Use DevExpress.common.charts.SeriesType instead */ - export type SeriesType = DevExpress.common.charts.SeriesType - /** @deprecated Use DevExpress.common.charts.VisualRange instead */ - export type VisualRange = DevExpress.common.charts.VisualRange - /** @deprecated Use DevExpress.common.charts.TimeIntervalConfig instead */ - export type VizTimeInterval = DevExpress.common.charts.TimeIntervalConfig - /** @deprecated Use DevExpress.common.charts.SeriesPoint instead */ - export type dxChartSeriesTypesCommonSeriesPoint = DevExpress.common.charts.SeriesPoint; - /** @deprecated Use DevExpress.common.charts.SeriesLabel instead */ - export type dxChartSeriesTypesCommonSeriesLabel = DevExpress.common.charts.SeriesLabel; - /** @deprecated Use DevExpress.common.charts.LegendItem instead */ - export type BaseChartLegendItem = DevExpress.common.charts.LegendItem; +declare namespace DevExpress.viz { + /** @deprecated Use DevExpress.common.charts.ScaleBreak instead */ + export type ScaleBreak = common.charts.ScaleBreak; + /** @deprecated Use DevExpress.common.charts.SeriesType instead */ + export type SeriesType = common.charts.SeriesType; + /** @deprecated Use DevExpress.common.charts.VisualRange instead */ + export type VisualRange = common.charts.VisualRange; + /** @deprecated Use DevExpress.common.charts.TimeIntervalConfig instead */ + export type VizTimeInterval = common.charts.TimeIntervalConfig; + /** @deprecated Use DevExpress.common.charts.SeriesPoint instead */ + export type dxChartSeriesTypesCommonSeriesPoint = common.charts.SeriesPoint; + /** @deprecated Use DevExpress.common.charts.SeriesLabel instead */ + export type dxChartSeriesTypesCommonSeriesLabel = common.charts.SeriesLabel; + /** @deprecated Use DevExpress.common.charts.LegendItem instead */ + export type BaseChartLegendItem = common.charts.LegendItem; } declare namespace DevExpress.data { - /** @deprecated Use DevExpress.data.Store.Options instead */ - export type StoreOptions = Store.Options; + /** @deprecated Use DevExpress.data.Store.Options instead */ + export type StoreOptions = Store.StoreOptionsBase; } // v23.1 -declare module DevExpress.ui.dxSlider { - /** @deprecated Use DevExpress.common.SliderValueChangeMode instead */ - export type ValueChangeMode = DevExpress.common.SliderValueChangeMode; +declare namespace DevExpress.ui.dxSlider { + /** @deprecated Use DevExpress.common.SliderValueChangeMode instead */ + export type ValueChangeMode = common.SliderValueChangeMode; } -declare module DevExpress.viz.dxFunnel { - /** @deprecated Use DevExpress.common.charts.ShiftLabelOverlap instead */ - export type FunnelLabelOverlap = DevExpress.common.charts.ShiftLabelOverlap; +declare namespace DevExpress.viz.dxFunnel { + /** @deprecated Use DevExpress.common.charts.ShiftLabelOverlap instead */ + export type FunnelLabelOverlap = common.charts.ShiftLabelOverlap; } -declare module DevExpress.viz.dxPieChart { - /** @deprecated Use DevExpress.common.charts.ShiftLabelOverlap instead */ - export type PieChartLabelOverlap = DevExpress.common.charts.ShiftLabelOverlap; +declare namespace DevExpress.viz.dxPieChart { + /** @deprecated Use DevExpress.common.charts.ShiftLabelOverlap instead */ + export type PieChartLabelOverlap = common.charts.ShiftLabelOverlap; } -declare module DevExpress.viz { +declare namespace DevExpress.viz { - /** @deprecated Use DevExpress.viz.dxBarGauge.Legend instead */ - export type dxBarGaugeLegend = DevExpress.viz.dxBarGauge.Legend; + /** @deprecated Use DevExpress.viz.dxBarGauge.Legend instead */ + export type dxBarGaugeLegend = dxBarGauge.Legend; - /** @deprecated Use DevExpress.viz.dxBarGauge.LoadingIndicator instead */ - export type dxBarGaugeLoadingIndicator = DevExpress.viz.dxBarGauge.LoadingIndicator; + /** @deprecated Use DevExpress.viz.dxBarGauge.LoadingIndicator instead */ + export type dxBarGaugeLoadingIndicator = dxBarGauge.LoadingIndicator; - /** @deprecated Use DevExpress.viz.dxBarGauge.Tooltip instead */ - export type dxBarGaugeTooltip = DevExpress.viz.dxBarGauge.Tooltip; + /** @deprecated Use DevExpress.viz.dxBarGauge.Tooltip instead */ + export type dxBarGaugeTooltip = dxBarGauge.Tooltip; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxis instead */ - export type dxChartArgumentAxis = DevExpress.viz.dxChart.ArgumentAxis; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxis instead */ + export type dxChartArgumentAxis = dxChart.ArgumentAxis; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLines instead */ - export type dxChartArgumentAxisConstantLines = DevExpress.viz.dxChart.ArgumentAxisConstantLines; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLines instead */ + export type dxChartArgumentAxisConstantLines = dxChart.ArgumentAxisConstantLines; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLinesLabel instead */ - export type dxChartArgumentAxisConstantLinesLabel = DevExpress.viz.dxChart.ArgumentAxisConstantLinesLabel; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLinesLabel instead */ + export type dxChartArgumentAxisConstantLinesLabel = dxChart.ArgumentAxisConstantLinesLabel; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLineStyle instead */ - export type dxChartArgumentAxisConstantLineStyle = DevExpress.viz.dxChart.ArgumentAxisConstantLineStyle; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLineStyle instead */ + export type dxChartArgumentAxisConstantLineStyle = dxChart.ArgumentAxisConstantLineStyle; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLineStyleLabel instead */ - export type dxChartArgumentAxisConstantLineStyleLabel = DevExpress.viz.dxChart.ArgumentAxisConstantLineStyleLabel; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLineStyleLabel instead */ + export type dxChartArgumentAxisConstantLineStyleLabel = dxChart.ArgumentAxisConstantLineStyleLabel; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisLabel instead */ - export type dxChartArgumentAxisLabel = DevExpress.viz.dxChart.ArgumentAxisLabel; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisLabel instead */ + export type dxChartArgumentAxisLabel = dxChart.ArgumentAxisLabel; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisStrips instead */ - export type dxChartArgumentAxisStrips = DevExpress.viz.dxChart.ArgumentAxisStrips; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisStrips instead */ + export type dxChartArgumentAxisStrips = dxChart.ArgumentAxisStrips; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisStripsLabel instead */ - export type dxChartArgumentAxisStripsLabel = DevExpress.viz.dxChart.ArgumentAxisStripsLabel; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisStripsLabel instead */ + export type dxChartArgumentAxisStripsLabel = dxChart.ArgumentAxisStripsLabel; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisTitle instead */ - export type dxChartArgumentAxisTitle = DevExpress.viz.dxChart.ArgumentAxisTitle; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisTitle instead */ + export type dxChartArgumentAxisTitle = dxChart.ArgumentAxisTitle; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettings instead */ - export type dxChartCommonAxisSettings = DevExpress.viz.dxChart.CommonAxisSettings; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettings instead */ + export type dxChartCommonAxisSettings = dxChart.CommonAxisSettings; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyle instead */ - export type dxChartCommonAxisSettingsConstantLineStyle = DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyle; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyle instead */ + export type dxChartCommonAxisSettingsConstantLineStyle = dxChart.CommonAxisSettingsConstantLineStyle; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyleLabel instead */ - export type dxChartCommonAxisSettingsConstantLineStyleLabel = DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyleLabel; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyleLabel instead */ + export type dxChartCommonAxisSettingsConstantLineStyleLabel = dxChart.CommonAxisSettingsConstantLineStyleLabel; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsLabel instead */ - export type dxChartCommonAxisSettingsLabel = DevExpress.viz.dxChart.CommonAxisSettingsLabel; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsLabel instead */ + export type dxChartCommonAxisSettingsLabel = dxChart.CommonAxisSettingsLabel; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsStripStyle instead */ - export type dxChartCommonAxisSettingsStripStyle = DevExpress.viz.dxChart.CommonAxisSettingsStripStyle; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsStripStyle instead */ + export type dxChartCommonAxisSettingsStripStyle = dxChart.CommonAxisSettingsStripStyle; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsStripStyleLabel instead */ - export type dxChartCommonAxisSettingsStripStyleLabel = DevExpress.viz.dxChart.CommonAxisSettingsStripStyleLabel; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsStripStyleLabel instead */ + export type dxChartCommonAxisSettingsStripStyleLabel = dxChart.CommonAxisSettingsStripStyleLabel; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsTitle instead */ - export type dxChartCommonAxisSettingsTitle = DevExpress.viz.dxChart.CommonAxisSettingsTitle; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsTitle instead */ + export type dxChartCommonAxisSettingsTitle = dxChart.CommonAxisSettingsTitle; - /** @deprecated Use DevExpress.viz.dxChart.CommonPaneSettings instead */ - export type dxChartCommonPaneSettings = DevExpress.viz.dxChart.CommonPaneSettings; + /** @deprecated Use DevExpress.viz.dxChart.CommonPaneSettings instead */ + export type dxChartCommonPaneSettings = dxChart.CommonPaneSettings; - /** @deprecated Use DevExpress.viz.dxChart.CommonSeriesSettings instead */ - export type dxChartCommonSeriesSettings = DevExpress.viz.dxChart.CommonSeriesSettings; + /** @deprecated Use DevExpress.viz.dxChart.CommonSeriesSettings instead */ + export type dxChartCommonSeriesSettings = dxChart.CommonSeriesSettings; - /** @deprecated Use DevExpress.viz.dxChart.Legend instead */ - export type dxChartLegend = DevExpress.viz.dxChart.Legend; + /** @deprecated Use DevExpress.viz.dxChart.Legend instead */ + export type dxChartLegend = dxChart.Legend; - /** @deprecated Use DevExpress.viz.dxChart.Panes instead */ - export type dxChartPanes = DevExpress.viz.dxChart.Panes; + /** @deprecated Use DevExpress.viz.dxChart.Panes instead */ + export type dxChartPanes = dxChart.Panes; - /** @deprecated Use DevExpress.viz.dxChart.Tooltip instead */ - export type dxChartTooltip = DevExpress.viz.dxChart.Tooltip; + /** @deprecated Use DevExpress.viz.dxChart.Tooltip instead */ + export type dxChartTooltip = dxChart.Tooltip; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxis instead */ - export type dxChartValueAxis = DevExpress.viz.dxChart.ValueAxis; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxis instead */ + export type dxChartValueAxis = dxChart.ValueAxis; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLines instead */ - export type dxChartValueAxisConstantLines = DevExpress.viz.dxChart.ValueAxisConstantLines; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLines instead */ + export type dxChartValueAxisConstantLines = dxChart.ValueAxisConstantLines; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLinesLabel instead */ - export type dxChartValueAxisConstantLinesLabel = DevExpress.viz.dxChart.ValueAxisConstantLinesLabel; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLinesLabel instead */ + export type dxChartValueAxisConstantLinesLabel = dxChart.ValueAxisConstantLinesLabel; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLineStyle instead */ - export type dxChartValueAxisConstantLineStyle = DevExpress.viz.dxChart.ValueAxisConstantLineStyle; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLineStyle instead */ + export type dxChartValueAxisConstantLineStyle = dxChart.ValueAxisConstantLineStyle; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLineStyleLabel instead */ - export type dxChartValueAxisConstantLineStyleLabel = DevExpress.viz.dxChart.ValueAxisConstantLineStyleLabel; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLineStyleLabel instead */ + export type dxChartValueAxisConstantLineStyleLabel = dxChart.ValueAxisConstantLineStyleLabel; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisLabel instead */ - export type dxChartValueAxisLabel = DevExpress.viz.dxChart.ValueAxisLabel; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisLabel instead */ + export type dxChartValueAxisLabel = dxChart.ValueAxisLabel; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisStrips instead */ - export type dxChartValueAxisStrips = DevExpress.viz.dxChart.ValueAxisStrips; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisStrips instead */ + export type dxChartValueAxisStrips = dxChart.ValueAxisStrips; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisStripsLabel instead */ - export type dxChartValueAxisStripsLabel = DevExpress.viz.dxChart.ValueAxisStripsLabel; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisStripsLabel instead */ + export type dxChartValueAxisStripsLabel = dxChart.ValueAxisStripsLabel; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisTitle instead */ - export type dxChartValueAxisTitle = DevExpress.viz.dxChart.ValueAxisTitle; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisTitle instead */ + export type dxChartValueAxisTitle = dxChart.ValueAxisTitle; - /** @deprecated Use DevExpress.viz.dxPolarChart.AdaptiveLayout instead */ - export type dxPolarChartAdaptiveLayout = DevExpress.viz.dxPolarChart.AdaptiveLayout; + /** @deprecated Use DevExpress.viz.dxPolarChart.AdaptiveLayout instead */ + export type dxPolarChartAdaptiveLayout = dxPolarChart.AdaptiveLayout; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxis instead */ - export type dxPolarChartArgumentAxis = DevExpress.viz.dxPolarChart.ArgumentAxis; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxis instead */ + export type dxPolarChartArgumentAxis = dxPolarChart.ArgumentAxis; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisConstantLines instead */ - export type dxPolarChartArgumentAxisConstantLines = DevExpress.viz.dxPolarChart.ArgumentAxisConstantLines; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisConstantLines instead */ + export type dxPolarChartArgumentAxisConstantLines = dxPolarChart.ArgumentAxisConstantLines; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisConstantLinesLabel instead */ - export type dxPolarChartArgumentAxisConstantLinesLabel = DevExpress.viz.dxPolarChart.ArgumentAxisConstantLinesLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisConstantLinesLabel instead */ + export type dxPolarChartArgumentAxisConstantLinesLabel = dxPolarChart.ArgumentAxisConstantLinesLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisLabel instead */ - export type dxPolarChartArgumentAxisLabel = DevExpress.viz.dxPolarChart.ArgumentAxisLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisLabel instead */ + export type dxPolarChartArgumentAxisLabel = dxPolarChart.ArgumentAxisLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisMinorTick instead */ - export type dxPolarChartArgumentAxisMinorTick = DevExpress.viz.dxPolarChart.ArgumentAxisMinorTick; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisMinorTick instead */ + export type dxPolarChartArgumentAxisMinorTick = dxPolarChart.ArgumentAxisMinorTick; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisStrips instead */ - export type dxPolarChartArgumentAxisStrips = DevExpress.viz.dxPolarChart.ArgumentAxisStrips; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisStrips instead */ + export type dxPolarChartArgumentAxisStrips = dxPolarChart.ArgumentAxisStrips; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisStripsLabel instead */ - export type dxPolarChartArgumentAxisStripsLabel = DevExpress.viz.dxPolarChart.ArgumentAxisStripsLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisStripsLabel instead */ + export type dxPolarChartArgumentAxisStripsLabel = dxPolarChart.ArgumentAxisStripsLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisTick instead */ - export type dxPolarChartArgumentAxisTick = DevExpress.viz.dxPolarChart.ArgumentAxisTick; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisTick instead */ + export type dxPolarChartArgumentAxisTick = dxPolarChart.ArgumentAxisTick; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettings instead */ - export type dxPolarChartCommonAxisSettings = DevExpress.viz.dxPolarChart.CommonAxisSettings; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettings instead */ + export type dxPolarChartCommonAxisSettings = dxPolarChart.CommonAxisSettings; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyle instead */ - export type dxPolarChartCommonAxisSettingsConstantLineStyle = DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyle; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyle instead */ + export type dxPolarChartCommonAxisSettingsConstantLineStyle = dxPolarChart.CommonAxisSettingsConstantLineStyle; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyleLabel instead */ - export type dxPolarChartCommonAxisSettingsConstantLineStyleLabel = DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyleLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyleLabel instead */ + export type dxPolarChartCommonAxisSettingsConstantLineStyleLabel = dxPolarChart.CommonAxisSettingsConstantLineStyleLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsLabel instead */ - export type dxPolarChartCommonAxisSettingsLabel = DevExpress.viz.dxPolarChart.CommonAxisSettingsLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsLabel instead */ + export type dxPolarChartCommonAxisSettingsLabel = dxPolarChart.CommonAxisSettingsLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsMinorTick instead */ - export type dxPolarChartCommonAxisSettingsMinorTick = DevExpress.viz.dxPolarChart.CommonAxisSettingsMinorTick; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsMinorTick instead */ + export type dxPolarChartCommonAxisSettingsMinorTick = dxPolarChart.CommonAxisSettingsMinorTick; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyle instead */ - export type dxPolarChartCommonAxisSettingsStripStyle = DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyle; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyle instead */ + export type dxPolarChartCommonAxisSettingsStripStyle = dxPolarChart.CommonAxisSettingsStripStyle; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyleLabel instead */ - export type dxPolarChartCommonAxisSettingsStripStyleLabel = DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyleLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyleLabel instead */ + export type dxPolarChartCommonAxisSettingsStripStyleLabel = dxPolarChart.CommonAxisSettingsStripStyleLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsTick instead */ - export type dxPolarChartCommonAxisSettingsTick = DevExpress.viz.dxPolarChart.CommonAxisSettingsTick; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsTick instead */ + export type dxPolarChartCommonAxisSettingsTick = dxPolarChart.CommonAxisSettingsTick; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonSeriesSettings instead */ - export type dxPolarChartCommonSeriesSettings = DevExpress.viz.dxPolarChart.CommonSeriesSettings; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonSeriesSettings instead */ + export type dxPolarChartCommonSeriesSettings = dxPolarChart.CommonSeriesSettings; - /** @deprecated Use DevExpress.viz.dxPolarChart.Legend instead */ - export type dxPolarChartLegend = DevExpress.viz.dxPolarChart.Legend; + /** @deprecated Use DevExpress.viz.dxPolarChart.Legend instead */ + export type dxPolarChartLegend = dxPolarChart.Legend; - /** @deprecated Use DevExpress.viz.dxPolarChart.Tooltip instead */ - export type dxPolarChartTooltip = DevExpress.viz.dxPolarChart.Tooltip; + /** @deprecated Use DevExpress.viz.dxPolarChart.Tooltip instead */ + export type dxPolarChartTooltip = dxPolarChart.Tooltip; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxis instead */ - export type dxPolarChartValueAxis = DevExpress.viz.dxPolarChart.ValueAxis; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxis instead */ + export type dxPolarChartValueAxis = dxPolarChart.ValueAxis; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisConstantLines instead */ - export type dxPolarChartValueAxisConstantLines = DevExpress.viz.dxPolarChart.ValueAxisConstantLines; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisConstantLines instead */ + export type dxPolarChartValueAxisConstantLines = dxPolarChart.ValueAxisConstantLines; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisConstantLinesLabel instead */ - export type dxPolarChartValueAxisConstantLinesLabel = DevExpress.viz.dxPolarChart.ValueAxisConstantLinesLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisConstantLinesLabel instead */ + export type dxPolarChartValueAxisConstantLinesLabel = dxPolarChart.ValueAxisConstantLinesLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisLabel instead */ - export type dxPolarChartValueAxisLabel = DevExpress.viz.dxPolarChart.ValueAxisLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisLabel instead */ + export type dxPolarChartValueAxisLabel = dxPolarChart.ValueAxisLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisStrips instead */ - export type dxPolarChartValueAxisStrips = DevExpress.viz.dxPolarChart.ValueAxisStrips; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisStrips instead */ + export type dxPolarChartValueAxisStrips = dxPolarChart.ValueAxisStrips; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisStripsLabel instead */ - export type dxPolarChartValueAxisStripsLabel = DevExpress.viz.dxPolarChart.ValueAxisStripsLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisStripsLabel instead */ + export type dxPolarChartValueAxisStripsLabel = dxPolarChart.ValueAxisStripsLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisTick instead */ - export type dxPolarChartValueAxisTick = DevExpress.viz.dxPolarChart.ValueAxisTick; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisTick instead */ + export type dxPolarChartValueAxisTick = dxPolarChart.ValueAxisTick; - /** @deprecated Use DevExpress.viz.dxCircularGauge.RangeContainer instead */ - export type dxCircularGaugeRangeContainer = DevExpress.viz.dxCircularGauge.RangeContainer; + /** @deprecated Use DevExpress.viz.dxCircularGauge.RangeContainer instead */ + export type dxCircularGaugeRangeContainer = dxCircularGauge.RangeContainer; - /** @deprecated Use DevExpress.viz.dxCircularGauge.Scale instead */ - export type dxCircularGaugeScale = DevExpress.viz.dxCircularGauge.Scale; + /** @deprecated Use DevExpress.viz.dxCircularGauge.Scale instead */ + export type dxCircularGaugeScale = dxCircularGauge.Scale; - /** @deprecated Use DevExpress.viz.dxCircularGauge.ScaleLabel instead */ - export type dxCircularGaugeScaleLabel = DevExpress.viz.dxCircularGauge.ScaleLabel; + /** @deprecated Use DevExpress.viz.dxCircularGauge.ScaleLabel instead */ + export type dxCircularGaugeScaleLabel = dxCircularGauge.ScaleLabel; - /** @deprecated Use DevExpress.viz.dxFunnel.Legend instead */ - export type dxFunnelLegend = DevExpress.viz.dxFunnel.Legend; + /** @deprecated Use DevExpress.viz.dxFunnel.Legend instead */ + export type dxFunnelLegend = dxFunnel.Legend; - /** @deprecated Use DevExpress.viz.dxFunnel.Tooltip instead */ - export type dxFunnelTooltip = DevExpress.viz.dxFunnel.Tooltip; + /** @deprecated Use DevExpress.viz.dxFunnel.Tooltip instead */ + export type dxFunnelTooltip = dxFunnel.Tooltip; - /** @deprecated Use DevExpress.viz.dxLinearGauge.RangeContainer instead */ - export type dxLinearGaugeRangeContainer = DevExpress.viz.dxLinearGauge.RangeContainer; + /** @deprecated Use DevExpress.viz.dxLinearGauge.RangeContainer instead */ + export type dxLinearGaugeRangeContainer = dxLinearGauge.RangeContainer; - /** @deprecated Use DevExpress.viz.dxLinearGauge.Scale instead */ - export type dxLinearGaugeScale = DevExpress.viz.dxLinearGauge.Scale; + /** @deprecated Use DevExpress.viz.dxLinearGauge.Scale instead */ + export type dxLinearGaugeScale = dxLinearGauge.Scale; - /** @deprecated Use DevExpress.viz.dxLinearGauge.ScaleLabel instead */ - export type dxLinearGaugeScaleLabel = DevExpress.viz.dxLinearGauge.ScaleLabel; + /** @deprecated Use DevExpress.viz.dxLinearGauge.ScaleLabel instead */ + export type dxLinearGaugeScaleLabel = dxLinearGauge.ScaleLabel; - /** @deprecated Use DevExpress.viz.dxPieChart.AdaptiveLayout instead */ - export type dxPieChartAdaptiveLayout = DevExpress.viz.dxPieChart.AdaptiveLayout; + /** @deprecated Use DevExpress.viz.dxPieChart.AdaptiveLayout instead */ + export type dxPieChartAdaptiveLayout = dxPieChart.AdaptiveLayout; - /** @deprecated Use DevExpress.viz.dxPieChart.Legend instead */ - export type dxPieChartLegend = DevExpress.viz.dxPieChart.Legend; + /** @deprecated Use DevExpress.viz.dxPieChart.Legend instead */ + export type dxPieChartLegend = dxPieChart.Legend; - /** @deprecated Use DevExpress.viz.dxSankey.Tooltip instead */ - export type dxSankeyTooltip = DevExpress.viz.dxSankey.Tooltip; + /** @deprecated Use DevExpress.viz.dxSankey.Tooltip instead */ + export type dxSankeyTooltip = dxSankey.Tooltip; - /** @deprecated Use DevExpress.viz.dxTreeMap.Tooltip instead */ - export type dxTreeMapTooltip = DevExpress.viz.dxTreeMap.Tooltip; + /** @deprecated Use DevExpress.viz.dxTreeMap.Tooltip instead */ + export type dxTreeMapTooltip = dxTreeMap.Tooltip; - /** @deprecated Use DevExpress.viz.dxVectorMap.Legend instead */ - export type dxVectorMapLegends = DevExpress.viz.dxVectorMap.Legend; + /** @deprecated Use DevExpress.viz.dxVectorMap.Legend instead */ + export type dxVectorMapLegends = dxVectorMap.Legend; - /** @deprecated Use DevExpress.viz.dxVectorMap.Tooltip instead */ - export type dxVectorMapTooltip = DevExpress.viz.dxVectorMap.Tooltip; + /** @deprecated Use DevExpress.viz.dxVectorMap.Tooltip instead */ + export type dxVectorMapTooltip = dxVectorMap.Tooltip; } -declare module DevExpress.ui { +declare namespace DevExpress.ui { - /** @deprecated Use DevExpress.ui.dxDataGrid.Editing instead */ - export type dxDataGridEditing = DevExpress.ui.dxDataGrid.Editing; + /** @deprecated Use DevExpress.ui.dxDataGrid.Editing instead */ + export type dxDataGridEditing = dxDataGrid.Editing; - /** @deprecated Use DevExpress.ui.dxDataGrid.Scrolling instead */ - export type dxDataGridScrolling = DevExpress.ui.dxDataGrid.Scrolling; + /** @deprecated Use DevExpress.ui.dxDataGrid.Scrolling instead */ + export type dxDataGridScrolling = dxDataGrid.Scrolling; - /** @deprecated Use DevExpress.ui.dxDataGrid.Selection instead */ - export type dxDataGridSelection = DevExpress.ui.dxDataGrid.Selection; + /** @deprecated Use DevExpress.ui.dxDataGrid.Selection instead */ + export type dxDataGridSelection = dxDataGrid.Selection; - /** @deprecated Use DevExpress.ui.dxTreeList.Editing instead */ - export type dxTreeListEditing = DevExpress.ui.dxTreeList.Editing; + /** @deprecated Use DevExpress.ui.dxTreeList.Editing instead */ + export type dxTreeListEditing = dxTreeList.Editing; - /** @deprecated Use DevExpress.ui.dxTreeList.Scrolling instead */ - export type dxTreeListScrolling = DevExpress.ui.dxTreeList.Scrolling; + /** @deprecated Use DevExpress.ui.dxTreeList.Scrolling instead */ + export type dxTreeListScrolling = dxTreeList.Scrolling; - /** @deprecated Use DevExpress.ui.dxTreeList.Selection instead */ - export type dxTreeListSelection = DevExpress.ui.dxTreeList.Selection; + /** @deprecated Use DevExpress.ui.dxTreeList.Selection instead */ + export type dxTreeListSelection = dxTreeList.Selection; - /** @deprecated Use DevExpress.ui.dxTreeList.EditingTexts instead */ - export type dxTreeListEditingTexts = DevExpress.ui.dxTreeList.EditingTexts; + /** @deprecated Use DevExpress.ui.dxTreeList.EditingTexts instead */ + export type dxTreeListEditingTexts = dxTreeList.EditingTexts; - /** @deprecated Use DevExpress.ui.dxTreeList.Paging instead */ - export type dxTreeListPaging = DevExpress.ui.dxTreeList.Paging; + /** @deprecated Use DevExpress.ui.dxTreeList.Paging instead */ + export type dxTreeListPaging = dxTreeList.Paging; - /** @deprecated Use DevExpress.ui.dxDataGrid.Column instead */ - export type GridBaseColumn = DevExpress.ui.dxDataGrid.ColumnBase; + /** @deprecated Use DevExpress.ui.dxDataGrid.Column instead */ + export type GridBaseColumn = dxDataGrid.ColumnBase; - /** @deprecated Use DevExpress.ui.dxDataGrid.ColumnButton instead */ - export type GridBaseColumnButton = DevExpress.ui.dxDataGrid.ColumnButtonBase; + /** @deprecated Use DevExpress.ui.dxDataGrid.ColumnButton instead */ + export type GridBaseColumnButton = dxDataGrid.ColumnButtonBase; - /** @deprecated Use DevExpress.ui.dxDataGrid.Editing instead */ - export type GridBaseEditing = DevExpress.ui.dxDataGrid.EditingBase; + /** @deprecated Use DevExpress.ui.dxDataGrid.Editing instead */ + export type GridBaseEditing = dxDataGrid.EditingBase; - /** @deprecated Use DevExpress.ui.dxDataGrid.EditingTexts instead */ - export type GridBaseEditingTexts = DevExpress.ui.dxDataGrid.EditingTextsBase; + /** @deprecated Use DevExpress.ui.dxDataGrid.EditingTexts instead */ + export type GridBaseEditingTexts = dxDataGrid.EditingTextsBase; - /** @deprecated Use DevExpress.ui.dxDataGrid.Paging instead */ - export type GridBasePaging = DevExpress.ui.dxDataGrid.Paging; + /** @deprecated Use DevExpress.ui.dxDataGrid.Paging instead */ + export type GridBasePaging = dxDataGrid.Paging; - /** @deprecated Use DevExpress.ui.dxDataGrid.Scrolling instead */ - export type GridBaseScrolling = DevExpress.ui.dxDataGrid.Scrolling; + /** @deprecated Use DevExpress.ui.dxDataGrid.Scrolling instead */ + export type GridBaseScrolling = dxDataGrid.Scrolling; - /** @deprecated Use DevExpress.ui.dxDataGrid.Selection instead */ - export type GridBaseSelection = DevExpress.ui.dxDataGrid.Selection; + /** @deprecated Use DevExpress.ui.dxDataGrid.Selection instead */ + export type GridBaseSelection = dxDataGrid.Selection; } -declare module DevExpress.ui.dxDataGrid { +declare namespace DevExpress.ui.dxDataGrid { - /** @deprecated Use DevExpress.ui.dxDataGrid.SortByGroupSummaryInfoItem instead */ - export type dxDataGridSortByGroupSummaryInfoItem = DevExpress.ui.dxDataGrid.SortByGroupSummaryInfoItem; + /** @deprecated Use DevExpress.ui.dxDataGrid.SortByGroupSummaryInfoItem instead */ + export type dxDataGridSortByGroupSummaryInfoItem = SortByGroupSummaryInfoItem; - /** @deprecated Use DevExpress.ui.dxDataGrid.EditingTexts instead */ - export type EditingTextsBase = DevExpress.ui.dxDataGrid.EditingTexts; + /** @deprecated Use DevExpress.ui.dxDataGrid.EditingTexts instead */ + export type EditingTextsBase = EditingTexts; } // v24.1 -declare module DevExpress.ui { - /** @deprecated DevExpress.ui.dxDiagram.CustomCommand instead */ - export type dxDiagramCustomCommand = DevExpress.ui.dxDiagram.CustomCommand; +declare namespace DevExpress.ui { + /** @deprecated DevExpress.ui.dxDiagram.CustomCommand instead */ + export type dxDiagramCustomCommand = dxDiagram.CustomCommand; } -declare module DevExpress.ui.dxDiagram { - /** @deprecated Use DevExpress.ui.dxDiagram.AutoZoomMode instead */ - export type DiagramAutoZoomMode = DevExpress.ui.dxDiagram.AutoZoomMode; +declare namespace DevExpress.ui.dxDiagram { + /** @deprecated Use DevExpress.ui.dxDiagram.AutoZoomMode instead */ + export type DiagramAutoZoomMode = AutoZoomMode; - /** @deprecated Use DevExpress.ui.dxDiagram.Command instead */ - export type DiagramCommand = DevExpress.ui.dxDiagram.Command; + /** @deprecated Use DevExpress.ui.dxDiagram.Command instead */ + export type DiagramCommand = Command; - /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorLineEnd instead */ - export type DiagramConnectorLineEnd = DevExpress.ui.dxDiagram.ConnectorLineEnd; + /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorLineEnd instead */ + export type DiagramConnectorLineEnd = ConnectorLineEnd; - /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorLineType instead */ - export type DiagramConnectorLineType = DevExpress.ui.dxDiagram.ConnectorLineType; + /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorLineType instead */ + export type DiagramConnectorLineType = ConnectorLineType; - /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorPosition instead */ - export type DiagramConnectorPosition = DevExpress.ui.dxDiagram.ConnectorPosition; + /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorPosition instead */ + export type DiagramConnectorPosition = ConnectorPosition; - /** @deprecated Use DevExpress.ui.dxDiagram.DataLayoutType instead */ - export type DiagramDataLayoutType = DevExpress.ui.dxDiagram.DataLayoutType; + /** @deprecated Use DevExpress.ui.dxDiagram.DataLayoutType instead */ + export type DiagramDataLayoutType = DataLayoutType; - /** @deprecated Use DevExpress.ui.dxDiagram.ItemType instead */ - export type DiagramItemType = DevExpress.ui.dxDiagram.ItemType; + /** @deprecated Use DevExpress.ui.dxDiagram.ItemType instead */ + export type DiagramItemType = ItemType; - /** @deprecated Use DevExpress.ui.dxDiagram.ModelOperation instead */ - export type DiagramModelOperation = DevExpress.ui.dxDiagram.ModelOperation; + /** @deprecated Use DevExpress.ui.dxDiagram.ModelOperation instead */ + export type DiagramModelOperation = ModelOperation; - /** @deprecated Use DevExpress.ui.dxDiagram.PanelVisibility instead */ - export type DiagramPanelVisibility = DevExpress.ui.dxDiagram.PanelVisibility; + /** @deprecated Use DevExpress.ui.dxDiagram.PanelVisibility instead */ + export type DiagramPanelVisibility = PanelVisibility; - /** @deprecated Use DevExpress.ui.dxDiagram.RequestEditOperationReason instead */ - export type DiagramRequestEditOperationReason = DevExpress.ui.dxDiagram.RequestEditOperationReason; + /** @deprecated Use DevExpress.ui.dxDiagram.RequestEditOperationReason instead */ + export type DiagramRequestEditOperationReason = RequestEditOperationReason; - /** @deprecated Use DevExpress.ui.dxDiagram.ShapeCategory instead */ - export type DiagramShapeCategory = DevExpress.ui.dxDiagram.ShapeCategory; + /** @deprecated Use DevExpress.ui.dxDiagram.ShapeCategory instead */ + export type DiagramShapeCategory = ShapeCategory; - /** @deprecated Use DevExpress.ui.dxDiagram.ShapeType instead */ - export type DiagramShapeType = DevExpress.ui.dxDiagram.ShapeType; + /** @deprecated Use DevExpress.ui.dxDiagram.ShapeType instead */ + export type DiagramShapeType = ShapeType; - /** @deprecated Use DevExpress.ui.dxDiagram.ToolboxDisplayMode instead */ - export type DiagramToolboxDisplayMode = DevExpress.ui.dxDiagram.ToolboxDisplayMode; + /** @deprecated Use DevExpress.ui.dxDiagram.ToolboxDisplayMode instead */ + export type DiagramToolboxDisplayMode = ToolboxDisplayMode; - /** @deprecated Use DevExpress.ui.dxDiagram.Units instead */ - export type DiagramUnits = DevExpress.ui.dxDiagram.Units; + /** @deprecated Use DevExpress.ui.dxDiagram.Units instead */ + export type DiagramUnits = Units; } // 24.2 -declare module DevExpress.common.grids { +declare namespace DevExpress.common.grids { /** @deprecated Use DevExpress.common.DisplayMode instead */ - export type PagerDisplayMode = DevExpress.common.DisplayMode; + export type PagerDisplayMode = DisplayMode; } diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index 66d2703518f9..324c4b1f4080 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -545,7 +545,7 @@ declare module DevExpress { /** * [descr:AnimationConfig.from] */ - from?: DevExpress.animation.AnimationState; + from?: DevExpress.common.AnimationState; /** * [descr:AnimationConfig.staggerDelay] */ @@ -560,11 +560,11 @@ declare module DevExpress { /** * [descr:AnimationConfig.to] */ - to?: DevExpress.animation.AnimationState; + to?: DevExpress.common.AnimationState; /** * [descr:AnimationConfig.type] */ - type?: DevExpress.animation.AnimationType; + type?: DevExpress.common.AnimationType; }; /** * [descr:animationPresets] @@ -697,15 +697,12 @@ declare module DevExpress { */ export function config(config: DevExpress.common.GlobalConfig): void; /** - * [descr:DataHelperMixin] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + * [descr:DefaultOptionsRule] */ - export class DataHelperMixin { - /** - * [descr:DataHelperMixin.getDataSource()] - */ - getDataSource(): DevExpress.data.DataSource; - } + export type DefaultOptionsRule = { + device?: Device | Device[] | ((device: Device) => boolean); + options: DevExpress.core.DeepPartial; + }; /** * [descr:Device] */ @@ -748,9 +745,9 @@ declare module DevExpress { version?: Array; }; /** - * [descr:devices] - */ - export const devices: DevicesObject; + * [descr:devices] + */ + export const devices: DevicesObject; /** * [descr:DevicesObject] */ @@ -767,19 +764,19 @@ declare module DevExpress { /** * [descr:DevicesObject.off(eventName)] */ - off(eventName: DevExpress.core.EventName): this; + off(eventName: DevExpress.common.EventName): this; /** * [descr:DevicesObject.off(eventName, eventHandler)] */ - off(eventName: DevExpress.core.EventName, eventHandler: Function): this; + off(eventName: DevExpress.common.EventName, eventHandler: Function): this; /** * [descr:DevicesObject.on(eventName, eventHandler)] */ - on(eventName: DevExpress.core.EventName, eventHandler: Function): this; + on(eventName: DevExpress.common.EventName, eventHandler: Function): this; /** * [descr:DevicesObject.on(events)] */ - on(events: { [key in DevExpress.core.EventName]?: Function }): this; + on(events: { [key in DevExpress.common.EventName]?: Function }): this; /** * [descr:DevicesObject.orientation()] */ @@ -817,7 +814,7 @@ declare module DevExpress { * [descr:DOMComponent.defaultOptions(rule)] */ static defaultOptions( - rule: DevExpress.core.DefaultOptionsRule + rule: DefaultOptionsRule ): void; /** @@ -850,8 +847,8 @@ declare module DevExpress { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export type OptionChangedEventInfo = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -864,8 +861,8 @@ declare module DevExpress { */ export interface DOMComponentOptions extends ComponentOptions< - DevExpress.events.EventInfo, - DevExpress.events.InitializedEventInfo, + DevExpress.common.EventInfo, + DevExpress.common.InitializedEventInfo, DevExpress.DOMComponent.OptionChangedEventInfo > { /** @@ -883,7 +880,7 @@ declare module DevExpress { /** * [descr:DOMComponentOptions.onDisposing] */ - onDisposing?: (e: DevExpress.events.EventInfo) => void; + onDisposing?: (e: DevExpress.common.EventInfo) => void; /** * [descr:DOMComponentOptions.onOptionChanged] */ @@ -899,23 +896,6 @@ declare module DevExpress { */ width?: number | string | (() => number | string) | undefined; } - /** - * [descr:dxSchedulerTimeZone] - */ - export interface dxSchedulerTimeZone { - /** - * [descr:dxSchedulerTimeZone.id] - */ - id: string; - /** - * [descr:dxSchedulerTimeZone.offset] - */ - offset: number; - /** - * [descr:dxSchedulerTimeZone.title] - */ - title: string; - } /** * [descr:EndpointSelector] */ @@ -968,39 +948,7 @@ declare module DevExpress { */ shadingColor?: string; } - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type ExternalFormat = Intl.DateTimeFormatOptions | Intl.NumberFormatOptions; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export interface FormatObject { - /** - * [descr:Format.currency] - */ - currency?: string; - /** - * [descr:Format.useCurrencyAccountingStyle] - */ - useCurrencyAccountingStyle?: boolean; - /** - * [descr:Format.formatter] - */ - formatter?: (value: number | Date) => string; - /** - * [descr:Format.parser] - */ - parser?: (value: string) => number | Date; - /** - * [descr:Format.precision] - */ - precision?: number; - /** - * [descr:Format.type] - */ - type?: DevExpress.common.Format | string; - } + export type FloatingActionButtonDirection = 'auto' | 'up' | 'down'; /** * [descr:fx] */ @@ -1027,28 +975,6 @@ declare module DevExpress { * [descr:hideTopOverlay()] */ export function hideTopOverlay(): boolean; - /** - * [descr:PdfExportGanttFont] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export interface PdfExportGanttFont { - /** - * [descr:PdfExportGanttFont.fontObject] - */ - fontObject: object | undefined; - /** - * [descr:PdfExportGanttFont.name] - */ - name: string | undefined; - /** - * [descr:PdfExportGanttFont.style] - */ - style?: string; - /** - * [descr:PdfExportGanttFont.weight] - */ - weight?: string | number | undefined; - } /** * [descr:PositionConfig] */ @@ -1091,16 +1017,16 @@ declare module DevExpress { * [descr:PositionConfig.collision] */ collision?: - | DevExpress.animation.CollisionResolutionCombination + | DevExpress.common.CollisionResolutionCombination | { /** * [descr:PositionConfig.collision.x] */ - x?: DevExpress.animation.CollisionResolution; + x?: DevExpress.common.CollisionResolution; /** * [descr:PositionConfig.collision.y] */ - y?: DevExpress.animation.CollisionResolution; + y?: DevExpress.common.CollisionResolution; }; /** * [descr:PositionConfig.my] @@ -1163,6 +1089,10 @@ declare module DevExpress { compile?: Function; render?: Function; }): void; + /** + * [descr:template] + */ + export type template = string | Function | DevExpress.core.UserDefinedElement; /** * [descr:TransitionExecutor] */ @@ -1240,9 +1170,15 @@ declare module DevExpress { } declare module DevExpress.animation { /** - * @deprecated Use the AnimationConfig type instead + * @deprecated Use the AnimationConfig type from common/core/animation instead */ export type animationConfig = AnimationConfig; + /** + * @deprecated Use the PositionConfig type from common/core/animation instead + */ + export interface positionConfig extends PositionConfig {} +} +declare module DevExpress.common { /** * [descr:AnimationState] */ @@ -1291,29 +1227,35 @@ declare module DevExpress.animation { | 'slide' | 'slideIn' | 'slideOut'; - export type CollisionResolution = 'fit' | 'flip' | 'flipfit' | 'none'; - export type CollisionResolutionCombination = - | 'fit' - | 'fit flip' - | 'fit flipfit' - | 'fit none' - | 'flip' - | 'flip fit' - | 'flip none' - | 'flipfit' - | 'flipfit fit' - | 'flipfit none' - | 'none' - | 'none fit' - | 'none flip' - | 'none flipfit'; + export type ApplyValueMode = 'instantly' | 'useButtons'; /** - * @deprecated Use the PositionConfig type instead + * [descr:ArrayStore] */ - export interface positionConfig extends PositionConfig {} -} -declare module DevExpress.common { - export type ApplyValueMode = 'instantly' | 'useButtons'; + export class ArrayStore extends DevExpress.data + .AbstractStore { + constructor(options?: DevExpress.data.ArrayStoreOptions); + /** + * [descr:ArrayStore.byKey(key)] + */ + byKey(key: TKey): DevExpress.core.utils.DxPromise; + /** + * [descr:ArrayStore.clear()] + */ + clear(): void; + /** + * [descr:ArrayStore.createQuery()] + */ + createQuery(): Query; + } + /** + * [descr:AsyncCancelable] + */ + export type AsyncCancelable = { + /** + * [descr:AsyncCancelable.cancel] + */ + cancel: boolean | PromiseLike; + }; /** * [descr:AsyncRule] */ @@ -1341,6 +1283,52 @@ declare module DevExpress.common { }; export type ButtonStyle = 'text' | 'outlined' | 'contained'; export type ButtonType = 'danger' | 'default' | 'normal' | 'success'; + /** + * [descr:Cancelable] + */ + export interface Cancelable { + /** + * [descr:Cancelable.cancel] + */ + cancel?: boolean; + } + /** + * [descr:ChangedOptionInfo] + */ + export interface ChangedOptionInfo { + /** + * [descr:ChangedOptionInfo.name] + */ + readonly name: string; + /** + * [descr:ChangedOptionInfo.fullName] + */ + readonly fullName: string; + /** + * [descr:ChangedOptionInfo.value] + */ + readonly value?: any; + /** + * [descr:ChangedOptionInfo.previousValue] + */ + readonly previousValue?: any; + } + export type CollisionResolution = 'fit' | 'flip' | 'flipfit' | 'none'; + export type CollisionResolutionCombination = + | 'fit' + | 'fit flip' + | 'fit flipfit' + | 'fit none' + | 'flip' + | 'flip fit' + | 'flip none' + | 'flipfit' + | 'flipfit fit' + | 'flipfit none' + | 'none' + | 'none fit' + | 'none flip' + | 'none flipfit'; /** * [descr:CompareRule] */ @@ -1400,6 +1388,257 @@ declare module DevExpress.common { */ validationCallback?: (options: ValidationCallbackData) => boolean; }; + /** + * [descr:CustomStore] + */ + export class CustomStore extends DevExpress.data + .StoreBase { + constructor(options?: DevExpress.data.CustomStoreOptions); + /** + * [descr:CustomStore.byKey(key, extraOptions)] + */ + byKey( + key: TKey, + extraOptions?: DevExpress.data.LoadOptions + ): DevExpress.core.utils.DxPromise; + /** + * [descr:CustomStore.clearRawDataCache()] + */ + clearRawDataCache(): void; + /** + * [descr:CustomStore.load()] + */ + load(): DevExpress.core.utils.DxExtendedPromise>; + /** + * [descr:CustomStore.load(options)] + */ + load( + options: DevExpress.data.LoadOptions + ): DevExpress.core.utils.DxExtendedPromise>; + } + /** + * [descr:DataHelperMixin] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export class DataHelperMixin { + /** + * [descr:DataHelperMixin.getDataSource()] + */ + getDataSource(): DataSource; + } + /** + * [descr:DataSource] + */ + export class DataSource { + constructor(data: Array); + constructor( + options: + | DevExpress.data.CustomStoreOptions + | DevExpress.data.DataSourceOptions + ); + constructor(store: DevExpress.data.utils.Store); + constructor(url: string); + /** + * [descr:DataSource.cancel(operationId)] + */ + cancel(operationId: number): boolean; + /** + * [descr:DataSource.dispose()] + */ + dispose(): void; + /** + * [descr:DataSource.filter()] + */ + filter(): FilterDescriptor | Array; + /** + * [descr:DataSource.filter(filterExpr)] + */ + filter(filterExpr: FilterDescriptor | Array): void; + /** + * [descr:DataSource.group()] + */ + group(): GroupDescriptor | Array>; + /** + * [descr:DataSource.group(groupExpr)] + */ + group( + groupExpr: GroupDescriptor | Array> + ): void; + /** + * [descr:DataSource.isLastPage()] + */ + isLastPage(): boolean; + /** + * [descr:DataSource.isLoaded()] + */ + isLoaded(): boolean; + /** + * [descr:DataSource.isLoading()] + */ + isLoading(): boolean; + /** + * [descr:DataSource.items()] + */ + items(): Array; + /** + * [descr:DataSource.key()] + */ + key(): string | Array; + /** + * [descr:DataSource.load()] + */ + load(): DevExpress.core.utils.DxExtendedPromise; + /** + * [descr:DataSource.loadOptions()] + */ + loadOptions(): DevExpress.data.LoadOptions; + /** + * [descr:DataSource.off(eventName)] + */ + off(eventName: DataSourceEventName): this; + /** + * [descr:DataSource.off(eventName, eventHandler)] + */ + off(eventName: DataSourceEventName, eventHandler: Function): this; + /** + * [descr:DataSource.on(eventName, eventHandler)] + */ + on(eventName: DataSourceEventName, eventHandler: Function): this; + /** + * [descr:DataSource.on(events)] + */ + on(events: { [key in DataSourceEventName]?: Function }): this; + /** + * [descr:DataSource.pageIndex()] + */ + pageIndex(): number; + /** + * [descr:DataSource.pageIndex(newIndex)] + */ + pageIndex(newIndex: number): void; + /** + * [descr:DataSource.pageSize()] + */ + pageSize(): number; + /** + * [descr:DataSource.pageSize(value)] + */ + pageSize(value: number): void; + /** + * [descr:DataSource.paginate()] + */ + paginate(): boolean; + /** + * [descr:DataSource.paginate(value)] + */ + paginate(value: boolean): void; + /** + * [descr:DataSource.reload()] + */ + reload(): DevExpress.core.utils.DxExtendedPromise; + /** + * [descr:DataSource.requireTotalCount()] + */ + requireTotalCount(): boolean; + /** + * [descr:DataSource.requireTotalCount(value)] + */ + requireTotalCount(value: boolean): void; + /** + * [descr:DataSource.searchExpr()] + */ + searchExpr(): string & Function & Array; + /** + * [descr:DataSource.searchExpr(expr)] + */ + searchExpr(expr: string | Function | Array): void; + /** + * [descr:DataSource.searchOperation()] + */ + searchOperation(): string; + /** + * [descr:DataSource.searchOperation(op)] + */ + searchOperation(op: string): void; + /** + * [descr:DataSource.searchValue()] + */ + searchValue(): any; + /** + * [descr:DataSource.searchValue(value)] + */ + searchValue(value: any): void; + /** + * [descr:DataSource.select()] + */ + select(): SelectDescriptor; + /** + * [descr:DataSource.select(expr)] + */ + select(expr: SelectDescriptor): void; + /** + * [descr:DataSource.sort()] + */ + sort(): SortDescriptor | Array>; + /** + * [descr:DataSource.sort(sortExpr)] + */ + sort(sortExpr: SortDescriptor | Array>): void; + /** + * [descr:DataSource.store()] + */ + store(): DevExpress.data.utils.Store; + /** + * [descr:DataSource.totalCount()] + */ + totalCount(): number; + } + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type DataSourceEventName = 'changed' | 'loadError' | 'loadingChanged'; + /** + * [descr:DataSourceLike] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export type DataSourceLike = + | string + | Array + | DevExpress.data.utils.Store + | DataSourceOptionsStub + | DataSource; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + interface DataSourceOptionsStub< + TStoreItem = any, + TMappedItem = TStoreItem, + TItem = TMappedItem + > { + customQueryParams?: any; + expand?: Array | string; + filter?: FilterDescriptor | Array; + group?: GroupDescriptor | Array>; + map?: (dataItem: TStoreItem) => TMappedItem; + onChanged?: (e: { readonly changes?: Array }) => void; + onLoadError?: (error: { readonly message?: string }) => void; + onLoadingChanged?: (isLoading: boolean) => void; + pageSize?: number; + paginate?: boolean; + postProcess?: (data: Array) => Array; + pushAggregationTimeout?: number; + requireTotalCount?: boolean; + reshapeOnPush?: boolean; + searchExpr?: string | Function | Array; + searchOperation?: SearchOperation; + searchValue?: any; + select?: SelectDescriptor; + sort?: SortDescriptor | Array>; + store?: + | Array + | DevExpress.data.utils.Store + | DevExpress.data.utils.StoreOptions; + } export type DataStructure = 'plain' | 'tree'; export type DataType = | 'string' @@ -1414,6 +1653,31 @@ declare module DevExpress.common { export type Draggable = DevExpress.core.OmitInternal; export type DragHighlight = 'push' | 'indicate'; + + /** + * [descr:DxEvent] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export type DxEvent = {} extends EventType + ? EventObject & TNativeEvent + : EventType; + /** + * [descr:dxSchedulerTimeZone] + */ + export interface dxSchedulerTimeZone { + /** + * [descr:dxSchedulerTimeZone.id] + */ + id: string; + /** + * [descr:dxSchedulerTimeZone.offset] + */ + offset: number; + /** + * [descr:dxSchedulerTimeZone.title] + */ + title: string; + } export type EditorStyle = 'outlined' | 'underlined' | 'filled'; /** * [descr:EmailRule] @@ -1432,8 +1696,106 @@ declare module DevExpress.common { */ type: 'email'; }; + /** + * [descr:event] + * @deprecated [depNote:event] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export type event = DxEvent; + /** + * [descr:EventInfo] + */ + export interface EventInfo { + /** + * [descr:EventInfo.component] + */ + readonly component: TComponent; + /** + * [descr:EventInfo.element] + */ + readonly element: DevExpress.core.DxElement; + /** + * [descr:EventInfo.model] + */ + readonly model?: any; + } + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type EventName = 'orientationChanged'; + /** + * [descr:EventObject] + */ + export type EventObject = { + /** + * [descr:EventObject.currentTarget] + */ + currentTarget: Element; + + /** + * [descr:EventObject.data] + */ + data: any; + + /** + * [descr:EventObject.delegateTarget] + */ + delegateTarget: Element; + + /** + * [descr:EventObject.target] + */ + target: Element; + /** + * [descr:EventObject.isDefaultPrevented()] + */ + isDefaultPrevented(): boolean; + /** + * [descr:EventObject.isImmediatePropagationStopped()] + */ + isImmediatePropagationStopped(): boolean; + /** + * [descr:EventObject.isPropagationStopped()] + */ + isPropagationStopped(): boolean; + /** + * [descr:EventObject.preventDefault()] + */ + preventDefault(): void; + /** + * [descr:EventObject.stopImmediatePropagation()] + */ + stopImmediatePropagation(): void; + /** + * [descr:EventObject.stopPropagation()] + */ + stopPropagation(): void; + }; + /** + * [descr:handler(event, extraParameters)] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export function eventsHandler(event: DxEvent, extraParameters: any): boolean; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export interface EventType {} + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + interface EventType extends JQueryEventObject { + cancel?: boolean; + } export type ExportFormat = 'GIF' | 'JPEG' | 'PDF' | 'PNG' | 'SVG'; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type ExternalFormat = Intl.DateTimeFormatOptions | Intl.NumberFormatOptions; export type FieldChooserLayout = 0 | 1 | 2; + /** + * [descr:FilterDescriptor] + */ + export type FilterDescriptor = any; export type FirstDayOfWeek = 0 | 1 | 2 | 3 | 4 | 5 | 6; export type Format = | 'billions' @@ -1464,6 +1826,35 @@ declare module DevExpress.common { | 'minute' | 'second' | 'shortDateShortTime'; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export interface FormatObject { + /** + * [descr:Format.currency] + */ + currency?: string; + /** + * [descr:Format.useCurrencyAccountingStyle] + */ + useCurrencyAccountingStyle?: boolean; + /** + * [descr:Format.formatter] + */ + formatter?: (value: number | Date) => string; + /** + * [descr:Format.parser] + */ + parser?: (value: string) => number | Date; + /** + * [descr:Format.precision] + */ + precision?: number; + /** + * [descr:Format.type] + */ + type?: Format | string; + } /** * [descr:GlobalConfig] */ @@ -1496,7 +1887,7 @@ declare module DevExpress.common { /** * [descr:GlobalConfig.floatingActionButtonConfig.direction] */ - direction?: DevExpress.core.FloatingActionButtonDirection; + direction?: FloatingActionButtonDirection; /** * [descr:GlobalConfig.floatingActionButtonConfig.icon] */ @@ -1562,6 +1953,24 @@ declare module DevExpress.common { buyNowLink?: string; licensingDocLink?: string; }; + /** + * [descr:GroupDescriptor] + */ + export type GroupDescriptor = + | KeySelector + | (OrderingDescriptor & { + groupInterval?: number | GroupingInterval; + isExpanded?: boolean; + }); + export type GroupingInterval = + | 'year' + | 'quarter' + | 'month' + | 'day' + | 'dayOfWeek' + | 'hour' + | 'minute' + | 'second'; /** * [descr:GroupItem] */ @@ -1585,6 +1994,23 @@ declare module DevExpress.common { }; export type HorizontalAlignment = 'center' | 'left' | 'right'; export type HorizontalEdge = 'left' | 'right'; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'MERGE'; + /** + * [descr:InitializedEventInfo] + */ + export interface InitializedEventInfo { + /** + * [descr:InitializedEventInfo.component] + */ + readonly component?: TComponent; + /** + * [descr:InitializedEventInfo.element] + */ + readonly element?: DevExpress.core.DxElement; + } /** * [descr:isGroupItemsArray] */ @@ -1603,7 +2029,50 @@ declare module DevExpress.common { export function isLoadResultObject( res: LoadResult ): res is LoadResultObject; + /** + * [descr:ItemInfo] + */ + export interface ItemInfo { + /** + * [descr:ItemInfo.itemData] + */ + readonly itemData?: TItemData; + /** + * [descr:ItemInfo.itemElement] + */ + readonly itemElement: DevExpress.core.DxElement; + /** + * [descr:ItemInfo.itemIndex] + */ + readonly itemIndex: number; + } + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type KeySelector = + | string + | ((source: T) => string | number | Date | Object); export type LabelMode = 'static' | 'floating' | 'hidden' | 'outside'; + /** + * [descr:LangParams] + */ + export type LangParams = { + /** + * [descr:LangParams.locale] + */ + locale: string; + /** + * [descr:LangParams.collatorOptions] + */ + collatorOptions?: Intl.CollatorOptions; + }; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type LoadFunctionResult = + | T + | DevExpress.core.utils.DxPromise + | PromiseLike; /** * [descr:LoadResult] */ @@ -1636,8 +2105,42 @@ declare module DevExpress.common { */ groupCount?: number; }; + /** + * [descr:LocalStore] + */ + export class LocalStore extends ArrayStore< + TItem, + TKey + > { + constructor(options?: DevExpress.data.LocalStoreOptions); + /** + * [descr:LocalStore.clear()] + */ + clear(): void; + } export type MaskMode = 'always' | 'onFocus'; export type Mode = 'auto'; + /** + * [descr:NativeEventInfo] + */ + export interface NativeEventInfo { + /** + * [descr:NativeEventInfo.component] + */ + readonly component: TComponent; + /** + * [descr:NativeEventInfo.element] + */ + readonly element: DevExpress.core.DxElement; + /** + * [descr:NativeEventInfo.model] + */ + readonly model?: any; + /** + * [descr:NativeEventInfo.event] + */ + readonly event?: DxEvent; + } /** * [descr:NumericRule] @@ -1656,6 +2159,78 @@ declare module DevExpress.common { */ type: 'numeric'; }; + /** + * [descr:ODataContext] + */ + export class ODataContext { + constructor(options?: DevExpress.data.ODataContextOptions); + /** + * [descr:ODataContext.get(operationName, params)] + */ + get( + operationName: string, + params: any + ): DevExpress.core.utils.DxPromise; + /** + * [descr:ODataContext.invoke(operationName, params, httpMethod)] + */ + invoke( + operationName: string, + params: any, + httpMethod: HttpMethod + ): DevExpress.core.utils.DxPromise; + /** + * [descr:ODataContext.objectLink(entityAlias, key)] + */ + objectLink(entityAlias: string, key: any | string | number): any; + } + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export interface ODataRequestOptions { + accepts: any; + async: boolean; + contentType: string | boolean; + data: any; + dataType: string; + headers: any; + jsonp?: boolean; + method: string; + timeout: number; + url: string; + xhrFields: any; + } + /** + * [descr:ODataStore] + */ + export class ODataStore extends DevExpress.data + .StoreBase { + constructor(options?: DevExpress.data.ODataStoreOptions); + /** + * [descr:ODataStore.byKey(key, extraOptions)] + */ + byKey( + key: TKey, + extraOptions?: { + expand?: string | Array; + select?: string | Array; + } + ): DevExpress.core.utils.DxPromise; + /** + * [descr:ODataStore.createQuery(loadOptions)] + */ + createQuery(loadOptions?: { + expand?: string | Array; + requireTotalCount?: boolean; + customQueryParams?: any; + }): Query; + } + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type OrderingDescriptor = SelectionDescriptor & { + desc?: boolean; + }; export type Orientation = 'horizontal' | 'vertical'; export type PageLoadMode = 'nextButton' | 'scrollBottom'; export type PageOrientation = 'portrait' | 'landscape'; @@ -1710,6 +2285,28 @@ declare module DevExpress.common { */ type: 'pattern'; }; + /** + * [descr:PdfExportGanttFont] + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + export interface PdfExportGanttFont { + /** + * [descr:PdfExportGanttFont.fontObject] + */ + fontObject: object | undefined; + /** + * [descr:PdfExportGanttFont.name] + */ + name: string | undefined; + /** + * [descr:PdfExportGanttFont.style] + */ + style?: string; + /** + * [descr:PdfExportGanttFont.weight] + */ + weight?: string | number | undefined; + } export type Position = 'bottom' | 'left' | 'right' | 'top'; export type PositionAlignment = | 'bottom' @@ -1721,6 +2318,103 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; + /** + * [descr:Query] + */ + export interface Query { + /** + * [descr:Query.aggregate(seed, step, finalize)] + */ + aggregate( + seed: any, + step: Function, + finalize: Function + ): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.aggregate(step)] + */ + aggregate(step: Function): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.avg()] + */ + avg(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.avg(getter)] + */ + avg(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.count()] + */ + count(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.enumerate()] + */ + enumerate(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.filter(criteria)] + */ + filter(criteria: Array): Query; + /** + * [descr:Query.filter(predicate)] + */ + filter(predicate: Function): Query; + /** + * [descr:Query.groupBy(getter)] + */ + groupBy(getter: any): Query; + /** + * [descr:Query.max()] + */ + max(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.max(getter)] + */ + max(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.min()] + */ + min(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.min(getter)] + */ + min(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.select(getter)] + */ + select(...getters: any[]): Query; + /** + * [descr:Query.slice(skip, take)] + */ + slice(skip: number, take?: number): Query; + /** + * [descr:Query.sortBy(getter)] + */ + sortBy(getter: any): Query; + /** + * [descr:Query.sortBy(getter, desc)] + */ + sortBy(getter: any, desc: boolean): Query; + /** + * [descr:Query.sum()] + */ + sum(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.sum(getter)] + */ + sum(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.thenBy(getter)] + */ + thenBy(getter: any): Query; + /** + * [descr:Query.thenBy(getter, desc)] + */ + thenBy(getter: any, desc: boolean): Query; + /** + * [descr:Query.toArray()] + */ + toArray(): Array; + } /** * [descr:RangeRule] */ @@ -1757,10 +2451,7 @@ declare module DevExpress.common { TComponent extends DevExpress.common.grids.GridBase > = Required< Pick< - DevExpress.events.NativeEventInfo< - TComponent, - PointerEvent | MouseEvent | TouchEvent - >, + NativeEventInfo, 'component' | 'event' > >; @@ -1781,13 +2472,42 @@ declare module DevExpress.common { */ type: 'required'; }; + /** + * [descr:ResolvedData] + * @deprecated [depNote:ResolvedData] + */ + export type ResolvedData = LoadResult; export type Scrollable = DevExpress.core.OmitInternal; export type ScrollbarMode = 'always' | 'never' | 'onHover' | 'onScroll'; export type ScrollDirection = 'both' | 'horizontal' | 'vertical'; export type ScrollMode = 'standard' | 'virtual'; export type SearchMode = 'contains' | 'startswith' | 'equals'; + export type SearchOperation = + | '=' + | '<>' + | '>' + | '>=' + | '<' + | '<=' + | 'startswith' + | 'endswith' + | 'contains' + | 'notcontains'; export type SelectAllMode = 'allPages' | 'page'; + /** + * [descr:SelectDescriptor] + */ + export type SelectDescriptor = + | string + | Array + | ((source: T) => any); + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type SelectionDescriptor = { + selector: KeySelector; + }; export type SimplifiedSearchMode = 'contains' | 'startswith'; export type SingleMultipleAllOrNone = 'single' | 'multiple' | 'all' | 'none'; export type SingleMultipleOrNone = 'single' | 'multiple' | 'none'; @@ -1795,7 +2515,26 @@ declare module DevExpress.common { export type SingleOrNone = 'single' | 'none'; export type SliderValueChangeMode = 'onHandleMove' | 'onHandleRelease'; export type Sortable = DevExpress.core.OmitInternal; + /** + * [descr:SortDescriptor] + */ + export type SortDescriptor = KeySelector | OrderingDescriptor; export type SortOrder = 'asc' | 'desc'; + /** + * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + */ + type StoreBaseEventName = + | 'loaded' + | 'loading' + | 'inserted' + | 'inserting' + | 'updated' + | 'updating' + | 'push' + | 'removed' + | 'removing' + | 'modified' + | 'modifying'; export type StoreType = 'array' | 'local' | 'odata'; /** * [descr:StringLengthRule] @@ -1827,6 +2566,14 @@ declare module DevExpress.common { type: 'stringLength'; }; export type SubmenuShowMode = 'onClick' | 'onHover'; + /** + * [descr:SummaryDescriptor] + */ + export type SummaryDescriptor = + | KeySelector + | (SelectionDescriptor & { + summaryType?: 'sum' | 'avg' | 'min' | 'max' | 'count'; + }); export type TabsIconPosition = 'top' | 'end' | 'bottom' | 'start'; export type TabsStyle = 'primary' | 'secondary'; export type TextBoxPredefinedButton = 'clear'; @@ -3089,7 +3836,7 @@ declare module DevExpress.common.grids { | DevExpress.ui.dxFilterBuilder.FilterLookupDataSource | ((options: { component?: any; - dataSource?: DevExpress.data.DataSource.Options | null; + dataSource?: DevExpress.data.DataSourceOptions | null; }) => void) | undefined; /** @@ -3639,7 +4386,7 @@ declare module DevExpress.common.grids { * [descr:GridBase.getCombinedFilter(returnDataField)] */ getCombinedFilter(returnDataField: boolean): any; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DataSource; /** * [descr:GridBase.getKeyByRowIndex(rowIndex)] */ @@ -3835,10 +4582,7 @@ declare module DevExpress.common.grids { /** * [descr:GridBaseOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< - TRowData, - TKey - > | null; + dataSource?: DataSourceLike | null; /** * [descr:GridBaseOptions.dateSerializationFormat] */ @@ -3915,144 +4659,119 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.onAdaptiveDetailRowPreparing] */ onAdaptiveDetailRowPreparing?: ( - e: DevExpress.events.EventInfo & - AdaptiveDetailRowPreparingInfo + e: EventInfo & AdaptiveDetailRowPreparingInfo ) => void; /** * [descr:GridBaseOptions.onDataErrorOccurred] */ onDataErrorOccurred?: ( - e: DevExpress.events.EventInfo & DataErrorOccurredInfo + e: EventInfo & DataErrorOccurredInfo ) => void; /** * [descr:GridBaseOptions.onEditCanceled] */ onEditCanceled?: ( - e: DevExpress.events.EventInfo & - DataChangeInfo + e: EventInfo & DataChangeInfo ) => void; /** * [descr:GridBaseOptions.onEditCanceling] */ onEditCanceling?: ( - e: DevExpress.events.Cancelable & - DevExpress.events.EventInfo & - DataChangeInfo + e: Cancelable & EventInfo & DataChangeInfo ) => void; /** * [descr:GridBaseOptions.onInitNewRow] */ - onInitNewRow?: ( - e: DevExpress.events.EventInfo & NewRowInfo - ) => void; + onInitNewRow?: (e: EventInfo & NewRowInfo) => void; /** * [descr:GridBaseOptions.onKeyDown] */ onKeyDown?: ( - e: DevExpress.events.NativeEventInfo & - KeyDownInfo + e: NativeEventInfo & KeyDownInfo ) => void; /** * [descr:GridBaseOptions.onRowCollapsed] */ - onRowCollapsed?: ( - e: DevExpress.events.EventInfo & RowKeyInfo - ) => void; + onRowCollapsed?: (e: EventInfo & RowKeyInfo) => void; /** * [descr:GridBaseOptions.onRowCollapsing] */ onRowCollapsing?: ( - e: DevExpress.events.Cancelable & - DevExpress.events.EventInfo & - RowKeyInfo + e: Cancelable & EventInfo & RowKeyInfo ) => void; /** * [descr:GridBaseOptions.onRowExpanded] */ - onRowExpanded?: ( - e: DevExpress.events.EventInfo & RowKeyInfo - ) => void; + onRowExpanded?: (e: EventInfo & RowKeyInfo) => void; /** * [descr:GridBaseOptions.onRowExpanding] */ onRowExpanding?: ( - e: DevExpress.events.Cancelable & - DevExpress.events.EventInfo & - RowKeyInfo + e: Cancelable & EventInfo & RowKeyInfo ) => void; /** * [descr:GridBaseOptions.onRowInserted] */ onRowInserted?: ( - e: DevExpress.events.EventInfo & - RowInsertedInfo + e: EventInfo & RowInsertedInfo ) => void; /** * [descr:GridBaseOptions.onRowInserting] */ onRowInserting?: ( - e: DevExpress.events.EventInfo & RowInsertingInfo + e: EventInfo & RowInsertingInfo ) => void; /** * [descr:GridBaseOptions.onRowRemoved] */ onRowRemoved?: ( - e: DevExpress.events.EventInfo & - RowRemovedInfo + e: EventInfo & RowRemovedInfo ) => void; /** * [descr:GridBaseOptions.onRowRemoving] */ onRowRemoving?: ( - e: DevExpress.events.EventInfo & - RowRemovingInfo + e: EventInfo & RowRemovingInfo ) => void; /** * [descr:GridBaseOptions.onRowUpdated] */ onRowUpdated?: ( - e: DevExpress.events.EventInfo & - RowUpdatedInfo + e: EventInfo & RowUpdatedInfo ) => void; /** * [descr:GridBaseOptions.onRowUpdating] */ onRowUpdating?: ( - e: DevExpress.events.EventInfo & - RowUpdatingInfo + e: EventInfo & RowUpdatingInfo ) => void; /** * [descr:GridBaseOptions.onRowValidating] */ onRowValidating?: ( - e: DevExpress.events.EventInfo & - RowValidatingInfo + e: EventInfo & RowValidatingInfo ) => void; /** * [descr:GridBaseOptions.onSaved] */ onSaved?: ( - e: DevExpress.events.EventInfo & - DataChangeInfo + e: EventInfo & DataChangeInfo ) => void; /** * [descr:GridBaseOptions.onSaving] */ - onSaving?: ( - e: DevExpress.events.EventInfo & SavingInfo - ) => void; + onSaving?: (e: EventInfo & SavingInfo) => void; /** * [descr:GridBaseOptions.onSelectionChanged] */ onSelectionChanged?: ( - e: DevExpress.events.EventInfo & - SelectionChangedInfo + e: EventInfo & SelectionChangedInfo ) => void; /** * [descr:GridBaseOptions.onToolbarPreparing] */ onToolbarPreparing?: ( - e: DevExpress.events.EventInfo & ToolbarPreparingInfo + e: EventInfo & ToolbarPreparingInfo ) => void; /** * [descr:GridBaseOptions.pager] @@ -4414,7 +5133,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.dragTemplate] */ dragTemplate?: - | DevExpress.core.template + | template | (( dragInfo: RowDraggingTemplateData, containerElement: DevExpress.core.DxElement @@ -4449,7 +5168,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragChange] */ onDragChange?: ( - e: DevExpress.events.Cancelable & + e: Cancelable & ReducedNativeEventInfo & RowDraggingEventInfo & DragDropInfo @@ -4458,7 +5177,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragEnd] */ onDragEnd?: ( - e: DevExpress.events.Cancelable & + e: Cancelable & ReducedNativeEventInfo & RowDraggingEventInfo & DragDropInfo @@ -4467,7 +5186,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragMove] */ onDragMove?: ( - e: DevExpress.events.Cancelable & + e: Cancelable & ReducedNativeEventInfo & RowDraggingEventInfo & DragDropInfo @@ -4476,7 +5195,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragStart] */ onDragStart?: ( - e: DevExpress.events.Cancelable & + e: Cancelable & ReducedNativeEventInfo & DragStartEventInfo ) => void; @@ -4917,13 +5636,6 @@ declare module DevExpress.core { : { [P in keyof T]?: DeepPartial; }; - /** - * [descr:DefaultOptionsRule] - */ - export type DefaultOptionsRule = { - device?: Device | Device[] | ((device: Device) => boolean); - options: DeepPartial; - }; /** * [descr:dxElement] * @deprecated [depNote:dxElement] @@ -4973,11 +5685,6 @@ declare module DevExpress.core { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ interface ElementWrapper extends JQuery {} - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type EventName = 'orientationChanged'; - export type FloatingActionButtonDirection = 'auto' | 'up' | 'down'; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -5019,10 +5726,6 @@ declare module DevExpress.core { | Function | Symbol | Array; - /** - * [descr:template] - */ - export type template = string | Function | UserDefinedElement; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -5081,7 +5784,7 @@ declare module DevExpress.data { /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export class AbstractStore extends Store< + export class AbstractStore extends StoreBase< TItem, TKey > { @@ -5110,7 +5813,7 @@ declare module DevExpress.data { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ interface AbstractStoreOptions - extends DevExpress.data.Store.Options { + extends DevExpress.data.Store.StoreOptionsBase { /** * [descr:StoreOptions.onLoaded] */ @@ -5124,40 +5827,12 @@ declare module DevExpress.data { changes: Array, options?: { keyExpr?: string | Array; immutable?: boolean } ): Array; - /** - * [descr:ArrayStore] - */ - export class ArrayStore extends AbstractStore< - TItem, - TKey - > { - constructor(options?: DevExpress.data.ArrayStore.Options); - /** - * [descr:ArrayStore.byKey(key)] - */ - byKey(key: TKey): DevExpress.core.utils.DxPromise; - /** - * [descr:ArrayStore.clear()] - */ - clear(): void; - /** - * [descr:ArrayStore.createQuery()] - */ - createQuery(): Query; - } - module ArrayStore { - export type Options = ArrayStoreOptions< - TItem, - TKey - >; - } /** * [descr:ArrayStoreOptions] - * @deprecated [depNote:ArrayStoreOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface ArrayStoreOptions - extends DevExpress.data.AbstractStore.Options { + extends AbstractStoreOptions { /** * [descr:ArrayStoreOptions.data] */ @@ -5167,66 +5842,12 @@ declare module DevExpress.data { * [descr:Utils.base64_encode(input)] */ export function base64_encode(input: string | Array): string; - /** - * [descr:CustomStore] - */ - export class CustomStore extends Store { - constructor(options?: DevExpress.data.CustomStore.Options); - /** - * [descr:CustomStore.byKey(key, extraOptions)] - */ - byKey( - key: TKey, - extraOptions?: LoadOptions - ): DevExpress.core.utils.DxPromise; - /** - * [descr:CustomStore.clearRawDataCache()] - */ - clearRawDataCache(): void; - /** - * [descr:CustomStore.load()] - */ - load(): DevExpress.core.utils.DxExtendedPromise< - DevExpress.common.LoadResult - >; - /** - * [descr:CustomStore.load(options)] - */ - load( - options: LoadOptions - ): DevExpress.core.utils.DxExtendedPromise< - DevExpress.common.LoadResult - >; - } - module CustomStore { - /** - * @deprecated Use GroupItem from common/data/custom-store instead - */ - export type GroupItem = DevExpress.common.GroupItem; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type LoadFunctionResult = - | T - | DevExpress.core.utils.DxPromise - | PromiseLike; - export type Options = CustomStoreOptions< - TItem, - TKey - >; - /** - * [descr:ResolvedData] - * @deprecated [depNote:ResolvedData] - */ - export type ResolvedData = DevExpress.common.LoadResult; - } /** * [descr:CustomStoreOptions] - * @deprecated [depNote:CustomStoreOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface CustomStoreOptions - extends DevExpress.data.Store.Options { + extends DevExpress.data.Store.StoreOptionsBase { /** * [descr:CustomStoreOptions.byKey] */ @@ -5247,7 +5868,7 @@ declare module DevExpress.data { */ load: ( options: LoadOptions - ) => DevExpress.data.CustomStore.LoadFunctionResult< + ) => DevExpress.common.LoadFunctionResult< DevExpress.common.LoadResult >; /** @@ -5269,8 +5890,12 @@ declare module DevExpress.data { * [descr:CustomStoreOptions.totalCount] */ totalCount?: (loadOptions: { - filter?: FilterDescriptor | Array; - group?: GroupDescriptor | Array>; + filter?: + | DevExpress.common.FilterDescriptor + | Array; + group?: + | DevExpress.common.GroupDescriptor + | Array>; }) => PromiseLike; /** * [descr:CustomStoreOptions.update] @@ -5281,238 +5906,8 @@ declare module DevExpress.data { */ useDefaultSearch?: boolean | undefined; } - /** - * [descr:DataSource] - */ - export class DataSource { - constructor(data: Array); - constructor( - options: - | DevExpress.data.CustomStore.Options - | DevExpress.data.DataSource.Options - ); - constructor(store: DevExpress.data.utils.Store); - constructor(url: string); - /** - * [descr:DataSource.cancel(operationId)] - */ - cancel(operationId: number): boolean; - /** - * [descr:DataSource.dispose()] - */ - dispose(): void; - /** - * [descr:DataSource.filter()] - */ - filter(): FilterDescriptor | Array; - /** - * [descr:DataSource.filter(filterExpr)] - */ - filter(filterExpr: FilterDescriptor | Array): void; - /** - * [descr:DataSource.group()] - */ - group(): GroupDescriptor | Array>; - /** - * [descr:DataSource.group(groupExpr)] - */ - group( - groupExpr: GroupDescriptor | Array> - ): void; - /** - * [descr:DataSource.isLastPage()] - */ - isLastPage(): boolean; - /** - * [descr:DataSource.isLoaded()] - */ - isLoaded(): boolean; - /** - * [descr:DataSource.isLoading()] - */ - isLoading(): boolean; - /** - * [descr:DataSource.items()] - */ - items(): Array; - /** - * [descr:DataSource.key()] - */ - key(): string | Array; - /** - * [descr:DataSource.load()] - */ - load(): DevExpress.core.utils.DxExtendedPromise; - /** - * [descr:DataSource.loadOptions()] - */ - loadOptions(): LoadOptions; - /** - * [descr:DataSource.off(eventName)] - */ - off(eventName: DevExpress.data.DataSource.EventName): this; - /** - * [descr:DataSource.off(eventName, eventHandler)] - */ - off( - eventName: DevExpress.data.DataSource.EventName, - eventHandler: Function - ): this; - /** - * [descr:DataSource.on(eventName, eventHandler)] - */ - on( - eventName: DevExpress.data.DataSource.EventName, - eventHandler: Function - ): this; - /** - * [descr:DataSource.on(events)] - */ - on( - events: { [key in DevExpress.data.DataSource.EventName]?: Function } - ): this; - /** - * [descr:DataSource.pageIndex()] - */ - pageIndex(): number; - /** - * [descr:DataSource.pageIndex(newIndex)] - */ - pageIndex(newIndex: number): void; - /** - * [descr:DataSource.pageSize()] - */ - pageSize(): number; - /** - * [descr:DataSource.pageSize(value)] - */ - pageSize(value: number): void; - /** - * [descr:DataSource.paginate()] - */ - paginate(): boolean; - /** - * [descr:DataSource.paginate(value)] - */ - paginate(value: boolean): void; - /** - * [descr:DataSource.reload()] - */ - reload(): DevExpress.core.utils.DxExtendedPromise; - /** - * [descr:DataSource.requireTotalCount()] - */ - requireTotalCount(): boolean; - /** - * [descr:DataSource.requireTotalCount(value)] - */ - requireTotalCount(value: boolean): void; - /** - * [descr:DataSource.searchExpr()] - */ - searchExpr(): string & Function & Array; - /** - * [descr:DataSource.searchExpr(expr)] - */ - searchExpr(expr: string | Function | Array): void; - /** - * [descr:DataSource.searchOperation()] - */ - searchOperation(): string; - /** - * [descr:DataSource.searchOperation(op)] - */ - searchOperation(op: string): void; - /** - * [descr:DataSource.searchValue()] - */ - searchValue(): any; - /** - * [descr:DataSource.searchValue(value)] - */ - searchValue(value: any): void; - /** - * [descr:DataSource.select()] - */ - select(): SelectDescriptor; - /** - * [descr:DataSource.select(expr)] - */ - select(expr: SelectDescriptor): void; - /** - * [descr:DataSource.sort()] - */ - sort(): SortDescriptor | Array>; - /** - * [descr:DataSource.sort(sortExpr)] - */ - sort(sortExpr: SortDescriptor | Array>): void; - /** - * [descr:DataSource.store()] - */ - store(): DevExpress.data.utils.Store; - /** - * [descr:DataSource.totalCount()] - */ - totalCount(): number; - } - module DataSource { - /** - * [descr:DataSourceLike] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export type DataSourceLike = - | string - | Array - | DevExpress.data.utils.Store - | DataSourceOptionsStub - | DataSource; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - interface DataSourceOptionsStub< - TStoreItem = any, - TMappedItem = TStoreItem, - TItem = TMappedItem - > { - customQueryParams?: any; - expand?: Array | string; - filter?: FilterDescriptor | Array; - group?: GroupDescriptor | Array>; - map?: (dataItem: TStoreItem) => TMappedItem; - onChanged?: (e: { readonly changes?: Array }) => void; - onLoadError?: (error: { readonly message?: string }) => void; - onLoadingChanged?: (isLoading: boolean) => void; - pageSize?: number; - paginate?: boolean; - postProcess?: (data: Array) => Array; - pushAggregationTimeout?: number; - requireTotalCount?: boolean; - reshapeOnPush?: boolean; - searchExpr?: string | Function | Array; - searchOperation?: SearchOperation; - searchValue?: any; - select?: SelectDescriptor; - sort?: SortDescriptor | Array>; - store?: - | Array - | DevExpress.data.utils.Store - | DevExpress.data.utils.StoreOptions; - } - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type EventName = 'changed' | 'loadError' | 'loadingChanged'; - export type Options< - TStoreItem = any, - TMappedItem = TStoreItem, - TItem = TMappedItem, - TKey = any - > = DataSourceOptions; - } /** * [descr:DataSourceOptions] - * @deprecated [depNote:DataSourceOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface DataSourceOptions< @@ -5532,15 +5927,19 @@ declare module DevExpress.data { /** * [descr:DataSourceOptions.filter] */ - filter?: FilterDescriptor | Array; + filter?: + | DevExpress.common.FilterDescriptor + | Array; /** * [descr:DataSourceOptions.group] */ - group?: GroupDescriptor | Array>; + group?: + | DevExpress.common.GroupDescriptor + | Array>; /** * [descr:DataSourceOptions.langParams] */ - langParams?: LangParams; + langParams?: DevExpress.common.LangParams; /** * [descr:DataSourceOptions.map] */ @@ -5588,7 +5987,7 @@ declare module DevExpress.data { /** * [descr:DataSourceOptions.searchOperation] */ - searchOperation?: SearchOperation; + searchOperation?: DevExpress.common.SearchOperation; /** * [descr:DataSourceOptions.searchValue] */ @@ -5596,11 +5995,13 @@ declare module DevExpress.data { /** * [descr:DataSourceOptions.select] */ - select?: SelectDescriptor; + select?: DevExpress.common.SelectDescriptor; /** * [descr:DataSourceOptions.sort] */ - sort?: SortDescriptor | Array>; + sort?: + | DevExpress.common.SortDescriptor + | Array>; /** * [descr:DataSourceOptions.store] */ @@ -5624,43 +6025,6 @@ declare module DevExpress.data { * @deprecated [depNote:Utils.errorHandler] */ export function errorHandler(e: Error): void; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type EventName = - | 'loaded' - | 'loading' - | 'inserted' - | 'inserting' - | 'updated' - | 'updating' - | 'push' - | 'removed' - | 'removing' - | 'modified' - | 'modifying'; - /** - * [descr:FilterDescriptor] - */ - export type FilterDescriptor = any; - /** - * [descr:GroupDescriptor] - */ - export type GroupDescriptor = - | KeySelector - | (OrderingDescriptor & { - groupInterval?: number | GroupingInterval; - isExpanded?: boolean; - }); - export type GroupingInterval = - | 'year' - | 'quarter' - | 'month' - | 'day' - | 'dayOfWeek' - | 'hour' - | 'minute' - | 'second'; /** * [descr:Guid] */ @@ -5676,25 +6040,6 @@ declare module DevExpress.data { */ valueOf(): string; } - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type KeySelector = - | string - | ((source: T) => string | number | Date | Object); - /** - * [descr:LangParams] - */ - export type LangParams = { - /** - * [descr:LangParams.locale] - */ - locale: string; - /** - * [descr:LangParams.collatorOptions] - */ - collatorOptions?: Intl.CollatorOptions; - }; /** * [descr:LoadOptions] */ @@ -5718,15 +6063,21 @@ declare module DevExpress.data { /** * [descr:LoadOptions.filter] */ - filter?: FilterDescriptor | Array; + filter?: + | DevExpress.common.FilterDescriptor + | Array; /** * [descr:LoadOptions.group] */ - group?: GroupDescriptor | Array>; + group?: + | DevExpress.common.GroupDescriptor + | Array>; /** * [descr:LoadOptions.groupSummary] */ - groupSummary?: SummaryDescriptor | Array>; + groupSummary?: + | DevExpress.common.SummaryDescriptor + | Array>; /** * [descr:LoadOptions.parentIds] */ @@ -5746,7 +6097,7 @@ declare module DevExpress.data { /** * [descr:LoadOptions.searchOperation] */ - searchOperation?: SearchOperation; + searchOperation?: DevExpress.common.SearchOperation; /** * [descr:LoadOptions.searchValue] */ @@ -5754,7 +6105,7 @@ declare module DevExpress.data { /** * [descr:LoadOptions.select] */ - select?: SelectDescriptor; + select?: DevExpress.common.SelectDescriptor; /** * [descr:LoadOptions.skip] */ @@ -5762,7 +6113,9 @@ declare module DevExpress.data { /** * [descr:LoadOptions.sort] */ - sort?: SortDescriptor | Array>; + sort?: + | DevExpress.common.SortDescriptor + | Array>; /** * [descr:LoadOptions.take] */ @@ -5770,34 +6123,16 @@ declare module DevExpress.data { /** * [descr:LoadOptions.totalSummary] */ - totalSummary?: SummaryDescriptor | Array>; + totalSummary?: + | DevExpress.common.SummaryDescriptor + | Array>; /** * [descr:LoadOptions.userData] */ userData?: any; } - /** - * [descr:LocalStore] - */ - export class LocalStore extends ArrayStore< - TItem, - TKey - > { - constructor(options?: DevExpress.data.LocalStore.Options); - /** - * [descr:LocalStore.clear()] - */ - clear(): void; - } - module LocalStore { - export type Options = LocalStoreOptions< - TItem, - TKey - >; - } /** * [descr:LocalStoreOptions] - * @deprecated [depNote:LocalStoreOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface LocalStoreOptions @@ -5815,53 +6150,6 @@ declare module DevExpress.data { */ name?: string; } - /** - * [descr:ODataContext] - */ - export class ODataContext { - constructor(options?: ODataContextOptions); - /** - * [descr:ODataContext.get(operationName, params)] - */ - get( - operationName: string, - params: any - ): DevExpress.core.utils.DxPromise; - /** - * [descr:ODataContext.invoke(operationName, params, httpMethod)] - */ - invoke( - operationName: string, - params: any, - httpMethod: DevExpress.data.ODataContext.HttpMethod - ): DevExpress.core.utils.DxPromise; - /** - * [descr:ODataContext.objectLink(entityAlias, key)] - */ - objectLink(entityAlias: string, key: any | string | number): any; - } - module ODataContext { - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'MERGE'; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export interface ODataRequestOptions { - accepts: any; - async: boolean; - contentType: string | boolean; - data: any; - dataType: string; - headers: any; - jsonp?: boolean; - method: string; - timeout: number; - url: string; - xhrFields: any; - } - } /** * [descr:ODataContextOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -5893,7 +6181,7 @@ declare module DevExpress.data { errorHandler?: (e: { httpStatus: number; errorDetails: any; - requestOptions: DevExpress.data.ODataContext.ODataRequestOptions; + requestOptions: DevExpress.common.ODataRequestOptions; }) => void; /** * [descr:ODataContextOptions.filterToLower] @@ -5916,46 +6204,12 @@ declare module DevExpress.data { */ withCredentials?: boolean; } - /** - * [descr:ODataStore] - */ - export class ODataStore extends AbstractStore< - TItem, - TKey - > { - constructor(options?: DevExpress.data.ODataStore.Options); - /** - * [descr:ODataStore.byKey(key, extraOptions)] - */ - byKey( - key: TKey, - extraOptions?: { - expand?: string | Array; - select?: string | Array; - } - ): DevExpress.core.utils.DxPromise; - /** - * [descr:ODataStore.createQuery(loadOptions)] - */ - createQuery(loadOptions?: { - expand?: string | Array; - requireTotalCount?: boolean; - customQueryParams?: any; - }): Query; - } - module ODataStore { - export type Options = ODataStoreOptions< - TItem, - TKey - >; - } /** * [descr:ODataStoreOptions] - * @deprecated [depNote:ODataStoreOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface ODataStoreOptions - extends DevExpress.data.AbstractStore.Options { + extends DevExpress.data.Store.StoreOptionsBase { /** * [descr:ODataStoreOptions.beforeSend] */ @@ -5978,7 +6232,7 @@ declare module DevExpress.data { errorHandler?: (e: { httpStatus: number; errorDetails: any; - requestOptions: DevExpress.data.ODataContext.ODataRequestOptions; + requestOptions: DevExpress.common.ODataRequestOptions; }) => void; /** * [descr:ODataStoreOptions.fieldTypes] @@ -6018,11 +6272,14 @@ declare module DevExpress.data { withCredentials?: boolean; } /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. + * @deprecated Use DataSourceOptions from /common/data instead */ - type OrderingDescriptor = SelectionDescriptor & { - desc?: boolean; - }; + export type Options< + TStoreItem = any, + TMappedItem = TStoreItem, + TItem = TMappedItem, + TKey = any + > = DataSourceOptions; /** * [descr:PivotGridDataSource] */ @@ -6045,7 +6302,7 @@ declare module DevExpress.data { dataIndex?: number; maxRowCount?: number; customColumns?: Array; - }): DataSource; + }): DevExpress.common.DataSource; /** * [descr:PivotGridDataSource.dispose()] */ @@ -6426,176 +6683,65 @@ declare module DevExpress.data { /** * [descr:Utils.query(array, queryOptions)] */ - export function query(array: Array, queryOptions?: any): Query; + export function query( + array: Array, + queryOptions?: any + ): DevExpress.common.Query; /** * [descr:Utils.query(url, queryOptions)] */ - export function query(url: string, queryOptions: any): Query; - /** - * [descr:Query] - */ - export interface Query { - /** - * [descr:Query.aggregate(seed, step, finalize)] - */ - aggregate( - seed: any, - step: Function, - finalize: Function - ): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.aggregate(step)] - */ - aggregate(step: Function): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.avg()] - */ - avg(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.avg(getter)] - */ - avg(getter: any): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.count()] - */ - count(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.enumerate()] - */ - enumerate(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.filter(criteria)] - */ - filter(criteria: Array): Query; - /** - * [descr:Query.filter(predicate)] - */ - filter(predicate: Function): Query; - /** - * [descr:Query.groupBy(getter)] - */ - groupBy(getter: any): Query; - /** - * [descr:Query.max()] - */ - max(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.max(getter)] - */ - max(getter: any): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.min()] - */ - min(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.min(getter)] - */ - min(getter: any): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.select(getter)] - */ - select(...getters: any[]): Query; - /** - * [descr:Query.slice(skip, take)] - */ - slice(skip: number, take?: number): Query; - /** - * [descr:Query.sortBy(getter)] - */ - sortBy(getter: any): Query; - /** - * [descr:Query.sortBy(getter, desc)] - */ - sortBy(getter: any, desc: boolean): Query; - /** - * [descr:Query.sum()] - */ - sum(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.sum(getter)] - */ - sum(getter: any): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.thenBy(getter)] - */ - thenBy(getter: any): Query; - /** - * [descr:Query.thenBy(getter, desc)] - */ - thenBy(getter: any, desc: boolean): Query; - /** - * [descr:Query.toArray()] - */ - toArray(): Array; - } - export type SearchOperation = - | '=' - | '<>' - | '>' - | '>=' - | '<' - | '<=' - | 'startswith' - | 'endswith' - | 'contains' - | 'notcontains'; - /** - * [descr:SelectDescriptor] - */ - export type SelectDescriptor = - | string - | Array - | ((source: T) => any); - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - type SelectionDescriptor = { - selector: KeySelector; - }; + export function query( + url: string, + queryOptions: any + ): DevExpress.common.Query; /** * [descr:Utils.setErrorHandler] */ export function setErrorHandler(handler: (e: Error) => void): void; - /** - * [descr:SortDescriptor] - */ - export type SortDescriptor = KeySelector | OrderingDescriptor; /** * [descr:Store] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export class Store { - constructor(options?: DevExpress.data.Store.Options); + export class StoreBase { + constructor(options?: DevExpress.data.Store.StoreOptionsBase); /** - * [descr:Store.insert(values)] + * [descr:StoreBase.insert(values)] */ insert(values: TItem): DevExpress.core.utils.DxExtendedPromise; /** - * [descr:Store.key()] + * [descr:StoreBase.key()] */ key(): string | Array; /** - * [descr:Store.keyOf(obj)] + * [descr:StoreBase.keyOf(obj)] */ keyOf(obj: TItem): TKey; /** - * [descr:Store.off(eventName)] + * [descr:StoreBase.off(eventName)] */ - off(eventName: EventName): this; + off(eventName: DevExpress.common.StoreBaseEventName): this; /** - * [descr:Store.off(eventName, eventHandler)] + * [descr:StoreBase.off(eventName, eventHandler)] */ - off(eventName: EventName, eventHandler: Function): this; + off( + eventName: DevExpress.common.StoreBaseEventName, + eventHandler: Function + ): this; /** - * [descr:Store.on(eventName, eventHandler)] + * [descr:StoreBase.on(eventName, eventHandler)] */ - on(eventName: EventName, eventHandler: Function): this; + on( + eventName: DevExpress.common.StoreBaseEventName, + eventHandler: Function + ): this; /** - * [descr:Store.on(events)] + * [descr:StoreBase.on(events)] */ - on(events: { [key in EventName]?: Function }): this; + on( + events: { [key in DevExpress.common.StoreBaseEventName]?: Function } + ): this; /** - * [descr:Store.push(changes)] + * [descr:StoreBase.push(changes)] */ push( changes: Array<{ @@ -6606,32 +6752,28 @@ declare module DevExpress.data { }> ): void; /** - * [descr:Store.remove(key)] + * [descr:StoreBase.remove(key)] */ remove(key: TKey): DevExpress.core.utils.DxPromise; /** - * [descr:Store.totalCount(options)] + * [descr:StoreBase.totalCount(options)] */ totalCount(obj: { - filter?: FilterDescriptor | Array; - group?: GroupDescriptor | Array>; + filter?: + | DevExpress.common.FilterDescriptor + | Array; + group?: + | DevExpress.common.GroupDescriptor + | Array>; }): DevExpress.core.utils.DxPromise; /** - * [descr:Store.update(key, values)] + * [descr:StoreBase.update(key, values)] */ update( key: TKey, values: DevExpress.core.DeepPartial ): DevExpress.core.utils.DxExtendedPromise; } - /** - * [descr:SummaryDescriptor] - */ - export type SummaryDescriptor = - | KeySelector - | (SelectionDescriptor & { - summaryType?: 'sum' | 'avg' | 'min' | 'max' | 'count'; - }); /** * [descr:XmlaStore] */ @@ -6668,6 +6810,33 @@ declare module DevExpress.data { url?: string; } } +declare module DevExpress.data.ArrayStore { + /** + * @deprecated Use ArrayStoreOptions from /common/data instead + */ + export type Options = ArrayStoreOptions; +} +declare module DevExpress.data.CustomStore { + /** + * @deprecated Use CustomStoreOptions from /common/data instead + */ + export type Options = CustomStoreOptions< + TItem, + TKey + >; +} +declare module DevExpress.data.LocalStore { + /** + * @deprecated Use LocalStoreOptions from /common/data instead + */ + export type Options = LocalStoreOptions; +} +declare module DevExpress.data.ODataStore { + /** + * @deprecated Use ODataStoreOptions from /common/data instead + */ + export type Options = ODataStoreOptions; +} declare module DevExpress.data.PivotGridDataSource { /** * [descr:PivotGridDataSourceOptions.fields] @@ -6679,7 +6848,7 @@ declare module DevExpress.data.Store { * [descr:StoreOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type Options = { + export type StoreOptionsBase = { /** * [descr:StoreOptions.errorHandler] */ @@ -6740,15 +6909,15 @@ declare module DevExpress.data.utils { */ export function compileSetter(expr: string | Array): Function; export type Store = - | CustomStore - | ArrayStore - | LocalStore - | ODataStore; + | DevExpress.common.CustomStore + | DevExpress.common.ArrayStore + | DevExpress.common.LocalStore + | DevExpress.common.ODataStore; export type StoreOptions = - | DevExpress.data.CustomStore.Options - | (DevExpress.data.ArrayStore.Options & { type: 'array' }) - | (DevExpress.data.LocalStore.Options & { type: 'local' }) - | (DevExpress.data.ODataStore.Options & { type: 'odata' }); + | CustomStoreOptions + | (ArrayStoreOptions & { type: 'array' }) + | (LocalStoreOptions & { type: 'local' }) + | (ODataStoreOptions & { type: 'odata' }); } declare module DevExpress.data.utils.odata { /** @@ -6757,190 +6926,6 @@ declare module DevExpress.data.utils.odata { export var keyConverters: any; } declare module DevExpress.events { - /** - * [descr:AsyncCancelable] - */ - export type AsyncCancelable = { - /** - * [descr:AsyncCancelable.cancel] - */ - cancel: boolean | PromiseLike; - }; - /** - * [descr:Cancelable] - */ - export interface Cancelable { - /** - * [descr:Cancelable.cancel] - */ - cancel?: boolean; - } - /** - * [descr:ChangedOptionInfo] - */ - export interface ChangedOptionInfo { - /** - * [descr:ChangedOptionInfo.name] - */ - readonly name: string; - /** - * [descr:ChangedOptionInfo.fullName] - */ - readonly fullName: string; - /** - * [descr:ChangedOptionInfo.value] - */ - readonly value?: any; - /** - * [descr:ChangedOptionInfo.previousValue] - */ - readonly previousValue?: any; - } - - /** - * [descr:DxEvent] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export type DxEvent = {} extends EventType - ? EventObject & TNativeEvent - : EventType; - /** - * [descr:event] - * @deprecated [depNote:event] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export type event = DxEvent; - /** - * [descr:EventInfo] - */ - export interface EventInfo { - /** - * [descr:EventInfo.component] - */ - readonly component: TComponent; - /** - * [descr:EventInfo.element] - */ - readonly element: DevExpress.core.DxElement; - /** - * [descr:EventInfo.model] - */ - readonly model?: any; - } - /** - * [descr:EventObject] - */ - export type EventObject = { - /** - * [descr:EventObject.currentTarget] - */ - currentTarget: Element; - - /** - * [descr:EventObject.data] - */ - data: any; - - /** - * [descr:EventObject.delegateTarget] - */ - delegateTarget: Element; - - /** - * [descr:EventObject.target] - */ - target: Element; - /** - * [descr:EventObject.isDefaultPrevented()] - */ - isDefaultPrevented(): boolean; - /** - * [descr:EventObject.isImmediatePropagationStopped()] - */ - isImmediatePropagationStopped(): boolean; - /** - * [descr:EventObject.isPropagationStopped()] - */ - isPropagationStopped(): boolean; - /** - * [descr:EventObject.preventDefault()] - */ - preventDefault(): void; - /** - * [descr:EventObject.stopImmediatePropagation()] - */ - stopImmediatePropagation(): void; - /** - * [descr:EventObject.stopPropagation()] - */ - stopPropagation(): void; - }; - /** - * [descr:handler(event, extraParameters)] - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export function eventsHandler(event: DxEvent, extraParameters: any): boolean; - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export interface EventType {} - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - interface EventType extends JQueryEventObject { - cancel?: boolean; - } - /** - * [descr:InitializedEventInfo] - */ - export interface InitializedEventInfo { - /** - * [descr:InitializedEventInfo.component] - */ - readonly component?: TComponent; - /** - * [descr:InitializedEventInfo.element] - */ - readonly element?: DevExpress.core.DxElement; - } - /** - * [descr:ItemInfo] - */ - export interface ItemInfo { - /** - * [descr:ItemInfo.itemData] - */ - readonly itemData?: TItemData; - /** - * [descr:ItemInfo.itemElement] - */ - readonly itemElement: DevExpress.core.DxElement; - /** - * [descr:ItemInfo.itemIndex] - */ - readonly itemIndex: number; - } - /** - * [descr:NativeEventInfo] - */ - export interface NativeEventInfo { - /** - * [descr:NativeEventInfo.component] - */ - readonly component: TComponent; - /** - * [descr:NativeEventInfo.element] - */ - readonly element: DevExpress.core.DxElement; - /** - * [descr:NativeEventInfo.model] - */ - readonly model?: any; - /** - * [descr:NativeEventInfo.event] - */ - readonly event?: DxEvent; - } /** * [descr:events.off(element)] */ @@ -7054,14 +7039,14 @@ declare module DevExpress.events { */ export function trigger( element: Element | Array, - event: string | DxEvent + event: string | DevExpress.common.DxEvent ): void; /** * [descr:events.trigger(element, event, extraParameters)] */ export function trigger( element: Element | Array, - event: string | DxEvent, + event: string | DevExpress.common.DxEvent, extraParameters: any ): void; /** @@ -7070,7 +7055,7 @@ declare module DevExpress.events { */ export function triggerHandler( element: Element | Array, - event: string | DxEvent + event: string | DevExpress.common.DxEvent ): void; /** * [descr:events.triggerHandler(element, event, extraParameters)] @@ -7078,7 +7063,7 @@ declare module DevExpress.events { */ export function triggerHandler( element: Element | Array, - event: string | DxEvent, + event: string | DevExpress.common.DxEvent, extraParameters: any ): void; } @@ -7287,16 +7272,10 @@ declare module DevExpress.fileManagement { * [descr:CustomFileSystemProvider] */ export class CustomFileSystemProvider extends FileSystemProviderBase { - constructor( - options?: DevExpress.fileManagement.CustomFileSystemProvider.Options - ); - } - module CustomFileSystemProvider { - export type Options = CustomFileSystemProviderOptions; + constructor(options?: CustomFileSystemProviderOptions); } /** * [descr:CustomFileSystemProviderOptions] - * @deprecated [depNote:CustomFileSystemProviderOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface CustomFileSystemProviderOptions @@ -7579,16 +7558,10 @@ declare module DevExpress.fileManagement { * [descr:ObjectFileSystemProvider] */ export class ObjectFileSystemProvider extends FileSystemProviderBase { - constructor( - options?: DevExpress.fileManagement.ObjectFileSystemProvider.Options - ); - } - module ObjectFileSystemProvider { - export type Options = ObjectFileSystemProviderOptions; + constructor(options?: ObjectFileSystemProviderOptions); } /** * [descr:ObjectFileSystemProviderOptions] - * @deprecated [depNote:ObjectFileSystemProviderOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface ObjectFileSystemProviderOptions @@ -7610,16 +7583,10 @@ declare module DevExpress.fileManagement { * [descr:RemoteFileSystemProvider] */ export class RemoteFileSystemProvider extends FileSystemProviderBase { - constructor( - options?: DevExpress.fileManagement.RemoteFileSystemProvider.Options - ); - } - module RemoteFileSystemProvider { - export type Options = RemoteFileSystemProviderOptions; + constructor(options?: RemoteFileSystemProviderOptions); } /** * [descr:RemoteFileSystemProviderOptions] - * @deprecated [depNote:RemoteFileSystemProviderOptions] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface RemoteFileSystemProviderOptions @@ -7679,6 +7646,24 @@ declare module DevExpress.fileManagement { chunkIndex: number; } } +declare module DevExpress.fileManagement.CustomFileSystemProvider { + /** + * @deprecated Use CustomFileSystemProviderOptions from /common/file_management instead + */ + export type Options = CustomFileSystemProviderOptions; +} +declare module DevExpress.fileManagement.ObjectFileSystemProvider { + /** + * @deprecated Use ObjectFileSystemProviderOptions from /common/file_management instead + */ + export type Options = ObjectFileSystemProviderOptions; +} +declare module DevExpress.fileManagement.RemoteFileSystemProvider { + /** + * @deprecated Use RemoteFileSystemProviderOptions from /common/file_management instead + */ + export type Options = RemoteFileSystemProviderOptions; +} declare module DevExpress.localization { /** * [descr:localization.formatDate(value, format)] @@ -7966,7 +7951,7 @@ declare module DevExpress.pdfExporter { /** * [descr:PdfExportGanttProps.font] */ - font?: PdfExportGanttFont; + font?: DevExpress.common.PdfExportGanttFont; } } declare module DevExpress.ui { @@ -8005,7 +7990,7 @@ declare module DevExpress.ui { TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any > extends Widget { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module CollectionWidget { /** @@ -8030,8 +8015,8 @@ declare module DevExpress.ui { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export type SelectionChangingEventBase = - DevExpress.events.AsyncCancelable & - DevExpress.events.EventInfo & + DevExpress.common.AsyncCancelable & + DevExpress.common.EventInfo & SelectionChangeInfo; } /** @@ -8051,7 +8036,7 @@ declare module DevExpress.ui { * [descr:CollectionWidgetItem.template] */ template?: - | DevExpress.core.template + | template | (( itemData: this, itemIndex: number, @@ -8078,7 +8063,7 @@ declare module DevExpress.ui { /** * [descr:CollectionWidgetOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:CollectionWidgetOptions.itemHoldTimeout] */ @@ -8087,7 +8072,7 @@ declare module DevExpress.ui { * [descr:CollectionWidgetOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | template | (( itemData: TItem, itemIndex: number, @@ -8110,39 +8095,39 @@ declare module DevExpress.ui { */ onItemClick?: | (( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo + DevExpress.common.ItemInfo ) => void) | string; /** * [descr:CollectionWidgetOptions.onItemContextMenu] */ onItemContextMenu?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo + DevExpress.common.ItemInfo ) => void; /** * [descr:CollectionWidgetOptions.onItemHold] */ onItemHold?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo + DevExpress.common.ItemInfo ) => void; /** * [descr:CollectionWidgetOptions.onItemRendered] */ onItemRendered?: ( - e: DevExpress.events.EventInfo & - DevExpress.events.ItemInfo + e: DevExpress.common.EventInfo & + DevExpress.common.ItemInfo ) => void; /** * [descr:CollectionWidgetOptions.onSelectionChanging] @@ -8154,7 +8139,7 @@ declare module DevExpress.ui { * [descr:CollectionWidgetOptions.onSelectionChanged] */ onSelectionChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.ui.CollectionWidget.SelectionChangeInfo ) => void; /** @@ -8188,7 +8173,7 @@ declare module DevExpress.ui { */ export class DataExpressionMixin { constructor(options?: DataExpressionMixinOptions); - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } /** * [descr:DataExpressionMixinOptions] @@ -8198,7 +8183,7 @@ declare module DevExpress.ui { /** * [descr:DataExpressionMixinOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.common.DataSourceLike< CollectionWidgetItem | any > | null; /** @@ -8209,7 +8194,7 @@ declare module DevExpress.ui { * [descr:DataExpressionMixinOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -8392,14 +8377,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_accordion_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -8419,40 +8404,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_accordion_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxAccordion, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_accordion_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxAccordion, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_accordion_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxAccordion, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -8463,27 +8448,27 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_accordion_ItemTitleClickEvent] */ export type ItemTitleClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxAccordion, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_accordion_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -8494,7 +8479,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -8514,7 +8499,7 @@ declare module DevExpress.ui { * [descr:dxAccordionItem.titleTemplate] */ titleTemplate?: - | DevExpress.core.template + | template | (() => string | DevExpress.core.UserDefinedElement); } /** @@ -8536,7 +8521,7 @@ declare module DevExpress.ui { /** * [descr:dxAccordionOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxAccordionOptions.deferRendering] */ @@ -8557,7 +8542,7 @@ declare module DevExpress.ui { * [descr:dxAccordionOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | template | (( itemData: TItem, itemIndex: number, @@ -8567,7 +8552,7 @@ declare module DevExpress.ui { * [descr:dxAccordionOptions.itemTitleTemplate] */ itemTitleTemplate?: - | DevExpress.core.template + | template | (( itemData: TItem, itemIndex: number, @@ -8625,22 +8610,22 @@ declare module DevExpress.ui { export type CancelClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo>; + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo>; /** * [descr:_ui_action_sheet_ContentReadyEvent] */ export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_action_sheet_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes, TKey> = { Properties: Properties; CancelClickEvent: CancelClickEvent; @@ -8659,40 +8644,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_action_sheet_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxActionSheet, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_action_sheet_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxActionSheet, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_action_sheet_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxActionSheet, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -8703,16 +8688,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_action_sheet_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -8732,7 +8717,7 @@ declare module DevExpress.ui { */ onClick?: | (( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< dxActionSheet, MouseEvent | PointerEvent > @@ -8762,7 +8747,7 @@ declare module DevExpress.ui { /** * [descr:dxActionSheetOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxActionSheetOptions.items] */ @@ -8811,56 +8796,56 @@ declare module DevExpress.ui { /** * [descr:_ui_autocomplete_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, Event >; /** * [descr:_ui_autocomplete_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_autocomplete_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_autocomplete_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, ClipboardEvent >; /** * [descr:_ui_autocomplete_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, ClipboardEvent >; /** * [descr:_ui_autocomplete_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_autocomplete_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent >; /** * [descr:_ui_autocomplete_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, FocusEvent >; /** * [descr:_ui_autocomplete_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, FocusEvent >; @@ -8868,54 +8853,54 @@ declare module DevExpress.ui { * [descr:_ui_autocomplete_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_autocomplete_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_autocomplete_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_autocomplete_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent >; /** * [descr:_ui_autocomplete_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent >; /** * [descr:_ui_autocomplete_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_autocomplete_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_autocomplete_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, ClipboardEvent >; @@ -8924,12 +8909,12 @@ declare module DevExpress.ui { * [descr:_ui_autocomplete_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.ui.dxDropDownList.SelectionChangedInfo; /** * [descr:_ui_autocomplete_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxAutocomplete, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -8979,7 +8964,7 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type CrosswiseDistribution = 'center' | 'end' | 'start' | 'stretch'; /** * [descr:_ui_box_DisposingEvent] @@ -8987,7 +8972,7 @@ declare module DevExpress.ui { export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type Distribution = | 'center' | 'end' @@ -9011,40 +8996,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_box_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxBox, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_box_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_box_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -9055,16 +9040,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_box_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -9111,7 +9096,7 @@ declare module DevExpress.ui { /** * [descr:dxBoxOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxBoxOptions.direction] */ @@ -9129,7 +9114,7 @@ declare module DevExpress.ui { /** * [descr:_ui_button_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.NativeEventInfo< dxButton, KeyboardEvent | MouseEvent | PointerEvent > & { @@ -9141,21 +9126,21 @@ declare module DevExpress.ui { /** * [descr:_ui_button_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_button_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_button_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_button_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxButtonOptions; export type TemplateData = { readonly text?: string; @@ -9170,36 +9155,36 @@ declare module DevExpress.ui { /** * [descr:_ui_button_group_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_button_group_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_button_group_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_button_group_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxButtonGroup, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_button_group_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxButtonGroupOptions; /** * [descr:_ui_button_group_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -9235,7 +9220,7 @@ declare module DevExpress.ui { * [descr:dxButtonGroupOptions.buttonTemplate] */ buttonTemplate?: - | DevExpress.core.template + | template | (( buttonData: any, buttonContent: DevExpress.core.DxElement @@ -9317,7 +9302,7 @@ declare module DevExpress.ui { * [descr:dxButtonOptions.template] */ template?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxButton.TemplateData, contentElement: DevExpress.core.DxElement @@ -9366,7 +9351,7 @@ declare module DevExpress.ui { readonly date: Date; readonly view: string; } - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:DisabledDate] */ @@ -9374,22 +9359,22 @@ declare module DevExpress.ui { /** * [descr:_ui_calendar_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_calendar_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_calendar_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxCalendarOptions; /** * [descr:_ui_calendar_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxCalendar, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event > & @@ -9414,7 +9399,7 @@ declare module DevExpress.ui { * [descr:dxCalendarOptions.cellTemplate] */ cellTemplate?: - | DevExpress.core.template + | template | (( itemData: DevExpress.ui.dxCalendar.CellTemplateData, itemIndex: number, @@ -9500,13 +9485,13 @@ declare module DevExpress.ui { */ renderMessage(message: DevExpress.ui.dxChat.Message): void; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module dxChat { /** * [descr:_ui_chat_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type ExplicitTypes = { Properties: Properties; DisposingEvent: DisposingEvent; @@ -9517,11 +9502,11 @@ declare module DevExpress.ui { * [descr:_ui_chat_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_chat_MessageEnteredEvent] */ - export type MessageEnteredEvent = DevExpress.events.NativeEventInfo< + export type MessageEnteredEvent = DevExpress.common.NativeEventInfo< dxChat, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -9537,13 +9522,13 @@ declare module DevExpress.ui { /** * [descr:_ui_chat_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxChatOptions; /** * [descr:_ui_chat_TypingEndEvent] */ - export type TypingEndEvent = DevExpress.events.EventInfo & { + export type TypingEndEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_chat_TypingEndEvent.user] */ @@ -9552,7 +9537,7 @@ declare module DevExpress.ui { /** * [descr:_ui_chat_TypingStartEvent] */ - export type TypingStartEvent = DevExpress.events.NativeEventInfo< + export type TypingStartEvent = DevExpress.common.NativeEventInfo< dxChat, UIEvent & { target: HTMLInputElement } > & { @@ -9590,7 +9575,7 @@ declare module DevExpress.ui { /** * [descr:dxChatOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxChatOptions.dayHeaderFormat] */ @@ -9607,7 +9592,7 @@ declare module DevExpress.ui { * [descr:dxChatOptions.messageTemplate] */ messageTemplate?: - | DevExpress.core.template + | template | null | (( data: DevExpress.ui.dxChat.MessageTemplateData, @@ -9673,26 +9658,26 @@ declare module DevExpress.ui { /** * [descr:_ui_check_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_check_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_check_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_check_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxCheckBoxOptions; /** * [descr:_ui_check_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxCheckBox, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event > & @@ -9750,52 +9735,52 @@ declare module DevExpress.ui { /** * [descr:_ui_color_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxColorBox, Event >; /** * [descr:_ui_color_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_color_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxColorBox, ClipboardEvent >; /** * [descr:_ui_color_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxColorBox, ClipboardEvent >; /** * [descr:_ui_color_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_color_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxColorBox, KeyboardEvent >; /** * [descr:_ui_color_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxColorBox, FocusEvent >; /** * [descr:_ui_color_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxColorBox, FocusEvent >; @@ -9803,45 +9788,45 @@ declare module DevExpress.ui { * [descr:_ui_color_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_color_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxColorBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_color_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxColorBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxColorBox, KeyboardEvent >; /** * [descr:_ui_color_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxColorBox, KeyboardEvent >; /** * [descr:_ui_color_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_color_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_color_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxColorBox, ClipboardEvent >; @@ -9849,7 +9834,7 @@ declare module DevExpress.ui { /** * [descr:_ui_color_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxColorBox, KeyboardEvent | MouseEvent | PointerEvent | UIEvent | Event > & @@ -9882,7 +9867,7 @@ declare module DevExpress.ui { * [descr:dxColorBoxOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | template | (( value: string, fieldElement: DevExpress.core.DxElement @@ -9925,14 +9910,14 @@ declare module DevExpress.ui { /** * [descr:_ui_context_menu_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo< + export type ContentReadyEvent = DevExpress.common.EventInfo< dxContextMenu >; export type ContextSubmenuDirection = 'auto' | 'left' | 'right'; /** * [descr:_ui_context_menu_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo< + export type DisposingEvent = DevExpress.common.EventInfo< dxContextMenu >; export type ExplicitTypes = { @@ -9954,55 +9939,55 @@ declare module DevExpress.ui { /** * [descr:_ui_context_menu_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo< + export type HiddenEvent = DevExpress.common.EventInfo< dxContextMenu >; /** * [descr:_ui_context_menu_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo>; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo>; /** * [descr:_ui_context_menu_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo>; + DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_context_menu_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxContextMenu, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_context_menu_ItemContextMenuEvent] */ export type ItemContextMenuEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxContextMenu, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_context_menu_ItemRenderedEvent] */ - export type ItemRenderedEvent = DevExpress.events.EventInfo< + export type ItemRenderedEvent = DevExpress.common.EventInfo< dxContextMenu > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_context_menu_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo< + export type OptionChangedEvent = DevExpress.common.EventInfo< dxContextMenu > & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_context_menu_PositioningEvent] */ export type PositioningEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxContextMenu, MouseEvent | PointerEvent | TouchEvent > & { @@ -10015,19 +10000,19 @@ declare module DevExpress.ui { /** * [descr:_ui_context_menu_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo< + export type SelectionChangedEvent = DevExpress.common.EventInfo< dxContextMenu > & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_context_menu_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo>; + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo>; /** * [descr:_ui_context_menu_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo< + export type ShownEvent = DevExpress.common.EventInfo< dxContextMenu >; } @@ -10054,14 +10039,14 @@ declare module DevExpress.ui { closeOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); /** * [descr:dxContextMenuOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.common.DataSourceLike< DevExpress.ui.dxContextMenu.Item, TKey > | null; @@ -10071,7 +10056,7 @@ declare module DevExpress.ui { hideOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -10259,7 +10244,7 @@ declare module DevExpress.ui { ): DevExpress.core.DxElement | undefined; getCombinedFilter(): any; getCombinedFilter(returnDataField: boolean): any; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; getKeyByRowIndex(rowIndex: number): TKey | undefined; getRowElement( rowIndex: number @@ -10304,7 +10289,7 @@ declare module DevExpress.ui { export type AdaptiveDetailRowPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.AdaptiveDetailRowPreparingInfo; /** * [descr:_ui_data_grid_CellClickEvent] @@ -10312,7 +10297,7 @@ declare module DevExpress.ui { export type CellClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -10367,7 +10352,7 @@ declare module DevExpress.ui { export type CellDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -10422,7 +10407,7 @@ declare module DevExpress.ui { export type CellHoverChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_CellHoverChangedEvent.eventType] */ @@ -10478,7 +10463,7 @@ declare module DevExpress.ui { export type CellPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_CellPreparedEvent.data] */ @@ -10569,7 +10554,7 @@ declare module DevExpress.ui { export type ColumnButtonClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -10645,14 +10630,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_data_grid_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_ContextMenuPreparingEvent.items] */ @@ -10696,7 +10681,7 @@ declare module DevExpress.ui { export type DataErrorOccurredEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataErrorOccurredInfo; export type DataGridCommandColumnType = | 'adaptive' @@ -10738,7 +10723,7 @@ declare module DevExpress.ui { export type DisposingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -10753,7 +10738,7 @@ declare module DevExpress.ui { export type EditCanceledEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_data_grid_EditCancelingEvent] @@ -10761,8 +10746,8 @@ declare module DevExpress.ui { export type EditCancelingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:dxDataGridEditing] @@ -10816,8 +10801,8 @@ declare module DevExpress.ui { export type EditingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_EditingStartEvent.data] */ @@ -10838,7 +10823,7 @@ declare module DevExpress.ui { export type EditorPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_EditorPreparedEvent.parentType] */ @@ -10890,7 +10875,7 @@ declare module DevExpress.ui { export type EditorPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_EditorPreparingEvent.parentType] */ @@ -11063,8 +11048,8 @@ declare module DevExpress.ui { export type ExportingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_ExportingEvent.fileName] */ @@ -11107,7 +11092,7 @@ declare module DevExpress.ui { export type FocusedCellChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_FocusedCellChangedEvent.cellElement] */ @@ -11135,8 +11120,8 @@ declare module DevExpress.ui { export type FocusedCellChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxDataGrid, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -11179,7 +11164,7 @@ declare module DevExpress.ui { export type FocusedRowChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_FocusedRowChangedEvent.rowElement] */ @@ -11199,8 +11184,8 @@ declare module DevExpress.ui { export type FocusedRowChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxDataGrid, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -11325,14 +11310,14 @@ declare module DevExpress.ui { export type InitializedEvent< TRowData = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_data_grid_InitNewRowEvent] */ export type InitNewRowEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.NewRowInfo; /** * [descr:_ui_data_grid_KeyDownEvent] @@ -11340,7 +11325,7 @@ declare module DevExpress.ui { export type KeyDownEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, KeyboardEvent > & @@ -11361,7 +11346,7 @@ declare module DevExpress.ui { * [descr:dxDataGridOptions.masterDetail.template] */ template?: - | DevExpress.core.template + | template | (( detailElement: DevExpress.core.DxElement, detailInfo: MasterDetailTemplateData @@ -11378,8 +11363,8 @@ declare module DevExpress.ui { export type OptionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -11473,7 +11458,7 @@ declare module DevExpress.ui { export type RowClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -11532,7 +11517,7 @@ declare module DevExpress.ui { export type RowCollapsedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowCollapsingEvent] @@ -11540,8 +11525,8 @@ declare module DevExpress.ui { export type RowCollapsingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowDblClickEvent] @@ -11549,7 +11534,7 @@ declare module DevExpress.ui { export type RowDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -11611,21 +11596,21 @@ declare module DevExpress.ui { export type RowDraggingChangeEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingEndEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingMoveEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; @@ -11643,7 +11628,7 @@ declare module DevExpress.ui { export type RowDraggingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.DragStartEventInfo; /** @@ -11652,7 +11637,7 @@ declare module DevExpress.ui { export type RowExpandedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowExpandingEvent] @@ -11660,8 +11645,8 @@ declare module DevExpress.ui { export type RowExpandingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowInsertedEvent] @@ -11669,7 +11654,7 @@ declare module DevExpress.ui { export type RowInsertedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowInsertedInfo; /** * [descr:_ui_data_grid_RowInsertingEvent] @@ -11677,7 +11662,7 @@ declare module DevExpress.ui { export type RowInsertingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowInsertingInfo; /** * [descr:_ui_data_grid_RowPreparedEvent] @@ -11685,7 +11670,7 @@ declare module DevExpress.ui { export type RowPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_data_grid_RowPreparedEvent.data] */ @@ -11737,7 +11722,7 @@ declare module DevExpress.ui { export type RowRemovedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowRemovedInfo; /** * [descr:_ui_data_grid_RowRemovingEvent] @@ -11745,7 +11730,7 @@ declare module DevExpress.ui { export type RowRemovingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowRemovingInfo; export type RowTemplateData = { readonly key: TKey; @@ -11765,7 +11750,7 @@ declare module DevExpress.ui { export type RowUpdatedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowUpdatedInfo; /** * [descr:_ui_data_grid_RowUpdatingEvent] @@ -11773,7 +11758,7 @@ declare module DevExpress.ui { export type RowUpdatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowUpdatingInfo; /** * [descr:_ui_data_grid_RowValidatingEvent] @@ -11781,7 +11766,7 @@ declare module DevExpress.ui { export type RowValidatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowValidatingInfo; /** * [descr:_ui_data_grid_SavedEvent] @@ -11789,7 +11774,7 @@ declare module DevExpress.ui { export type SavedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_data_grid_SavingEvent] @@ -11797,7 +11782,7 @@ declare module DevExpress.ui { export type SavingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.SavingInfo; /** * [descr:dxDataGridScrolling] @@ -11842,7 +11827,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.SelectionChangedInfo; export type SelectionSensitivity = 'base' | 'accent' | 'case' | 'variant'; /** @@ -12034,7 +12019,7 @@ declare module DevExpress.ui { export type ToolbarPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.ToolbarPreparingInfo; } /** @@ -12072,7 +12057,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.cellTemplate] */ cellTemplate?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnCellTemplateData< @@ -12090,7 +12075,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.editCellTemplate] */ editCellTemplate?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnEditCellTemplateData< @@ -12102,7 +12087,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.groupCellTemplate] */ groupCellTemplate?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnGroupCellTemplateData< @@ -12118,7 +12103,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.headerCellTemplate] */ headerCellTemplate?: - | DevExpress.core.template + | template | (( columnHeader: DevExpress.core.DxElement, headerInfo: DevExpress.ui.dxDataGrid.ColumnHeaderCellTemplateData< @@ -12155,7 +12140,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumnButton.template] */ template?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnButtonTemplateData< @@ -12365,7 +12350,7 @@ declare module DevExpress.ui { * @deprecated [depNote:dxDataGridOptions.rowTemplate] */ rowTemplate?: - | DevExpress.core.template + | template | (( rowElement: DevExpress.core.DxElement, rowInfo: DevExpress.ui.dxDataGrid.RowTemplateData @@ -12374,7 +12359,7 @@ declare module DevExpress.ui { * [descr:dxDataGridOptions.dataRowTemplate] */ dataRowTemplate?: - | DevExpress.core.template + | template | (( rowElement: DevExpress.core.DxElement, rowInfo: DevExpress.ui.dxDataGrid.DataRowTemplateData @@ -12427,29 +12412,29 @@ declare module DevExpress.ui { /** * [descr:_ui_date_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxDateBox, Event >; /** * [descr:_ui_date_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxDateBox, ClipboardEvent >; /** * [descr:_ui_date_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxDateBox, ClipboardEvent >; @@ -12460,27 +12445,27 @@ declare module DevExpress.ui { /** * [descr:_ui_date_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_date_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxDateBox, KeyboardEvent >; /** * [descr:_ui_date_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxDateBox, FocusEvent >; /** * [descr:_ui_date_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxDateBox, FocusEvent >; @@ -12488,45 +12473,45 @@ declare module DevExpress.ui { * [descr:_ui_date_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_date_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxDateBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_date_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxDateBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxDateBox, KeyboardEvent >; /** * [descr:_ui_date_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxDateBox, KeyboardEvent >; /** * [descr:_ui_date_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_date_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxDateBox, ClipboardEvent >; @@ -12534,7 +12519,7 @@ declare module DevExpress.ui { /** * [descr:_ui_date_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxDateBox, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -12630,53 +12615,53 @@ declare module DevExpress.ui { /** * [descr:_ui_date_range_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo; + export type ChangeEvent = DevExpress.common.NativeEventInfo; /** * [descr:_ui_date_range_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_range_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_range_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, ClipboardEvent >; /** * [descr:_ui_date_range_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, ClipboardEvent >; /** * [descr:_ui_date_range_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_date_range_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; /** * [descr:_ui_date_range_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, FocusEvent >; /** * [descr:_ui_date_range_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, FocusEvent >; @@ -12684,46 +12669,46 @@ declare module DevExpress.ui { * [descr:_ui_date_range_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_date_range_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_date_range_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; /** * [descr:_ui_date_range_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; /** * [descr:_ui_date_range_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_date_range_box_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_date_range_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, ClipboardEvent >; @@ -12818,7 +12803,7 @@ declare module DevExpress.ui { /** * [descr:_ui_date_range_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxDateRangeBox, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -12833,31 +12818,31 @@ declare module DevExpress.ui { * [descr:_ui_defer_rendering_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_defer_rendering_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_defer_rendering_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_defer_rendering_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxDeferRenderingOptions; /** * [descr:_ui_defer_rendering_RenderedEvent] */ - export type RenderedEvent = DevExpress.events.EventInfo; + export type RenderedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_defer_rendering_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; } /** * [descr:dxDeferRenderingOptions] @@ -12898,11 +12883,11 @@ declare module DevExpress.ui { /** * [descr:dxDiagram.getNodeDataSource()] */ - getNodeDataSource(): DevExpress.data.DataSource; + getNodeDataSource(): DevExpress.common.DataSource; /** * [descr:dxDiagram.getEdgeDataSource()] */ - getEdgeDataSource(): DevExpress.data.DataSource; + getEdgeDataSource(): DevExpress.common.DataSource; /** * [descr:dxDiagram.getItemByKey(key)] */ @@ -12959,7 +12944,7 @@ declare module DevExpress.ui { /** * [descr:_ui_diagram_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_diagram_CustomCommandEvent] */ @@ -12986,16 +12971,16 @@ declare module DevExpress.ui { /** * [descr:_ui_diagram_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_diagram_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_diagram_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.EventInfo & { + export type ItemClickEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_diagram_ItemClickEvent.item] */ @@ -13004,7 +12989,7 @@ declare module DevExpress.ui { /** * [descr:_ui_diagram_ItemDblClickEvent] */ - export type ItemDblClickEvent = DevExpress.events.EventInfo & { + export type ItemDblClickEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_diagram_ItemDblClickEvent.item] */ @@ -13013,14 +12998,14 @@ declare module DevExpress.ui { /** * [descr:_ui_diagram_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxDiagramOptions; /** * [descr:_ui_diagram_RequestEditOperationEvent] */ export type RequestEditOperationEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_diagram_RequestEditOperationEvent.operation] */ @@ -13060,7 +13045,7 @@ declare module DevExpress.ui { * [descr:_ui_diagram_RequestLayoutUpdateEvent] */ export type RequestLayoutUpdateEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_diagram_RequestLayoutUpdateEvent.changes] */ @@ -13074,7 +13059,7 @@ declare module DevExpress.ui { * [descr:_ui_diagram_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_diagram_SelectionChangedEvent.items] */ @@ -13420,7 +13405,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapeTemplate] */ customShapeTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeTemplateData @@ -13429,7 +13414,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapeToolboxTemplate] */ customShapeToolboxTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeToolboxTemplateData @@ -13551,7 +13536,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapes.template] */ template?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeTemplateData @@ -13596,7 +13581,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapes.toolboxTemplate] */ toolboxTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeToolboxTemplateData @@ -13703,7 +13688,7 @@ declare module DevExpress.ui { /** * [descr:dxDiagramOptions.edges.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxDiagramOptions.edges.fromExpr] */ @@ -13833,7 +13818,7 @@ declare module DevExpress.ui { /** * [descr:dxDiagramOptions.nodes.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxDiagramOptions.nodes.heightExpr] */ @@ -14240,12 +14225,12 @@ declare module DevExpress.ui { /** * [descr:_ui_draggable_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_draggable_DragEndEvent] */ - export type DragEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragEndEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxDraggable, PointerEvent | MouseEvent | TouchEvent > & { @@ -14277,8 +14262,8 @@ declare module DevExpress.ui { /** * [descr:_ui_draggable_DragMoveEvent] */ - export type DragMoveEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragMoveEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxDraggable, PointerEvent | MouseEvent | TouchEvent > & { @@ -14310,8 +14295,8 @@ declare module DevExpress.ui { /** * [descr:_ui_draggable_DragStartEvent] */ - export type DragStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragStartEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxDraggable, PointerEvent | MouseEvent | TouchEvent > & { @@ -14336,12 +14321,12 @@ declare module DevExpress.ui { * [descr:_ui_draggable_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_draggable_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxDraggableOptions; } /** @@ -14359,7 +14344,7 @@ declare module DevExpress.ui { * [descr:dxDraggableOptions.dragTemplate] */ dragTemplate?: - | DevExpress.core.template + | template | (( dragInfo: DevExpress.ui.dxDraggable.DragTemplateData, containerElement: DevExpress.core.DxElement @@ -14403,18 +14388,18 @@ declare module DevExpress.ui { /** * [descr:_ui_drawer_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_drawer_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; export type OpenedStateMode = 'overlap' | 'shrink' | 'push'; /** * [descr:_ui_drawer_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type PanelLocation = | 'left' | 'right' @@ -14445,7 +14430,7 @@ declare module DevExpress.ui { closeOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -14480,28 +14465,26 @@ declare module DevExpress.ui { /** * [descr:dxDrawerOptions.template] */ - template?: - | DevExpress.core.template - | ((Element: DevExpress.core.DxElement) => any); + template?: template | ((Element: DevExpress.core.DxElement) => any); } /** * [descr:dxDropDownBox] */ export class dxDropDownBox extends dxDropDownEditor { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module dxDropDownBox { /** * [descr:_ui_drop_down_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, Event >; /** * [descr:_ui_drop_down_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; export type ContentTemplateData = { component: dxDropDownBox; readonly value?: any; @@ -14509,41 +14492,41 @@ declare module DevExpress.ui { /** * [descr:_ui_drop_down_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, ClipboardEvent >; /** * [descr:_ui_drop_down_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, ClipboardEvent >; /** * [descr:_ui_drop_down_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_drop_down_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, KeyboardEvent >; /** * [descr:_ui_drop_down_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, FocusEvent >; /** * [descr:_ui_drop_down_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, FocusEvent >; @@ -14551,46 +14534,46 @@ declare module DevExpress.ui { * [descr:_ui_drop_down_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_drop_down_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_drop_down_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, KeyboardEvent >; /** * [descr:_ui_drop_down_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, KeyboardEvent >; /** * [descr:_ui_drop_down_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_drop_down_box_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_drop_down_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, ClipboardEvent >; @@ -14598,7 +14581,7 @@ declare module DevExpress.ui { /** * [descr:_ui_drop_down_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxDropDownBox, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -14620,7 +14603,7 @@ declare module DevExpress.ui { * [descr:dxDropDownBoxOptions.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( templateData: DevExpress.ui.dxDropDownBox.ContentTemplateData, contentElement: DevExpress.core.DxElement @@ -14628,7 +14611,7 @@ declare module DevExpress.ui { /** * [descr:dxDropDownBoxOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxDropDownBoxOptions.displayValueFormatter] */ @@ -14637,7 +14620,7 @@ declare module DevExpress.ui { * [descr:dxDropDownBoxOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | template | (( value: any, fieldElement: DevExpress.core.DxElement @@ -14668,7 +14651,7 @@ declare module DevExpress.ui { * [descr:dxDropDownButton.close()] */ close(): DevExpress.core.utils.DxPromise; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxDropDownButton.open()] */ @@ -14686,7 +14669,7 @@ declare module DevExpress.ui { /** * [descr:_ui_drop_down_button_ButtonClickEvent] */ - export type ButtonClickEvent = DevExpress.events.NativeEventInfo< + export type ButtonClickEvent = DevExpress.common.NativeEventInfo< dxDropDownButton, KeyboardEvent | MouseEvent | PointerEvent > & { @@ -14699,20 +14682,20 @@ declare module DevExpress.ui { * [descr:_ui_drop_down_button_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_drop_down_button_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_drop_down_button_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_drop_down_button_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxDropDownButton, KeyboardEvent | MouseEvent | PointerEvent > & { @@ -14729,14 +14712,14 @@ declare module DevExpress.ui { * [descr:_ui_drop_down_button_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxDropDownButtonOptions; /** * [descr:_ui_drop_down_button_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_drop_down_button_SelectionChangedEvent.item] */ @@ -14769,7 +14752,7 @@ declare module DevExpress.ui { /** * [descr:dxDropDownButtonOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.common.DataSourceLike< DevExpress.ui.dxDropDownButton.Item | any > | null; /** @@ -14784,9 +14767,9 @@ declare module DevExpress.ui { * [descr:dxDropDownButtonOptions.dropDownContentTemplate] */ dropDownContentTemplate?: - | DevExpress.core.template + | template | (( - data: Array | DevExpress.data.DataSource, + data: Array | DevExpress.common.DataSource, contentElement: DevExpress.core.DxElement ) => string | DevExpress.core.UserDefinedElement); /** @@ -14809,7 +14792,7 @@ declare module DevExpress.ui { * [descr:dxDropDownButtonOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -14873,7 +14856,7 @@ declare module DevExpress.ui { * [descr:dxDropDownButtonOptions.template] */ template?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxButton.TemplateData, contentElement: DevExpress.core.DxElement @@ -14970,7 +14953,7 @@ declare module DevExpress.ui { * [descr:dxDropDownEditorOptions.dropDownButtonTemplate] */ dropDownButtonTemplate?: - | DevExpress.core.template + | template | (( buttonData: DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel, contentElement: DevExpress.core.DxElement @@ -14978,11 +14961,11 @@ declare module DevExpress.ui { /** * [descr:dxDropDownEditorOptions.onClosed] */ - onClosed?: (e: DevExpress.events.EventInfo) => void; + onClosed?: (e: DevExpress.common.EventInfo) => void; /** * [descr:dxDropDownEditorOptions.onOpened] */ - onOpened?: (e: DevExpress.events.EventInfo) => void; + onOpened?: (e: DevExpress.common.EventInfo) => void; /** * [descr:dxDropDownEditorOptions.openOnFieldClick] */ @@ -15013,7 +14996,7 @@ declare module DevExpress.ui { export class dxDropDownList< TProperties > extends dxDropDownEditor { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module dxDropDownList { /** @@ -15042,7 +15025,7 @@ declare module DevExpress.ui { * [descr:dxDropDownListOptions.groupTemplate] */ groupTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -15064,24 +15047,24 @@ declare module DevExpress.ui { * [descr:dxDropDownListOptions.onItemClick] */ onItemClick?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo + DevExpress.common.ItemInfo ) => void; /** * [descr:dxDropDownListOptions.onSelectionChanged] */ onSelectionChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.ui.dxDropDownList.SelectionChangedInfo ) => void; /** * [descr:dxDropDownListOptions.onValueChanged] */ onValueChanged?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -15167,11 +15150,11 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_file_manager_ContextMenuItemClickEvent] */ - export type ContextMenuItemClickEvent = DevExpress.events.NativeEventInfo< + export type ContextMenuItemClickEvent = DevExpress.common.NativeEventInfo< dxFileManager, KeyboardEvent | PointerEvent | MouseEvent > & { @@ -15199,8 +15182,8 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ContextMenuShowingEvent] */ - export type ContextMenuShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ContextMenuShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxFileManager, KeyboardEvent | PointerEvent | MouseEvent > & { @@ -15221,7 +15204,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_CurrentDirectoryChangedEvent] */ export type CurrentDirectoryChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_CurrentDirectoryChangedEvent.directory] */ @@ -15231,7 +15214,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_DirectoryCreatedEvent] */ export type DirectoryCreatedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_DirectoryCreatedEvent.parentDirectory] */ @@ -15245,7 +15228,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_DirectoryCreatingEvent] */ export type DirectoryCreatingEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_DirectoryCreatingEvent.parentDirectory] @@ -15259,12 +15242,12 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_file_manager_ErrorOccurredEvent] */ export type ErrorOccurredEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_ErrorOccurredEvent.errorCode] */ @@ -15312,7 +15295,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_FileUploadedEvent] */ export type FileUploadedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_FileUploadedEvent.fileData] */ @@ -15326,7 +15309,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_FileUploadingEvent] */ export type FileUploadingEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_FileUploadingEvent.fileData] @@ -15341,7 +15324,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_FocusedItemChangedEvent] */ export type FocusedItemChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_FocusedItemChangedEvent.item] */ @@ -15355,11 +15338,11 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_file_manager_ItemCopiedEvent] */ - export type ItemCopiedEvent = DevExpress.events.EventInfo & { + export type ItemCopiedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_ItemCopiedEvent.sourceItem] */ @@ -15380,7 +15363,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemCopyingEvent] */ - export type ItemCopyingEvent = DevExpress.events.EventInfo & + export type ItemCopyingEvent = DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_ItemCopyingEvent.item] @@ -15395,7 +15378,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_ItemDeletedEvent] */ export type ItemDeletedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_ItemDeletedEvent.item] */ @@ -15404,7 +15387,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemDeletingEvent] */ - export type ItemDeletingEvent = DevExpress.events.EventInfo & + export type ItemDeletingEvent = DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_ItemDeletingEvent.item] @@ -15415,7 +15398,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_ItemDownloadingEvent] */ export type ItemDownloadingEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_ItemDownloadingEvent.item] @@ -15425,7 +15408,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemMovedEvent] */ - export type ItemMovedEvent = DevExpress.events.EventInfo & { + export type ItemMovedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_ItemMovedEvent.sourceItem] */ @@ -15446,7 +15429,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemMovingEvent] */ - export type ItemMovingEvent = DevExpress.events.EventInfo & + export type ItemMovingEvent = DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_ItemMovingEvent.item] @@ -15461,7 +15444,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_ItemRenamedEvent] */ export type ItemRenamedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_ItemRenamedEvent.sourceItem] */ @@ -15474,7 +15457,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemRenamingEvent] */ - export type ItemRenamingEvent = DevExpress.events.EventInfo & + export type ItemRenamingEvent = DevExpress.common.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_ItemRenamingEvent.item] @@ -15489,14 +15472,14 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxFileManagerOptions; /** * [descr:_ui_file_manager_SelectedFileOpenedEvent] */ export type SelectedFileOpenedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_SelectedFileOpenedEvent.file] */ @@ -15506,7 +15489,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_manager_SelectionChangedEvent.currentSelectedItemKeys] */ @@ -15527,7 +15510,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ToolbarItemClickEvent] */ - export type ToolbarItemClickEvent = DevExpress.events.NativeEventInfo< + export type ToolbarItemClickEvent = DevExpress.common.NativeEventInfo< dxFileManager, PointerEvent | MouseEvent > & { @@ -15581,9 +15564,7 @@ declare module DevExpress.ui { /** * [descr:dxFileManagerContextMenuItem.template] */ - template?: - | DevExpress.core.template - | (() => string | DevExpress.core.UserDefinedElement); + template?: template | (() => string | DevExpress.core.UserDefinedElement); } /** * [descr:dxFileManagerDetailsColumn] @@ -15938,14 +15919,12 @@ declare module DevExpress.ui { /** * [descr:dxFileManagerToolbarItem.template] */ - template?: - | DevExpress.core.template - | (() => string | DevExpress.core.UserDefinedElement); + template?: template | (() => string | DevExpress.core.UserDefinedElement); /** * [descr:dxFileManagerToolbarItem.menuItemTemplate] */ menuItemTemplate?: - | DevExpress.core.template + | template | (() => string | DevExpress.core.UserDefinedElement); } /** @@ -15994,7 +15973,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_BeforeSendEvent] */ export type BeforeSendEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_file_uploader_BeforeSendEvent.request] */ @@ -16011,15 +15990,15 @@ declare module DevExpress.ui { /** * [descr:_ui_file_uploader_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_file_uploader_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_file_uploader_DropZoneEnterEvent] */ - export type DropZoneEnterEvent = DevExpress.events.NativeEventInfo< + export type DropZoneEnterEvent = DevExpress.common.NativeEventInfo< dxFileUploader, PointerEvent | MouseEvent > & { @@ -16031,7 +16010,7 @@ declare module DevExpress.ui { /** * [descr:_ui_file_uploader_DropZoneLeaveEvent] */ - export type DropZoneLeaveEvent = DevExpress.events.NativeEventInfo< + export type DropZoneLeaveEvent = DevExpress.common.NativeEventInfo< dxFileUploader, PointerEvent | MouseEvent > & { @@ -16044,24 +16023,24 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_FilesUploadedEvent] */ export type FilesUploadedEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; export type FileUploadMode = 'instantly' | 'useButtons' | 'useForm'; /** * [descr:_ui_file_uploader_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_file_uploader_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_file_uploader_ProgressEvent] */ export type ProgressEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_ProgressEvent.file] */ @@ -16088,7 +16067,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadAbortedEvent] */ export type UploadAbortedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadAbortedEvent.file] */ @@ -16106,7 +16085,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadedEvent] */ export type UploadedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadedEvent.file] */ @@ -16124,7 +16103,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadErrorEvent] */ export type UploadErrorEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadErrorEvent.file] */ @@ -16147,7 +16126,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadStartedEvent] */ export type UploadStartedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadStartedEvent.file] */ @@ -16161,7 +16140,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_ValueChangedEvent] */ export type ValueChangedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_file_uploader_ValueChangedEvent.value] */ @@ -16390,7 +16369,7 @@ declare module DevExpress.ui { * [descr:_ui_filter_builder_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; export type CustomOperation = dxFilterBuilderCustomOperation; export type CustomOperationEditorTemplate = { readonly value?: string | number | Date; @@ -16400,12 +16379,12 @@ declare module DevExpress.ui { /** * [descr:_ui_filter_builder_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_filter_builder_EditorPreparedEvent] */ export type EditorPreparedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_filter_builder_EditorPreparedEvent.value] */ @@ -16454,8 +16433,8 @@ declare module DevExpress.ui { /** * [descr:_ui_filter_builder_EditorPreparingEvent] */ - export type EditorPreparingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type EditorPreparingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_filter_builder_EditorPreparingEvent.value] */ @@ -16532,27 +16511,27 @@ declare module DevExpress.ui { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export type FilterLookupDataSource = Exclude< - DevExpress.data.DataSource.DataSourceLike, - string | DevExpress.data.DataSource + DevExpress.common.DataSourceLike, + string | DevExpress.common.DataSource >; export type GroupOperation = 'and' | 'or' | 'notAnd' | 'notOr'; /** * [descr:_ui_filter_builder_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_filter_builder_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxFilterBuilderOptions; /** * [descr:_ui_filter_builder_ValueChangedEvent] */ export type ValueChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_filter_builder_ValueChangedEvent.value] */ @@ -16595,7 +16574,7 @@ declare module DevExpress.ui { * [descr:dxFilterBuilderCustomOperation.editorTemplate] */ editorTemplate?: - | DevExpress.core.template + | template | (( conditionInfo: DevExpress.ui.dxFilterBuilder.CustomOperationEditorTemplate, container: DevExpress.core.DxElement @@ -16652,7 +16631,7 @@ declare module DevExpress.ui { * [descr:dxFilterBuilderField.editorTemplate] */ editorTemplate?: - | DevExpress.core.template + | template | (( conditionInfo: DevExpress.ui.dxFilterBuilder.FieldEditorTemplate, container: DevExpress.core.DxElement @@ -16893,15 +16872,15 @@ declare module DevExpress.ui { /** * [descr:_ui_form_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_form_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_form_EditorEnterKeyEvent] */ - export type EditorEnterKeyEvent = DevExpress.events.EventInfo & { + export type EditorEnterKeyEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_form_EditorEnterKeyEvent.dataField] */ @@ -16910,7 +16889,7 @@ declare module DevExpress.ui { /** * [descr:_ui_form_FieldDataChangedEvent] */ - export type FieldDataChangedEvent = DevExpress.events.EventInfo & { + export type FieldDataChangedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_form_FieldDataChangedEvent.dataField] */ @@ -16959,13 +16938,13 @@ declare module DevExpress.ui { * [descr:_ui_form_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; export type LabelLocation = 'left' | 'right' | 'top'; /** * [descr:_ui_form_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxFormOptions; export type SimpleItemLabelTemplateData = SimpleItemTemplateData & { text: string; @@ -17067,7 +17046,7 @@ declare module DevExpress.ui { * [descr:dxFormGroupItem.captionTemplate] */ captionTemplate?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxForm.GroupCaptionTemplateData, itemElement: DevExpress.core.DxElement @@ -17104,7 +17083,7 @@ declare module DevExpress.ui { * [descr:dxFormGroupItem.template] */ template?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxForm.GroupItemTemplateData, itemElement: DevExpress.core.DxElement @@ -17280,7 +17259,7 @@ declare module DevExpress.ui { * [descr:dxFormSimpleItem.label.template] */ template?: - | DevExpress.core.template + | template | (( itemData: DevExpress.ui.dxForm.SimpleItemLabelTemplateData, itemElement: DevExpress.core.DxElement @@ -17302,7 +17281,7 @@ declare module DevExpress.ui { * [descr:dxFormSimpleItem.template] */ template?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxForm.SimpleItemTemplateData, itemElement: DevExpress.core.DxElement @@ -17391,7 +17370,7 @@ declare module DevExpress.ui { * [descr:dxFormTabbedItem.tabs.tabTemplate] */ tabTemplate?: - | DevExpress.core.template + | template | (( tabData: any, tabIndex: number, @@ -17402,7 +17381,7 @@ declare module DevExpress.ui { * [descr:dxFormTabbedItem.tabs.template] */ template?: - | DevExpress.core.template + | template | (( tabData: any, tabIndex: number, @@ -17453,14 +17432,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_gallery_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -17479,40 +17458,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_gallery_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxGallery, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_gallery_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxGallery, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_gallery_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxGallery, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -17523,16 +17502,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_gallery_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -17543,7 +17522,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -17579,7 +17558,7 @@ declare module DevExpress.ui { /** * [descr:dxGalleryOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxGalleryOptions.focusStateEnabled] */ @@ -17782,11 +17761,11 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_gantt_ContextMenuPreparingEvent] */ - export type ContextMenuPreparingEvent = DevExpress.events.Cancelable & { + export type ContextMenuPreparingEvent = DevExpress.common.Cancelable & { /** * [descr:_ui_gantt_ContextMenuPreparingEvent.component] */ @@ -17798,7 +17777,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ContextMenuPreparingEvent.event] */ - readonly event?: DevExpress.events.DxEvent< + readonly event?: DevExpress.common.DxEvent< PointerEvent | MouseEvent | TouchEvent >; /** @@ -17839,7 +17818,7 @@ declare module DevExpress.ui { * [descr:_ui_gantt_DependencyDeletedEvent] */ export type DependencyDeletedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_DependencyDeletedEvent.values] */ @@ -17852,8 +17831,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_DependencyDeletingEvent] */ - export type DependencyDeletingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type DependencyDeletingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_DependencyDeletingEvent.values] */ @@ -17867,7 +17846,7 @@ declare module DevExpress.ui { * [descr:_ui_gantt_DependencyInsertedEvent] */ export type DependencyInsertedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_DependencyInsertedEvent.values] */ @@ -17880,8 +17859,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_DependencyInsertingEvent] */ - export type DependencyInsertingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type DependencyInsertingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_DependencyInsertingEvent.values] */ @@ -17890,7 +17869,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -17960,12 +17939,12 @@ declare module DevExpress.ui { * [descr:_ui_gantt_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_gantt_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type ProgressTooltipTemplateData = { readonly progress: number; }; @@ -17973,7 +17952,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceAssignedEvent] */ - export type ResourceAssignedEvent = DevExpress.events.EventInfo & { + export type ResourceAssignedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceAssignedEvent.values] */ @@ -17986,8 +17965,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceAssigningEvent] */ - export type ResourceAssigningEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ResourceAssigningEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceAssigningEvent.values] */ @@ -17996,7 +17975,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceDeletedEvent] */ - export type ResourceDeletedEvent = DevExpress.events.EventInfo & { + export type ResourceDeletedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceDeletedEvent.values] */ @@ -18009,8 +17988,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceDeletingEvent] */ - export type ResourceDeletingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ResourceDeletingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceDeletingEvent.values] */ @@ -18023,7 +18002,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceInsertedEvent] */ - export type ResourceInsertedEvent = DevExpress.events.EventInfo & { + export type ResourceInsertedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceInsertedEvent.values] */ @@ -18036,8 +18015,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceInsertingEvent] */ - export type ResourceInsertingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ResourceInsertingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceInsertingEvent.values] */ @@ -18047,8 +18026,8 @@ declare module DevExpress.ui { * [descr:_ui_gantt_ResourceManagerDialogShowingEvent] */ export type ResourceManagerDialogShowingEvent = - DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceManagerDialogShowingEvent.values] */ @@ -18058,7 +18037,7 @@ declare module DevExpress.ui { * [descr:_ui_gantt_ResourceUnassignedEvent] */ export type ResourceUnassignedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceUnassignedEvent.values] */ @@ -18071,8 +18050,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceUnassigningEvent] */ - export type ResourceUnassigningEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ResourceUnassigningEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_ResourceUnassigningEvent.values] */ @@ -18086,7 +18065,7 @@ declare module DevExpress.ui { * [descr:_ui_gantt_ScaleCellPreparedEvent] */ export type ScaleCellPreparedEvent = - DevExpress.events.InitializedEventInfo & { + DevExpress.common.InitializedEventInfo & { /** * [descr:_ui_gantt_ScaleCellPreparedEvent.scaleIndex] */ @@ -18115,7 +18094,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & { + export type SelectionChangedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_SelectionChangedEvent.selectedRowKey] */ @@ -18124,7 +18103,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskClickEvent] */ - export type TaskClickEvent = DevExpress.events.NativeEventInfo< + export type TaskClickEvent = DevExpress.common.NativeEventInfo< dxGantt, PointerEvent | MouseEvent > & { @@ -18149,8 +18128,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskDblClickEvent] */ - export type TaskDblClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type TaskDblClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo & { /** * [descr:_ui_gantt_TaskDblClickEvent.key] */ @@ -18163,7 +18142,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskDeletedEvent] */ - export type TaskDeletedEvent = DevExpress.events.EventInfo & { + export type TaskDeletedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskDeletedEvent.values] */ @@ -18176,8 +18155,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskDeletingEvent] */ - export type TaskDeletingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskDeletingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskDeletingEvent.values] */ @@ -18190,8 +18169,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskEditDialogShowingEvent] */ - export type TaskEditDialogShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskEditDialogShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskEditDialogShowingEvent.values] */ @@ -18212,7 +18191,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskInsertedEvent] */ - export type TaskInsertedEvent = DevExpress.events.EventInfo & { + export type TaskInsertedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskInsertedEvent.values] */ @@ -18225,8 +18204,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskInsertingEvent] */ - export type TaskInsertingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskInsertingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskInsertingEvent.values] */ @@ -18235,8 +18214,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskMovingEvent] */ - export type TaskMovingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskMovingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskMovingEvent.newValues] */ @@ -18253,7 +18232,7 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskUpdatedEvent] */ - export type TaskUpdatedEvent = DevExpress.events.EventInfo & { + export type TaskUpdatedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskUpdatedEvent.values] */ @@ -18266,8 +18245,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskUpdatingEvent] */ - export type TaskUpdatingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskUpdatingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_gantt_TaskUpdatingEvent.newValues] */ @@ -18611,7 +18590,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.dependencies.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxGanttOptions.dependencies.keyExpr] */ @@ -18851,7 +18830,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.resourceAssignments.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxGanttOptions.resourceAssignments.keyExpr] */ @@ -18876,7 +18855,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.resources.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxGanttOptions.resources.keyExpr] */ @@ -18942,7 +18921,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.tasks.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxGanttOptions.tasks.endExpr] */ @@ -18984,7 +18963,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskTooltipContentTemplate] */ taskTooltipContentTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, task: any @@ -18993,7 +18972,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskTimeTooltipContentTemplate] */ taskTimeTooltipContentTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, item: DevExpress.ui.dxGantt.TimeTooltipTemplateData @@ -19002,7 +18981,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskProgressTooltipContentTemplate] */ taskProgressTooltipContentTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, item: DevExpress.ui.dxGantt.ProgressTooltipTemplateData @@ -19011,7 +18990,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskContentTemplate] */ taskContentTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, item: DevExpress.ui.dxGantt.TaskContentTemplateData @@ -19231,22 +19210,22 @@ declare module DevExpress.ui { /** * [descr:_ui_html_editor_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_html_editor_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_html_editor_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxHtmlEditor, FocusEvent >; /** * [descr:_ui_html_editor_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxHtmlEditor, FocusEvent >; @@ -19350,7 +19329,7 @@ declare module DevExpress.ui { * [descr:_ui_html_editor_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; export interface MentionTemplateData { readonly marker: string; readonly id?: string | number; @@ -19359,13 +19338,13 @@ declare module DevExpress.ui { /** * [descr:_ui_html_editor_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxHtmlEditorOptions; /** * [descr:_ui_html_editor_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxHtmlEditor, KeyboardEvent | ClipboardEvent | Event > & @@ -19432,7 +19411,7 @@ declare module DevExpress.ui { /** * [descr:dxHtmlEditorMention.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxHtmlEditorMention.displayExpr] */ @@ -19441,7 +19420,7 @@ declare module DevExpress.ui { * [descr:dxHtmlEditorMention.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -19467,7 +19446,7 @@ declare module DevExpress.ui { * [descr:dxHtmlEditorMention.template] */ template?: - | DevExpress.core.template + | template | (( mentionData: DevExpress.ui.dxHtmlEditor.MentionTemplateData, contentElement: DevExpress.core.DxElement @@ -19663,7 +19642,7 @@ declare module DevExpress.ui { /** * [descr:dxHtmlEditorVariables.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxHtmlEditorVariables.escapeChar] */ @@ -19786,14 +19765,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_list_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -19822,7 +19801,7 @@ declare module DevExpress.ui { export type GroupRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_list_GroupRenderedEvent.groupData] */ @@ -19842,14 +19821,14 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_list_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxList, KeyboardEvent | MouseEvent | PointerEvent > & @@ -19860,7 +19839,7 @@ declare module DevExpress.ui { export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxList, MouseEvent | PointerEvent | TouchEvent > & @@ -19871,7 +19850,7 @@ declare module DevExpress.ui { export type ItemDeletedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & ListItemInfo; + > = DevExpress.common.EventInfo> & ListItemInfo; export type ItemDeleteMode = | 'context' | 'slideButton' @@ -19885,7 +19864,7 @@ declare module DevExpress.ui { export type ItemDeletingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & ListItemInfo & { /** * [descr:_ui_list_ItemDeletingEvent.cancel] @@ -19898,7 +19877,7 @@ declare module DevExpress.ui { export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxList, MouseEvent | PointerEvent | TouchEvent > & @@ -19913,15 +19892,15 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends Item | any = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_list_ItemReorderedEvent] */ export type ItemReorderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & ListItemInfo & { /** * [descr:_ui_list_ItemReorderedEvent.fromIndex] @@ -19938,7 +19917,7 @@ declare module DevExpress.ui { export type ItemSwipeEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxList, MouseEvent | PointerEvent | TouchEvent > & @@ -19973,15 +19952,15 @@ declare module DevExpress.ui { export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_list_PageLoadingEvent] */ export type PageLoadingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type Properties< TItem extends ItemLike = any, TKey = any @@ -19992,14 +19971,14 @@ declare module DevExpress.ui { export type PullRefreshEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_list_ScrollEvent] */ export type ScrollEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo, Event> & + > = DevExpress.common.NativeEventInfo, Event> & ScrollInfo; /** * [descr:ScrollInfo] @@ -20033,7 +20012,7 @@ declare module DevExpress.ui { export type SelectAllValueChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_list_SelectAllValueChangedEvent.value] */ @@ -20045,7 +20024,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_list_SelectionChangingEvent] @@ -20107,7 +20086,7 @@ declare module DevExpress.ui { /** * [descr:dxListOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxListOptions.displayExpr] */ @@ -20120,7 +20099,7 @@ declare module DevExpress.ui { * [descr:dxListOptions.groupTemplate] */ groupTemplate?: - | DevExpress.core.template + | template | (( groupData: any, groupIndex: number, @@ -20315,22 +20294,22 @@ declare module DevExpress.ui { * [descr:_ui_load_indicator_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_load_indicator_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_load_indicator_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_load_indicator_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxLoadIndicatorOptions; } /** @@ -20353,40 +20332,40 @@ declare module DevExpress.ui { /** * [descr:_ui_load_panel_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_load_panel_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_load_panel_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = DevExpress.common.EventInfo; /** * [descr:_ui_load_panel_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_load_panel_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_load_panel_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxLoadPanelOptions; /** * [descr:_ui_load_panel_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_load_panel_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; } /** * [descr:dxLoadPanelAnimation] @@ -20473,50 +20452,50 @@ declare module DevExpress.ui { /** * [descr:_ui_lookup_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_lookup_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_lookup_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_lookup_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_lookup_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxLookup, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_lookup_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_lookup_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_lookup_PageLoadingEvent] */ - export type PageLoadingEvent = DevExpress.events.EventInfo; + export type PageLoadingEvent = DevExpress.common.EventInfo; export type Properties = dxLookupOptions; /** * [descr:_ui_lookup_PullRefreshEvent] */ - export type PullRefreshEvent = DevExpress.events.EventInfo; + export type PullRefreshEvent = DevExpress.common.EventInfo; /** * [descr:_ui_lookup_ScrollEvent] */ - export type ScrollEvent = DevExpress.events.NativeEventInfo< + export type ScrollEvent = DevExpress.common.NativeEventInfo< dxLookup, MouseEvent | Event > & @@ -20524,14 +20503,14 @@ declare module DevExpress.ui { /** * [descr:_ui_lookup_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & + export type SelectionChangedEvent = DevExpress.common.EventInfo & DevExpress.ui.dxDropDownList.SelectionChangedInfo; - export type TitleRenderedEvent = DevExpress.events.EventInfo & + export type TitleRenderedEvent = DevExpress.common.EventInfo & DevExpress.ui.dxPopup.TitleRenderedInfo; /** * [descr:_ui_lookup_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxLookup, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -20567,7 +20546,7 @@ declare module DevExpress.ui { * [descr:dxLookupOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | template | (( selectedItem: any, fieldElement: DevExpress.core.DxElement @@ -20585,7 +20564,7 @@ declare module DevExpress.ui { * [descr:dxLookupOptions.groupTemplate] */ groupTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -20716,25 +20695,25 @@ declare module DevExpress.ui { /** * [descr:_ui_map_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.NativeEventInfo< dxMap, MouseEvent | PointerEvent >; /** * [descr:_ui_map_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_map_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; export type MapProvider = 'azure' | 'bing' | 'google' | 'googleStatic'; export type MapType = 'hybrid' | 'roadmap' | 'satellite'; /** * [descr:_ui_map_MarkerAddedEvent] */ - export type MarkerAddedEvent = DevExpress.events.EventInfo & { + export type MarkerAddedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_map_MarkerAddedEvent.options] */ @@ -20747,7 +20726,7 @@ declare module DevExpress.ui { /** * [descr:_ui_map_MarkerRemovedEvent] */ - export type MarkerRemovedEvent = DevExpress.events.EventInfo & { + export type MarkerRemovedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_map_MarkerRemovedEvent.options] */ @@ -20756,13 +20735,13 @@ declare module DevExpress.ui { /** * [descr:_ui_map_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxMapOptions; /** * [descr:_ui_map_ReadyEvent] */ - export type ReadyEvent = DevExpress.events.EventInfo & { + export type ReadyEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_map_ReadyEvent.originalMap] */ @@ -20771,7 +20750,7 @@ declare module DevExpress.ui { /** * [descr:_ui_map_RouteAddedEvent] */ - export type RouteAddedEvent = DevExpress.events.EventInfo & { + export type RouteAddedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_map_RouteAddedEvent.options] */ @@ -20785,7 +20764,7 @@ declare module DevExpress.ui { /** * [descr:_ui_map_RouteRemovedEvent] */ - export type RouteRemovedEvent = DevExpress.events.EventInfo & { + export type RouteRemovedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_map_RouteRemovedEvent.options] */ @@ -20970,13 +20949,13 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo< + export type ContentReadyEvent = DevExpress.common.EventInfo< dxMenu >; /** * [descr:_ui_menu_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo< + export type DisposingEvent = DevExpress.common.EventInfo< dxMenu >; export type ExplicitTypes = { @@ -20998,31 +20977,31 @@ declare module DevExpress.ui { * [descr:_ui_menu_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo>; + DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_menu_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxMenu, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_menu_ItemContextMenuEvent] */ export type ItemContextMenuEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxMenu, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_menu_ItemRenderedEvent] */ - export type ItemRenderedEvent = DevExpress.events.EventInfo< + export type ItemRenderedEvent = DevExpress.common.EventInfo< dxMenu > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -21063,15 +21042,15 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo< + export type OptionChangedEvent = DevExpress.common.EventInfo< dxMenu > & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.ChangedOptionInfo; export type Properties = dxMenuOptions; /** * [descr:_ui_menu_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo< + export type SelectionChangedEvent = DevExpress.common.EventInfo< dxMenu > & DevExpress.ui.CollectionWidget.SelectionChangeInfo; @@ -21079,7 +21058,7 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_SubmenuHiddenEvent] */ - export type SubmenuHiddenEvent = DevExpress.events.EventInfo< + export type SubmenuHiddenEvent = DevExpress.common.EventInfo< dxMenu > & { /** @@ -21098,8 +21077,8 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_SubmenuHidingEvent] */ - export type SubmenuHidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + export type SubmenuHidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & { /** * [descr:_ui_menu_SubmenuHidingEvent.itemData] */ @@ -21116,7 +21095,7 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_SubmenuShowingEvent] */ - export type SubmenuShowingEvent = DevExpress.events.EventInfo< + export type SubmenuShowingEvent = DevExpress.common.EventInfo< dxMenu > & { /** @@ -21135,7 +21114,7 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_SubmenuShownEvent] */ - export type SubmenuShownEvent = DevExpress.events.EventInfo< + export type SubmenuShownEvent = DevExpress.common.EventInfo< dxMenu > & { /** @@ -21217,7 +21196,7 @@ declare module DevExpress.ui { /** * [descr:dxMenuBaseOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxMenuBaseOptions.items] */ @@ -21288,7 +21267,7 @@ declare module DevExpress.ui { /** * [descr:dxMenuOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.common.DataSourceLike< DevExpress.ui.dxMenu.Item, TKey > | null; @@ -21375,14 +21354,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_multi_view_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -21401,40 +21380,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_multi_view_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxMultiView, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_multi_view_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxMultiView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_multi_view_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxMultiView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -21445,16 +21424,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_multi_view_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -21465,7 +21444,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -21485,7 +21464,7 @@ declare module DevExpress.ui { /** * [descr:dxMultiViewOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxMultiViewOptions.deferRendering] */ @@ -21537,50 +21516,50 @@ declare module DevExpress.ui { /** * [descr:_ui_number_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxNumberBox, Event >; /** * [descr:_ui_number_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_number_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxNumberBox, ClipboardEvent >; /** * [descr:_ui_number_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxNumberBox, ClipboardEvent >; /** * [descr:_ui_number_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_number_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxNumberBox, KeyboardEvent >; /** * [descr:_ui_number_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxNumberBox, FocusEvent >; /** * [descr:_ui_number_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxNumberBox, FocusEvent >; @@ -21588,29 +21567,29 @@ declare module DevExpress.ui { * [descr:_ui_number_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_number_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxNumberBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_number_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxNumberBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxNumberBox, KeyboardEvent >; /** * [descr:_ui_number_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxNumberBox, KeyboardEvent >; @@ -21619,12 +21598,12 @@ declare module DevExpress.ui { /** * [descr:_ui_number_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_number_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxNumberBox, ClipboardEvent >; @@ -21632,7 +21611,7 @@ declare module DevExpress.ui { /** * [descr:_ui_number_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxNumberBox, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event > & @@ -21745,7 +21724,7 @@ declare module DevExpress.ui { closeOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -21753,7 +21732,7 @@ declare module DevExpress.ui { * [descr:dxOverlayOptions.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( contentElement: DevExpress.core.DxElement ) => string | DevExpress.core.UserDefinedElement); @@ -21772,7 +21751,7 @@ declare module DevExpress.ui { hideOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -21803,23 +21782,23 @@ declare module DevExpress.ui { /** * [descr:dxOverlayOptions.onHidden] */ - onHidden?: (e: DevExpress.events.EventInfo) => void; + onHidden?: (e: DevExpress.common.EventInfo) => void; /** * [descr:dxOverlayOptions.onHiding] */ onHiding?: ( - e: DevExpress.events.Cancelable & DevExpress.events.EventInfo + e: DevExpress.common.Cancelable & DevExpress.common.EventInfo ) => void; /** * [descr:dxOverlayOptions.onShowing] */ onShowing?: ( - e: DevExpress.events.Cancelable & DevExpress.events.EventInfo + e: DevExpress.common.Cancelable & DevExpress.common.EventInfo ) => void; /** * [descr:dxOverlayOptions.onShown] */ - onShown?: (e: DevExpress.events.EventInfo) => void; + onShown?: (e: DevExpress.common.EventInfo) => void; /** * [descr:dxOverlayOptions.position] */ @@ -21921,8 +21900,8 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_CellClickEvent] */ - export type CellClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type CellClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxPivotGrid, MouseEvent | PointerEvent > & { @@ -21962,7 +21941,7 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_CellPreparedEvent] */ - export type CellPreparedEvent = DevExpress.events.EventInfo & { + export type CellPreparedEvent = DevExpress.common.EventInfo & { /** * [descr:_ui_pivot_grid_CellPreparedEvent.area] */ @@ -21987,12 +21966,12 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_pivot_grid_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_pivot_grid_ContextMenuPreparingEvent.area] */ @@ -22037,12 +22016,12 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_pivot_grid_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ExportingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_pivot_grid_ExportingEvent.fileName] */ @@ -22052,12 +22031,12 @@ declare module DevExpress.ui { * [descr:_ui_pivot_grid_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_pivot_grid_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type PivotGridDataFieldArea = 'column' | 'row'; export type PivotGridRowHeaderLayout = 'standard' | 'tree'; export type PivotGridTotalDisplayMode = @@ -22093,12 +22072,12 @@ declare module DevExpress.ui { * [descr:_ui_pivot_grid_field_chooser_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_pivot_grid_field_chooser_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_pivot_grid_field_chooser_ContextMenuPreparingEvent.area] */ @@ -22110,7 +22089,7 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_field_chooser_ContextMenuPreparingEvent.event] */ - readonly event?: DevExpress.events.DxEvent; + readonly event?: DevExpress.common.DxEvent; /** * [descr:_ui_pivot_grid_field_chooser_ContextMenuPreparingEvent.items] */ @@ -22120,18 +22099,18 @@ declare module DevExpress.ui { * [descr:_ui_pivot_grid_field_chooser_DisposingEvent] */ export type DisposingEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_pivot_grid_field_chooser_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_pivot_grid_field_chooser_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxPivotGridFieldChooserOptions; } /** @@ -22800,30 +22779,30 @@ declare module DevExpress.ui { /** * [descr:_ui_popover_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_popover_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_popover_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = DevExpress.common.EventInfo; /** * [descr:_ui_popover_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_popover_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_popover_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -22832,16 +22811,16 @@ declare module DevExpress.ui { /** * [descr:_ui_popover_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_popover_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; /** * [descr:_ui_popover_TitleRenderedEvent] */ - export type TitleRenderedEvent = DevExpress.events.EventInfo & + export type TitleRenderedEvent = DevExpress.common.EventInfo & DevExpress.ui.dxPopup.TitleRenderedInfo; } /** @@ -22876,7 +22855,7 @@ declare module DevExpress.ui { closeOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -22906,7 +22885,7 @@ declare module DevExpress.ui { hideOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -22958,39 +22937,39 @@ declare module DevExpress.ui { TProperties = DevExpress.ui.dxPopup.Properties > extends dxOverlay {} module dxPopup { - export type ContentReadyEvent = DevExpress.events.EventInfo; - export type DisposingEvent = DevExpress.events.EventInfo; - export type HiddenEvent = DevExpress.events.EventInfo; - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; + export type HiddenEvent = DevExpress.common.EventInfo; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; export type InitializedEvent = - DevExpress.events.InitializedEventInfo; - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.InitializedEventInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ interface PopupInstance extends dxPopup {} export type Properties = dxPopupOptions; - export type ResizeEndEvent = DevExpress.events.NativeEventInfo< + export type ResizeEndEvent = DevExpress.common.NativeEventInfo< dxPopup, MouseEvent | TouchEvent > & DevExpress.ui.dxResizable.ResizeInfo; - export type ResizeEvent = DevExpress.events.NativeEventInfo< + export type ResizeEvent = DevExpress.common.NativeEventInfo< dxPopup, MouseEvent | TouchEvent > & DevExpress.ui.dxResizable.ResizeInfo; - export type ResizeStartEvent = DevExpress.events.NativeEventInfo< + export type ResizeStartEvent = DevExpress.common.NativeEventInfo< dxPopup, MouseEvent | TouchEvent > & DevExpress.ui.dxResizable.ResizeInfo; - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; - export type ShownEvent = DevExpress.events.EventInfo; - export type TitleRenderedEvent = DevExpress.events.EventInfo & + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; + export type TitleRenderedEvent = DevExpress.common.EventInfo & TitleRenderedInfo; /** * [descr:TitleRenderedInfo] @@ -23070,7 +23049,7 @@ declare module DevExpress.ui { * [descr:dxPopupOptions.onTitleRendered] */ onTitleRendered?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.ui.dxPopup.TitleRenderedInfo ) => void; /** @@ -23105,7 +23084,7 @@ declare module DevExpress.ui { * [descr:dxPopupOptions.titleTemplate] */ titleTemplate?: - | DevExpress.core.template + | template | (( titleElement: DevExpress.core.DxElement ) => string | DevExpress.core.UserDefinedElement); @@ -23132,32 +23111,32 @@ declare module DevExpress.ui { * [descr:_ui_progress_bar_CompleteEvent] */ export type CompleteEvent = - DevExpress.events.NativeEventInfo; + DevExpress.common.NativeEventInfo; /** * [descr:_ui_progress_bar_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_progress_bar_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_progress_bar_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_progress_bar_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxProgressBarOptions; /** * [descr:_ui_progress_bar_ValueChangedEvent] */ export type ValueChangedEvent = - DevExpress.events.NativeEventInfo & + DevExpress.common.NativeEventInfo & DevExpress.ui.Editor.ValueChangedInfo; } /** @@ -23188,32 +23167,32 @@ declare module DevExpress.ui { * [descr:dxRadioGroup] */ export class dxRadioGroup extends Editor { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module dxRadioGroup { /** * [descr:_ui_radio_group_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_radio_group_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_radio_group_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_radio_group_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxRadioGroupOptions; /** * [descr:_ui_radio_group_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxRadioGroup, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -23265,27 +23244,27 @@ declare module DevExpress.ui { /** * [descr:_ui_range_slider_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_range_slider_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_range_slider_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_range_slider_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxRangeSliderOptions; /** * [descr:_ui_range_slider_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxRangeSlider, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event > & @@ -23345,23 +23324,23 @@ declare module DevExpress.ui { * [descr:_ui_recurrence_editor_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_recurrence_editor_DisposingEvent] */ export type DisposingEvent = - DevExpress.events.EventInfo; + DevExpress.common.EventInfo; /** * [descr:_ui_recurrence_editor_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_recurrence_editor_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -23369,7 +23348,7 @@ declare module DevExpress.ui { /** * [descr:_ui_recurrence_editor_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxRecurrenceEditor, Event > & @@ -23394,22 +23373,22 @@ declare module DevExpress.ui { /** * [descr:_ui_resizable_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_resizable_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_resizable_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxResizableOptions; /** * [descr:_ui_resizable_ResizeEndEvent] */ - export type ResizeEndEvent = DevExpress.events.NativeEventInfo< + export type ResizeEndEvent = DevExpress.common.NativeEventInfo< dxResizable, MouseEvent | TouchEvent > & @@ -23417,7 +23396,7 @@ declare module DevExpress.ui { /** * [descr:_ui_resizable_ResizeEvent] */ - export type ResizeEvent = DevExpress.events.NativeEventInfo< + export type ResizeEvent = DevExpress.common.NativeEventInfo< dxResizable, MouseEvent | TouchEvent > & @@ -23440,7 +23419,7 @@ declare module DevExpress.ui { /** * [descr:_ui_resizable_ResizeStartEvent] */ - export type ResizeStartEvent = DevExpress.events.NativeEventInfo< + export type ResizeStartEvent = DevExpress.common.NativeEventInfo< dxResizable, MouseEvent | TouchEvent > & @@ -23519,14 +23498,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_responsive_box_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -23544,40 +23523,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_responsive_box_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxResponsiveBox, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_responsive_box_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxResponsiveBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_responsive_box_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxResponsiveBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -23588,16 +23567,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_responsive_box_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -23674,7 +23653,7 @@ declare module DevExpress.ui { /** * [descr:dxResponsiveBoxOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxResponsiveBoxOptions.height] */ @@ -23737,7 +23716,7 @@ declare module DevExpress.ui { date: Date | string, recurrenceEditMode: DevExpress.ui.dxScheduler.RecurrenceEditMode ): void; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxScheduler.getEndViewDate()] */ @@ -23790,7 +23769,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentAddedEvent] */ export type AppointmentAddedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentAddedEvent.appointmentData] */ @@ -23804,7 +23783,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentAddingEvent] */ export type AppointmentAddingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentAddingEvent.appointmentData] */ @@ -23817,8 +23796,8 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_AppointmentClickEvent] */ - export type AppointmentClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type AppointmentClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxScheduler, KeyboardEvent | MouseEvent | PointerEvent > & @@ -23835,7 +23814,7 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_AppointmentContextMenuEvent] */ - export type AppointmentContextMenuEvent = DevExpress.events.NativeEventInfo< + export type AppointmentContextMenuEvent = DevExpress.common.NativeEventInfo< dxScheduler, MouseEvent | PointerEvent | TouchEvent > & @@ -23848,8 +23827,8 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_AppointmentDblClickEvent] */ - export type AppointmentDblClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type AppointmentDblClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxScheduler, MouseEvent | PointerEvent > & @@ -23863,7 +23842,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentDeletedEvent] */ export type AppointmentDeletedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentDeletedEvent.appointmentData] */ @@ -23877,7 +23856,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentDeletingEvent] */ export type AppointmentDeletingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentDeletingEvent.appointmentData] */ @@ -23892,7 +23871,7 @@ declare module DevExpress.ui { readonly toComponent?: dxSortable | dxDraggable; readonly toData?: any; }; - export type AppointmentDraggingEndEvent = DevExpress.events.Cancelable & + export type AppointmentDraggingEndEvent = DevExpress.common.Cancelable & AppointmentDraggingEvent & { readonly fromComponent?: dxSortable | dxDraggable; readonly toComponent?: dxSortable | dxDraggable; @@ -23904,12 +23883,12 @@ declare module DevExpress.ui { */ interface AppointmentDraggingEvent { readonly component: dxScheduler; - readonly event?: DevExpress.events.DxEvent; + readonly event?: DevExpress.common.DxEvent; readonly itemData?: any; readonly itemElement?: DevExpress.core.DxElement; readonly fromData?: any; } - export type AppointmentDraggingMoveEvent = DevExpress.events.Cancelable & + export type AppointmentDraggingMoveEvent = DevExpress.common.Cancelable & AppointmentDraggingEvent & { readonly fromComponent?: dxSortable | dxDraggable; readonly toComponent?: dxSortable | dxDraggable; @@ -23919,15 +23898,15 @@ declare module DevExpress.ui { readonly fromComponent?: dxSortable | dxDraggable; readonly toComponent?: dxSortable | dxDraggable; }; - export type AppointmentDraggingStartEvent = DevExpress.events.Cancelable & + export type AppointmentDraggingStartEvent = DevExpress.common.Cancelable & Omit & { itemData?: any; }; /** * [descr:_ui_scheduler_AppointmentFormOpeningEvent] */ - export type AppointmentFormOpeningEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type AppointmentFormOpeningEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentFormOpeningEvent.appointmentData] */ @@ -23945,7 +23924,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentRenderedEvent] */ export type AppointmentRenderedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & TargetedAppointmentInfo & { /** * [descr:_ui_scheduler_AppointmentRenderedEvent.appointmentElement] @@ -23967,8 +23946,8 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_AppointmentTooltipShowingEvent] */ - export type AppointmentTooltipShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type AppointmentTooltipShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentTooltipShowingEvent.targetElement] */ @@ -23991,7 +23970,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentUpdatedEvent] */ export type AppointmentUpdatedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentUpdatedEvent.appointmentData] */ @@ -24005,7 +23984,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentUpdatingEvent] */ export type AppointmentUpdatingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_scheduler_AppointmentUpdatingEvent.oldData] */ @@ -24023,8 +24002,8 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_CellClickEvent] */ - export type CellClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type CellClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxScheduler, KeyboardEvent | MouseEvent | PointerEvent > & { @@ -24040,7 +24019,7 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_CellContextMenuEvent] */ - export type CellContextMenuEvent = DevExpress.events.NativeEventInfo< + export type CellContextMenuEvent = DevExpress.common.NativeEventInfo< dxScheduler, MouseEvent | PointerEvent | TouchEvent > & { @@ -24056,7 +24035,7 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; export type DateNavigatorTextInfo = { readonly startDate: Date; readonly endDate: Date; @@ -24065,17 +24044,17 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_scheduler_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_scheduler_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSchedulerOptions; export type RecurrenceEditMode = 'dialog' | 'occurrence' | 'series'; /** @@ -24151,7 +24130,7 @@ declare module DevExpress.ui { /** * [descr:dxSchedulerAppointment.template] */ - template?: DevExpress.core.template; + template?: template; /** * [descr:dxSchedulerAppointment.text] */ @@ -24179,7 +24158,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.appointmentCollectorTemplate] */ appointmentCollectorTemplate?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxScheduler.AppointmentCollectorTemplateData, collectorElement: DevExpress.core.DxElement @@ -24243,7 +24222,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.appointmentTemplate] */ appointmentTemplate?: - | DevExpress.core.template + | template | (( model: DevExpress.ui.dxScheduler.AppointmentTemplateData, itemIndex: number, @@ -24253,7 +24232,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.appointmentTooltipTemplate] */ appointmentTooltipTemplate?: - | DevExpress.core.template + | template | (( model: DevExpress.ui.dxScheduler.AppointmentTooltipTemplateData, itemIndex: number, @@ -24285,7 +24264,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.dataCellTemplate] */ dataCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24294,12 +24273,12 @@ declare module DevExpress.ui { /** * [descr:dxSchedulerOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxSchedulerOptions.dateCellTemplate] */ dateCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24318,7 +24297,7 @@ declare module DevExpress.ui { * @deprecated [depNote:dxSchedulerOptions.dropDownAppointmentTemplate] */ dropDownAppointmentTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24510,7 +24489,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.resourceCellTemplate] */ resourceCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24531,7 +24510,7 @@ declare module DevExpress.ui { /** * [descr:dxSchedulerOptions.resources.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxSchedulerOptions.resources.displayExpr] */ @@ -24593,7 +24572,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.timeCellTemplate] */ timeCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24637,7 +24616,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.appointmentCollectorTemplate] */ appointmentCollectorTemplate?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxScheduler.AppointmentCollectorTemplateData, collectorElement: DevExpress.core.DxElement @@ -24646,7 +24625,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.appointmentTemplate] */ appointmentTemplate?: - | DevExpress.core.template + | template | (( model: DevExpress.ui.dxScheduler.AppointmentTemplateData, itemIndex: number, @@ -24656,7 +24635,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.appointmentTooltipTemplate] */ appointmentTooltipTemplate?: - | DevExpress.core.template + | template | (( model: DevExpress.ui.dxScheduler.AppointmentTooltipTemplateData, itemIndex: number, @@ -24667,7 +24646,7 @@ declare module DevExpress.ui { * @deprecated [depNote:dxSchedulerOptions.views.dropDownAppointmentTemplate] */ dropDownAppointmentTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24681,7 +24660,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.dataCellTemplate] */ dataCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24691,7 +24670,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.dateCellTemplate] */ dateCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24735,7 +24714,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.resourceCellTemplate] */ resourceCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24753,7 +24732,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.timeCellTemplate] */ timeCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24857,7 +24836,7 @@ declare module DevExpress.ui { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface ScrollEventInfo - extends DevExpress.events.NativeEventInfo< + extends DevExpress.common.NativeEventInfo< T, WheelEvent | MouseEvent | Event > { @@ -24949,26 +24928,26 @@ declare module DevExpress.ui { /** * [descr:_ui_scroll_view_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_scroll_view_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_scroll_view_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxScrollViewOptions; /** * [descr:_ui_scroll_view_PullDownEvent] */ - export type PullDownEvent = DevExpress.events.EventInfo; + export type PullDownEvent = DevExpress.common.EventInfo; /** * [descr:_ui_scroll_view_ReachBottomEvent] */ - export type ReachBottomEvent = DevExpress.events.EventInfo; + export type ReachBottomEvent = DevExpress.common.EventInfo; /** * [descr:_ui_scroll_view_ScrollEvent] */ @@ -25022,22 +25001,22 @@ declare module DevExpress.ui { /** * [descr:_ui_select_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxSelectBox, Event >; /** * [descr:_ui_select_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_select_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_select_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxSelectBox, ClipboardEvent >; @@ -25045,7 +25024,7 @@ declare module DevExpress.ui { * [descr:_ui_select_box_CustomItemCreatingEvent] */ export type CustomItemCreatingEvent = - DevExpress.events.EventInfo & CustomItemCreatingInfo; + DevExpress.common.EventInfo & CustomItemCreatingInfo; /** * [descr:CustomItemCreatingInfo] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -25063,34 +25042,34 @@ declare module DevExpress.ui { /** * [descr:_ui_select_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxSelectBox, ClipboardEvent >; /** * [descr:_ui_select_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_select_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent >; /** * [descr:_ui_select_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxSelectBox, FocusEvent >; /** * [descr:_ui_select_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxSelectBox, FocusEvent >; @@ -25098,53 +25077,53 @@ declare module DevExpress.ui { * [descr:_ui_select_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_select_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxSelectBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_select_box_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_select_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent >; /** * [descr:_ui_select_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent >; /** * [descr:_ui_select_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_select_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_select_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxSelectBox, ClipboardEvent >; @@ -25157,12 +25136,12 @@ declare module DevExpress.ui { * [descr:_ui_select_box_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.ui.dxDropDownList.SelectionChangedInfo; /** * [descr:_ui_select_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxSelectBox, KeyboardEvent | MouseEvent | Event > & @@ -25183,7 +25162,7 @@ declare module DevExpress.ui { * [descr:dxSelectBoxOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | template | (( selectedItem: any, fieldElement: DevExpress.core.DxElement @@ -25192,7 +25171,7 @@ declare module DevExpress.ui { * [descr:dxSelectBoxOptions.onCustomItemCreating] */ onCustomItemCreating?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.ui.dxSelectBox.CustomItemCreatingInfo ) => void; /** @@ -25240,26 +25219,26 @@ declare module DevExpress.ui { /** * [descr:_ui_slider_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_slider_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_slider_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_slider_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSliderOptions; /** * [descr:_ui_slider_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxSlider, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event > & @@ -25390,7 +25369,7 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_AddEvent.event] */ - readonly event: DevExpress.events.DxEvent< + readonly event: DevExpress.common.DxEvent< PointerEvent | MouseEvent | TouchEvent >; /** @@ -25433,12 +25412,12 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_sortable_DragChangeEvent] */ - export type DragChangeEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragChangeEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25482,8 +25461,8 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DragEndEvent] */ - export type DragEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragEndEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25527,8 +25506,8 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DragMoveEvent] */ - export type DragMoveEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragMoveEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25572,8 +25551,8 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DragStartEvent] */ - export type DragStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragStartEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25603,17 +25582,17 @@ declare module DevExpress.ui { * [descr:_ui_sortable_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_sortable_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSortableOptions; /** * [descr:_ui_sortable_RemoveEvent] */ - export type RemoveEvent = DevExpress.events.NativeEventInfo< + export type RemoveEvent = DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25653,7 +25632,7 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_ReorderEvent] */ - export type ReorderEvent = DevExpress.events.NativeEventInfo< + export type ReorderEvent = DevExpress.common.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25717,7 +25696,7 @@ declare module DevExpress.ui { * [descr:dxSortableOptions.dragTemplate] */ dragTemplate?: - | DevExpress.core.template + | template | (( dragInfo: DevExpress.ui.dxSortable.DragTemplateData, containerElement: DevExpress.core.DxElement @@ -25776,7 +25755,7 @@ declare module DevExpress.ui { /** * [descr:_ui_speed_dial_action_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.NativeEventInfo< dxSpeedDialAction, MouseEvent | PointerEvent > & { @@ -25789,7 +25768,7 @@ declare module DevExpress.ui { * [descr:_ui_speed_dial_action_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_speed_dial_action_ContentReadyEvent.actionElement] */ @@ -25798,18 +25777,18 @@ declare module DevExpress.ui { /** * [descr:_ui_speed_dial_action_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_speed_dial_action_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_speed_dial_action_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSpeedDialActionOptions; } /** @@ -25864,14 +25843,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_splitter_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes, TKey> = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -25888,51 +25867,51 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_splitter_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxSplitter, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_splitter_ItemCollapsedEvent] */ export type ItemCollapsedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_splitter_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxSplitter, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_splitter_ItemExpandedEvent] */ export type ItemExpandedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -25943,16 +25922,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_splitter_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -25960,7 +25939,7 @@ declare module DevExpress.ui { /** * [descr:_ui_splitter_ResizeEndEvent] */ - export type ResizeEndEvent = DevExpress.events.NativeEventInfo< + export type ResizeEndEvent = DevExpress.common.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & @@ -25968,8 +25947,8 @@ declare module DevExpress.ui { /** * [descr:_ui_splitter_ResizeEvent] */ - export type ResizeEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ResizeEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & @@ -25987,8 +25966,8 @@ declare module DevExpress.ui { /** * [descr:_ui_splitter_ResizeStartEvent] */ - export type ResizeStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ResizeStartEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & @@ -26043,7 +26022,7 @@ declare module DevExpress.ui { /** * [descr:dxSplitterOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxSplitterOptions.orientation] */ @@ -26094,26 +26073,26 @@ declare module DevExpress.ui { /** * [descr:_ui_switch_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_switch_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_switch_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_switch_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSwitchOptions; /** * [descr:_ui_switch_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxSwitch, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event > & @@ -26172,14 +26151,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_tab_panel_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -26202,40 +26181,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_tab_panel_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabPanel, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tab_panel_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabPanel, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tab_panel_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabPanel, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -26246,16 +26225,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_tab_panel_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -26266,7 +26245,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_tab_panel_SelectionChangingEvent] @@ -26297,7 +26276,7 @@ declare module DevExpress.ui { export type TitleClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabPanel, KeyboardEvent | MouseEvent | PointerEvent > & @@ -26308,7 +26287,7 @@ declare module DevExpress.ui { export type TitleHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabPanel, MouseEvent | PointerEvent | TouchEvent > & @@ -26319,7 +26298,7 @@ declare module DevExpress.ui { export type TitleRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & TabPanelItemInfo; } /** @@ -26339,7 +26318,7 @@ declare module DevExpress.ui { * [descr:dxTabPanelItem.tabTemplate] */ tabTemplate?: - | DevExpress.core.template + | template | (() => string | DevExpress.core.UserDefinedElement); /** * [descr:dxTabPanelItem.title] @@ -26361,7 +26340,7 @@ declare module DevExpress.ui { /** * [descr:dxTabPanelOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxTabPanelOptions.hoverStateEnabled] */ @@ -26370,7 +26349,7 @@ declare module DevExpress.ui { * [descr:dxTabPanelOptions.itemTitleTemplate] */ itemTitleTemplate?: - | DevExpress.core.template + | template | (( itemData: TItem, itemIndex: number, @@ -26449,14 +26428,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_tabs_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -26476,40 +26455,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_tabs_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabs, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tabs_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabs, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tabs_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTabs, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -26520,16 +26499,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_tabs_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -26540,7 +26519,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_tabs_SelectionChangingEvent] @@ -26565,7 +26544,7 @@ declare module DevExpress.ui { /** * [descr:dxTabsOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxTabsOptions.focusStateEnabled] */ @@ -26641,48 +26620,48 @@ declare module DevExpress.ui { /** * [descr:_ui_tag_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxTagBox, Event >; /** * [descr:_ui_tag_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tag_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tag_box_CustomItemCreatingEvent] */ export type CustomItemCreatingEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.ui.dxSelectBox.CustomItemCreatingInfo; /** * [descr:_ui_tag_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_tag_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxTagBox, KeyboardEvent >; /** * [descr:_ui_tag_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxTagBox, FocusEvent >; /** * [descr:_ui_tag_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxTagBox, FocusEvent >; @@ -26690,42 +26669,42 @@ declare module DevExpress.ui { * [descr:_ui_tag_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_tag_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxTagBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_tag_box_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo & - DevExpress.events.ItemInfo; + export type ItemClickEvent = DevExpress.common.NativeEventInfo & + DevExpress.common.ItemInfo; /** * [descr:_ui_tag_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxTagBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxTagBox, KeyboardEvent >; /** * [descr:_ui_tag_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxTagBox, KeyboardEvent >; /** * [descr:_ui_tag_box_MultiTagPreparingEvent] */ - export type MultiTagPreparingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type MultiTagPreparingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo & { /** * [descr:_ui_tag_box_MultiTagPreparingEvent.multiTagElement] */ @@ -26742,18 +26721,18 @@ declare module DevExpress.ui { /** * [descr:_ui_tag_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tag_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxTagBoxOptions; /** * [descr:_ui_tag_box_SelectAllValueChangedEvent] */ export type SelectAllValueChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_ui_tag_box_SelectAllValueChangedEvent.value] */ @@ -26762,12 +26741,12 @@ declare module DevExpress.ui { /** * [descr:_ui_tag_box_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & + export type SelectionChangedEvent = DevExpress.common.EventInfo & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_tag_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxTagBox, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -26845,7 +26824,7 @@ declare module DevExpress.ui { * [descr:dxTagBoxOptions.tagTemplate] */ tagTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemElement: DevExpress.core.DxElement @@ -26863,50 +26842,50 @@ declare module DevExpress.ui { /** * [descr:_ui_text_area_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxTextArea, Event >; /** * [descr:_ui_text_area_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_text_area_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxTextArea, ClipboardEvent >; /** * [descr:_ui_text_area_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxTextArea, ClipboardEvent >; /** * [descr:_ui_text_area_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_text_area_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxTextArea, KeyboardEvent >; /** * [descr:_ui_text_area_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxTextArea, FocusEvent >; /** * [descr:_ui_text_area_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxTextArea, FocusEvent >; @@ -26914,41 +26893,41 @@ declare module DevExpress.ui { * [descr:_ui_text_area_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_text_area_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxTextArea, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_text_area_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxTextArea, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxTextArea, KeyboardEvent >; /** * [descr:_ui_text_area_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxTextArea, KeyboardEvent >; /** * [descr:_ui_text_area_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_text_area_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxTextArea, ClipboardEvent >; @@ -26956,7 +26935,7 @@ declare module DevExpress.ui { /** * [descr:_ui_text_area_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxTextArea, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event > & @@ -27000,50 +26979,50 @@ declare module DevExpress.ui { /** * [descr:_ui_text_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.NativeEventInfo< dxTextBox, Event >; /** * [descr:_ui_text_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_text_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.NativeEventInfo< dxTextBox, ClipboardEvent >; /** * [descr:_ui_text_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.NativeEventInfo< dxTextBox, ClipboardEvent >; /** * [descr:_ui_text_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_text_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.NativeEventInfo< dxTextBox, KeyboardEvent >; /** * [descr:_ui_text_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.NativeEventInfo< dxTextBox, FocusEvent >; /** * [descr:_ui_text_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.NativeEventInfo< dxTextBox, FocusEvent >; @@ -27051,41 +27030,41 @@ declare module DevExpress.ui { * [descr:_ui_text_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_text_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.NativeEventInfo< dxTextBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_text_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.NativeEventInfo< dxTextBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.NativeEventInfo< dxTextBox, KeyboardEvent >; /** * [descr:_ui_text_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.NativeEventInfo< dxTextBox, KeyboardEvent >; /** * [descr:_ui_text_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_ui_text_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.NativeEventInfo< dxTextBox, ClipboardEvent >; @@ -27104,7 +27083,7 @@ declare module DevExpress.ui { /** * [descr:_ui_text_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxTextBox, KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event > & @@ -27218,61 +27197,61 @@ declare module DevExpress.ui { * [descr:dxTextEditorOptions.onChange] */ onChange?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onCopy] */ onCopy?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onCut] */ onCut?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onEnterKey] */ onEnterKey?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onFocusIn] */ onFocusIn?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onFocusOut] */ onFocusOut?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onInput] */ onInput?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onKeyDown] */ onKeyDown?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onKeyUp] */ onKeyUp?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onPaste] */ onPaste?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.placeholder] @@ -27330,14 +27309,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_tile_view_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -27355,40 +27334,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_tile_view_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTileView, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tile_view_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTileView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_tile_view_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTileView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -27399,16 +27378,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; /** * [descr:_ui_tile_view_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -27451,7 +27430,7 @@ declare module DevExpress.ui { /** * [descr:dxTileViewOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxTileViewOptions.direction] */ @@ -27489,40 +27468,40 @@ declare module DevExpress.ui { /** * [descr:_ui_toast_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_toast_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_toast_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = DevExpress.common.EventInfo; /** * [descr:_ui_toast_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_toast_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_toast_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxToastOptions; /** * [descr:_ui_toast_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_toast_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; export type ToastType = 'custom' | 'error' | 'info' | 'success' | 'warning'; } /** @@ -27560,7 +27539,7 @@ declare module DevExpress.ui { closeOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -27578,7 +27557,7 @@ declare module DevExpress.ui { hideOnOutsideClick?: | boolean | (( - event: DevExpress.events.DxEvent< + event: DevExpress.common.DxEvent< MouseEvent | PointerEvent | TouchEvent > ) => boolean); @@ -27629,14 +27608,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_toolbar_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -27654,40 +27633,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_toolbar_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxToolbar, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_toolbar_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxToolbar, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_toolbar_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxToolbar, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -27698,8 +27677,8 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ItemInfo; export type LocateInMenuMode = 'always' | 'auto' | 'never'; /** * [descr:_ui_toolbar_OptionChangedEvent] @@ -27707,8 +27686,8 @@ declare module DevExpress.ui { export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -27736,7 +27715,7 @@ declare module DevExpress.ui { * [descr:dxToolbarItem.menuItemTemplate] */ menuItemTemplate?: - | DevExpress.core.template + | template | (() => string | DevExpress.core.UserDefinedElement); /** * [descr:dxToolbarItem.options] @@ -27762,7 +27741,7 @@ declare module DevExpress.ui { /** * [descr:dxToolbarOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxToolbarOptions.items] */ @@ -27775,7 +27754,7 @@ declare module DevExpress.ui { * [descr:dxToolbarOptions.menuItemTemplate] */ menuItemTemplate?: - | DevExpress.core.template + | template | (( itemData: TItem, itemIndex: number, @@ -27790,40 +27769,40 @@ declare module DevExpress.ui { /** * [descr:_ui_tooltip_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tooltip_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tooltip_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = DevExpress.common.EventInfo; /** * [descr:_ui_tooltip_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_tooltip_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_tooltip_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxTooltipOptions; /** * [descr:_ui_tooltip_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.Cancelable & + DevExpress.common.EventInfo; /** * [descr:_ui_tooltip_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.EventInfo; } /** * [descr:dxTooltipOptions] @@ -27996,7 +27975,7 @@ declare module DevExpress.ui { ): DevExpress.core.DxElement | undefined; getCombinedFilter(): any; getCombinedFilter(returnDataField: boolean): any; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; getKeyByRowIndex(rowIndex: number): TKey | undefined; getRowElement( rowIndex: number @@ -28042,7 +28021,7 @@ declare module DevExpress.ui { export type AdaptiveDetailRowPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.AdaptiveDetailRowPreparingInfo; /** * [descr:_ui_tree_list_CellClickEvent] @@ -28050,7 +28029,7 @@ declare module DevExpress.ui { export type CellClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & @@ -28061,7 +28040,7 @@ declare module DevExpress.ui { export type CellDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & @@ -28072,7 +28051,7 @@ declare module DevExpress.ui { export type CellHoverChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & CellInfo & { /** * [descr:_ui_tree_list_CellHoverChangedEvent.eventType] @@ -28135,7 +28114,7 @@ declare module DevExpress.ui { export type CellPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & CellInfo & { /** * [descr:_ui_tree_list_CellPreparedEvent.isSelected] @@ -28169,7 +28148,7 @@ declare module DevExpress.ui { export type ColumnButtonClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & { @@ -28228,14 +28207,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_tree_list_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_ContextMenuPreparingEvent.items] */ @@ -28271,7 +28250,7 @@ declare module DevExpress.ui { export type DataErrorOccurredEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataErrorOccurredInfo; /** * [descr:_ui_tree_list_DisposingEvent] @@ -28279,7 +28258,7 @@ declare module DevExpress.ui { export type DisposingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -28294,7 +28273,7 @@ declare module DevExpress.ui { export type EditCanceledEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_tree_list_EditCancelingEvent] @@ -28302,8 +28281,8 @@ declare module DevExpress.ui { export type EditCancelingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:dxTreeListEditing] @@ -28348,8 +28327,8 @@ declare module DevExpress.ui { export type EditingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_EditingStartEvent.data] */ @@ -28378,7 +28357,7 @@ declare module DevExpress.ui { export type EditorPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_EditorPreparedEvent.parentType] */ @@ -28430,8 +28409,8 @@ declare module DevExpress.ui { export type EditorPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_EditorPreparingEvent.parentType] */ @@ -28555,7 +28534,7 @@ declare module DevExpress.ui { export type FocusedCellChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_FocusedCellChangedEvent.cellElement] */ @@ -28583,8 +28562,8 @@ declare module DevExpress.ui { export type FocusedCellChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxTreeList, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -28627,7 +28606,7 @@ declare module DevExpress.ui { export type FocusedRowChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_FocusedRowChangedEvent.rowElement] */ @@ -28647,8 +28626,8 @@ declare module DevExpress.ui { export type FocusedRowChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxTreeList, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -28675,14 +28654,14 @@ declare module DevExpress.ui { export type InitializedEvent< TRowData = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_tree_list_InitNewRowEvent] */ export type InitNewRowEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.NewRowInfo; /** * [descr:_ui_tree_list_KeyDownEvent] @@ -28690,7 +28669,7 @@ declare module DevExpress.ui { export type KeyDownEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, KeyboardEvent > & @@ -28734,7 +28713,7 @@ declare module DevExpress.ui { export type NodesInitializedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_NodesInitializedEvent.root] */ @@ -28746,8 +28725,8 @@ declare module DevExpress.ui { export type OptionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; /** * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ @@ -28854,7 +28833,7 @@ declare module DevExpress.ui { export type RowClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & { @@ -28917,7 +28896,7 @@ declare module DevExpress.ui { export type RowCollapsedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowCollapsingEvent] @@ -28925,8 +28904,8 @@ declare module DevExpress.ui { export type RowCollapsingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowDblClickEvent] @@ -28934,7 +28913,7 @@ declare module DevExpress.ui { export type RowDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & { @@ -28988,21 +28967,21 @@ declare module DevExpress.ui { export type RowDraggingChangeEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingEndEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingMoveEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; @@ -29020,7 +28999,7 @@ declare module DevExpress.ui { export type RowDraggingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.DragStartEventInfo; /** @@ -29029,7 +29008,7 @@ declare module DevExpress.ui { export type RowExpandedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowExpandingEvent] @@ -29037,8 +29016,8 @@ declare module DevExpress.ui { export type RowExpandingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.Cancelable & + DevExpress.common.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowInsertedEvent] @@ -29046,7 +29025,7 @@ declare module DevExpress.ui { export type RowInsertedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowInsertedInfo; /** * [descr:_ui_tree_list_RowInsertingEvent] @@ -29054,7 +29033,7 @@ declare module DevExpress.ui { export type RowInsertingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowInsertingInfo; /** * [descr:_ui_tree_list_RowPreparedEvent] @@ -29062,7 +29041,7 @@ declare module DevExpress.ui { export type RowPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_list_RowPreparedEvent.data] */ @@ -29118,7 +29097,7 @@ declare module DevExpress.ui { export type RowRemovedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowRemovedInfo; /** * [descr:_ui_tree_list_RowRemovingEvent] @@ -29126,7 +29105,7 @@ declare module DevExpress.ui { export type RowRemovingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowRemovingInfo; /** * [descr:_ui_tree_list_RowUpdatedEvent] @@ -29134,7 +29113,7 @@ declare module DevExpress.ui { export type RowUpdatedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowUpdatedInfo; /** * [descr:_ui_tree_list_RowUpdatingEvent] @@ -29142,7 +29121,7 @@ declare module DevExpress.ui { export type RowUpdatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowUpdatingInfo; /** * [descr:_ui_tree_list_RowValidatingEvent] @@ -29150,7 +29129,7 @@ declare module DevExpress.ui { export type RowValidatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.RowValidatingInfo; /** * [descr:_ui_tree_list_SavedEvent] @@ -29158,7 +29137,7 @@ declare module DevExpress.ui { export type SavedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_tree_list_SavingEvent] @@ -29166,7 +29145,7 @@ declare module DevExpress.ui { export type SavingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.SavingInfo; export type Scrollable = Omit< dxScrollable, @@ -29202,7 +29181,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.SelectionChangedInfo; /** * [descr:_ui_tree_list_ToolbarPreparingEvent] @@ -29210,7 +29189,7 @@ declare module DevExpress.ui { export type ToolbarPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.EventInfo> & DevExpress.common.grids.ToolbarPreparingInfo; export type TreeListCommandColumnType = 'adaptive' | 'buttons' | 'drag'; export type TreeListFilterMode = @@ -29249,7 +29228,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumn.cellTemplate] */ cellTemplate?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxTreeList.ColumnCellTemplateData< @@ -29267,7 +29246,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumn.editCellTemplate] */ editCellTemplate?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxTreeList.ColumnEditCellTemplateData< @@ -29279,7 +29258,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumn.headerCellTemplate] */ headerCellTemplate?: - | DevExpress.core.template + | template | (( columnHeader: DevExpress.core.DxElement, headerInfo: DevExpress.ui.dxTreeList.ColumnHeaderCellTemplateData< @@ -29312,7 +29291,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumnButton.template] */ template?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxTreeList.ColumnButtonTemplateData< @@ -29672,13 +29651,13 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo< + export type ContentReadyEvent = DevExpress.common.EventInfo< dxTreeView >; /** * [descr:_ui_tree_view_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo< + export type DisposingEvent = DevExpress.common.EventInfo< dxTreeView >; export type ExplicitTypes = { @@ -29702,11 +29681,11 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo>; + DevExpress.common.InitializedEventInfo>; /** * [descr:_ui_tree_view_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxTreeView, KeyboardEvent | MouseEvent | PointerEvent > & @@ -29715,7 +29694,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_ItemCollapsedEvent] */ export type ItemCollapsedEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxTreeView, MouseEvent | PointerEvent > & @@ -29724,7 +29703,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_ItemContextMenuEvent] */ export type ItemContextMenuEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxTreeView, MouseEvent | PointerEvent | TouchEvent > & @@ -29733,7 +29712,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_ItemExpandedEvent] */ export type ItemExpandedEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.NativeEventInfo< dxTreeView, MouseEvent | PointerEvent > & @@ -29741,7 +29720,7 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_ItemHoldEvent] */ - export type ItemHoldEvent = DevExpress.events.NativeEventInfo< + export type ItemHoldEvent = DevExpress.common.NativeEventInfo< dxTreeView, MouseEvent | PointerEvent | TouchEvent > & @@ -29771,7 +29750,7 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_ItemRenderedEvent] */ - export type ItemRenderedEvent = DevExpress.events.EventInfo< + export type ItemRenderedEvent = DevExpress.common.EventInfo< dxTreeView > & ItemInfo; @@ -29779,7 +29758,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_ItemSelectionChangedEvent] */ export type ItemSelectionChangedEvent = - DevExpress.events.EventInfo> & ItemInfo; + DevExpress.common.EventInfo> & ItemInfo; /** * [descr:dxTreeViewNode] */ @@ -29787,10 +29766,10 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo< + export type OptionChangedEvent = DevExpress.common.EventInfo< dxTreeView > & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.ChangedOptionInfo; export type Properties = dxTreeViewOptions; export type Scrollable = Omit< dxScrollable, @@ -29806,7 +29785,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_SelectAllValueChangedEvent] */ export type SelectAllValueChangedEvent = - DevExpress.events.EventInfo> & { + DevExpress.common.EventInfo> & { /** * [descr:_ui_tree_view_SelectAllValueChangedEvent.value] */ @@ -29815,7 +29794,7 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo< + export type SelectionChangedEvent = DevExpress.common.EventInfo< dxTreeView >; export type TreeViewCheckBoxMode = 'none' | 'normal' | 'selectAll'; @@ -29923,7 +29902,7 @@ declare module DevExpress.ui { /** * [descr:dxTreeViewOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.common.DataSourceLike< DevExpress.ui.dxTreeView.Item, TKey > | null; @@ -30071,18 +30050,18 @@ declare module DevExpress.ui { /** * [descr:_ui_validation_group_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_ui_validation_group_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_ui_validation_group_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxValidationGroupOptions; export type ValidationResult = dxValidationGroupResult; } @@ -30175,14 +30154,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; /** * [descr:_ui_validation_summary_DisposingEvent] */ export type DisposingEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.EventInfo>; export type ExplicitTypes< TItem extends DevExpress.ui.CollectionWidget.ItemLike, TKey @@ -30200,7 +30179,7 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo< + > = DevExpress.common.InitializedEventInfo< dxValidationSummary >; /** @@ -30209,19 +30188,19 @@ declare module DevExpress.ui { export type ItemClickEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.NativeEventInfo< dxValidationSummary, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.ItemInfo; /** * [descr:_ui_validation_summary_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.EventInfo> & + DevExpress.common.ChangedOptionInfo; export type Properties< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any @@ -30262,11 +30241,11 @@ declare module DevExpress.ui { validate(): DevExpress.ui.dxValidator.ValidationResult; } module dxValidator { - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; export type InitializedEvent = - DevExpress.events.InitializedEventInfo; - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.InitializedEventInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxValidatorOptions; export type ValidatedEvent = { name?: string; @@ -30426,7 +30405,7 @@ declare module DevExpress.ui { * [descr:EditorOptions.onValueChanged] */ onValueChanged?: ( - e: DevExpress.events.NativeEventInfo & + e: DevExpress.common.NativeEventInfo & DevExpress.ui.Editor.ValueChangedInfo ) => void; /** @@ -30475,13 +30454,13 @@ declare module DevExpress.ui { * [descr:Format] */ export type Format = - | FormatObject + | DevExpress.common.FormatObject | DevExpress.common.Format | string | ((value: number | Date) => string) | ((value: Date) => string) | ((value: number) => string) - | ExternalFormat + | DevExpress.common.ExternalFormat | undefined; /** * [descr:ui.hideToasts()] @@ -30658,7 +30637,7 @@ declare module DevExpress.ui { * [descr:ui.template] * @deprecated [depNote:ui.template] */ - export type Template = DevExpress.core.template; + export type Template = template; /** * [descr:ui.themes] */ @@ -30739,7 +30718,7 @@ declare module DevExpress.ui { /** * [descr:WidgetOptions.onContentReady] */ - onContentReady?: (e: DevExpress.events.EventInfo) => void; + onContentReady?: (e: DevExpress.common.EventInfo) => void; /** * [descr:WidgetOptions.tabIndex] */ @@ -31180,7 +31159,9 @@ declare module DevExpress.utils { /** * [descr:utils.getTimeZones(date)] */ - export function getTimeZones(date?: Date): Array; + export function getTimeZones( + date?: Date + ): Array; /** * [descr:utils.initMobileViewport(options)] */ @@ -31237,7 +31218,7 @@ declare module DevExpress.viz { * [descr:BaseChart.getAllSeries()] */ getAllSeries(): Array; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:BaseChart.getSeriesByName(seriesName)] */ @@ -31334,7 +31315,7 @@ declare module DevExpress.viz { * [descr:BaseChartOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | template | (( legendItem: DevExpress.common.charts.LegendItem, element: SVGGElement @@ -31385,7 +31366,7 @@ declare module DevExpress.viz { /** * [descr:BaseChartOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:BaseChartOptions.legend] */ @@ -31393,13 +31374,13 @@ declare module DevExpress.viz { /** * [descr:BaseChartOptions.onDone] */ - onDone?: (e: DevExpress.events.EventInfo) => void; + onDone?: (e: DevExpress.common.EventInfo) => void; /** * [descr:BaseChartOptions.onPointClick] */ onPointClick?: | (( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.NativeEventInfo< TComponent, MouseEvent | PointerEvent > & @@ -31410,28 +31391,28 @@ declare module DevExpress.viz { * [descr:BaseChartOptions.onPointHoverChanged] */ onPointHoverChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo ) => void; /** * [descr:BaseChartOptions.onPointSelectionChanged] */ onPointSelectionChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo ) => void; /** * [descr:BaseChartOptions.onTooltipHidden] */ onTooltipHidden?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo ) => void; /** * [descr:BaseChartOptions.onTooltipShown] */ onTooltipShown?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo ) => void; /** @@ -31468,7 +31449,7 @@ declare module DevExpress.viz { * [descr:BaseChartOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( pointInfo: any, element: DevExpress.core.DxElement @@ -31582,14 +31563,14 @@ declare module DevExpress.viz { * [descr:BaseGaugeOptions.onTooltipHidden] */ onTooltipHidden?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo ) => void; /** * [descr:BaseGaugeOptions.onTooltipShown] */ onTooltipShown?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo ) => void; /** @@ -31786,7 +31767,7 @@ declare module DevExpress.viz { * [descr:BaseGaugeOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( scaleValue: { value?: number; valueText?: string }, element: DevExpress.core.DxElement @@ -32024,11 +32005,11 @@ declare module DevExpress.viz { /** * [descr:BaseSparklineOptions.onTooltipHidden] */ - onTooltipHidden?: (e: DevExpress.events.EventInfo) => void; + onTooltipHidden?: (e: DevExpress.common.EventInfo) => void; /** * [descr:BaseSparklineOptions.onTooltipShown] */ - onTooltipShown?: (e: DevExpress.events.EventInfo) => void; + onTooltipShown?: (e: DevExpress.common.EventInfo) => void; /** * [descr:BaseSparklineOptions.redrawOnResize] */ @@ -32051,7 +32032,7 @@ declare module DevExpress.viz { * [descr:BaseSparklineOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( pointsInfo: any, element: DevExpress.core.DxElement @@ -32080,7 +32061,7 @@ declare module DevExpress.viz { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ static defaultOptions( - rule: DevExpress.core.DefaultOptionsRule + rule: DefaultOptionsRule ): void; /** * [descr:BaseWidget.exportTo(fileName, format)] @@ -32130,7 +32111,7 @@ declare module DevExpress.viz { * [descr:FileSavingEventInfo] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ - export type FileSavingEventInfo = DevExpress.events.Cancelable & { + export type FileSavingEventInfo = DevExpress.common.Cancelable & { /** * [descr:FileSavingEventInfo.component] */ @@ -32439,16 +32420,16 @@ declare module DevExpress.viz { /** * [descr:BaseWidgetOptions.onDrawn] */ - onDrawn?: (e: DevExpress.events.EventInfo) => void; + onDrawn?: (e: DevExpress.common.EventInfo) => void; /** * [descr:BaseWidgetOptions.onExported] */ - onExported?: (e: DevExpress.events.EventInfo) => void; + onExported?: (e: DevExpress.common.EventInfo) => void; /** * [descr:BaseWidgetOptions.onExporting] */ onExporting?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo ) => void; /** @@ -32461,7 +32442,7 @@ declare module DevExpress.viz { * [descr:BaseWidgetOptions.onIncidentOccurred] */ onIncidentOccurred?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo ) => void; /** @@ -32955,19 +32936,19 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bar_gauge_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bar_gauge_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bar_gauge_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_bar_gauge_FileSavingEvent] @@ -32978,13 +32959,13 @@ declare module DevExpress.viz { * [descr:_viz_bar_gauge_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_bar_gauge_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:dxBarGaugeLegend] */ @@ -33015,7 +32996,7 @@ declare module DevExpress.viz { * [descr:dxBarGaugeOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | template | (( legendItem: LegendItem, element: SVGGElement @@ -33038,8 +33019,8 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxBarGaugeOptions; /** * [descr:dxBarGaugeTooltip] @@ -33049,7 +33030,7 @@ declare module DevExpress.viz { * [descr:dxBarGaugeOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( scaleValue: { value?: number; valueText?: string; index?: number }, element: DevExpress.core.DxElement @@ -33073,7 +33054,7 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & + export type TooltipHiddenEvent = DevExpress.common.EventInfo & TooltipInfo; /** * [descr:_viz_bar_gauge_TooltipInfo] @@ -33088,7 +33069,7 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & TooltipInfo; } /** @@ -33134,7 +33115,7 @@ declare module DevExpress.viz { * [descr:dxBarGaugeOptions.centerTemplate] */ centerTemplate?: - | DevExpress.core.template + | template | (( component: dxBarGauge, element: SVGGElement @@ -33229,19 +33210,19 @@ declare module DevExpress.viz { /** * [descr:_viz_bullet_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bullet_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bullet_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bullet_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_bullet_FileSavingEvent] @@ -33251,27 +33232,27 @@ declare module DevExpress.viz { /** * [descr:_viz_bullet_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & + export type IncidentOccurredEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_bullet_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_bullet_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxBulletOptions; /** * [descr:_viz_bullet_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo; + export type TooltipHiddenEvent = DevExpress.common.EventInfo; /** * [descr:_viz_bullet_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo; + export type TooltipShownEvent = DevExpress.common.EventInfo; } /** * [descr:dxBulletOptions] @@ -33488,7 +33469,7 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ArgumentAxisClickEvent] */ - export type ArgumentAxisClickEvent = DevExpress.events.NativeEventInfo< + export type ArgumentAxisClickEvent = DevExpress.common.NativeEventInfo< dxChart, MouseEvent | PointerEvent > & { @@ -33889,7 +33870,7 @@ declare module DevExpress.viz { * [descr:dxChartOptions.commonAxisSettings.label.template] */ template?: - | DevExpress.core.template + | template | (( data: object, element: SVGGElement @@ -34155,15 +34136,15 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_chart_DoneEvent] */ - export type DoneEvent = DevExpress.events.EventInfo; + export type DoneEvent = DevExpress.common.EventInfo; /** * [descr:_viz_chart_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * @deprecated Use CommonSeriesSettings instead * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -34173,11 +34154,11 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_chart_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_chart_FileSavingEvent] @@ -34192,13 +34173,13 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & + export type IncidentOccurredEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_chart_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:dxChartLegend] */ @@ -34231,8 +34212,8 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type LegendClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo & { /** * [descr:_viz_chart_LegendClickEvent.target] */ @@ -34241,8 +34222,8 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:dxChartPanes] */ @@ -34259,25 +34240,25 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_PointClickEvent] */ - export type PointClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & + export type PointClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_chart_PointHoverChangedEvent] */ - export type PointHoverChangedEvent = DevExpress.events.EventInfo & + export type PointHoverChangedEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_chart_PointSelectionChangedEvent] */ export type PointSelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; export type Properties = dxChartOptions; /** * [descr:_viz_chart_SeriesClickEvent] */ - export type SeriesClickEvent = DevExpress.events.NativeEventInfo< + export type SeriesClickEvent = DevExpress.common.NativeEventInfo< dxChart, MouseEvent | PointerEvent > & { @@ -34289,7 +34270,7 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_SeriesHoverChangedEvent] */ - export type SeriesHoverChangedEvent = DevExpress.events.EventInfo & + export type SeriesHoverChangedEvent = DevExpress.common.EventInfo & SeriesInteractionInfo; /** * [descr:_viz_chart_SeriesInteractionInfo] @@ -34305,7 +34286,7 @@ declare module DevExpress.viz { * [descr:_viz_chart_SeriesSelectionChangedEvent] */ export type SeriesSelectionChangedEvent = - DevExpress.events.EventInfo & SeriesInteractionInfo; + DevExpress.common.EventInfo & SeriesInteractionInfo; /** * [descr:dxChartTooltip] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -34319,12 +34300,12 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & + export type TooltipHiddenEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:_viz_chart_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:dxChartValueAxis] @@ -34584,8 +34565,8 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ZoomEndEvent] */ - export type ZoomEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type ZoomEndEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo & { /** * [descr:_viz_chart_ZoomEndEvent.rangeStart] */ @@ -34622,8 +34603,8 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ZoomStartEvent] */ - export type ZoomStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type ZoomStartEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo & { /** * [descr:_viz_chart_ZoomStartEvent.axis] */ @@ -34669,7 +34650,7 @@ declare module DevExpress.viz { * [descr:dxChartCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | template | (( annotation: dxChartAnnotationConfig | any, element: SVGGElement @@ -34679,7 +34660,7 @@ declare module DevExpress.viz { * [descr:dxChartCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | template | (( annotation: dxChartAnnotationConfig | any, element: DevExpress.core.DxElement @@ -36833,19 +36814,19 @@ declare module DevExpress.viz { /** * [descr:_viz_circular_gauge_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_circular_gauge_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_circular_gauge_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_circular_gauge_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_circular_gauge_FileSavingEvent] @@ -36856,19 +36837,19 @@ declare module DevExpress.viz { * [descr:_viz_circular_gauge_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_circular_gauge_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_circular_gauge_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxCircularGaugeOptions; /** * [descr:dxCircularGaugeRangeContainer] @@ -36913,13 +36894,13 @@ declare module DevExpress.viz { * [descr:_viz_circular_gauge_TooltipHiddenEvent] */ export type TooltipHiddenEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo; /** * [descr:_viz_circular_gauge_TooltipShownEvent] */ export type TooltipShownEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo; } /** @@ -36946,7 +36927,7 @@ declare module DevExpress.viz { * [descr:dxCircularGaugeOptions.centerTemplate] */ centerTemplate?: - | DevExpress.core.template + | template | (( component: dxCircularGauge, element: SVGGElement @@ -36981,7 +36962,7 @@ declare module DevExpress.viz { * [descr:dxFunnel.getAllItems()] */ getAllItems(): Array; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxFunnel.hideTooltip()] */ @@ -36991,19 +36972,19 @@ declare module DevExpress.viz { /** * [descr:_viz_funnel_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_funnel_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_funnel_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_funnel_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_funnel_FileSavingEvent] @@ -37024,22 +37005,22 @@ declare module DevExpress.viz { /** * [descr:_viz_funnel_HoverChangedEvent] */ - export type HoverChangedEvent = DevExpress.events.EventInfo & + export type HoverChangedEvent = DevExpress.common.EventInfo & FunnelItemInfo; /** * [descr:_viz_funnel_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & + export type IncidentOccurredEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_funnel_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_funnel_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.NativeEventInfo< dxFunnel, MouseEvent | PointerEvent > & @@ -37064,7 +37045,7 @@ declare module DevExpress.viz { * [descr:dxFunnelOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | template | (( legendItem: LegendItem, element: SVGGElement @@ -37078,7 +37059,7 @@ declare module DevExpress.viz { /** * [descr:_viz_funnel_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.NativeEventInfo< + export type LegendClickEvent = DevExpress.common.NativeEventInfo< dxFunnel, MouseEvent | PointerEvent > & @@ -37086,13 +37067,13 @@ declare module DevExpress.viz { /** * [descr:_viz_funnel_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxFunnelOptions; /** * [descr:_viz_funnel_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & + export type SelectionChangedEvent = DevExpress.common.EventInfo & FunnelItemInfo; /** * [descr:dxFunnelTooltip] @@ -37102,7 +37083,7 @@ declare module DevExpress.viz { * [descr:dxFunnelOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( info: { item?: Item; @@ -37212,7 +37193,7 @@ declare module DevExpress.viz { /** * [descr:dxFunnelOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxFunnelOptions.hoverEnabled] */ @@ -37497,19 +37478,19 @@ declare module DevExpress.viz { /** * [descr:_viz_linear_gauge_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_linear_gauge_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_linear_gauge_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_linear_gauge_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_linear_gauge_FileSavingEvent] @@ -37520,19 +37501,19 @@ declare module DevExpress.viz { * [descr:_viz_linear_gauge_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_linear_gauge_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_linear_gauge_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxLinearGaugeOptions; /** * [descr:dxLinearGaugeRangeContainer] @@ -37596,12 +37577,12 @@ declare module DevExpress.viz { * [descr:_viz_linear_gauge_TooltipHiddenEvent] */ export type TooltipHiddenEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo; /** * [descr:_viz_linear_gauge_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo; } /** @@ -37659,23 +37640,23 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_pie_chart_DoneEvent] */ - export type DoneEvent = DevExpress.events.EventInfo; + export type DoneEvent = DevExpress.common.EventInfo; /** * [descr:_viz_pie_chart_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_pie_chart_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_pie_chart_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_pie_chart_FileSavingEvent] @@ -37686,13 +37667,13 @@ declare module DevExpress.viz { * [descr:_viz_pie_chart_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_pie_chart_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:dxPieChartLegend] */ @@ -37725,7 +37706,7 @@ declare module DevExpress.viz { * [descr:dxPieChartOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | template | (( legendItem: LegendItem, element: SVGGElement @@ -37735,7 +37716,7 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.NativeEventInfo< + export type LegendClickEvent = DevExpress.common.NativeEventInfo< dxPieChart, MouseEvent | PointerEvent > & { @@ -37751,8 +37732,8 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type PieChartAnnotationLocation = 'center' | 'edge'; export type PieChartLegendHoverMode = 'none' | 'allArgumentPoints'; export type PieChartSegmentDirection = 'anticlockwise' | 'clockwise'; @@ -37761,7 +37742,7 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_PointClickEvent] */ - export type PointClickEvent = DevExpress.events.NativeEventInfo< + export type PointClickEvent = DevExpress.common.NativeEventInfo< dxPieChart, MouseEvent | PointerEvent > & @@ -37770,13 +37751,13 @@ declare module DevExpress.viz { * [descr:_viz_pie_chart_PointHoverChangedEvent] */ export type PointHoverChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_pie_chart_PointSelectionChangedEvent] */ export type PointSelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; export type Properties = dxPieChartOptions; export type SmallValuesGroupingMode = @@ -37786,12 +37767,12 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & + export type TooltipHiddenEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:_viz_pie_chart_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; } /** @@ -37833,7 +37814,7 @@ declare module DevExpress.viz { * [descr:dxPieChartCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | template | (( annotation: dxPieChartAnnotationConfig | any, element: SVGGElement @@ -37843,7 +37824,7 @@ declare module DevExpress.viz { * [descr:dxPieChartCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | template | (( annotation: dxPieChartAnnotationConfig | any, element: DevExpress.core.DxElement @@ -37864,7 +37845,7 @@ declare module DevExpress.viz { * [descr:dxPieChartOptions.centerTemplate] */ centerTemplate?: - | DevExpress.core.template + | template | (( component: dxPieChart, element: SVGGElement @@ -38367,7 +38348,7 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_ArgumentAxisClickEvent] */ - export type ArgumentAxisClickEvent = DevExpress.events.NativeEventInfo< + export type ArgumentAxisClickEvent = DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | PointerEvent > & { @@ -38734,23 +38715,23 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_polar_chart_DoneEvent] */ - export type DoneEvent = DevExpress.events.EventInfo; + export type DoneEvent = DevExpress.common.EventInfo; /** * [descr:_viz_polar_chart_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_polar_chart_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_polar_chart_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_polar_chart_FileSavingEvent] @@ -38761,13 +38742,13 @@ declare module DevExpress.viz { * [descr:_viz_polar_chart_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_polar_chart_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:dxPolarChartLegend] */ @@ -38796,8 +38777,8 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type LegendClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | PointerEvent > & { @@ -38809,13 +38790,13 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; /** * [descr:_viz_polar_chart_PointClickEvent] */ - export type PointClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type PointClickEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | PointerEvent > & @@ -38824,13 +38805,13 @@ declare module DevExpress.viz { * [descr:_viz_polar_chart_PointHoverChangedEvent] */ export type PointHoverChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_polar_chart_PointSelectionChangedEvent] */ export type PointSelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; export type PolarChartSeriesType = | 'area' @@ -38842,7 +38823,7 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_SeriesClickEvent] */ - export type SeriesClickEvent = DevExpress.events.NativeEventInfo< + export type SeriesClickEvent = DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | PointerEvent > & { @@ -38855,7 +38836,7 @@ declare module DevExpress.viz { * [descr:_viz_polar_chart_SeriesHoverChangedEvent] */ export type SeriesHoverChangedEvent = - DevExpress.events.EventInfo & SeriesInteractionInfo; + DevExpress.common.EventInfo & SeriesInteractionInfo; /** * [descr:_viz_polar_chart_SeriesInteractionInfo] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -38870,7 +38851,7 @@ declare module DevExpress.viz { * [descr:_viz_polar_chart_SeriesSelectionChangedEvent] */ export type SeriesSelectionChangedEvent = - DevExpress.events.EventInfo & SeriesInteractionInfo; + DevExpress.common.EventInfo & SeriesInteractionInfo; /** * [descr:dxPolarChartTooltip] */ @@ -38883,12 +38864,12 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & + export type TooltipHiddenEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:_viz_polar_chart_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:dxPolarChartValueAxis] @@ -39085,8 +39066,8 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_ZoomEndEvent] */ - export type ZoomEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ZoomEndEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | TouchEvent > & { @@ -39118,8 +39099,8 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_ZoomStartEvent] */ - export type ZoomStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ZoomStartEvent = DevExpress.common.Cancelable & + DevExpress.common.NativeEventInfo< dxPolarChart, MouseEvent | TouchEvent > & { @@ -39172,7 +39153,7 @@ declare module DevExpress.viz { * [descr:dxPolarChartCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | template | (( annotation: dxPolarChartAnnotationConfig | any, element: SVGGElement @@ -39182,7 +39163,7 @@ declare module DevExpress.viz { * [descr:dxPolarChartCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | template | (( annotation: dxPolarChartAnnotationConfig | any, element: DevExpress.core.DxElement @@ -39953,7 +39934,7 @@ declare module DevExpress.viz { * [descr:dxRangeSelector] */ export class dxRangeSelector extends BaseWidget { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxRangeSelector.getValue()] */ @@ -39993,19 +39974,19 @@ declare module DevExpress.viz { /** * [descr:_viz_range_selector_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_range_selector_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_range_selector_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_range_selector_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_range_selector_FileSavingEvent] @@ -40016,25 +39997,25 @@ declare module DevExpress.viz { * [descr:_viz_range_selector_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_range_selector_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_range_selector_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxRangeSelectorOptions; export type ValueChangedCallMode = 'onMoving' | 'onMovingComplete'; /** * [descr:_viz_range_selector_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< + export type ValueChangedEvent = DevExpress.common.NativeEventInfo< dxRangeSelector, MouseEvent | TouchEvent > & { @@ -40235,7 +40216,7 @@ declare module DevExpress.viz { /** * [descr:dxRangeSelectorOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxRangeSelectorOptions.dataSourceField] */ @@ -40598,7 +40579,7 @@ declare module DevExpress.viz { * [descr:dxSankey.getAllNodes()] */ getAllNodes(): Array; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxSankey.hideTooltip()] */ @@ -40608,19 +40589,19 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sankey_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sankey_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sankey_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_sankey_FileSavingEvent] @@ -40630,17 +40611,17 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & + export type IncidentOccurredEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_sankey_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_sankey_LinkClickEvent] */ - export type LinkClickEvent = DevExpress.events.NativeEventInfo< + export type LinkClickEvent = DevExpress.common.NativeEventInfo< dxSankey, MouseEvent | PointerEvent > & { @@ -40652,7 +40633,7 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_LinkHoverEvent] */ - export type LinkHoverEvent = DevExpress.events.EventInfo & { + export type LinkHoverEvent = DevExpress.common.EventInfo & { /** * [descr:_viz_sankey_LinkHoverEvent.target] */ @@ -40661,7 +40642,7 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_NodeClickEvent] */ - export type NodeClickEvent = DevExpress.events.NativeEventInfo< + export type NodeClickEvent = DevExpress.common.NativeEventInfo< dxSankey, MouseEvent | PointerEvent > & { @@ -40673,7 +40654,7 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_NodeHoverEvent] */ - export type NodeHoverEvent = DevExpress.events.EventInfo & { + export type NodeHoverEvent = DevExpress.common.EventInfo & { /** * [descr:_viz_sankey_NodeHoverEvent.target] */ @@ -40682,8 +40663,8 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSankeyOptions; export type SankeyColorMode = 'none' | 'source' | 'target' | 'gradient'; /** @@ -40715,7 +40696,7 @@ declare module DevExpress.viz { * [descr:dxSankeyOptions.tooltip.linkTooltipTemplate] */ linkTooltipTemplate?: - | DevExpress.core.template + | template | (( info: { source?: string; target?: string; weight?: number }, element: DevExpress.core.DxElement @@ -40725,7 +40706,7 @@ declare module DevExpress.viz { * [descr:dxSankeyOptions.tooltip.nodeTooltipTemplate] */ nodeTooltipTemplate?: - | DevExpress.core.template + | template | (( info: { label?: string; weightIn?: number; weightOut?: number }, element: DevExpress.core.DxElement @@ -40848,7 +40829,7 @@ declare module DevExpress.viz { /** * [descr:dxSankeyOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxSankeyOptions.hoverEnabled] */ @@ -41155,25 +41136,25 @@ declare module DevExpress.viz { * [descr:dxSparkline] */ export class dxSparkline extends BaseSparkline { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; } module dxSparkline { /** * [descr:_viz_sparkline_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sparkline_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sparkline_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sparkline_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_sparkline_FileSavingEvent] @@ -41184,18 +41165,18 @@ declare module DevExpress.viz { * [descr:_viz_sparkline_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_sparkline_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:_viz_sparkline_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxSparklineOptions; export type SparklineType = | 'area' @@ -41209,11 +41190,11 @@ declare module DevExpress.viz { /** * [descr:_viz_sparkline_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo; + export type TooltipHiddenEvent = DevExpress.common.EventInfo; /** * [descr:_viz_sparkline_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo; + export type TooltipShownEvent = DevExpress.common.EventInfo; } /** * [descr:dxSparklineOptions] @@ -41237,7 +41218,7 @@ declare module DevExpress.viz { /** * [descr:dxSparklineOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxSparklineOptions.firstLastColor] */ @@ -41327,7 +41308,7 @@ declare module DevExpress.viz { * [descr:dxTreeMap.getCurrentNode()] */ getCurrentNode(): dxTreeMapNode; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:dxTreeMap.getRootNode()] */ @@ -41345,7 +41326,7 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.NativeEventInfo< dxTreeMap, MouseEvent | PointerEvent > & { @@ -41357,15 +41338,15 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_tree_map_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_tree_map_DrillEvent] */ - export type DrillEvent = DevExpress.events.EventInfo & { + export type DrillEvent = DevExpress.common.EventInfo & { /** * [descr:_viz_tree_map_DrillEvent.node] */ @@ -41374,11 +41355,11 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_tree_map_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_tree_map_FileSavingEvent] @@ -41388,18 +41369,18 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_HoverChangedEvent] */ - export type HoverChangedEvent = DevExpress.events.EventInfo & + export type HoverChangedEvent = DevExpress.common.EventInfo & InteractionInfo; /** * [descr:_viz_tree_map_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & + export type IncidentOccurredEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_tree_map_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:InteractionInfo] * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -41414,7 +41395,7 @@ declare module DevExpress.viz { * [descr:_viz_tree_map_NodesInitializedEvent] */ export type NodesInitializedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_viz_tree_map_NodesInitializedEvent.root] */ @@ -41423,7 +41404,7 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_NodesRenderingEvent] */ - export type NodesRenderingEvent = DevExpress.events.EventInfo & { + export type NodesRenderingEvent = DevExpress.common.EventInfo & { /** * [descr:_viz_tree_map_NodesRenderingEvent.node] */ @@ -41432,13 +41413,13 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxTreeMapOptions; /** * [descr:_viz_tree_map_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & + export type SelectionChangedEvent = DevExpress.common.EventInfo & InteractionInfo; /** * [descr:dxTreeMapTooltip] @@ -41448,7 +41429,7 @@ declare module DevExpress.viz { * [descr:dxTreeMapOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( info: { value?: number; valueText?: string; node?: dxTreeMapNode }, element: DevExpress.core.DxElement @@ -41612,7 +41593,7 @@ declare module DevExpress.viz { /** * [descr:dxTreeMapOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.common.DataSourceLike | null; /** * [descr:dxTreeMapOptions.group] */ @@ -41943,7 +41924,7 @@ declare module DevExpress.viz { * [descr:_viz_vector_map_CenterChangedEvent] */ export type CenterChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_viz_vector_map_CenterChangedEvent.center] */ @@ -41952,7 +41933,7 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.NativeEventInfo< dxVectorMap, MouseEvent | PointerEvent > & { @@ -41964,19 +41945,19 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.EventInfo; /** * [descr:_viz_vector_map_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.EventInfo; /** * [descr:_viz_vector_map_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = DevExpress.common.EventInfo; /** * [descr:_viz_vector_map_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & + export type ExportingEvent = DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_vector_map_FileSavingEvent] @@ -41987,13 +41968,13 @@ declare module DevExpress.viz { * [descr:_viz_vector_map_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_vector_map_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.InitializedEventInfo; /** * [descr:dxVectorMapLegends] */ @@ -42042,7 +42023,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapOptions.legends.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | template | (( legendItem: LegendItem, element: SVGGElement @@ -42065,14 +42046,14 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = DevExpress.common.EventInfo & + DevExpress.common.ChangedOptionInfo; export type Properties = dxVectorMapOptions; /** * [descr:_viz_vector_map_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_viz_vector_map_SelectionChangedEvent.target] */ @@ -42086,7 +42067,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( info: MapLayerElement, element: DevExpress.core.DxElement @@ -42104,7 +42085,7 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & + export type TooltipHiddenEvent = DevExpress.common.EventInfo & TooltipInfo; /** * [descr:_viz_vector_map_TooltipInfo] @@ -42119,7 +42100,7 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & + export type TooltipShownEvent = DevExpress.common.EventInfo & TooltipInfo; export type VectorMapLayerType = 'area' | 'line' | 'marker'; export type VectorMapMarkerShape = 'circle' | 'square'; @@ -42128,7 +42109,7 @@ declare module DevExpress.viz { * [descr:_viz_vector_map_ZoomFactorChangedEvent] */ export type ZoomFactorChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.EventInfo & { /** * [descr:_viz_vector_map_ZoomFactorChangedEvent.zoomFactor] */ @@ -42166,7 +42147,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | template | (( annotation: dxVectorMapAnnotationConfig | any, element: SVGGElement @@ -42176,7 +42157,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | template | (( annotation: dxVectorMapAnnotationConfig | any, element: DevExpress.core.DxElement @@ -42287,10 +42268,7 @@ declare module DevExpress.viz { /** * [descr:dxVectorMapOptions.layers.dataSource] */ - dataSource?: - | object - | DevExpress.data.DataSource.DataSourceLike - | null; + dataSource?: object | DevExpress.common.DataSourceLike | null; /** * [descr:dxVectorMapOptions.layers.elementType] */ @@ -42397,10 +42375,7 @@ declare module DevExpress.viz { colorGroups?: Array; customize?: (elements: Array) => any; dataField?: string; - dataSource?: - | object - | DevExpress.data.DataSource.DataSourceLike - | null; + dataSource?: object | DevExpress.common.DataSourceLike | null; elementType?: 'bubble' | 'dot' | 'image' | 'pie'; hoverEnabled?: boolean; hoveredBorderColor?: string; @@ -42626,7 +42601,7 @@ declare module DevExpress.viz { /** * [descr:MapLayer.getDataSource()] */ - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.DataSource; /** * [descr:MapLayer.getElements()] */ From 8e56e76ab2d6527260568f665a080609a5f1d49f Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Wed, 13 Nov 2024 18:41:20 +0400 Subject: [PATCH 03/38] update imports in tests --- .../src/core/integration.ts | 2 +- .../js/__internal/core/utils/m_support.ts | 2 +- .../devextreme/js/bundles/modules/data.js | 2 +- packages/devextreme/js/common.js | 12 +++-- .../devextreme/js/common/core/animation.js | 16 ++++-- .../devextreme/js/common/core/environment.js | 15 ++++-- packages/devextreme/js/common/data.js | 46 +++++++++++----- .../devextreme/js/common/data/custom_store.js | 15 ++++-- .../devextreme/js/common/file_management.js | 22 +++++--- .../helpers/data.errorHandlingHelper.js | 2 +- .../testing/helpers/dataGridMocks.js | 4 +- .../devextreme/testing/helpers/eventHelper.js | 2 +- .../testing/helpers/fileManager/events.js | 2 +- .../file_provider.no_duplicates.js | 4 +- .../helpers/fileManager/file_provider.slow.js | 4 +- .../helpers/fileManager/file_provider.test.js | 4 +- .../testing/helpers/fileManagerHelpers.js | 2 +- .../helpers/grid/keyboardNavigationHelper.js | 8 +-- .../testing/helpers/jQueryEventsPatch.js | 2 +- .../devextreme/testing/helpers/pointerMock.js | 4 +- .../testing/helpers/scheduler/helpers.js | 2 +- .../testing/helpers/treeListMocks.js | 4 +- .../widget_bundled.tests.js | 2 +- .../DevExpress.animation/easing.tests.js | 2 +- .../tests/DevExpress.animation/fx.tests.js | 10 ++-- .../DevExpress.animation/position.tests.js | 4 +- .../transitionExecutors.tests.js | 6 +-- .../DevExpress.animation/translator.tests.js | 2 +- .../DevExpress.core/domComponent.tests.js | 4 +- .../utils.animationFrame.tests.js | 2 +- .../tests/DevExpress.core/utils.dom.tests.js | 2 +- .../DevExpress.core/utils.topOverlay.tests.js | 4 +- .../tests/DevExpress.core/utils.type.tests.js | 2 +- .../DevExpress.data/abstractStore.test.js | 2 +- .../DevExpress.data/applyChanges.tests.js | 6 +-- .../tests/DevExpress.data/dataSource.tests.js | 10 ++-- .../dataSourceCreating.tests.js | 10 ++-- .../DevExpress.data/odataCommonOData.tests.js | 4 +- .../tests/DevExpress.data/odataQuery.tests.js | 6 +-- .../tests/DevExpress.data/odataStore.tests.js | 6 +-- .../tests/DevExpress.data/queryArray.tests.js | 2 +- .../tests/DevExpress.data/storeArray.tests.js | 2 +- .../DevExpress.data/storeCustom.tests.js | 4 +- .../storeCustom_loadModeRaw.tests.js | 2 +- .../tests/DevExpress.data/storeLocal.tests.js | 2 +- .../tests/DevExpress.data/utils.tests.js | 6 +-- .../commonParts/loadPanel.tests.js | 4 +- .../tests/DevExpress.jquery/easing.tests.js | 2 +- .../eventRegistrator.tests.js | 2 +- .../DevExpress.knockout/dataGrid.tests.js | 4 +- .../DevExpress.knockout/datebox.tests.js | 4 +- .../eventRegistration.tests.js | 12 ++--- .../tests/DevExpress.knockout/form.tests.js | 2 +- .../tests/DevExpress.knockout/lookup.tests.js | 2 +- .../DevExpress.knockout/overlay.tests.js | 2 +- .../DevExpress.knockout/selectBox.tests.js | 2 +- .../tests/DevExpress.knockout/tagBox.tests.js | 2 +- .../DevExpress.localization/ldml.tests.js | 20 +++---- .../DevExpress.localization/locales.tests.js | 54 +++++++++---------- .../localization.base.tests.js | 6 +-- .../localization.custom.tests.js | 4 +- .../localization.globalize.tests.js | 26 ++++----- .../localization.globalize.widgets.tests.js | 12 ++--- .../localization.intl.tests.js | 10 ++-- .../localization.intl.widgets.tests.js | 6 +-- .../localization.messages.test.js | 2 +- .../localization.nativeIntl.base.tests.js | 6 +-- .../localization.utils.tests.js | 2 +- .../sharedParts/localization.shared.js | 6 +-- .../validation.tests.js | 12 ++--- .../overlaysStyleRecalculations.tests.js | 2 +- .../translatorRecalculations.tests.js | 2 +- .../widgetsCreation.tests.js | 2 +- .../tests/DevExpress.ui.events/click.tests.js | 2 +- .../DevExpress.ui.events/contextmenu.tests.js | 4 +- .../DevExpress.ui.events/dblclick.tests.js | 4 +- .../tests/DevExpress.ui.events/drag.tests.js | 4 +- .../eventRegistrator.tests.js | 6 +-- .../events.utils.tests.js | 4 +- .../eventsEngine.tests.js | 4 +- .../eventsInteraction.tests.js | 22 ++++---- .../DevExpress.ui.events/feedback.tests.js | 2 +- .../tests/DevExpress.ui.events/hold.tests.js | 2 +- .../tests/DevExpress.ui.events/hover.tests.js | 2 +- .../pointerParts/baseTests.js | 4 +- .../pointerParts/mouseAndTouchTests.js | 4 +- .../pointerParts/mouseTests.js | 4 +- .../pointerParts/strategySelectionTests.js | 8 +-- .../pointerParts/touchTests.js | 6 +-- .../DevExpress.ui.events/remove.tests.js | 4 +- .../DevExpress.ui.events/scroll.tests.js | 8 +-- .../tests/DevExpress.ui.events/swipe.tests.js | 4 +- .../transformation.tests.js | 2 +- .../tests/DevExpress.ui.events/wheel.tests.js | 2 +- .../adaptiveColumns.integration.tests.js | 2 +- .../adaptiveColumns.tests.js | 2 +- .../columnChooser.integration.tests.js | 2 +- .../columnChooserModule.tests.js | 2 +- .../columnFixing.integration.tests.js | 2 +- .../columnFixing.tests.js | 2 +- .../columnsController.tests.js | 12 ++--- .../columnsHeadersView.tests.js | 6 +-- .../columnsResizingReorderingModule.tests.js | 4 +- .../columnsView.tests.js | 2 +- .../dataController.tests.js | 6 +-- .../dataGrid.tests.js | 8 +-- .../dataSource.tests.js | 12 ++--- .../editing.integration.tests.js | 8 +-- .../editing.tests.js | 14 ++--- .../editorFactory.tests.js | 2 +- .../exportController.tests.js | 4 +- .../filterBuilder.tests.js | 2 +- .../filterPanel.tests.js | 6 +-- .../filterRow.tests.js | 6 +-- .../filterSync.tests.js | 2 +- .../filtering.integration.tests.js | 6 +-- .../focus.integration.tests.js | 8 +-- .../focus.tests.js | 8 +-- .../gridView.tests.js | 2 +- .../grouping.integration.tests.js | 4 +- .../headerFilter.tests.js | 12 ++--- .../keyboardNavigation.accessibility.tests.js | 4 +- ...oardNavigation.keyboardController.tests.js | 6 +-- .../keyboardNavigation.keyboardKeys.tests.js | 2 +- ...eyboardNavigation.realControllers.tests.js | 2 +- .../keyboardNavigation.rowsView.tests.js | 6 +-- .../masterDetail.integration.tests.js | 2 +- .../pagerView.tests.js | 2 +- .../rowDragging.integration.tests.js | 2 +- .../rowsView.tests.js | 6 +-- .../scrolling.integration.tests.js | 2 +- .../selection.tests.js | 10 ++-- .../stateStoring.tests.js | 4 +- .../virtualColumns.tests.js | 2 +- .../virtualScrolling.integration.tests.js | 10 ++-- .../autocomplete.tests.js | 6 +-- .../calendar.markup.tests.js | 2 +- .../calendar.tests.js | 10 ++-- .../calendarView.markup.tests.js | 2 +- .../calendarViews.tests.js | 6 +-- .../checkbox.tests.js | 2 +- .../colorBox.markup.tests.js | 2 +- .../colorBox.tests.js | 4 +- .../colorView.markup.tests.js | 2 +- .../colorView.tests.js | 4 +- .../dateRangeBox.strategy.tests.js | 2 +- .../dateRangeBox.tests.js | 4 +- .../dateView.tests.js | 8 +-- .../datebox.markup.tests.js | 2 +- .../datebox.mask.tests.js | 4 +- .../datebox.tests.js | 10 ++-- .../dropDownBox.markup.tests.js | 2 +- .../dropDownBox.tests.js | 8 +-- .../dropDownEditor.tests.js | 4 +- .../dropDownList.tests.js | 8 +-- .../dropDownOptions.tests.js | 2 +- .../editor.tests.js | 2 +- .../lookup.markup.tests.js | 2 +- .../lookup.tests.js | 12 ++--- .../numberBoxParts/common.tests.js | 4 +- .../numberBoxParts/mask.tests.js | 2 +- .../numberbox.format.tests.js | 2 +- .../radioGroup.tests.js | 6 +-- .../rangeSlider.tests.js | 4 +- .../selectBox.markup.tests.js | 6 +-- .../selectBox.tests.js | 10 ++-- .../slider.tests.js | 10 ++-- .../switch.tests.js | 4 +- .../tagBox.markup.tests.js | 2 +- .../tagBox.tests.js | 18 +++---- .../textEditorParts/common.tests.js | 4 +- .../timeView.tests.js | 2 +- .../trackBar.tests.js | 2 +- .../validationGroup.tests.js | 2 +- .../DevExpress.ui.widgets.form/form.tests.js | 2 +- .../htmlEditorParts/events.tests.js | 4 +- .../imageCursorModule.tests.js | 2 +- .../imageUploadIntegration.tests.js | 2 +- .../htmlEditorParts/mentionModule.tests.js | 4 +- .../resizingIntegration.tests.js | 2 +- .../htmlEditorParts/resizingModule.tests.js | 2 +- .../htmlEditorParts/scrolling.tests.js | 2 +- .../tableContextMenuIntegration.tests.js | 4 +- .../toolbarIntegration.tests.js | 2 +- .../htmlEditorParts/toolbarModule.tests.js | 2 +- .../dataSource_bundled.tests.js | 4 +- .../export.tests.js | 2 +- .../fieldChooser.tests.js | 2 +- .../pivotGrid.tests.js | 8 +-- .../store.local.tests.js | 2 +- .../store.remote.tests.js | 4 +- .../store.xmla.common.tests.js | 4 +- .../agenda.resourceProcessor.tests.js | 4 +- .../agenda.tests.js | 2 +- .../allDayAppointments.common-0.tests.js | 10 ++-- .../allDayAppointments.common-1.tests.js | 10 ++-- .../allDayAppointments.dragging.tests.js | 6 +-- .../appointment.dataProcessor.tests.js | 2 +- .../appointment.editing.tests.js | 4 +- .../appointment.filtering.tests.js | 4 +- .../appointment.monthView.tests.js | 8 +-- .../appointment.resources.tests.js | 4 +- .../appointment.scroll.tests.js | 4 +- .../appointment.templates.tests.js | 4 +- .../appointment.tests.js | 2 +- .../appointment.timeLines.tests.js | 2 +- .../appointment.tooltip.tests.js | 2 +- .../appointment.week.based.views.tests.js | 10 ++-- .../appointmentPopup.tests.js | 6 +-- .../appointments.horizontalStrategy.tests.js | 2 +- .../appointments.tests.js | 10 ++-- .../appointments.verticalStrategy.tests.js | 2 +- .../common.events.tests.js | 4 +- .../common.initialization.tests.js | 6 +-- .../common.markup.tests.js | 4 +- .../common.methods.tests.js | 6 +-- .../common.options.tests.js | 6 +-- .../common.tests.js | 8 +-- .../contentReadyEvent.tests.js | 8 +-- .../dataSource.tests.js | 12 ++--- .../dragAndDropAppointments.tests.js | 8 +-- .../editing.tests.js | 2 +- .../integration.RTL.tests.js | 4 +- .../integration.adaptivity.tests.js | 2 +- .../integration.agenda.tests.js | 8 +-- .../integration.appointmentCollector.tests.js | 8 +-- .../integration.appointmentTooltip.tests.js | 8 +-- ...ppointments.crossScrollingEnabled.tests.js | 4 +- .../integration.appointmentsVertical.tests.js | 6 +-- .../integration.dateNavigator.tests.js | 2 +- .../integration.dstAppointments.tests.js | 4 +- ...integration.multiWeekAppointments.tests.js | 6 +-- .../integration.optionChange.tests.js | 2 +- ...egration.recurrenceRuleValidation.tests.js | 6 +-- ...integration.recurringAppointments.tests.js | 10 ++-- .../integration.resources.dataSource.tests.js | 4 +- .../integration.resources.tests.js | 8 +-- .../integration.timeline.tests.js | 4 +- .../integration.viewSwitcher.tests.js | 2 +- .../integration.workSpace.tests.js | 12 ++--- .../keyboardNavigation.tests.js | 2 +- .../layoutManager.tests.js | 4 +- .../loading.tests.js | 2 +- .../pacificTime.tests.js | 2 +- .../perfomance.tests.js | 6 +-- .../recurrenceDialog.tests.js | 2 +- .../recurrenceEditor.tests.js | 2 +- .../resourceManager.tests.js | 4 +- .../scrollTo.tests.js | 2 +- .../scrollToTime.tests.js | 2 +- .../subscribes.tests.js | 2 +- .../timeline.markup.tests.js | 2 +- .../timeline.tests.js | 2 +- .../timezones.tests.js | 12 ++--- .../views.cellTemplate.tests.js | 2 +- .../views.cellsSelection.tests.js | 2 +- .../virtual_scrolling.integration.tests.js | 2 +- .../virtual_scrolling.tests.js | 4 +- .../workSpace.base.tests.js | 2 +- .../workSpace.day.tests.js | 4 +- .../workSpace.markup.tests.js | 2 +- .../workSpace.week.tests.js | 2 +- .../workSpaceWithHorizontalScroll.tests.js | 2 +- .../dataController.tests.js | 6 +-- .../editing.tests.js | 4 +- .../gridView.tests.js | 2 +- .../headerPanel.tests.js | 2 +- .../rows.tests.js | 2 +- .../selection.integration.tests.js | 2 +- .../selection.tests.js | 4 +- .../treeList.tests.js | 8 +-- .../DevExpress.ui.widgets/accordion.tests.js | 10 ++-- .../actionSheet.tests.js | 6 +-- .../DevExpress.ui.widgets/animator.tests.js | 2 +- .../tests/DevExpress.ui.widgets/box.tests.js | 2 +- .../DevExpress.ui.widgets/button.tests.js | 2 +- .../buttonGroup.selection.tests.js | 2 +- .../buttonGroup.tests.js | 2 +- .../chatParts/chat.tests.js | 6 +-- .../chatParts/messageGroup.tests.js | 2 +- .../chatParts/messageList.tests.js | 2 +- .../contextMenu.tests.js | 8 +-- .../deferRendering.animation.tests.js | 2 +- .../deferRendering.tests.js | 2 +- .../diagramParts/dataBinding.tests.js | 4 +- .../DevExpress.ui.widgets/draggable.tests.js | 8 +-- .../drawer.scenarios.tests.js | 2 +- .../DevExpress.ui.widgets/drawer.tests.js | 8 +-- .../dropDownButton.markup.tests.js | 2 +- .../dropDownButton.tests.js | 8 +-- .../fileManagerParts/adaptivity.tests.js | 2 +- .../fileManagerParts/arrayProvider.tests.js | 6 +-- .../fileManagerParts/common.tests.js | 4 +- .../fileManagerParts/contextMenu.tests.js | 4 +- .../fileManagerParts/customProvider.tests.js | 4 +- .../fileManagerParts/detailsView.tests.js | 6 +-- .../fileManagerParts/editing.tests.js | 12 ++--- .../fileManagerParts/editingEvents.tests.js | 4 +- .../fileManagerParts/editingProgress.tests.js | 6 +-- .../fileItemsController.tests.js | 2 +- .../fileManagerParts/markup.tests.js | 2 +- .../fileManagerParts/navigation.tests.js | 8 +-- .../fileManagerParts/progressPanel.tests.js | 4 +- .../fileManagerParts/remoteProvider.tests.js | 4 +- .../fileManagerParts/scroll.tests.js | 4 +- .../fileManagerParts/selection.tests.js | 2 +- .../fileManagerParts/thumbnailsView.tests.js | 2 +- .../fileManagerParts/toolbar.tests.js | 2 +- .../filterBuilderParts/utilsTests.js | 4 +- .../DevExpress.ui.widgets/gallery.tests.js | 10 ++-- .../ganttParts/clientSideEvents.tests.js | 2 +- .../ganttParts/dialogs.tests.js | 2 +- .../ganttParts/editDataSources.tests.js | 6 +-- .../ganttParts/refresh.tests.js | 2 +- .../init_dispose_widget_bundled_tests.js | 2 +- .../listParts/commonTests.js | 14 ++--- .../listParts/editingTests.js | 4 +- .../listParts/editingUITests.js | 12 ++--- .../listParts/liveUpdateTests.js | 4 +- .../loadIndicator.tests.js | 2 +- .../DevExpress.ui.widgets/loadPanel.tests.js | 4 +- .../menu.markup.tests.js | 2 +- .../tests/DevExpress.ui.widgets/menu.tests.js | 10 ++-- .../multiView.integration.tests.js | 2 +- .../DevExpress.ui.widgets/multiView.tests.js | 8 +-- .../optionChanged_bundled.tests.js | 4 +- .../DevExpress.ui.widgets/overlay.tests.js | 12 ++--- .../DevExpress.ui.widgets/popover.tests.js | 4 +- .../popup.materialTheme.tests.js | 2 +- .../DevExpress.ui.widgets/popup.tests.js | 4 +- .../progressBar.tests.js | 2 +- .../DevExpress.ui.widgets/resizable.tests.js | 4 +- .../resizeHandle.markup.tests.js | 4 +- .../resizeHandle.tests.js | 4 +- .../responsiveBox.tests.js | 2 +- .../DevExpress.ui.widgets/scrollView.tests.js | 6 +-- .../scrollable.actions.tests.js | 2 +- .../scrollable.dynamic.tests.js | 2 +- .../scrollableParts/scrollable.main.tests.js | 6 +-- .../scrollable.mouseWheel.tests.js | 2 +- .../scrollableParts/scrollable.rtl.tests.js | 4 +- .../scrollable.scrollbar.tests.js | 2 +- .../scrollable.scrollingByThumb.tests.js | 2 +- .../scrollable.useNative.tests.js | 2 +- .../DevExpress.ui.widgets/selection.test.js | 6 +-- .../DevExpress.ui.widgets/sortable.tests.js | 6 +-- .../speedDialAction.tests.js | 2 +- .../DevExpress.ui.widgets/splitter.tests.js | 8 +-- .../DevExpress.ui.widgets/swipeable.tests.js | 4 +- .../tabPanel.repaintChangesOnly.tests.js | 2 +- .../DevExpress.ui.widgets/tabPanel.tests.js | 4 +- .../tabPanel.width.tests.js | 2 +- .../tests/DevExpress.ui.widgets/tabs.tests.js | 6 +-- .../DevExpress.ui.widgets/tabs.width.tests.js | 2 +- .../DevExpress.ui.widgets/tileView.tests.js | 2 +- .../DevExpress.ui.widgets/toast.tests.js | 2 +- .../toolbar.disabled.tests.js | 4 +- .../toolbar.menu.tests.js | 6 +-- .../DevExpress.ui.widgets/toolbar.tests.js | 2 +- .../toolbar.themes.sharedTests.js | 2 +- .../DevExpress.ui.widgets/tooltip.tests.js | 2 +- .../treeView.checkboxes.tests.js | 2 +- .../treeView.expanded.tests.js | 2 +- .../DevExpress.ui.widgets/treeView.tests.js | 4 +- .../treeViewParts/accessibility.js | 2 +- .../treeViewParts/animation.js | 2 +- .../treeViewParts/events.js | 8 +-- .../treeViewParts/initialization.js | 4 +- .../treeViewParts/keyboardNavigation.js | 2 +- .../treeViewParts/rendering.js | 8 +-- .../treeViewParts/selection.js | 2 +- .../treeViewParts/testUtils.js | 4 +- .../treeViewParts/virtualMode.js | 12 ++--- .../DevExpress.ui/collectionWidget.tests.js | 8 +-- .../collectionWidgetParts/editingTests.js | 6 +-- .../collectionWidgetParts/liveUpdateTests.js | 4 +- .../tests/DevExpress.ui/dialog.tests.js | 2 +- .../floatingActionButtonRepaint.tests.js | 2 +- .../tests/DevExpress.ui/hideToasts.tests.js | 2 +- .../hierarchicalCollectionWidget.js | 2 +- .../hierarchicalDataAdapter.js | 2 +- .../DevExpress.ui/keyboardProcessor.tests.js | 2 +- .../tests/DevExpress.ui/notify.tests.js | 2 +- .../tests/DevExpress.ui/tooltip.tests.js | 2 +- .../tests/DevExpress.ui/widget.tests.js | 2 +- .../DevExpress.utils/utils.inkRipple.tests.js | 2 +- .../chart.part1.tests.js | 4 +- .../DevExpress.viz.charts/chart.tests.js | 2 +- .../chartInteraction.tests.js | 2 +- .../DevExpress.viz.charts/chartSync.tests.js | 2 +- .../DevExpress.viz.charts/pieChart.tests.js | 4 +- .../DevExpress.viz.charts/scrollBar.tests.js | 2 +- .../DevExpress.viz.charts/tracker.tests.js | 2 +- .../annotations.plugins.tests.js | 2 +- .../loadingIndicator.integration.tests.js | 2 +- .../funnel.tracker.tests.js | 4 +- .../DevExpress.viz.gauges/tracker.tests.js | 2 +- .../common.part1.tests.js | 2 +- .../common.part2.tests.js | 2 +- .../common.part3.tests.js | 4 +- .../range_selector.integration.tests.js | 2 +- .../tracker.tests.js | 2 +- .../Animation.tests.js | 2 +- .../SvgElement.tests.js | 2 +- .../sankey.tracker.tests.js | 4 +- .../baseSparklineTooltipEvents.tests.js | 2 +- .../sparkline.tests.js | 2 +- .../DevExpress.viz.treeMap/tracker.tests.js | 4 +- .../treeMap.base.tests.js | 2 +- .../map.integration.tests.js | 4 +- .../mapLayer.tests.js | 2 +- .../mapLayer_new.tests.js | 2 +- .../DevExpress.viz.vectorMap/tracker.tests.js | 2 +- 413 files changed, 997 insertions(+), 939 deletions(-) diff --git a/packages/devextreme-angular/src/core/integration.ts b/packages/devextreme-angular/src/core/integration.ts index 56f7ee8703af..c27505a6b4e5 100644 --- a/packages/devextreme-angular/src/core/integration.ts +++ b/packages/devextreme-angular/src/core/integration.ts @@ -7,7 +7,7 @@ import httpRequest from 'devextreme/core/http_request'; import domAdapter from 'devextreme/core/dom_adapter'; import readyCallbacks from 'devextreme/core/utils/ready_callbacks'; -import eventsEngine from 'devextreme/events/core/events_engine'; +import eventsEngine from 'devextreme/common/core/events/core/events_engine'; const outsideZoneEvents = ['mousemove', 'mouseover', 'mouseout']; const insideZoneEvents = ['mouseup', 'click', 'mousedown', 'transitionend', 'wheel']; diff --git a/packages/devextreme/js/__internal/core/utils/m_support.ts b/packages/devextreme/js/__internal/core/utils/m_support.ts index c1c0927d4b92..ac8e89e57662 100644 --- a/packages/devextreme/js/__internal/core/utils/m_support.ts +++ b/packages/devextreme/js/__internal/core/utils/m_support.ts @@ -1,4 +1,4 @@ -import devices from '@js/core/devices'; +import { devices } from '@js/common/core/environment'; import domAdapter from '@js/core/dom_adapter'; import callOnce from '@js/core/utils/call_once'; import { styleProp, stylePropPrefix } from '@js/core/utils/style'; diff --git a/packages/devextreme/js/bundles/modules/data.js b/packages/devextreme/js/bundles/modules/data.js index fe7a2cfc1937..89f26b9a14d8 100644 --- a/packages/devextreme/js/bundles/modules/data.js +++ b/packages/devextreme/js/bundles/modules/data.js @@ -30,7 +30,7 @@ DevExpress.data.DataSource = require('../../common/data/data_source'); DevExpress.data.query = require('../../common/data/query'); DevExpress.data.Store = require('../../common/data/abstract_store'); DevExpress.data.ArrayStore = require('../../common/data/array_store'); -DevExpress.data.CustomStore = require('../../common/data/custom_store'); +DevExpress.data.CustomStore = require('../../common/data/custom_store').CustomStore; DevExpress.data.LocalStore = require('../../common/data/local_store'); DevExpress.data.base64_encode = require('../../common/data/utils').base64_encode; DevExpress.data.applyChanges = require('../../common/data/apply_changes'); diff --git a/packages/devextreme/js/common.js b/packages/devextreme/js/common.js index 96cc4203e8c8..7110b0df4ba5 100644 --- a/packages/devextreme/js/common.js +++ b/packages/devextreme/js/common.js @@ -1,3 +1,9 @@ -export { default as config } from './common/config'; -export { default as Guid } from './common/guid'; -export { default as setTemplateEngine } from './common/set_template_engine'; +import config from './common/config'; +import Guid from './common/guid'; +import setTemplateEngine from './common/set_template_engine'; + +export { + config, + Guid, + setTemplateEngine, +}; diff --git a/packages/devextreme/js/common/core/animation.js b/packages/devextreme/js/common/core/animation.js index 3257df279e74..d759e10cf8f6 100644 --- a/packages/devextreme/js/common/core/animation.js +++ b/packages/devextreme/js/common/core/animation.js @@ -1,4 +1,12 @@ -export { requestAnimationFrame, cancelAnimationFrame } from './animation/frame'; -export { default as fx } from './animation/fx'; -export { default as animationPresets } from './animation/presets'; -export { default as TransitionExecutor } from './animation/transition_executor'; +import { requestAnimationFrame, cancelAnimationFrame } from './animation/frame'; +import fx from './animation/fx'; +import animationPresets from './animation/presets'; +import TransitionExecutor from './animation/transition_executor'; + +export { + requestAnimationFrame, + cancelAnimationFrame, + fx, + animationPresets, + TransitionExecutor, +}; diff --git a/packages/devextreme/js/common/core/environment.js b/packages/devextreme/js/common/core/environment.js index 049d7782b4c6..06bf67894425 100644 --- a/packages/devextreme/js/common/core/environment.js +++ b/packages/devextreme/js/common/core/environment.js @@ -1,4 +1,11 @@ -export { default as devices } from './environment/devices'; -export { default as hideTopOverlay } from './environment/hide_top_overlay'; -export { default as initMobileViewport } from './environment/init_mobile_viewport'; -export { getTimeZones } from './environment/time_zone_utils'; +import devices from './environment/devices'; +import hideTopOverlay from './environment/hide_top_overlay'; +import initMobileViewport from './environment/init_mobile_viewport'; +import { getTimeZones } from './environment/time_zone_utils'; + +export { + devices, + hideTopOverlay, + initMobileViewport, + getTimeZones, +}; diff --git a/packages/devextreme/js/common/data.js b/packages/devextreme/js/common/data.js index 82f267f97a39..1436d188ee62 100644 --- a/packages/devextreme/js/common/data.js +++ b/packages/devextreme/js/common/data.js @@ -1,13 +1,33 @@ -export { default as applyChanges } from './data/apply_changes'; -export { default as ArrayStore } from './data/array_store'; -export { default as CustomStore } from './data/custom_store'; -export { default as DataSource } from './data/data_source'; -export { default as EndpointSelector } from './data/endpoint_selector'; -export { errorHandler, setErrorHandler } from './data/errors'; -export { default as LocalStore } from './data/local_store'; -export { default as query } from './data/query'; -export { base64_encode, compileGetter, compileSetter } from './data/utils'; -export { default as DataHelperMixin } from './data/data_helper'; -export { default as ODataContext } from './data/odata/context'; -export { default as ODataStore } from './data/odata/store'; -export { EdmLiteral, keyConverters } from './data/odata/utils'; +import applyChanges from './data/apply_changes'; +import ArrayStore from './data/array_store'; +import { CustomStore } from './data/custom_store'; +import DataSource from './data/data_source'; +import EndpointSelector from './data/endpoint_selector'; +import { errorHandler, setErrorHandler } from './data/errors'; +import LocalStore from './data/local_store'; +import query from './data/query'; +import { base64_encode, compileGetter, compileSetter } from './data/utils'; +import DataHelperMixin from './data/data_helper'; +import ODataContext from './data/odata/context'; +import ODataStore from './data/odata/store'; +import { EdmLiteral, keyConverters } from './data/odata/utils'; + +export { + applyChanges, + ArrayStore, + CustomStore, + DataSource, + EndpointSelector, + errorHandler, + setErrorHandler, + LocalStore, + query, + base64_encode, + compileGetter, + compileSetter, + DataHelperMixin, + ODataContext, + ODataStore, + EdmLiteral, + keyConverters, +}; diff --git a/packages/devextreme/js/common/data/custom_store.js b/packages/devextreme/js/common/data/custom_store.js index d819e26f5476..7e530635fab3 100644 --- a/packages/devextreme/js/common/data/custom_store.js +++ b/packages/devextreme/js/common/data/custom_store.js @@ -1,4 +1,4 @@ -export { default } from '../../__internal/data/m_custom_store'; +import CustomStore from '../../__internal/data/m_custom_store'; function isGroupItem(item) { if(item === undefined || item === null || typeof item !== 'object') { @@ -7,14 +7,21 @@ function isGroupItem(item) { return 'key' in item && 'items' in item; } -export function isLoadResultObject(res) { +function isLoadResultObject(res) { return !Array.isArray(res) && 'data' in res; } -export function isGroupItemsArray(res) { +function isGroupItemsArray(res) { return Array.isArray(res) && !!res.length && isGroupItem(res[0]); } -export function isItemsArray(res) { +function isItemsArray(res) { return Array.isArray(res) && !isGroupItem(res[0]); } + +export { + CustomStore, + isLoadResultObject, + isGroupItemsArray, + isItemsArray, +}; diff --git a/packages/devextreme/js/common/file_management.js b/packages/devextreme/js/common/file_management.js index 6d260b044eac..7d49fec426e6 100644 --- a/packages/devextreme/js/common/file_management.js +++ b/packages/devextreme/js/common/file_management.js @@ -1,6 +1,16 @@ -export { default as CustomFileSystemProvider } from './file_management/custom_provider'; -export { default as FileSystemError } from './file_management/error'; -export { default as FileSystemItem } from './file_management/file_system_item'; -export { default as ObjectFileSystemProvider } from './file_management/object_provider'; -export { default as FileSystemProviderBase } from './file_management/provider_base'; -export { default as RemoteFileSystemProvider } from './file_management/remote_provider'; +import CustomFileSystemProvider from './file_management/custom_provider'; +import FileSystemError from './file_management/error'; +import FileSystemItem from './file_management/file_system_item'; +import ObjectFileSystemProvider from './file_management/object_provider'; +import FileSystemProviderBase from './file_management/provider_base'; +import RemoteFileSystemProvider from './file_management/remote_provider'; + +export { + CustomFileSystemProvider, + FileSystemError, + FileSystemItem, + ObjectFileSystemProvider, + FileSystemProviderBase, + RemoteFileSystemProvider, +}; + diff --git a/packages/devextreme/testing/helpers/data.errorHandlingHelper.js b/packages/devextreme/testing/helpers/data.errorHandlingHelper.js index af3d56a2637d..9e4d4d445357 100644 --- a/packages/devextreme/testing/helpers/data.errorHandlingHelper.js +++ b/packages/devextreme/testing/helpers/data.errorHandlingHelper.js @@ -5,7 +5,7 @@ if(typeof define === 'function' && define.amd) { define(function(require, exports, module) { - root.DevExpress.data.testing.ErrorHandlingHelper = module.exports = factory(require('jquery'), require('core/class'), require('data/errors')); + root.DevExpress.data.testing.ErrorHandlingHelper = module.exports = factory(require('jquery'), require('core/class'), require('common/data/errors')); }); } else { root.DevExpress.data.testing.ErrorHandlingHelper = factory(window.jQuery, DevExpress.Class, DevExpress.data); diff --git a/packages/devextreme/testing/helpers/dataGridMocks.js b/packages/devextreme/testing/helpers/dataGridMocks.js index 5e004fc85ec8..966f4ccb369a 100644 --- a/packages/devextreme/testing/helpers/dataGridMocks.js +++ b/packages/devextreme/testing/helpers/dataGridMocks.js @@ -12,7 +12,7 @@ if(typeof define === 'function' && define.amd) { require('__internal/core/utils/m_dom'), require('__internal/core/utils/m_common'), require('__internal/core/utils/m_type'), - require('data/array_store'), + require('common/data/array_store'), 'DataGrid' ); }); @@ -26,7 +26,7 @@ if(typeof define === 'function' && define.amd) { DevExpress.require('__internal/core/utils/m_dom'), DevExpress.require('__internal/core/utils/m_common'), DevExpress.require('__internal/core/utils/m_type'), - DevExpress.require('data/array_store'), + DevExpress.require('common/data/array_store'), 'DataGrid' )); } diff --git a/packages/devextreme/testing/helpers/eventHelper.js b/packages/devextreme/testing/helpers/eventHelper.js index 176238f0a3b2..0e02549c83e4 100644 --- a/packages/devextreme/testing/helpers/eventHelper.js +++ b/packages/devextreme/testing/helpers/eventHelper.js @@ -1,4 +1,4 @@ -import registerEventCallbacks from 'events/core/event_registrator_callbacks'; +import registerEventCallbacks from 'common/core/events/core/event_registrator_callbacks'; export const special = {}; diff --git a/packages/devextreme/testing/helpers/fileManager/events.js b/packages/devextreme/testing/helpers/fileManager/events.js index c00410613759..14c34ca19301 100644 --- a/packages/devextreme/testing/helpers/fileManager/events.js +++ b/packages/devextreme/testing/helpers/fileManager/events.js @@ -1,4 +1,4 @@ -import pointerEvents from 'events/pointer'; +import pointerEvents from 'common/core/events/pointer'; export const triggerCellClick = ($cell, singleSelection) => { $cell diff --git a/packages/devextreme/testing/helpers/fileManager/file_provider.no_duplicates.js b/packages/devextreme/testing/helpers/fileManager/file_provider.no_duplicates.js index d7bbb7707d6e..31501d17f763 100644 --- a/packages/devextreme/testing/helpers/fileManager/file_provider.no_duplicates.js +++ b/packages/devextreme/testing/helpers/fileManager/file_provider.no_duplicates.js @@ -1,7 +1,7 @@ import { Deferred } from 'core/utils/deferred'; import { createTestFileSystem } from '../fileManagerHelpers.js'; -import CustomFileSystemProvider from 'file_management/custom_provider'; -import ObjectFileSystemProvider from 'file_management/object_provider'; +import CustomFileSystemProvider from 'common/file_management/custom_provider'; +import ObjectFileSystemProvider from 'common/file_management/object_provider'; export default class NoDuplicatesFileProvider extends CustomFileSystemProvider { constructor(options) { diff --git a/packages/devextreme/testing/helpers/fileManager/file_provider.slow.js b/packages/devextreme/testing/helpers/fileManager/file_provider.slow.js index de579240c3b9..a10b28825434 100644 --- a/packages/devextreme/testing/helpers/fileManager/file_provider.slow.js +++ b/packages/devextreme/testing/helpers/fileManager/file_provider.slow.js @@ -1,7 +1,7 @@ import { Deferred } from 'core/utils/deferred'; import { createTestFileSystem, stubFileReader } from '../fileManagerHelpers.js'; -import CustomFileSystemProvider from 'file_management/custom_provider'; -import ObjectFileSystemProvider from 'file_management/object_provider'; +import CustomFileSystemProvider from 'common/file_management/custom_provider'; +import ObjectFileSystemProvider from 'common/file_management/object_provider'; export default class SlowFileProvider extends CustomFileSystemProvider { constructor(options) { diff --git a/packages/devextreme/testing/helpers/fileManager/file_provider.test.js b/packages/devextreme/testing/helpers/fileManager/file_provider.test.js index 248ab45aee55..96c4dc73feb3 100644 --- a/packages/devextreme/testing/helpers/fileManager/file_provider.test.js +++ b/packages/devextreme/testing/helpers/fileManager/file_provider.test.js @@ -1,7 +1,7 @@ import { Deferred } from 'core/utils/deferred'; -import FileSystemProviderBase from 'file_management/provider_base'; -import ErrorCode from 'file_management/error_codes'; +import FileSystemProviderBase from 'common/file_management/provider_base'; +import ErrorCode from 'common/file_management/error_codes'; const DEFAULT_DELAY = 2000; diff --git a/packages/devextreme/testing/helpers/fileManagerHelpers.js b/packages/devextreme/testing/helpers/fileManagerHelpers.js index d2f08d5226b1..e8fd5e8203c6 100644 --- a/packages/devextreme/testing/helpers/fileManagerHelpers.js +++ b/packages/devextreme/testing/helpers/fileManagerHelpers.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import devices from '__internal/core/m_devices'; import { isDefined } from 'core/utils/type.js'; import { deserializeDate } from 'core/utils/date_serialization'; -import FileSystemItem from 'file_management/file_system_item'; +import FileSystemItem from 'common/file_management/file_system_item'; import FileReaderMock from './fileManager/file_reader.mock.js'; diff --git a/packages/devextreme/testing/helpers/grid/keyboardNavigationHelper.js b/packages/devextreme/testing/helpers/grid/keyboardNavigationHelper.js index 6678469e366f..a61d47d4ce73 100644 --- a/packages/devextreme/testing/helpers/grid/keyboardNavigationHelper.js +++ b/packages/devextreme/testing/helpers/grid/keyboardNavigationHelper.js @@ -1,14 +1,14 @@ import $ from 'jquery'; import devices from '__internal/core/m_devices'; -import { addNamespace, createEvent } from 'events/utils/index'; +import { addNamespace, createEvent } from 'common/core/events/utils/index'; import { setupDataGridModules, MockDataController, MockColumnsController, MockSelectionController } from '../dataGridMocks.js'; -import clickEvent from 'events/click'; -import pointerEvents from 'events/pointer'; -import { keyboard } from 'events/short'; +import clickEvent from 'common/core/events/click'; +import pointerEvents from 'common/core/events/pointer'; +import { keyboard } from 'common/core/events/short'; import DataGridWrapper from '../wrappers/dataGridWrappers.js'; export const dataGridWrapper = new DataGridWrapper('#container'); diff --git a/packages/devextreme/testing/helpers/jQueryEventsPatch.js b/packages/devextreme/testing/helpers/jQueryEventsPatch.js index d6f3ea676162..5cfc97c2445c 100644 --- a/packages/devextreme/testing/helpers/jQueryEventsPatch.js +++ b/packages/devextreme/testing/helpers/jQueryEventsPatch.js @@ -1,6 +1,6 @@ /* global jQuery */ -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; let originalJQueryEvent; const originalJQueryMethods = {}; diff --git a/packages/devextreme/testing/helpers/pointerMock.js b/packages/devextreme/testing/helpers/pointerMock.js index f3f751f7de31..d5c923fe5d17 100644 --- a/packages/devextreme/testing/helpers/pointerMock.js +++ b/packages/devextreme/testing/helpers/pointerMock.js @@ -5,8 +5,8 @@ root.pointerMock = module.exports = factory( require('jquery'), require('inferno'), - require('events/gesture/emitter.gesture'), - require('events/click')); + require('common/core/events/gesture/emitter.gesture'), + require('common/core/events/click')); }); } else { root.pointerMock = factory(jQuery, DevExpress.events.GestureEmitter, DevExpress.events.click); diff --git a/packages/devextreme/testing/helpers/scheduler/helpers.js b/packages/devextreme/testing/helpers/scheduler/helpers.js index 1d5532258c14..5f2eee2a0af7 100644 --- a/packages/devextreme/testing/helpers/scheduler/helpers.js +++ b/packages/devextreme/testing/helpers/scheduler/helpers.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import { locate } from 'animation/translator'; +import { locate } from 'common/core/animation/translator'; import devices from '__internal/core/m_devices'; import pointerMock from '../../helpers/pointerMock.js'; import dataUtils from 'core/element_data'; diff --git a/packages/devextreme/testing/helpers/treeListMocks.js b/packages/devextreme/testing/helpers/treeListMocks.js index da98c335a813..45f1d23b83e0 100644 --- a/packages/devextreme/testing/helpers/treeListMocks.js +++ b/packages/devextreme/testing/helpers/treeListMocks.js @@ -12,7 +12,7 @@ if(typeof define === 'function' && define.amd) { require('__internal/core/utils/m_dom'), require('__internal/core/utils/m_common'), require('__internal/core/utils/m_type'), - require('data/array_store'), + require('common/data/array_store'), 'TreeList' ); }); @@ -26,7 +26,7 @@ if(typeof define === 'function' && define.amd) { DevExpress.require('__internal/core/utils/m_dom'), DevExpress.require('__internal/core/utils/m_common'), DevExpress.require('__internal/core/utils/m_type'), - DevExpress.require('data/array_store'), + DevExpress.require('common/data/array_store'), 'TreeList' )); } diff --git a/packages/devextreme/testing/tests/Bootstrap Integration/widget_bundled.tests.js b/packages/devextreme/testing/tests/Bootstrap Integration/widget_bundled.tests.js index 559c99e400a3..7e2f308a28c9 100644 --- a/packages/devextreme/testing/tests/Bootstrap Integration/widget_bundled.tests.js +++ b/packages/devextreme/testing/tests/Bootstrap Integration/widget_bundled.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import GoogleStaticProvider from '__internal/ui/map/m_provider.google_static'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.animation/easing.tests.js b/packages/devextreme/testing/tests/DevExpress.animation/easing.tests.js index adf9e3eeef7a..b09d7ca4bf74 100644 --- a/packages/devextreme/testing/tests/DevExpress.animation/easing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.animation/easing.tests.js @@ -1,4 +1,4 @@ -const easing = require('animation/easing'); +const easing = require('common/core/animation/easing'); QUnit.module('easing'); diff --git a/packages/devextreme/testing/tests/DevExpress.animation/fx.tests.js b/packages/devextreme/testing/tests/DevExpress.animation/fx.tests.js index cf4909c380ef..7263b533411a 100644 --- a/packages/devextreme/testing/tests/DevExpress.animation/fx.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.animation/fx.tests.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import renderer from 'core/renderer'; -import eventsEngine from 'events/core/events_engine'; -import fx from 'animation/fx'; -import translator from 'animation/translator'; -import animationFrame from 'animation/frame'; -import positionUtils from 'animation/position'; +import eventsEngine from 'common/core/events/core/events_engine'; +import fx from 'common/core/animation/fx'; +import translator from 'common/core/animation/translator'; +import animationFrame from 'common/core/animation/frame'; +import positionUtils from 'common/core/animation/position'; import support from '__internal/core/utils/m_support'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.animation/position.tests.js b/packages/devextreme/testing/tests/DevExpress.animation/position.tests.js index 1598072bb10c..4a2dbe729c71 100644 --- a/packages/devextreme/testing/tests/DevExpress.animation/position.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.animation/position.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import positionUtils from 'animation/position'; -import translator from 'animation/translator'; +import positionUtils from 'common/core/animation/position'; +import translator from 'common/core/animation/translator'; import browser from 'core/utils/browser'; import fixtures from '../../helpers/positionFixtures.js'; import devices from 'core/devices.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.animation/transitionExecutors.tests.js b/packages/devextreme/testing/tests/DevExpress.animation/transitionExecutors.tests.js index bfe41d92d605..0c8f20239018 100644 --- a/packages/devextreme/testing/tests/DevExpress.animation/transitionExecutors.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.animation/transitionExecutors.tests.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import { noop } from '__internal/core/utils/m_common'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import { presets as animationPresets } from 'animation/presets/presets'; -import TransitionExecutorModule from 'animation/transition_executor/transition_executor'; +import { presets as animationPresets } from 'common/core/animation/presets/presets'; +import TransitionExecutorModule from 'common/core/animation/transition_executor/transition_executor'; QUnit.module('transition executor', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.animation/translator.tests.js b/packages/devextreme/testing/tests/DevExpress.animation/translator.tests.js index 22387d5b9389..795307a74539 100644 --- a/packages/devextreme/testing/tests/DevExpress.animation/translator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.animation/translator.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const translator = require('animation/translator'); +const translator = require('common/core/animation/translator'); const styleUtils = require('core/utils/style'); const transformStyle = styleUtils.styleProp('transform'); diff --git a/packages/devextreme/testing/tests/DevExpress.core/domComponent.tests.js b/packages/devextreme/testing/tests/DevExpress.core/domComponent.tests.js index 755e5c4f6609..d425dbf2bb60 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/domComponent.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/domComponent.tests.js @@ -7,8 +7,8 @@ import { TemplateManager } from 'core/template_manager'; import { noop } from 'core/utils/common'; import publicComponentUtils from 'core/utils/public_component'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import eventsEngine from 'events/core/events_engine'; -import { triggerResizeEvent } from 'events/visibility_change'; +import eventsEngine from 'common/core/events/core/events_engine'; +import { triggerResizeEvent } from 'common/core/events/visibility_change'; import licenseModule, { setLicenseCheckSkipCondition } from '__internal/core/license/license_validation'; import $ from 'jquery'; diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js index d9f77af4f661..d7e6613bccd6 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const animationFrame = require('animation/frame'); +const animationFrame = require('common/core/animation/frame'); QUnit.module('animation frame'); diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js index d942925e548d..51e2fd52a7fd 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js @@ -3,7 +3,7 @@ import domUtils from '__internal/core/utils/m_dom'; import support from '__internal/core/utils/m_support'; import styleUtils from 'core/utils/style'; import devices from '__internal/core/m_devices'; -import initMobileViewport from 'mobile/init_mobile_viewport'; +import initMobileViewport from 'common/core/environment/init_mobile_viewport'; import keyboardMock from '../../helpers/keyboardMock.js'; QUnit.module('createMarkup'); diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.topOverlay.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.topOverlay.tests.js index 21eeb586be11..e166fe4a77b8 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.topOverlay.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.topOverlay.tests.js @@ -1,5 +1,5 @@ -const hideTopOverlay = require('mobile/hide_top_overlay'); -const hideTopOverlayCallback = require('mobile/hide_callback').hideCallback; +const hideTopOverlay = require('common/core/environment/hide_top_overlay'); +const hideTopOverlayCallback = require('common/core/environment/hide_callback').hideCallback; QUnit.module('top overlay util'); diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.type.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.type.tests.js index 89dd97bbd897..64fc102e8fbf 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.type.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.type.tests.js @@ -2,7 +2,7 @@ const $ = require('jquery'); const typeUtils = require('core/utils/type'); const Deferred = require('core/utils/deferred').Deferred; const renderer = require('core/renderer'); -const eventsEngine = require('events/core/events_engine'); +const eventsEngine = require('common/core/events/core/events_engine'); QUnit.module('Type checking'); diff --git a/packages/devextreme/testing/tests/DevExpress.data/abstractStore.test.js b/packages/devextreme/testing/tests/DevExpress.data/abstractStore.test.js index f70ab3b91ae2..d54e97525f5a 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/abstractStore.test.js +++ b/packages/devextreme/testing/tests/DevExpress.data/abstractStore.test.js @@ -1,4 +1,4 @@ -import Store from 'data/abstract_store'; +import Store from 'common/data/abstract_store'; QUnit.module('Abstract Store', function() { class MyStore { } diff --git a/packages/devextreme/testing/tests/DevExpress.data/applyChanges.tests.js b/packages/devextreme/testing/tests/DevExpress.data/applyChanges.tests.js index c695345634ae..69e06664766a 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/applyChanges.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/applyChanges.tests.js @@ -1,7 +1,7 @@ import { extend } from 'core/utils/extend'; -import { errors } from 'data/errors'; -import applyChanges from 'data/apply_changes'; -import { applyBatch } from 'data/array_utils'; +import { errors } from 'common/data/errors'; +import applyChanges from 'common/data/apply_changes'; +import { applyBatch } from 'common/data/array_utils'; QUnit.module('Apply Changes', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js index 08893a18ea7a..79ef14d6a1a2 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js @@ -3,12 +3,12 @@ import { noop } from 'core/utils/common'; import typeUtils from 'core/utils/type'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; import ajaxMock from '../../helpers/ajaxMock.js'; -import { DataSource } from 'data/data_source/data_source'; -import Store from 'data/abstract_store'; -import ArrayStore from 'data/array_store'; -import ODataStore from 'data/odata/store'; +import { DataSource } from 'common/data/data_source/data_source'; +import Store from 'common/data/abstract_store'; +import ArrayStore from 'common/data/array_store'; +import ODataStore from 'common/data/odata/store'; import AggregateCalculator from '__internal/grids/data_grid/m_aggregate_calculator'; -import LocalStore from 'data/local_store'; +import LocalStore from 'common/data/local_store'; const TEN_NUMBERS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; diff --git a/packages/devextreme/testing/tests/DevExpress.data/dataSourceCreating.tests.js b/packages/devextreme/testing/tests/DevExpress.data/dataSourceCreating.tests.js index 85817d81fd97..ef08ff6e5590 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/dataSourceCreating.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/dataSourceCreating.tests.js @@ -1,8 +1,8 @@ -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import LocalStore from 'data/local_store'; -import ODataStore from 'data/odata/store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import LocalStore from 'common/data/local_store'; +import ODataStore from 'common/data/odata/store'; import ajaxMock from '../../helpers/ajaxMock.js'; QUnit.test('no options', function(assert) { diff --git a/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js b/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js index 29fec4dfbad4..b34ede44a4c0 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); -const converters = require('data/odata/utils').keyConverters; -const interpretJsonFormat = require('data/odata/utils').OData__internals.interpretJsonFormat; +const converters = require('common/data/odata/utils').keyConverters; +const interpretJsonFormat = require('common/data/odata/utils').OData__internals.interpretJsonFormat; const Guid = require('core/guid'); QUnit.module('OData 2'); diff --git a/packages/devextreme/testing/tests/DevExpress.data/odataQuery.tests.js b/packages/devextreme/testing/tests/DevExpress.data/odataQuery.tests.js index 34c68a7770b1..ae4afe0e4af7 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/odataQuery.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/odataQuery.tests.js @@ -1,11 +1,11 @@ import $ from 'jquery'; -import { EdmLiteral } from 'data/odata/utils'; -import query from 'data/query'; +import { EdmLiteral } from 'common/data/odata/utils'; +import query from 'common/data/query'; import config from 'core/config'; import ErrorHandlingHelper from '../../helpers/data.errorHandlingHelper.js'; import ajaxMock from '../../helpers/ajaxMock.js'; -import 'data/odata/query_adapter'; +import 'common/data/odata/query_adapter'; const MUST_NOT_REACH_MESSAGE = 'Shouldn\'t reach this point'; diff --git a/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js b/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js index 47aeef00fdec..d04ce4da3d7e 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import { EdmLiteral } from 'data/odata/utils'; -import ODataStore from 'data/odata/store'; -import ODataContext from 'data/odata/context'; +import { EdmLiteral } from 'common/data/odata/utils'; +import ODataStore from 'common/data/odata/store'; +import ODataContext from 'common/data/odata/context'; import Guid from 'core/guid'; import config from 'core/config'; import ErrorHandlingHelper from '../../helpers/data.errorHandlingHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.data/queryArray.tests.js b/packages/devextreme/testing/tests/DevExpress.data/queryArray.tests.js index 3dcef8b21a72..75f50b9b8518 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/queryArray.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/queryArray.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import QUERY from 'data/query'; +import QUERY from 'common/data/query'; import ErrorHandlingHelper from '../../helpers/data.errorHandlingHelper.js'; QUnit.module('Misc'); diff --git a/packages/devextreme/testing/tests/DevExpress.data/storeArray.tests.js b/packages/devextreme/testing/tests/DevExpress.data/storeArray.tests.js index 84cc244759c6..fa57b16bac3f 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/storeArray.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/storeArray.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import config from 'core/config'; import ErrorHandlingHelper from '../../helpers/data.errorHandlingHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js b/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js index b54f31ff3851..307ad2d2b331 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); -const CustomStore = require('data/custom_store'); +const CustomStore = require('common/data/custom_store').CustomStore; const { isLoadResultObject, isGroupItemsArray, isItemsArray } = require('common/data/custom-store'); -const processRequestResultLock = require('data/utils').processRequestResultLock; +const processRequestResultLock = require('common/data/utils').processRequestResultLock; const config = require('core/config'); const ERRORS = { INVALID_RETURN: 'E4012', diff --git a/packages/devextreme/testing/tests/DevExpress.data/storeCustom_loadModeRaw.tests.js b/packages/devextreme/testing/tests/DevExpress.data/storeCustom_loadModeRaw.tests.js index 96d1feb16542..1d77cb003870 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/storeCustom_loadModeRaw.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/storeCustom_loadModeRaw.tests.js @@ -1,4 +1,4 @@ -const CustomStore = require('data/custom_store'); +const CustomStore = require('common/data/custom_store').CustomStore; const ErrorHandlingHelper = require('../../helpers/data.errorHandlingHelper.js'); const RAW = 'raw'; diff --git a/packages/devextreme/testing/tests/DevExpress.data/storeLocal.tests.js b/packages/devextreme/testing/tests/DevExpress.data/storeLocal.tests.js index 612e6ff9d87b..84d9f5ef2c2c 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/storeLocal.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/storeLocal.tests.js @@ -1,4 +1,4 @@ -const LocalStore = require('data/local_store'); +const LocalStore = require('common/data/local_store'); const TEST_NAME = '65DFE188-D178-11E1-A097-51216288709B'; const DX_LOCALSTORAGE_ITEM_NAME = 'dx-data-localStore-' + TEST_NAME; diff --git a/packages/devextreme/testing/tests/DevExpress.data/utils.tests.js b/packages/devextreme/testing/tests/DevExpress.data/utils.tests.js index 8431238e4f57..8636eb417d75 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/utils.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/utils.tests.js @@ -1,7 +1,7 @@ import Guid from 'core/guid'; -import { processRequestResultLock, keysEqual, isGroupCriterion, throttleChanges, base64_encode as b64, isUniformEqualsByOr } from 'data/utils'; -import { EdmLiteral } from 'data/odata/utils'; -import { createObjectWithChanges } from 'data/array_utils'; +import { processRequestResultLock, keysEqual, isGroupCriterion, throttleChanges, base64_encode as b64, isUniformEqualsByOr } from 'common/data/utils'; +import { EdmLiteral } from 'common/data/odata/utils'; +import { createObjectWithChanges } from 'common/data/array_utils'; QUnit.module('keysEqual'); diff --git a/packages/devextreme/testing/tests/DevExpress.exporter/commonParts/loadPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.exporter/commonParts/loadPanel.tests.js index 69d27708414a..84839ffc80ad 100644 --- a/packages/devextreme/testing/tests/DevExpress.exporter/commonParts/loadPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.exporter/commonParts/loadPanel.tests.js @@ -1,8 +1,8 @@ import { setHeight } from 'core/utils/size'; import $ from 'core/renderer'; import localization from 'localization'; -import ja from 'localization/messages/ja.json!'; -import messageLocalization from 'localization/message'; +import ja from 'common/core/localization/messages/ja.json!'; +import messageLocalization from 'common/core/localization/message'; import { getWindow, setWindow } from 'core/utils/window'; const LOAD_PANEL_CLASS = 'dx-loadpanel'; diff --git a/packages/devextreme/testing/tests/DevExpress.jquery/easing.tests.js b/packages/devextreme/testing/tests/DevExpress.jquery/easing.tests.js index 93fb2aea7c16..5fe65561f3a5 100644 --- a/packages/devextreme/testing/tests/DevExpress.jquery/easing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.jquery/easing.tests.js @@ -1,6 +1,6 @@ define(function(require) { const $ = require('jquery'); - const easing = require('animation/easing'); + const easing = require('common/core/animation/easing'); require('integration/jquery'); diff --git a/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js b/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js index 070d6b6c34f9..515a82a64cb8 100644 --- a/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js @@ -1,6 +1,6 @@ define(function(require) { const $ = require('jquery'); - const registerEvent = require('events/core/event_registrator'); + const registerEvent = require('common/core/events/core/event_registrator'); const Class = require('core/class'); require('integration/jquery'); diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js index 457fb2d01906..243371183df1 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import ko from 'knockout'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { logger } from 'core/utils/console'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dataSourceAdapter from '__internal/grids/data_grid/m_data_source_adapter'; import dataGridMocks from '../../helpers/dataGridMocks.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/datebox.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/datebox.tests.js index e29096d6e049..03537c6f0d0b 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/datebox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/datebox.tests.js @@ -1,11 +1,11 @@ import '../../helpers/noIntl.js'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import support from '__internal/core/utils/m_support'; import devices from '__internal/core/m_devices'; import uiDateUtils from '__internal/ui/date_box/m_date_utils'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import ko from 'knockout'; import 'integration/knockout'; diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/eventRegistration.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/eventRegistration.tests.js index 36f117bdb39b..d361180f9fd4 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/eventRegistration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/eventRegistration.tests.js @@ -1,11 +1,11 @@ const $ = require('jquery'); const ko = require('knockout'); -const registerEvent = require('events/core/event_registrator'); -const dragEvents = require('events/drag'); -const clickEvent = require('events/click'); -const holdEvent = require('events/hold'); -const pointerEvents = require('events/pointer'); -const swipeEvents = require('events/swipe'); +const registerEvent = require('common/core/events/core/event_registrator'); +const dragEvents = require('common/core/events/drag'); +const clickEvent = require('common/core/events/click'); +const holdEvent = require('common/core/events/hold'); +const pointerEvents = require('common/core/events/pointer'); +const swipeEvents = require('common/core/events/swipe'); require('integration/knockout'); diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/form.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/form.tests.js index 8029aeed34a1..31700ce67b68 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/form.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/form.tests.js @@ -4,7 +4,7 @@ import { FIELD_ITEM_CONTENT_CLASS } from '__internal/ui/form/constants'; import { FIELD_ITEM_CONTENT_LOCATION_CLASS } from '__internal/ui/form/components/m_field_item'; import { FIELD_ITEM_LABEL_LOCATION_CLASS } from '__internal/ui/form/components/m_label'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/form'; import 'ui/text_area'; diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/lookup.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/lookup.tests.js index 23670235094d..35414eb2f14c 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/lookup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/lookup.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const executeAsyncMock = require('../../helpers/executeAsyncMock.js'); const ko = require('knockout'); diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/overlay.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/overlay.tests.js index 8d639dd14750..4a0fee800fa1 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/overlay.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/overlay.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const ko = require('knockout'); require('ui/overlay/ui.overlay'); diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/selectBox.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/selectBox.tests.js index 84f6b611e11e..e1ef4e07e3a6 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/selectBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/selectBox.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); const SelectBox = require('ui/select_box'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const ko = require('knockout'); require('integration/knockout'); diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/tagBox.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/tagBox.tests.js index 5a48c80d0db8..88ba2a659dd1 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/tagBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/tagBox.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); const TagBox = require('ui/tag_box'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const ko = require('knockout'); require('integration/knockout'); diff --git a/packages/devextreme/testing/tests/DevExpress.localization/ldml.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/ldml.tests.js index 5817e1307444..b29a2a08b8c5 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/ldml.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/ldml.tests.js @@ -1,17 +1,17 @@ require('../../helpers/noIntl.js'); -const getNumberFormatter = require('localization/ldml/number').getFormatter; -const getNumberFormat = require('localization/ldml/number').getFormat; -const getDateParser = require('localization/ldml/date.parser').getParser; -const getRegExpInfo = require('localization/ldml/date.parser').getRegExpInfo; -const getDateFormatter = require('localization/ldml/date.formatter').getFormatter; -const getDateFormat = require('localization/ldml/date.format').getFormat; -const defaultDateNames = require('localization/default_date_names'); -const numberLocalization = require('localization/number'); -const dateLocalization = require('localization/date'); +const getNumberFormatter = require('common/core/localization/ldml/number').getFormatter; +const getNumberFormat = require('common/core/localization/ldml/number').getFormat; +const getDateParser = require('common/core/localization/ldml/date.parser').getParser; +const getRegExpInfo = require('common/core/localization/ldml/date.parser').getRegExpInfo; +const getDateFormatter = require('common/core/localization/ldml/date.formatter').getFormatter; +const getDateFormat = require('common/core/localization/ldml/date.format').getFormat; +const defaultDateNames = require('common/core/localization/default_date_names'); +const numberLocalization = require('common/core/localization/number'); +const dateLocalization = require('common/core/localization/date'); const extend = require('core/utils/extend').extend; const console = require('core/utils/console').logger; -require('localization/currency'); +require('common/core/localization/currency'); const dateParts = extend({}, defaultDateNames, { getPeriodNames: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.localization/locales.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/locales.tests.js index c2e0e95a785c..30e914299833 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/locales.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/locales.tests.js @@ -1,33 +1,33 @@ -const messageLocalization = require('localization/message'); +const messageLocalization = require('common/core/localization/message'); const localization = require('localization'); const dictionaries = {}; -dictionaries['ar'] = require('localization/messages/ar.json!'); -dictionaries['ca'] = require('localization/messages/ca.json!'); -dictionaries['cs'] = require('localization/messages/cs.json!'); -dictionaries['de'] = require('localization/messages/de.json!'); -dictionaries['el'] = require('localization/messages/el.json!'); -dictionaries['en'] = require('localization/messages/en.json!'); -dictionaries['es'] = require('localization/messages/es.json!'); -dictionaries['fi'] = require('localization/messages/fi.json!'); -dictionaries['fr'] = require('localization/messages/fr.json!'); -dictionaries['hu'] = require('localization/messages/hu.json!'); -dictionaries['it'] = require('localization/messages/it.json!'); -dictionaries['ja'] = require('localization/messages/ja.json!'); -dictionaries['lt'] = require('localization/messages/lt.json!'); -dictionaries['lv'] = require('localization/messages/lv.json!'); -dictionaries['nb'] = require('localization/messages/nb.json!'); -dictionaries['nl'] = require('localization/messages/nl.json!'); -dictionaries['pt'] = require('localization/messages/pt.json!'); -dictionaries['ro'] = require('localization/messages/ro.json!'); -dictionaries['ru'] = require('localization/messages/ru.json!'); -dictionaries['sl'] = require('localization/messages/sl.json!'); -dictionaries['sv'] = require('localization/messages/sv.json!'); -dictionaries['tr'] = require('localization/messages/tr.json!'); -dictionaries['vi'] = require('localization/messages/vi.json!'); -dictionaries['zh-tw'] = require('localization/messages/zh-tw.json!'); -dictionaries['zh'] = require('localization/messages/zh.json!'); -dictionaries['fa'] = require('localization/messages/fa.json!'); +dictionaries['ar'] = require('common/core/localization/messages/ar.json!'); +dictionaries['ca'] = require('common/core/localization/messages/ca.json!'); +dictionaries['cs'] = require('common/core/localization/messages/cs.json!'); +dictionaries['de'] = require('common/core/localization/messages/de.json!'); +dictionaries['el'] = require('common/core/localization/messages/el.json!'); +dictionaries['en'] = require('common/core/localization/messages/en.json!'); +dictionaries['es'] = require('common/core/localization/messages/es.json!'); +dictionaries['fi'] = require('common/core/localization/messages/fi.json!'); +dictionaries['fr'] = require('common/core/localization/messages/fr.json!'); +dictionaries['hu'] = require('common/core/localization/messages/hu.json!'); +dictionaries['it'] = require('common/core/localization/messages/it.json!'); +dictionaries['ja'] = require('common/core/localization/messages/ja.json!'); +dictionaries['lt'] = require('common/core/localization/messages/lt.json!'); +dictionaries['lv'] = require('common/core/localization/messages/lv.json!'); +dictionaries['nb'] = require('common/core/localization/messages/nb.json!'); +dictionaries['nl'] = require('common/core/localization/messages/nl.json!'); +dictionaries['pt'] = require('common/core/localization/messages/pt.json!'); +dictionaries['ro'] = require('common/core/localization/messages/ro.json!'); +dictionaries['ru'] = require('common/core/localization/messages/ru.json!'); +dictionaries['sl'] = require('common/core/localization/messages/sl.json!'); +dictionaries['sv'] = require('common/core/localization/messages/sv.json!'); +dictionaries['tr'] = require('common/core/localization/messages/tr.json!'); +dictionaries['vi'] = require('common/core/localization/messages/vi.json!'); +dictionaries['zh-tw'] = require('common/core/localization/messages/zh-tw.json!'); +dictionaries['zh'] = require('common/core/localization/messages/zh.json!'); +dictionaries['fa'] = require('common/core/localization/messages/fa.json!'); const LOCALES = [ 'ar', 'ca', 'cs', 'de', 'el', diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.base.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.base.tests.js index fa576022e381..13324b337cf0 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.base.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.base.tests.js @@ -1,9 +1,9 @@ import '../../helpers/noIntl.js'; import sharedTests from './sharedParts/localization.shared.js'; import localization from 'localization'; -import numberLocalization from 'localization/number'; -import dateLocalization from 'localization/date'; -import messageLocalization from 'localization/message'; +import numberLocalization from 'common/core/localization/number'; +import dateLocalization from 'common/core/localization/date'; +import messageLocalization from 'common/core/localization/message'; import { logger } from 'core/utils/console'; QUnit.module('base localization', {}, () => { diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.custom.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.custom.tests.js index 1177965ed1de..c3079b762b39 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.custom.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.custom.tests.js @@ -1,5 +1,5 @@ -const numberLocalization = require('localization/number'); -const dateLocalization = require('localization/date'); +const numberLocalization = require('common/core/localization/number'); +const dateLocalization = require('common/core/localization/date'); QUnit.module('Custom date names', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.tests.js index caace08a1911..d028a628baf6 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.tests.js @@ -2,11 +2,11 @@ SystemJS.config({ meta: { './localization.base.tests.js': { deps: [ - 'localization/globalize/core', - 'localization/globalize/number', - 'localization/globalize/currency', - 'localization/globalize/date', - 'localization/globalize/message' + 'common/core/localization/globalize/core', + 'common/core/localization/globalize/number', + 'common/core/localization/globalize/currency', + 'common/core/localization/globalize/date', + 'common/core/localization/globalize/message' ] } }, @@ -29,19 +29,19 @@ define(function(require, exports, module) { require('devextreme-cldr-data/da.json!json') ]; - require('localization/globalize/core'); - require('localization/globalize/number'); - require('localization/globalize/currency'); - require('localization/globalize/date'); - require('localization/globalize/message'); + require('common/core/localization/globalize/core'); + require('common/core/localization/globalize/number'); + require('common/core/localization/globalize/currency'); + require('common/core/localization/globalize/date'); + require('common/core/localization/globalize/message'); const generateExpectedDate = require('../../helpers/dateHelper.js').generateDate; const $ = require('jquery'); const Globalize = require('globalize'); - const numberLocalization = require('localization/number'); - const dateLocalization = require('localization/date'); - const messageLocalization = require('localization/message'); + const numberLocalization = require('common/core/localization/number'); + const dateLocalization = require('common/core/localization/date'); + const messageLocalization = require('common/core/localization/message'); const config = require('core/config'); const ExcelJSLocalizationFormatTests = require('../DevExpress.exporter/exceljsParts/exceljs.format.tests.js'); diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.widgets.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.widgets.tests.js index 72451b01e2ff..459ce6cb4c20 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.widgets.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.widgets.tests.js @@ -16,14 +16,14 @@ cldrData.forEach(localeCldrData => { Globalize.load(localeCldrData); }); -require('localization/globalize/core'); -require('localization/globalize/number'); -require('localization/globalize/currency'); -require('localization/globalize/date'); -require('localization/globalize/message'); +require('common/core/localization/globalize/core'); +require('common/core/localization/globalize/number'); +require('common/core/localization/globalize/currency'); +require('common/core/localization/globalize/date'); +require('common/core/localization/globalize/message'); const $ = require('jquery'); -const dateLocalization = require('localization/date'); +const dateLocalization = require('common/core/localization/date'); require('ui/date_box'); require('viz/chart'); diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js index d703cb459f62..ff25519e862b 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js @@ -1,11 +1,11 @@ import '../../helpers/noIntl.js'; import Intl from 'intl'; import sharedTests from './sharedParts/localization.shared.js'; -import dateLocalization from 'localization/date'; -import numberLocalization from 'localization/number'; -import intlDateLocalization from 'localization/intl/date'; -import intlNumberLocalization from 'localization/intl/number'; -import { locale } from 'localization/core'; +import dateLocalization from 'common/core/localization/date'; +import numberLocalization from 'common/core/localization/number'; +import intlDateLocalization from 'common/core/localization/intl/date'; +import intlNumberLocalization from 'common/core/localization/intl/number'; +import { locale } from 'common/core/localization/core'; import { disableIntl } from 'localization'; import config from 'core/config'; import ExcelJSLocalizationFormatTests from '../DevExpress.exporter/exceljsParts/exceljs.format.tests.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.widgets.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.widgets.tests.js index 7d04d2d60d70..b8568c4684bb 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.widgets.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.widgets.tests.js @@ -1,11 +1,11 @@ import 'intl'; -import 'localization/number'; -import { locale } from 'localization/core'; +import 'common/core/localization/number'; +import { locale } from 'common/core/localization/core'; import $ from 'jquery'; import 'ui/date_box'; import { ExportFormat } from 'exporter/exceljs/export_format'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import keyboardMock from '../../helpers/keyboardMock.js'; const TEXTEDITOR_INPUT_SELECTOR = '.dx-texteditor-input'; diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.messages.test.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.messages.test.js index 6f4570399b3b..fb2c4c879ee2 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.messages.test.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.messages.test.js @@ -1,7 +1,7 @@ const localization = require('localization'); const dictionaries = {}; -dictionaries['zh-tw'] = require('localization/messages/zh-tw.json!'); +dictionaries['zh-tw'] = require('common/core/localization/messages/zh-tw.json!'); QUnit.module('Locale messages of DevExtreme', { }, () => { diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.nativeIntl.base.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.nativeIntl.base.tests.js index e934db79c565..802712834c5e 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.nativeIntl.base.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.nativeIntl.base.tests.js @@ -1,6 +1,6 @@ -import dateLocalization from 'localization/date'; -import numberLocalization from 'localization/number'; -import { locale } from 'localization/core'; +import dateLocalization from 'common/core/localization/date'; +import numberLocalization from 'common/core/localization/number'; +import { locale } from 'common/core/localization/core'; locale('en'); diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.utils.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.utils.tests.js index b2fef7d89ea5..7a30ec972570 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.utils.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.utils.tests.js @@ -1,4 +1,4 @@ -import { toFixed } from 'localization/utils'; +import { toFixed } from 'common/core/localization/utils'; const { module: testModule, test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js b/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js index cf45f8dd2395..75749894b0da 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import dateLocalization from 'localization/date'; -import numberLocalization from 'localization/number'; -import messageLocalization from 'localization/message'; +import dateLocalization from 'common/core/localization/date'; +import numberLocalization from 'common/core/localization/number'; +import messageLocalization from 'common/core/localization/message'; import errors from 'core/errors'; import localization from 'localization'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.localization/validation.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/validation.tests.js index 3db8ffa96ac4..edf83bb11f69 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/validation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/validation.tests.js @@ -1,8 +1,8 @@ -require('localization/globalize/core'); -require('localization/globalize/number'); -require('localization/globalize/currency'); -require('localization/globalize/date'); -require('localization/globalize/message'); +require('common/core/localization/globalize/core'); +require('common/core/localization/globalize/number'); +require('common/core/localization/globalize/currency'); +require('common/core/localization/globalize/date'); +require('common/core/localization/globalize/message'); const cldrData = [ require('devextreme-cldr-data/fr.json!json') ]; @@ -10,7 +10,7 @@ const cldrData = [ const ValidationEngine = require('ui/validation_engine'); const Globalize = require('globalize'); const localization = require('localization'); -const fr = require('localization/messages/fr.json!'); +const fr = require('common/core/localization/messages/fr.json!'); cldrData.forEach(localeCldrData => { Globalize.load(localeCldrData); diff --git a/packages/devextreme/testing/tests/DevExpress.performance/overlaysStyleRecalculations.tests.js b/packages/devextreme/testing/tests/DevExpress.performance/overlaysStyleRecalculations.tests.js index ba690583970c..27278b49c314 100644 --- a/packages/devextreme/testing/tests/DevExpress.performance/overlaysStyleRecalculations.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.performance/overlaysStyleRecalculations.tests.js @@ -5,7 +5,7 @@ require('ui/popup'); require('generic_light.css!'); const $ = require('jquery'); -const positionUtils = require('animation/position'); +const positionUtils = require('common/core/animation/position'); positionUtils.calculateScrollbarWidth(); diff --git a/packages/devextreme/testing/tests/DevExpress.performance/translatorRecalculations.tests.js b/packages/devextreme/testing/tests/DevExpress.performance/translatorRecalculations.tests.js index 232060e7df51..cab359634bbf 100644 --- a/packages/devextreme/testing/tests/DevExpress.performance/translatorRecalculations.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.performance/translatorRecalculations.tests.js @@ -1,6 +1,6 @@ require('../../helpers/qunitPerformanceExtension.js'); const $ = require('jquery'); -const translator = require('animation/translator'); +const translator = require('common/core/animation/translator'); QUnit.testStart(function() { $('#qunit-fixture').html('
'); diff --git a/packages/devextreme/testing/tests/DevExpress.serverSide/widgetsCreation.tests.js b/packages/devextreme/testing/tests/DevExpress.serverSide/widgetsCreation.tests.js index 2d3b4b8802d8..cd0c19786b31 100644 --- a/packages/devextreme/testing/tests/DevExpress.serverSide/widgetsCreation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.serverSide/widgetsCreation.tests.js @@ -1,6 +1,6 @@ const widgets = require('../../helpers/widgetsList.js').widgetsList; -const DataSource = require('data/data_source'); +const DataSource = require('common/data/data_source'); QUnit.module('Widget creation', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/click.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/click.tests.js index bb78aa995d6f..b1a60379837d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/click.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/click.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; -import clickEvent from 'events/click'; +import clickEvent from 'common/core/events/click'; import domUtils from '__internal/core/utils/m_dom'; import support from '__internal/core/utils/m_support'; import devices from '__internal/core/m_devices'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/contextmenu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/contextmenu.tests.js index 25de98e2b59d..b2fbf79af553 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/contextmenu.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/contextmenu.tests.js @@ -2,8 +2,8 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; const devices = require('core/devices'); const support = require('core/utils/support'); -const holdEvent = require('events/hold'); -const contextMenuEvent = require('events/contextmenu'); +const holdEvent = require('common/core/events/hold'); +const contextMenuEvent = require('common/core/events/contextmenu'); QUnit.testStart(function() { const markup = diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/dblclick.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/dblclick.tests.js index 0d6d62db4230..0a29dd77b7f3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/dblclick.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/dblclick.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const dblclickEvent = require('events/dblclick'); +const dblclickEvent = require('common/core/events/dblclick'); const { dblClick } = require('__internal/events/m_dblclick'); const pointerMock = require('../../helpers/pointerMock.js'); @@ -39,7 +39,7 @@ QUnit.test('dxdblclick should not be handled on a usual dxclick even if dblClick const el = $('#element'); const handler = sinon.stub(); - // emulate calling .off('dxdblclick') before import 'events/dblclick' (T1208575) + // emulate calling .off('dxdblclick') before import 'common/core/events/dblclick' (T1208575) dblClick.remove(); el.off(dblclickEvent.name); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/drag.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/drag.tests.js index 075133aea5e5..182e9b32063c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/drag.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/drag.tests.js @@ -1,8 +1,8 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; -const dragEvents = require('events/drag'); +const dragEvents = require('common/core/events/drag'); const support = require('core/utils/support'); -const GestureEmitter = require('events/gesture/emitter.gesture'); +const GestureEmitter = require('common/core/events/gesture/emitter.gesture'); const dropTargets = dragEvents.dropTargets; const pointerMock = require('../../helpers/pointerMock.js'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js index 8991da54889f..0bdf439505a3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import registerEvent from 'events/core/event_registrator'; -import eventsEngine from 'events/core/events_engine'; -import registerEventCallbacks from 'events/core/event_registrator_callbacks'; +import registerEvent from 'common/core/events/core/event_registrator'; +import eventsEngine from 'common/core/events/core/events_engine'; +import registerEventCallbacks from 'common/core/events/core/event_registrator_callbacks'; import Class from 'core/class'; import eventHelper from '../../helpers/eventHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/events.utils.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/events.utils.tests.js index b1debe5b84b3..9def33e8166b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/events.utils.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/events.utils.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { compare } from 'core/utils/version'; -import { getEventTarget } from 'events/utils/event_target'; +import { getEventTarget } from 'common/core/events/utils/event_target'; import { eventData, eventDelta, @@ -9,7 +9,7 @@ import { normalizeKeyName, getChar, isCommandKeyPressed, -} from 'events/utils/index'; +} from 'common/core/events/utils/index'; import pointerMock from '../../helpers/pointerMock.js'; import nativePointerMock from '../../helpers/nativePointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/eventsEngine.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/eventsEngine.tests.js index 9131093a4db0..69dd769503b9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/eventsEngine.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/eventsEngine.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import keyboardMock from '../../helpers/keyboardMock.js'; -import registerEvent from 'events/core/event_registrator'; +import registerEvent from 'common/core/events/core/event_registrator'; import { compare as compareVersion } from 'core/utils/version'; QUnit.module('base'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/eventsInteraction.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/eventsInteraction.tests.js index d4ccecc93f9b..627e83b40965 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/eventsInteraction.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/eventsInteraction.tests.js @@ -2,17 +2,17 @@ import $ from 'jquery'; import { noop } from '__internal/core/utils/m_common'; import domUtils from '__internal/core/utils/m_dom'; import devices from '__internal/core/m_devices'; -import eventUtils from 'events/utils/index'; -import Emitter from 'events/core/emitter'; -import GestureEmitter from 'events/gesture/emitter.gesture'; -import registerEmitter from 'events/core/emitter_registrator'; -import feedbackEvents from 'events/core/emitter.feedback'; -import scrollEvents from 'events/gesture/emitter.gesture.scroll'; -import holdEvent from 'events/hold'; -import swipeEvents from 'events/swipe'; -import transformEvent from 'events/transform'; -import dragEvents from 'events/drag'; -import dblclickEvent from 'events/dblclick'; +import eventUtils from 'common/core/events/utils/index'; +import Emitter from 'common/core/events/core/emitter'; +import GestureEmitter from 'common/core/events/gesture/emitter.gesture'; +import registerEmitter from 'common/core/events/core/emitter_registrator'; +import feedbackEvents from 'common/core/events/core/emitter.feedback'; +import scrollEvents from 'common/core/events/gesture/emitter.gesture.scroll'; +import holdEvent from 'common/core/events/hold'; +import swipeEvents from 'common/core/events/swipe'; +import transformEvent from 'common/core/events/transform'; +import dragEvents from 'common/core/events/drag'; +import dblclickEvent from 'common/core/events/dblclick'; import pointerMock from '../../helpers/pointerMock.js'; const GESTURE_COVER_CLASS = 'dx-gesture-cover'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/feedback.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/feedback.tests.js index ca7bdd606531..6458f0852da3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/feedback.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/feedback.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; const devices = require('core/devices'); -const feedbackEvents = require('events/core/emitter.feedback'); +const feedbackEvents = require('common/core/events/core/emitter.feedback'); const pointerMock = require('../../helpers/pointerMock.js'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/hold.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/hold.tests.js index fefc05414cfb..78a4db9961b1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/hold.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/hold.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const holdEvent = require('events/hold'); +const holdEvent = require('common/core/events/hold'); const pointerMock = require('../../helpers/pointerMock.js'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/hover.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/hover.tests.js index 0924e5cdb6cb..a358fb58f39d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/hover.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/hover.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); const devices = require('core/devices'); -const hoverEvents = require('events/hover'); +const hoverEvents = require('common/core/events/hover'); QUnit.testStart(function() { const markup = diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js index e17b0d147aca..abb399642422 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; -const BaseStrategy = require('events/pointer/base'); -const registerEvent = require('events/core/event_registrator'); +const BaseStrategy = require('common/core/events/pointer/base'); +const registerEvent = require('common/core/events/core/event_registrator'); const special = require('../../../helpers/eventHelper.js').special; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseAndTouchTests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseAndTouchTests.js index fa064fc4536e..ac065b0129b6 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseAndTouchTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseAndTouchTests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); -const MouseAndTouchStrategy = require('events/pointer/mouse_and_touch'); -const registerEvent = require('events/core/event_registrator'); +const MouseAndTouchStrategy = require('common/core/events/pointer/mouse_and_touch'); +const registerEvent = require('common/core/events/core/event_registrator'); const nativePointerMock = require('../../../helpers/nativePointerMock.js'); const special = require('../../../helpers/eventHelper.js').special; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseTests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseTests.js index 2ba312e54303..8733017ed2d0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseTests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); -const MouseStrategy = require('events/pointer/mouse'); -const registerEvent = require('events/core/event_registrator'); +const MouseStrategy = require('common/core/events/pointer/mouse'); +const registerEvent = require('common/core/events/core/event_registrator'); const nativePointerMock = require('../../../helpers/nativePointerMock.js'); const special = require('../../../helpers/eventHelper.js').special; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/strategySelectionTests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/strategySelectionTests.js index 20c35dbfa8d8..323f83a215b7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/strategySelectionTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/strategySelectionTests.js @@ -1,8 +1,8 @@ import GlobalConfig from 'core/config'; -import { getStrategy } from 'events/pointer'; -import TouchStrategy from 'events/pointer/touch'; -import MouseStrategy from 'events/pointer/mouse'; -import MouseAndTouchStrategy from 'events/pointer/mouse_and_touch'; +import { getStrategy } from 'common/core/events/pointer'; +import TouchStrategy from 'common/core/events/pointer/touch'; +import MouseStrategy from 'common/core/events/pointer/mouse'; +import MouseAndTouchStrategy from 'common/core/events/pointer/mouse_and_touch'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/touchTests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/touchTests.js index 5857804e8c85..78cf41582d81 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/touchTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/touchTests.js @@ -1,10 +1,10 @@ const $ = require('jquery'); -const TouchStrategy = require('events/pointer/touch'); -const registerEvent = require('events/core/event_registrator'); +const TouchStrategy = require('common/core/events/pointer/touch'); +const registerEvent = require('common/core/events/core/event_registrator'); const nativePointerMock = require('../../../helpers/nativePointerMock.js'); const noop = require('core/utils/common').noop; const special = require('../../../helpers/eventHelper.js').special; -const eventsEngine = require('events/core/events_engine'); +const eventsEngine = require('common/core/events/core/events_engine'); QUnit.module('touch events', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/remove.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/remove.tests.js index 93ab45907107..b5f4cc51e47b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/remove.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/remove.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import eventsEngine from 'events/core/events_engine'; -import { removeEvent } from 'events/remove'; +import eventsEngine from 'common/core/events/core/events_engine'; +import { removeEvent } from 'common/core/events/remove'; QUnit.testStart(function() { const markup = '
'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/scroll.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/scroll.tests.js index d15ad4438cab..d80ac13750a1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/scroll.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/scroll.tests.js @@ -1,11 +1,11 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; -const scrollEvents = require('events/gesture/emitter.gesture.scroll'); -const GestureEmitter = require('events/gesture/emitter.gesture'); -const eventUtils = require('events/utils/index'); +const scrollEvents = require('common/core/events/gesture/emitter.gesture.scroll'); +const GestureEmitter = require('common/core/events/gesture/emitter.gesture'); +const eventUtils = require('common/core/events/utils/index'); const devices = require('core/devices'); const compareVersions = require('core/utils/version').compare; -const animationFrame = require('animation/frame'); +const animationFrame = require('common/core/animation/frame'); const pointerMock = require('../../helpers/pointerMock.js'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/swipe.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/swipe.tests.js index b2b216b4a6ac..fbfa26200fb5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/swipe.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/swipe.tests.js @@ -1,11 +1,11 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; -import swipeEvents from 'events/swipe'; +import swipeEvents from 'common/core/events/swipe'; import mathUtils from 'core/utils/math'; import domUtils from '__internal/core/utils/m_dom'; import Action from '__internal/core/m_action'; import devices from '__internal/core/m_devices'; -import GestureEmitter from 'events/gesture/emitter.gesture'; +import GestureEmitter from 'common/core/events/gesture/emitter.gesture'; import pointerMock from '../../helpers/pointerMock.js'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/transformation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/transformation.tests.js index 42ee470f4d90..a0e83e63a5a6 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/transformation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/transformation.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const transformEvent = require('events/transform'); +const transformEvent = require('common/core/events/transform'); $('#qunit-fixture').addClass('qunit-fixture-visible'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/wheel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/wheel.tests.js index 400784272019..458537abb57c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/wheel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/wheel.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const wheelEvent = require('events/core/wheel'); +const wheelEvent = require('common/core/events/core/wheel'); const nativePointerMock = require('../../helpers/nativePointerMock.js'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.integration.tests.js index 14987b98a6f6..065bbf64d23b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.integration.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import typeUtils from 'core/utils/type'; import browser from 'core/utils/browser'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import config from 'core/config'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js index 52cbd4f0801d..e31a921306a1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js @@ -7,7 +7,7 @@ import { noop as noop } from 'core/utils/common'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; import dataGridMocks from '../../helpers/dataGridMocks.js'; import pointerMock from '../../helpers/pointerMock.js'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import typeUtils from 'core/utils/type'; import config from 'core/config'; import renderer from 'core/renderer'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooser.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooser.integration.tests.js index 4aacf0bd2a18..c0ccae2eb2f8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooser.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooser.integration.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; QUnit.testStart(function() { const gridMarkup = ` diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooserModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooserModule.tests.js index 523515b3ce96..ce46b35f237d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooserModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooserModule.tests.js @@ -8,7 +8,7 @@ import devices from '__internal/core/m_devices'; import themes from 'ui/themes'; import dataGridMocks from '../../helpers/dataGridMocks.js'; import publicComponentUtils from 'core/utils/public_component'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import { TreeViewSearchBoxWrapper } from '../../helpers/wrappers/searchBoxWrappers.js'; const device = devices.real(); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.integration.tests.js index ece56b890fbd..e7d48ef9d175 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.integration.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import browser from 'core/utils/browser'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import commonUtils from 'core/utils/common'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js index cdf71831588a..376215cf6ef8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js @@ -9,7 +9,7 @@ import nativePointerMock from '../../helpers/nativePointerMock.js'; import { setupDataGridModules, MockDataController, MockColumnsController } from '../../helpers/dataGridMocks.js'; import gridCoreUtils from '__internal/grids/grid_core/m_utils'; import dataUtils from 'core/element_data'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import { getOuterHeight } from 'core/utils/size'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js index 87bcb225c478..f6d917b6793b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import dateLocalization from 'localization/date'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import dateLocalization from 'common/core/localization/date'; import { isFunction } from 'core/utils/type'; import gridCore from '__internal/grids/data_grid/m_core'; import dataSourceAdapter from '__internal/grids/data_grid/m_data_source_adapter'; @@ -14,9 +14,9 @@ import ajaxMock from '../../helpers/ajaxMock.js'; import 'ui/data_grid'; -import 'localization/globalize/currency'; -import 'localization/globalize/number'; -import { locale } from 'localization/core'; +import 'common/core/localization/globalize/currency'; +import 'common/core/localization/globalize/number'; +import { locale } from 'common/core/localization/core'; const createMockDataSource = function(items, loadOptions) { loadOptions = loadOptions || {}; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsHeadersView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsHeadersView.tests.js index dcb9f6736e7a..ee037ba51fe7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsHeadersView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsHeadersView.tests.js @@ -6,11 +6,11 @@ import typeUtils from 'core/utils/type'; import { format } from 'core/utils/string'; import config from 'core/config'; import devices from '__internal/core/m_devices'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import dataGridMocks from '../../helpers/dataGridMocks.js'; import { findShadowHostOrDocument } from '../../helpers/dataGridHelper.js'; -import dateLocalization from 'localization/date'; -import messageLocalization from 'localization/message'; +import dateLocalization from 'common/core/localization/date'; +import messageLocalization from 'common/core/localization/message'; import { addShadowDomStyles } from 'core/utils/shadow_dom.js'; import 'ui/data_grid'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsResizingReorderingModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsResizingReorderingModule.tests.js index 58395ff82d76..b35855666997 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsResizingReorderingModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsResizingReorderingModule.tests.js @@ -6,7 +6,7 @@ import 'ui/data_grid'; import $ from 'jquery'; import { noop } from 'core/utils/common'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dataGridMocks from '../../helpers/dataGridMocks.js'; const MockTablePositionViewController = dataGridMocks.MockTablePositionViewController; @@ -20,7 +20,7 @@ const MockColumnsController = dataGridMocks.MockColumnsController; const MockEditingController = dataGridMocks.MockEditingController; import gridCore from '__internal/grids/data_grid/m_core'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/drag'; import columnsResizingReordering from '__internal/grids/data_grid/module_not_extended/columns_resizing_reordering'; import { ColumnChooserView } from '__internal/grids/data_grid/module_not_extended/column_chooser'; import { ColumnHeadersView } from '__internal/grids/data_grid/module_not_extended/column_headers'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsView.tests.js index 7115bd35e590..a372e45c8d8f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsView.tests.js @@ -7,7 +7,7 @@ import 'ui/data_grid'; import browser from 'core/utils/browser'; import { ColumnsView } from '__internal/grids/grid_core/views/m_columns_view'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dataGridMocks from '../../helpers/dataGridMocks.js'; const MockColumnsController = dataGridMocks.MockColumnsController; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js index 4c8f74f96489..07c53c564db5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import config from 'core/config'; import formatHelper from 'format_helper'; import errors from 'ui/widget/ui.errors'; -import { errors as dataErrors } from 'data/errors'; +import { errors as dataErrors } from 'common/data/errors'; import typeUtils from 'core/utils/type'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; import gridCoreUtils from '__internal/grids/grid_core/m_utils'; import { setupDataGridModules, MockGridDataSource } from '../../helpers/dataGridMocks.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js index 021b42030641..e2000e8a5f9c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js @@ -9,11 +9,11 @@ import devices from '__internal/core/m_devices'; import { version } from 'core/version'; import errors from 'core/errors'; import gridCore from '__internal/grids/data_grid/m_core'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import messageLocalization from 'localization/message'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import messageLocalization from 'common/core/localization/message'; import { setTemplateEngine } from 'core/templates/template_engine_registry'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import config from 'core/config'; import ajaxMock from '../../helpers/ajaxMock.js'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js index 6cf38d965b14..bc43bc4c75f4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js @@ -1,11 +1,11 @@ import $ from 'jquery'; import { logger } from 'core/utils/console'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import ODataStore from 'data/odata/store'; -import dataQuery from 'data/query'; -import { queryByOptions } from 'data/store_helper'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import ODataStore from 'common/data/odata/store'; +import dataQuery from 'common/data/query'; +import { queryByOptions } from 'common/data/store_helper'; import gridCore from '__internal/grids/data_grid/m_core'; import { createOffsetFilter } from '__internal/grids/data_grid/grouping/m_grouping_core'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js index d82e79dcc79b..d7892cfdd289 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; -import pointerEvents from 'events/pointer'; +import fx from 'common/core/animation/fx'; +import pointerEvents from 'common/core/events/pointer'; import themes from 'ui/themes'; import typeUtils from 'core/utils/type'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import SelectBox from 'ui/select_box'; import 'ui/text_area'; import config from 'core/config'; @@ -18,7 +18,7 @@ import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.j import { generateItems } from '../../helpers/dataGridMocks.js'; import { getOuterHeight } from 'core/utils/size'; import { getEmulatorStyles } from '../../helpers/stylesHelper.js'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; const TEXTEDITOR_INPUT_SELECTOR = '.dx-texteditor-input'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js index 6d5f8a21bc2e..b712d1cc835b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; @@ -9,11 +9,11 @@ import { Deferred } from 'core/utils/deferred'; import { getHeight, getWidth, setWidth, getOffset } from 'core/utils/size'; import typeUtils from 'core/utils/type'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; -import eventsEngine from 'events/core/events_engine'; -import pointerEvents from 'events/pointer'; -import { name as clickEventName } from 'events/click'; -import { name as dblClickEventName } from 'events/dblclick'; -import { triggerResizeEvent } from 'events/visibility_change'; +import eventsEngine from 'common/core/events/core/events_engine'; +import pointerEvents from 'common/core/events/pointer'; +import { name as clickEventName } from 'common/core/events/click'; +import { name as dblClickEventName } from 'common/core/events/dblclick'; +import { triggerResizeEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import 'ui/autocomplete'; @@ -29,7 +29,7 @@ import { getCells, generateItems, MockColumnsController, MockDataController, set import pointerMock from '../../helpers/pointerMock.js'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { findShadowHostOrDocument } from '../../helpers/dataGridHelper.js'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; QUnit.testStart(function() { const markup = diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editorFactory.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editorFactory.tests.js index 62034517bae9..807f0e5b6085 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editorFactory.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editorFactory.tests.js @@ -39,7 +39,7 @@ import 'ui/tag_box'; import TextArea from 'ui/text_area'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import browser from 'core/utils/browser'; import devices from '__internal/core/m_devices'; import SelectBox from 'ui/select_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js index 4c3fcd3b2c40..05fab53a5e4f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js @@ -5,8 +5,8 @@ import 'generic_light.css!'; import 'ui/data_grid'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; -import ArrayStore from 'data/array_store'; -import messageLocalization from 'localization/message'; +import ArrayStore from 'common/data/array_store'; +import messageLocalization from 'common/core/localization/message'; import { prepareItems } from '__internal/grids/grid_core/m_export'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterBuilder.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterBuilder.tests.js index 14626172b33c..7bddf49743e8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterBuilder.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterBuilder.tests.js @@ -1,7 +1,7 @@ import 'ui/data_grid'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dataGridMocks from '../../helpers/dataGridMocks.js'; const setupDataGridModules = dataGridMocks.setupDataGridModules; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterPanel.tests.js index 59032b18ed13..b20fa3f0080c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterPanel.tests.js @@ -1,10 +1,10 @@ import 'ui/data_grid'; import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import errors from 'ui/widget/ui.errors'; const FILTER_PANEL_CLASS = 'dx-datagrid-filter-panel'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterRow.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterRow.tests.js index 858cc643fa2a..1744b86ee05f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterRow.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterRow.tests.js @@ -2,15 +2,15 @@ import 'generic_light.css!'; import 'ui/data_grid'; import 'ui/tag_box'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import $ from 'jquery'; import { noop } from 'core/utils/common'; import { value as viewPort } from 'core/utils/view_port'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; -import dateLocalization from 'localization/date'; +import fx from 'common/core/animation/fx'; +import dateLocalization from 'common/core/localization/date'; import { setupDataGridModules, MockDataController, MockColumnsController } from '../../helpers/dataGridMocks.js'; const device = devices.real(); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterSync.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterSync.tests.js index 493ebf26e57b..7431103e369b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterSync.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterSync.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; import * as customOperations from '__internal/grids/grid_core/filter/m_filter_custom_operations'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/data_grid'; const HEADER_FILTER_CLASS = 'dx-header-filter'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js index 9d0c5c900661..b59cefcd8d46 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js @@ -1,10 +1,10 @@ import $ from 'jquery'; -import { EdmLiteral } from 'data/odata/utils'; +import { EdmLiteral } from 'common/data/odata/utils'; import commonUtils from 'core/utils/common'; import devices from '__internal/core/m_devices'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import gridCoreUtils from '__internal/grids/grid_core/m_utils'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; import { getEmulatorStyles } from '../../helpers/stylesHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.integration.tests.js index 0df103874d93..09861fff1afc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.integration.tests.js @@ -1,15 +1,15 @@ import $ from 'jquery'; import typeUtils from 'core/utils/type'; import devices from '__internal/core/m_devices'; -import pointerEvents from 'events/pointer'; -import fx from 'animation/fx'; +import pointerEvents from 'common/core/events/pointer'; +import fx from 'common/core/animation/fx'; import commonUtils from 'core/utils/common'; -import { keyboard } from 'events/short'; +import { keyboard } from 'common/core/events/short'; import keyboardMock from '../../helpers/keyboardMock.js'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { CLICK_EVENT } from '../../helpers/grid/keyboardNavigationHelper.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import DataGrid from 'ui/data_grid'; import { getEmulatorStyles } from '../../helpers/stylesHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js index 515537b82400..c98a8834c3f4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js @@ -1,12 +1,12 @@ import 'generic_light.css!'; import 'ui/data_grid'; -import 'data/odata/store'; +import 'common/data/odata/store'; import $ from 'jquery'; -import ArrayStore from 'data/array_store'; -import pointerEvents from 'events/pointer'; -import clickEvent from 'events/click'; +import ArrayStore from 'common/data/array_store'; +import pointerEvents from 'common/core/events/pointer'; +import clickEvent from 'common/core/events/click'; import { setupDataGridModules, generateItems } from '../../helpers/dataGridMocks.js'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { CLICK_EVENT, isMobile, device, fireKeyDown, triggerKeyDown } from '../../helpers/grid/keyboardNavigationHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/gridView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/gridView.tests.js index 35373bbff836..e6d65c183617 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/gridView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/gridView.tests.js @@ -1,5 +1,5 @@ import devices from '__internal/core/m_devices'; -import visibilityChange from 'events/visibility_change'; +import visibilityChange from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import 'ui/data_grid'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/grouping.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/grouping.integration.tests.js index 7446d8e80e6e..9f01e09d6f54 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/grouping.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/grouping.integration.tests.js @@ -1,6 +1,6 @@ import gridCore from '__internal/grids/data_grid/m_core'; -import ArrayStore from 'data/array_store'; -import { DataSource } from 'data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; import commonUtils from 'core/utils/common'; import typeUtils from 'core/utils/type'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js index 5cfa85c32794..12054fd3ed0a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js @@ -4,17 +4,17 @@ import 'ui/data_grid'; import gridCoreUtils from '__internal/grids/grid_core/m_utils'; import $ from 'jquery'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import { noop } from 'core/utils/common'; -import ODataStore from 'data/odata/store'; +import ODataStore from 'common/data/odata/store'; import devices from '__internal/core/m_devices'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { invertFilterExpression } from '__internal/grids/grid_core/header_filter/m_header_filter'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/drag'; import { setupDataGridModules, MockDataController, MockColumnsController } from '../../helpers/dataGridMocks.js'; import viewPortUtils from 'core/utils/view_port'; -import fx from 'animation/fx'; -import messageLocalization from 'localization/message'; +import fx from 'common/core/animation/fx'; +import messageLocalization from 'common/core/localization/message'; import dateSerialization from 'core/utils/date_serialization'; import { ListSearchBoxWrapper } from '../../helpers/wrappers/searchBoxWrappers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.accessibility.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.accessibility.tests.js index 41970aa5a5d6..cee07ca172ce 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.accessibility.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.accessibility.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import 'generic_light.css!'; import 'ui/data_grid'; -import { createEvent } from 'events/utils/index'; +import { createEvent } from 'common/core/events/utils/index'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; import { CLICK_EVENT, @@ -12,7 +12,7 @@ import { focusCell, dataGridWrapper } from '../../helpers/grid/keyboardNavigationHelper.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; QUnit.testStart(function() { const markup = ` diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js index 8570f588de8c..423a2a0fed51 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js @@ -8,9 +8,9 @@ import { keyboardNavigationModule } from '__internal/grids/grid_core/keyboard_na import commonUtils from 'core/utils/common'; import typeUtils from 'core/utils/type'; import publicComponentUtils from 'core/utils/public_component'; -import eventsEngine from 'events/core/events_engine'; -import pointerEvents from 'events/pointer'; -import { keyboard } from 'events/short'; +import eventsEngine from 'common/core/events/core/events_engine'; +import pointerEvents from 'common/core/events/pointer'; +import { keyboard } from 'common/core/events/short'; import { MockDataController, MockColumnsController, MockEditingController } from '../../helpers/dataGridMocks.js'; import { CLICK_EVENT, callViewsRenderCompleted } from '../../helpers/grid/keyboardNavigationHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js index 5ce5e971a74f..a9866a18c4e7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js @@ -10,7 +10,7 @@ import keyboardMock from '../../helpers/keyboardMock.js'; import commonUtils from 'core/utils/common'; import typeUtils from 'core/utils/type'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; -import pointerEvents from 'events/pointer'; +import pointerEvents from 'common/core/events/pointer'; import { setupDataGridModules, MockDataController } from '../../helpers/dataGridMocks.js'; import { CLICK_EVENT, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.realControllers.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.realControllers.tests.js index 0b82ca67a442..d42ef80dfbfd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.realControllers.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.realControllers.tests.js @@ -5,7 +5,7 @@ import $ from 'jquery'; import 'ui/data_grid'; import commonUtils from 'core/utils/common'; -import pointerEvents from 'events/pointer'; +import pointerEvents from 'common/core/events/pointer'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; import { getActiveElement } from '../../helpers/shadowDom.js'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.rowsView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.rowsView.tests.js index ba14041e1ea2..5d965d595942 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.rowsView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.rowsView.tests.js @@ -3,10 +3,10 @@ import 'generic_light.css!'; import $ from 'jquery'; import 'ui/data_grid'; import commonUtils from 'core/utils/common'; -import { createEvent } from 'events/utils/index'; +import { createEvent } from 'common/core/events/utils/index'; import typeUtils from 'core/utils/type'; -import pointerEvents from 'events/pointer'; -import eventsEngine from 'events/core/events_engine'; +import pointerEvents from 'common/core/events/pointer'; +import eventsEngine from 'common/core/events/core/events_engine'; import { setupDataGridModules, MockDataController, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/masterDetail.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/masterDetail.integration.tests.js index f7709b0f1ce1..66657433e0bf 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/masterDetail.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/masterDetail.integration.tests.js @@ -1,6 +1,6 @@ import typeUtils from 'core/utils/type'; import config from 'core/config'; -import pointerEvents from 'events/pointer'; +import pointerEvents from 'common/core/events/pointer'; import commonUtils from 'core/utils/common'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; import $ from 'jquery'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js index 00926234a4d4..8445df0838a4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js @@ -5,7 +5,7 @@ import 'ui/data_grid'; import $ from 'jquery'; import { setupDataGridModules, MockDataController } from '../../helpers/dataGridMocks.js'; import dataUtils from 'core/element_data'; -import { createEvent } from 'events/utils/index'; +import { createEvent } from 'common/core/events/utils/index'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; import Pager from 'ui/pagination'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowDragging.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowDragging.integration.tests.js index 26a45b348cf6..864236c6b19b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowDragging.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowDragging.integration.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import DataGrid from 'ui/data_grid'; import pointerMock from '../../helpers/pointerMock.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import { generateItems } from '../../helpers/dataGridMocks.js'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js index 7cdf1941c18e..90a424aad1af 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js @@ -17,10 +17,10 @@ import pointerMock from '../../helpers/pointerMock.js'; import nativePointerMock from '../../helpers/nativePointerMock.js'; import { setupDataGridModules, MockDataController, MockColumnsController, MockSelectionController, getCells, generateItems } from '../../helpers/dataGridMocks.js'; import { findShadowHostOrDocument } from '../../helpers/dataGridHelper.js'; -import numberLocalization from 'localization/number'; +import numberLocalization from 'common/core/localization/number'; import virtualScrollingCore from '__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core'; -import ODataStore from 'data/odata/store'; -import ArrayStore from 'data/array_store'; +import ODataStore from 'common/data/odata/store'; +import ArrayStore from 'common/data/array_store'; const expandCellTemplate = gridCoreUtils.getExpandCellTemplate(); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/scrolling.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/scrolling.integration.tests.js index 184e3995ca19..27c0b4fa179c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/scrolling.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/scrolling.integration.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import commonUtils from 'core/utils/common'; import devices from '__internal/core/m_devices'; import browser from 'core/utils/browser'; -import pointerEvents from 'events/pointer'; +import pointerEvents from 'common/core/events/pointer'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; import { getHeight, getWidth } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js index 8dfb7b85c570..a99fcd24349d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js @@ -1,13 +1,13 @@ import 'ui/data_grid'; -import 'data/odata/store'; +import 'common/data/odata/store'; import $ from 'jquery'; import { setupDataGridModules, generateItems } from '../../helpers/dataGridMocks.js'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; -import clickEvent from 'events/click'; +import clickEvent from 'common/core/events/click'; import errors from 'ui/widget/ui.errors'; const dataGridWrapper = new DataGridWrapper('#container'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/stateStoring.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/stateStoring.tests.js index 1ee65154aa5a..6fcd98396d5f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/stateStoring.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/stateStoring.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { setupDataGridModules, MockDataController } from '../../helpers/dataGridMocks.js'; -import ArrayStore from 'data/array_store'; -import fx from 'animation/fx'; +import ArrayStore from 'common/data/array_store'; +import fx from 'common/core/animation/fx'; import 'ui/data_grid'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualColumns.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualColumns.tests.js index bdafceaebb9e..7fa3b79effb6 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualColumns.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualColumns.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import dataGridMocks from '../../helpers/dataGridMocks.js'; import 'ui/data_grid'; import 'generic_light.css!'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import dataSourceAdapter from '__internal/grids/data_grid/m_data_source_adapter'; import { getOuterWidth } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.integration.tests.js index 7471f1c6c1a3..aacfa5f7a6f4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.integration.tests.js @@ -2,17 +2,17 @@ import { getHeight, getWidth } from 'core/utils/size'; import devices from '__internal/core/m_devices'; import commonUtils from 'core/utils/common'; import browser from 'core/utils/browser'; -import ArrayStore from 'data/array_store'; -import { DataSource } from 'data/data_source/data_source'; -import pointerEvents from 'events/pointer'; +import ArrayStore from 'common/data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import pointerEvents from 'common/core/events/pointer'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; import Scrollable from 'ui/scroll_view/ui.scrollable.js'; import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import dataUtils from 'core/element_data'; -import ODataStore from 'data/odata/store'; +import ODataStore from 'common/data/odata/store'; const dataGridWrapper = new DataGridWrapper('#dataGrid'); const isRenovatedScrollable = !!Scrollable.IS_RENOVATED_WIDGET; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/autocomplete.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/autocomplete.tests.js index be257b8c8cb9..a59a8740b37b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/autocomplete.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/autocomplete.tests.js @@ -1,15 +1,15 @@ import $ from 'jquery'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import Autocomplete from 'ui/autocomplete'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import resizeCallbacks from 'core/utils/resize_callbacks'; import { isRenderer } from 'core/utils/type'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import { getHeight, getOuterHeight } from 'core/utils/size'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.markup.tests.js index 7c06483a693f..40bf86ddbe24 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.markup.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import dateSerialization from 'core/utils/date_serialization'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import { isDefined, isRenderer } from 'core/utils/type'; import config from 'core/config'; import windowUtils from 'core/utils/window'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.tests.js index 6f0fbba10678..589c3eb44a1e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.tests.js @@ -1,11 +1,11 @@ import $ from 'jquery'; import { camelize } from 'core/utils/inflector'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import dateUtils from 'core/utils/date'; import dateSerialization from 'core/utils/date_serialization'; import { noop } from 'core/utils/common'; -import swipeEvents from 'events/swipe'; -import fx from 'animation/fx'; +import swipeEvents from 'common/core/events/swipe'; +import fx from 'common/core/animation/fx'; import Views from '__internal/ui/calendar/m_calendar.views'; import Calendar from 'ui/calendar'; import pointerMock from '../../helpers/pointerMock.js'; @@ -13,8 +13,8 @@ import keyboardMock from '../../helpers/keyboardMock.js'; import config from 'core/config'; import dataUtils from 'core/element_data'; import devices from 'core/devices.js'; -import dateLocalization from 'localization/date'; -import { normalizeKeyName } from 'events/utils/index'; +import dateLocalization from 'common/core/localization/date'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import localization from 'localization'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarView.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarView.markup.tests.js index 05620297cb43..e80fa16e1624 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarView.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarView.markup.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import dateUtils from 'core/utils/date'; import BaseView from '__internal/ui/calendar/m_calendar.base_view'; import Views from '__internal/ui/calendar/m_calendar.views'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dateSerialization from 'core/utils/date_serialization'; import 'ui/calendar'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarViews.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarViews.tests.js index 4e2adb617845..c651dd953a7d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarViews.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarViews.tests.js @@ -4,10 +4,10 @@ import dateUtils from 'core/utils/date'; import BaseView from '__internal/ui/calendar/m_calendar.base_view'; import Views from '__internal/ui/calendar/m_calendar.views'; import pointerMock from '../../helpers/pointerMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dateSerialization from 'core/utils/date_serialization'; -import dateLocalization from 'localization/date'; -import messageLocalization from 'localization/message'; +import dateLocalization from 'common/core/localization/date'; +import messageLocalization from 'common/core/localization/message'; import 'ui/calendar'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/checkbox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/checkbox.tests.js index 8ca9fe5cc5e2..18d4917d8cae 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/checkbox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/checkbox.tests.js @@ -3,7 +3,7 @@ import devices from '__internal/core/m_devices'; import keyboardMock from '../../helpers/keyboardMock.js'; import { validateGroup } from 'ui/validation_engine'; import dxCheckBox from 'ui/check_box'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; // eslint-disable-next-line spellcheck/spell-checker import { rerender } from 'inferno'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.markup.tests.js index 5466de50e605..2e2555c156c0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.markup.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/color_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.tests.js index 0e53e926ffb1..426da5f2d34e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.tests.js @@ -4,8 +4,8 @@ import devices from '__internal/core/m_devices'; import Color from 'color'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; -import { normalizeKeyName } from 'events/utils/index'; +import fx from 'common/core/animation/fx'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'generic_light.css!'; import 'ui/color_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.markup.tests.js index d7685ff6afb4..b1c5da30188d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.markup.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import '__internal/ui/color_box/m_color_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.tests.js index eecf87e3ba8f..74a7891a7649 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.tests.js @@ -3,8 +3,8 @@ import { noop } from 'core/utils/common'; import Color from 'color'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; -import { normalizeKeyName } from 'events/utils/index'; +import fx from 'common/core/animation/fx'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'generic_light.css!'; import '__internal/ui/color_box/m_color_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.strategy.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.strategy.tests.js index 0e55024c426f..94e7bdc274ac 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.strategy.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.strategy.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dataUtils from 'core/element_data'; import devices from 'core/devices.js'; import keyboardMock from '../../helpers/keyboardMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.tests.js index 0bcf4db7663d..909c17dd248d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.tests.js @@ -5,8 +5,8 @@ import DateRangeBox from 'ui/date_range_box'; import DateBox from 'ui/date_box'; import { isRenderer } from 'core/utils/type'; import { isObject } from 'core/utils/type.js'; -import fx from 'animation/fx'; -import hoverEvents from 'events/hover'; +import fx from 'common/core/animation/fx'; +import hoverEvents from 'common/core/events/hover'; import keyboardMock from '../../helpers/keyboardMock.js'; import Popup from 'ui/popup/ui.popup'; import localization from 'localization'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateView.tests.js index e3829d50a32c..aa540bb086ab 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateView.tests.js @@ -1,10 +1,10 @@ -import fx from 'animation/fx'; -import translator from 'animation/translator'; +import fx from 'common/core/animation/fx'; +import translator from 'common/core/animation/translator'; import devices from '__internal/core/m_devices'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import '__internal/ui/date_box/m_date_view'; import '__internal/ui/date_box/m_date_view_roller'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.markup.tests.js index cfa747b15631..2e60fd803657 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.markup.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import support from '__internal/core/utils/m_support'; import uiDateUtils from '__internal/ui/date_box/m_date_utils'; import DateBox from 'ui/date_box'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import keyboardMock from '../../helpers/keyboardMock.js'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.mask.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.mask.tests.js index b64cf2697129..11fd1e75c021 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.mask.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.mask.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { renderDateParts, getDatePartIndexByPosition } from '__internal/ui/date_box/m_date_box.mask.parts'; -import dateParser from 'localization/ldml/date.parser'; -import dateLocalization from 'localization/date'; +import dateParser from 'common/core/localization/ldml/date.parser'; +import dateLocalization from 'common/core/localization/date'; import { noop } from 'core/utils/common'; import pointerMock from '../../helpers/pointerMock.js'; import 'ui/date_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.tests.js index 313f68a77bef..a8a4caa865ca 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.tests.js @@ -4,23 +4,23 @@ import Box from 'ui/box'; import Calendar from 'ui/calendar'; import DateBox from 'ui/date_box'; import config from 'core/config'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import dateSerialization from 'core/utils/date_serialization'; import dateUtils from 'core/utils/date'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; import { getActiveElement } from '../../helpers/shadowDom.js'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import localization from 'localization'; -import ja from 'localization/messages/ja.json!'; +import ja from 'common/core/localization/messages/ja.json!'; import pointerMock from '../../helpers/pointerMock.js'; import support from '__internal/core/utils/m_support'; import typeUtils from 'core/utils/type'; import uiDateUtils from '__internal/ui/date_box/m_date_utils'; import { noop } from 'core/utils/common'; import { logger } from 'core/utils/console'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import browser from 'core/utils/browser'; import '../../helpers/calendarFixtures.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.markup.tests.js index 33b6195cca2e..ad9825e9da8e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.markup.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import DropDownBox from 'ui/drop_down_box'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.tests.js index aa78535ab2c1..b6380f72581f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.tests.js @@ -1,14 +1,14 @@ import $ from 'jquery'; import renderer from 'core/renderer'; import keyboardMock from '../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import DropDownBox from 'ui/drop_down_box'; import typeUtils, { isRenderer } from 'core/utils/type'; import config from 'core/config'; import devices from '__internal/core/m_devices'; -import { normalizeKeyName } from 'events/utils/index'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; +import { normalizeKeyName } from 'common/core/events/utils/index'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; import 'generic_light.css!'; import 'ui/validator'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownEditor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownEditor.tests.js index 7fe118d4bdfb..5667f2beb58d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownEditor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownEditor.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import config from 'core/config'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'events/core/events_engine'; -import fx from 'animation/fx'; +import eventsEngine from 'common/core/events/core/events_engine'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import support from '__internal/core/utils/m_support'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownList.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownList.tests.js index 4b768c1f9ae6..65bf4226cb28 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownList.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownList.tests.js @@ -3,11 +3,11 @@ import { noop } from 'core/utils/common'; import devices from '__internal/core/m_devices'; import { Template } from 'core/templates/template'; import Guid from 'core/guid'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import keyboardMock from '../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import ajaxMock from '../../helpers/ajaxMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownOptions.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownOptions.tests.js index ef6adc46e879..a78e5fc9309f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownOptions.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownOptions.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { dropDownEditorsList } from '../../helpers/widgetsList.js'; import { defaultDropDownOptions } from '../../helpers/dropDownOptions.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/editor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/editor.tests.js index 605373f2d87c..3b3ed11d3275 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/editor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/editor.tests.js @@ -4,7 +4,7 @@ import OldEditor from 'ui/editor/editor'; import CheckBoxEditor from '__internal/ui/check_box/editor_base/generated_wrapper'; import Class from 'core/class'; import ValidationEngine from 'ui/validation_engine'; -import hoverEvents from 'events/hover'; +import hoverEvents from 'common/core/events/hover'; import { wrapRenovatedWidget } from '../../helpers/wrapRenovatedWidget.js'; import Validator from 'ui/validator'; import { getOuterWidth } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.markup.tests.js index 949c77b71871..ae7ce916c143 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.markup.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import Lookup from 'ui/lookup'; import { Deferred } from 'core/utils/deferred'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js index 93323dc89330..838b145d5d19 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js @@ -1,17 +1,17 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; import config from 'core/config'; import browser from 'core/utils/browser'; import errors from 'core/errors'; import { isRenderer } from 'core/utils/type'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import Query from 'data/query'; -import { DataSource } from 'data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import Query from 'common/data/query'; +import { DataSource } from 'common/data/data_source/data_source'; import themes from 'ui/themes'; import Lookup from 'ui/lookup'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js index 72ee81b75e89..3e5106f017a7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import SpinButton from '__internal/ui/number_box/m_number_box.spin'; import config from 'core/config'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events/core/events_engine'; import keyboardMock from '../../../helpers/keyboardMock.js'; import pointerMock from '../../../helpers/pointerMock.js'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/core/events/utils/index'; import 'ui/number_box'; import 'ui/validator'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/mask.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/mask.tests.js index 8a7bef64bced..31ceaafc392f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/mask.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/mask.tests.js @@ -3,7 +3,7 @@ import browser from 'core/utils/browser'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import keyboardMock from '../../../helpers/keyboardMock.js'; -import numberLocalization from 'localization/number'; +import numberLocalization from 'common/core/localization/number'; import errors from 'core/errors'; import 'ui/text_box/ui.text_editor'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberbox.format.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberbox.format.tests.js index 08fa02972804..d272889078ea 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberbox.format.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberbox.format.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import keyboardMock from '../../helpers/keyboardMock.js'; -import numberLocalization from 'localization/number'; +import numberLocalization from 'common/core/localization/number'; import localization from 'localization'; import 'ui/number_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/radioGroup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/radioGroup.tests.js index da0a2aa91d6f..52234311698d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/radioGroup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/radioGroup.tests.js @@ -2,12 +2,12 @@ import $ from 'jquery'; import devices from '__internal/core/m_devices'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; import { deferUpdate } from 'core/utils/common'; import registerKeyHandlerTestHelper from '../../helpers/registerKeyHandlerTestHelper.js'; import errors from 'ui/widget/ui.errors'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'ui/radio_group'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/rangeSlider.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/rangeSlider.tests.js index 87c4662ccd2c..93be1ed70b11 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/rangeSlider.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/rangeSlider.tests.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import SliderTooltip from '__internal/ui/slider/m_slider_tooltip'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; -import fx from 'animation/fx'; -import { normalizeKeyName } from 'events/utils/index'; +import fx from 'common/core/animation/fx'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'ui/range_slider'; import 'ui/number_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.markup.tests.js index f30ae86e67f8..71239e4fcce2 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.markup.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import SelectBox from 'ui/select_box'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; -import fx from 'animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import fx from 'common/core/animation/fx'; import windowUtils from 'core/utils/window'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.tests.js index 8fb9b590d91b..577bf2e4398d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.tests.js @@ -4,15 +4,15 @@ import SelectBox from 'ui/select_box'; import devices from '__internal/core/m_devices'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import fx from 'animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import fx from 'common/core/animation/fx'; import { isRenderer } from 'core/utils/type'; import errors from 'core/errors'; import config from 'core/config'; import ariaAccessibilityTestHelper from '../../helpers/ariaAccessibilityTestHelper.js'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'generic_light.css!'; import 'ui/validator'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js index 5b48bb6340bf..478097cd38a5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js @@ -1,17 +1,17 @@ -import fx from 'animation/fx'; -import positionUtils from 'animation/position'; +import fx from 'common/core/animation/fx'; +import positionUtils from 'common/core/animation/position'; import 'generic_light.css!'; import config from 'core/config'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/core/events/visibility_change'; import $ from 'jquery'; -import { hideCallback as hideTopOverlayCallback } from 'mobile/hide_callback'; +import { hideCallback as hideTopOverlayCallback } from 'common/core/environment/hide_callback'; import 'ui/slider'; import SliderTooltip from '__internal/ui/slider/m_slider_tooltip'; import SliderHandle from '__internal/ui/slider/m_slider_handle'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/core/events/utils/index'; const { module, testStart, test, testInActiveWindow } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/switch.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/switch.tests.js index 3c80857a2593..6f1c0ed35639 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/switch.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/switch.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; -import { normalizeKeyName } from 'events/utils/index'; +import fx from 'common/core/animation/fx'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'generic_light.css!'; import 'ui/switch'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.markup.tests.js index 0ccd779e77c2..f6c4e6ea1224 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.markup.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import TagBox from 'ui/tag_box'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import windowModule from 'core/utils/window'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js index 96c105041037..9bb8d4085150 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js @@ -1,23 +1,23 @@ import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { isRenderer } from 'core/utils/type'; import { createTextElementHiddenCopy } from '__internal/core/utils/m_dom'; import ajaxMock from '../../helpers/ajaxMock.js'; import config from 'core/config'; -import dataQuery from 'data/query'; +import dataQuery from 'common/data/query'; import devices from '__internal/core/m_devices'; import coreErrors from 'core/errors'; import uiErrors from 'ui/widget/ui.errors'; -import { errors as dataErrors } from 'data/errors'; -import fx from 'animation/fx'; +import { errors as dataErrors } from 'common/data/errors'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import pointerMock from '../../helpers/pointerMock.js'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import ODataStore from 'data/odata/store'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import ODataStore from 'common/data/odata/store'; import TagBox from 'ui/tag_box'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import { getWidth, getHeight } from 'core/utils/size'; import Guid from 'core/guid'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js index 561d3c8f06f1..bdaf9b3da942 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events/core/events_engine'; import domUtils from '__internal/core/utils/m_dom'; import devices from '__internal/core/m_devices'; import pointerMock from '../../../helpers/pointerMock.js'; @@ -8,7 +8,7 @@ import caretWorkaround from './caretWorkaround.js'; import themes from 'ui/themes'; import config from 'core/config'; import consoleUtils from 'core/utils/console'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/core/events/utils/index'; import { getWidth, implementationsMap } from 'core/utils/size'; import TextEditor from '__internal/ui/text_box/m_text_editor'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/timeView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/timeView.tests.js index ea6ea5d2142e..8c139c6a929b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/timeView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/timeView.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import keyboardMock from '../../helpers/keyboardMock.js'; import 'ui/date_box/ui.time_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/trackBar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/trackBar.tests.js index faa06e63aaf9..1294c9a6041f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/trackBar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/trackBar.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/track_bar'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js index b26ef3c5b0ad..5cecf12abca9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js @@ -1,6 +1,6 @@ import Class from 'core/class'; import { Deferred } from 'core/utils/deferred'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/core/events/visibility_change'; import $ from 'jquery'; import DefaultAdapter from '__internal/ui/validation/m_default_adapter'; import ValidationEngine from 'ui/validation_engine'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js index 9e82cdcbc985..d98c1a4e9411 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js @@ -5,7 +5,7 @@ import domAdapter from '__internal/core/m_dom_adapter'; import resizeCallbacks from '__internal/core/utils/m_resize_callbacks'; import typeUtils from 'core/utils/type'; import { extend } from 'core/utils/extend'; -import visibilityEventsModule from 'events/visibility_change'; +import visibilityEventsModule from 'common/core/events/core/events/visibility_change'; import { EDITORS_WITHOUT_LABELS } from '__internal/ui/form/m_form.layout_manager.utils'; import 'generic_light.css!'; import $ from 'jquery'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js index 156c95129201..ed1a4260281b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import 'ui/html_editor'; import { deferUpdate } from 'core/utils/common'; -import { Event as dxEvent } from 'events/index'; +import { Event as dxEvent } from 'common/core/events/core/events/index'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events/core/events_engine'; import keyboardMock from '../../../helpers/keyboardMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageCursorModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageCursorModule.tests.js index 423781adbbc5..99fe6df8b00f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageCursorModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageCursorModule.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import ImageCursor from '__internal/ui/html_editor/modules/m_imageCursor'; -import { name as clickEvent } from 'events/click'; +import { name as clickEvent } from 'common/core/events/click'; const moduleConfig = { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageUploadIntegration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageUploadIntegration.tests.js index e1e432ee2a6e..a37e42942c78 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageUploadIntegration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageUploadIntegration.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import keyboardMock from '../../../helpers/keyboardMock.js'; import '../../../helpers/xmlHttpRequestMock.js'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/html_editor'; const FIELD_ITEM_CLASS = 'dx-field-item'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js index c1c7cd2703e4..0a224b23454b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js @@ -5,8 +5,8 @@ import Mentions from '__internal/ui/html_editor/modules/m_mentions'; import { noop } from 'core/utils/common'; import devices from '__internal/core/m_devices'; -import { Event as dxEvent } from 'events/index'; -import { normalizeKeyName } from 'events/utils/index'; +import { Event as dxEvent } from 'common/core/events/core/events/index'; +import { normalizeKeyName } from 'common/core/events/core/events/utils/index'; import Quill from 'devextreme-quill'; const SUGGESTION_LIST_CLASS = 'dx-suggestion-list'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js index f05740789f35..c6daf0746069 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/html_editor'; -import { name as clickEvent } from 'events/click'; +import { name as clickEvent } from 'common/core/events/core/events/click'; import PointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js index 00e1266be20f..e1369ccc73b4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js @@ -3,7 +3,7 @@ import Quill from 'devextreme-quill'; import Resizing from '__internal/ui/html_editor/modules/m_resizing'; import devices from '__internal/core/m_devices'; -import { name as clickEvent } from 'events/click'; +import { name as clickEvent } from 'common/core/events/core/events/click'; import PointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/scrolling.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/scrolling.tests.js index 414288767752..1c0cf647c3cb 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/scrolling.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/scrolling.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import nativePointerMock from '../../../helpers/nativePointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js index 7e865222021c..d668d00cb367 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/html_editor'; -import { createEvent } from 'events/utils/index'; -import eventsEngine from 'events/core/events_engine'; +import { createEvent } from 'common/core/events/core/events/utils/index'; +import eventsEngine from 'common/core/events/core/events/core/events_engine'; const tableMarkup = '\ before table text
\ diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarIntegration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarIntegration.tests.js index e7917546b6ff..2caf6d03d10e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarIntegration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarIntegration.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/html_editor'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { checkLink, prepareEmbedValue, prepareTableValue } from './utils.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarModule.tests.js index 80e7b67e8f8f..0820c0ee012d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarModule.tests.js @@ -9,7 +9,7 @@ import Toolbar from '__internal/ui/html_editor/modules/m_toolbar'; import FormDialog from '__internal/ui/html_editor/ui/m_formDialog'; import { noop } from 'core/utils/common'; import keyboardMock from '../../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import errors from 'ui/widget/ui.errors'; import localization from 'localization'; import resizeCallbacks from 'core/utils/resize_callbacks.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js index 2c2352e1317a..2b4ad041c12d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import inflector from '__internal/core/utils/m_inflector'; import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source'; import summaryDisplayModesModule from '__internal/grids/pivot_grid/summary_display_modes/m_summary_display_modes'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js index 4ca2544c65d7..9d573c939658 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { DataProvider } from '__internal/grids/pivot_grid/export/m_export'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; import { checkDxFontIcon, DX_ICON_XLSX_FILE_CONTENT_CODE } from '../../helpers/checkDxFontIconHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js index 8b447dad051c..33052ccfdb7a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js @@ -10,7 +10,7 @@ import { isDefined } from 'core/utils/type'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; import renderer from 'core/renderer'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js index faa572fd7d05..99b2c2467842 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js @@ -15,8 +15,8 @@ QUnit.testStart(function() { addShadowDomStyles($('#qunit-fixture')); }); -import fx from 'animation/fx'; -import eventsEngine from 'events/core/events_engine'; +import fx from 'common/core/animation/fx'; +import eventsEngine from 'common/core/events/core/events/core/events_engine'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; @@ -29,10 +29,10 @@ import { } from 'core/utils/size'; import { isRenderer } from 'core/utils/type'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source'; import 'ui/pivot_grid/ui.pivot_grid'; import { getRealElementWidth } from '__internal/grids/pivot_grid/area_item/m_area_item'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js index 9f0146e6b6e3..237695e110a0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js @@ -1,5 +1,5 @@ import '../../content/orders.js'; -import 'data/odata/store'; +import 'common/data/odata/store'; import $ from 'jquery'; import { noop } from 'core/utils/common'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js index 6c56b401b6f0..47576ac5a2c3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js @@ -3,8 +3,8 @@ import { RemoteStore } from '__internal/grids/pivot_grid/remote_store/m_remote_s import { forEachGroup } from '__internal/grids/pivot_grid/remote_store/m_remote_store_utils'; import { sort } from '__internal/grids/pivot_grid/data_source/m_data_source_utils'; import pivotGridUtils from '__internal/grids/pivot_grid/m_widget_utils'; -import ArrayStore from 'data/array_store'; -import DataSource from 'data/data_source'; +import ArrayStore from 'common/data/array_store'; +import DataSource from 'common/data/data_source'; import '../../content/orders.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js index c1a5438f9e99..399dbfce3634 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js @@ -2,9 +2,9 @@ import $ from 'jquery'; import ajax from 'core/utils/ajax'; import pivotGridUtils from '__internal/grids/pivot_grid/m_widget_utils'; import { XmlaStore } from '__internal/grids/pivot_grid/xmla_store/m_xmla_store'; -import { errors } from 'data/errors'; +import { errors } from 'common/data/errors'; import localization from 'localization'; -import { getLanguageId } from 'localization/language_codes'; +import { getLanguageId } from 'common/core/localization/language_codes'; const languageId = getLanguageId(); const ERROR_RESPONCE = 'XMLAnalysisError.0xc10a004dQuery (1, 77) The Fiscal hierarchy is used more than once in the Crossjoin function.17712030127'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.resourceProcessor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.resourceProcessor.tests.js index 1e128ca73f70..567b65c3ff22 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.resourceProcessor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.resourceProcessor.tests.js @@ -1,6 +1,6 @@ import { AgendaResourceProcessor } from '__internal/scheduler/resources/m_agenda_resource_processor'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; const { module, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.tests.js index 808835325da7..9edc20cb647d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import SchedulerAgenda from '__internal/scheduler/workspaces/m_agenda'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import { AppointmentDataProvider } from '__internal/scheduler/appointments/data_provider/m_appointment_data_provider'; const DATE_TABLE_CELL_CLASS = 'dx-scheduler-date-table-cell'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js index 88fc1f551599..38afcfbdae5a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js @@ -1,11 +1,11 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import Query from 'data/query'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import Query from 'common/data/query'; import dataUtils from 'core/element_data'; import { CLASSES, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js index 076d1849749a..1214331f42c8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js @@ -1,10 +1,10 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import translator from 'animation/translator'; -import dblclickEvent from 'events/dblclick'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import translator from 'common/core/animation/translator'; +import dblclickEvent from 'common/core/events/core/events/dblclick'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import { supportedScrollingModes, createWrapper, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js index 77a38539b704..e81fb5e57877 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js @@ -1,9 +1,9 @@ import { getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'events/drag'; -import { DataSource } from 'data/data_source/data_source'; +import dragEvents from 'common/core/events/core/events/drag'; +import { DataSource } from 'common/data/data_source/data_source'; import dataUtils from 'core/element_data'; import { createWrapper, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.dataProcessor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.dataProcessor.tests.js index 85d929195135..2caa4b3ec2e4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.dataProcessor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.dataProcessor.tests.js @@ -1,6 +1,6 @@ import { compileGetter, compileSetter } from 'core/utils/data'; import config from 'core/config'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { AppointmentDataProvider } from '__internal/scheduler/appointments/data_provider/m_appointment_data_provider'; import { getPreparedDataItems } from '__internal/scheduler/r1/utils/index.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.editing.tests.js index f98018c6e1f2..d919ca0b6be0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.editing.tests.js @@ -1,10 +1,10 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; import { noop } from 'core/utils/common'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import { hide } from '__internal/ui/tooltip/m_tooltip'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { Deferred } from 'core/utils/deferred'; import { initTestMarkup, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.filtering.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.filtering.tests.js index 220fcf1e9caf..77330b3b5554 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.filtering.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.filtering.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import dataUtils from 'core/element_data'; import { initTestMarkup, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js index 3431660dbc4d..94bc36bdf4de 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js @@ -1,11 +1,11 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; -import translator from 'animation/translator'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import Color from 'color'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import browser from 'core/utils/browser'; import { APPOINTMENT_FORM_GROUP_NAMES } from '__internal/scheduler/appointment_popup/m_form'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.resources.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.resources.tests.js index d3d60f7fd8a4..b13e711234a3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.resources.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.resources.tests.js @@ -1,5 +1,5 @@ -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { initTestMarkup, createWrapper diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js index 1ba94cd7d728..79f4b7d64c86 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { createWrapper, initTestMarkup diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js index 5cd084df5568..8b7d65a9d431 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { initTestMarkup, createWrapper, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tests.js index 720225f79b07..e5eb6f3b3519 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { Appointment } from '__internal/scheduler/appointments/m_appointment'; import { Deferred } from 'core/utils/deferred'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; const { module, test, testStart } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js index dfe2c60d7e23..f5f5b165432d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import { initTestMarkup, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tooltip.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tooltip.tests.js index 7208a8dce980..cb14107d4702 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tooltip.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tooltip.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { initTestMarkup, createWrapper diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js index 0becf99bad76..a9fbe2f1207b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js @@ -1,14 +1,14 @@ import { getHeight, getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; import errors from 'ui/widget/ui.errors'; -import translator from 'animation/translator'; -import dateLocalization from 'localization/date'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import dateLocalization from 'common/core/localization/date'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import Color from 'color'; import { hide } from '__internal/ui/tooltip/m_tooltip'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import dataUtils from 'core/element_data'; import dateSerialization from 'core/utils/date_serialization'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointmentPopup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointmentPopup.tests.js index 7e34004484b4..7279e2a97ac3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointmentPopup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointmentPopup.tests.js @@ -5,10 +5,10 @@ import { initTestMarkup, createWrapper, isDesktopEnvironment } from '../../helpe import $ from 'jquery'; import devices from '__internal/core/m_devices'; import SelectBox from 'ui/select_box'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import { APPOINTMENT_FORM_GROUP_NAMES } from '__internal/scheduler/appointment_popup/m_form'; import { dateToMilliseconds as toMs } from 'core/utils/date'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.horizontalStrategy.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.horizontalStrategy.tests.js index 099a2881a952..9ffbf0c621ec 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.horizontalStrategy.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.horizontalStrategy.tests.js @@ -3,7 +3,7 @@ import $ from 'jquery'; import dataCoreUtils from 'core/utils/data'; import typeUtils from 'core/utils/type'; import { Deferred } from 'core/utils/deferred'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import '__internal/scheduler/m_scheduler'; import { ExpressionUtils } from '__internal/scheduler/m_expression_utils'; import { createExpressions } from '__internal/scheduler/resources/m_utils'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js index a7bde7993cd3..072bbd61df6c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js @@ -9,16 +9,16 @@ import '__internal/scheduler/workspaces/m_work_space_week'; import VerticalAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_vertical'; import HorizontalMonthAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month'; import SchedulerAppointments from '__internal/scheduler/appointments/m_appointment_collection'; -import eventsEngine from 'events/core/events_engine'; -import dblclickEvent from 'events/dblclick'; -import translator from 'animation/translator'; +import eventsEngine from 'common/core/events/core/events/core/events_engine'; +import dblclickEvent from 'common/core/events/core/events/dblclick'; +import translator from 'common/core/animation/translator'; import dataCoreUtils from 'core/utils/data'; import commonUtils from 'core/utils/common'; import typeUtils, { isRenderer } from 'core/utils/type'; import config from 'core/config'; import Resizable from 'ui/resizable'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { ExpressionUtils } from '__internal/scheduler/m_expression_utils'; import { Deferred } from 'core/utils/deferred'; import { createExpressions } from '__internal/scheduler/resources/m_utils'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.verticalStrategy.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.verticalStrategy.tests.js index 7f2caa21f27b..38558a04058b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.verticalStrategy.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.verticalStrategy.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import dataCoreUtils from 'core/utils/data'; import typeUtils from 'core/utils/type'; import { Deferred } from 'core/utils/deferred'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import '__internal/scheduler/m_scheduler'; import { ExpressionUtils } from '__internal/scheduler/m_expression_utils'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.events.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.events.tests.js index 219250b5c200..e5171bb93fa8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.events.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.events.tests.js @@ -1,10 +1,10 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import Color from 'color'; import config from 'core/config'; import { noop } from 'core/utils/common'; import resizeCallbacks from 'core/utils/resize_callbacks'; import { isRenderer } from 'core/utils/type'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import $ from 'jquery'; import dxScheduler from '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js index 3bf12679570b..7d194e231af3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js @@ -1,7 +1,7 @@ -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; -import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/core/events/visibility_change'; import $ from 'jquery'; import { AppointmentDataProvider } from '__internal/scheduler/appointments/data_provider/m_appointment_data_provider'; import errors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.markup.tests.js index 199f5c1a45ff..a6b49100d9a8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.markup.tests.js @@ -1,6 +1,6 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dxScheduler from '__internal/scheduler/m_scheduler'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import dateUtils from 'core/utils/date'; import { AppointmentDataProvider } from '__internal/scheduler/appointments/data_provider/m_appointment_data_provider'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js index c485cf937e32..36821518546f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import fx from 'animation/fx'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js index 50c77159e65a..6ced74f6674f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js @@ -1,10 +1,10 @@ import { getOuterHeight } from 'core/utils/size'; import config from 'core/config'; import devices from '__internal/core/m_devices'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; -import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/core/events/visibility_change'; import $ from 'jquery'; import dxSchedulerWorkSpaceDay from '__internal/scheduler/workspaces/m_work_space_day'; import errors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js index f06fc99c4f45..432641261764 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js @@ -1,13 +1,13 @@ import { getOuterHeight, getHeight } from 'core/utils/size'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import config from 'core/config'; import dataUtils from 'core/element_data'; import { isRenderer } from 'core/utils/type'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; import timeZoneDataUtils from '__internal/scheduler/timezones/m_utils_timezones_data'; -import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import { getTimeZones } from 'time_zone_utils'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/contentReadyEvent.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/contentReadyEvent.tests.js index 729fc3dd8658..2e2bfbbea0cd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/contentReadyEvent.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/contentReadyEvent.tests.js @@ -1,9 +1,9 @@ import { SchedulerTestWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; import $ from 'jquery'; -import translator from 'animation/translator'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import fx from 'common/core/animation/fx'; import '__internal/scheduler/m_scheduler'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js index c3ea1f1cf93f..18f1573748bc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js @@ -5,15 +5,15 @@ import { initTestMarkup, isDesktopEnvironment } from '../../helpers/scheduler/helpers.js'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import fx from 'animation/fx'; -import translator from 'animation/translator'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import fx from 'common/core/animation/fx'; +import translator from 'common/core/animation/translator'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import { noop } from 'core/utils/common'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/core/events/drag'; const { module, test, testStart } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js index d800b813b3ea..367412dc280c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js @@ -1,11 +1,11 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; import browser from 'core/utils/browser'; -import { DataSource } from 'data/data_source/data_source'; -import translator from 'animation/translator'; +import { DataSource } from 'common/data/data_source/data_source'; +import translator from 'common/core/animation/translator'; import config from 'core/config'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/core/events/drag'; import dataUtils from 'core/element_data'; import Color from 'color'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/editing.tests.js index c138be185f39..2e7218bdb3fe 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/editing.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const devices = require('core/devices'); const tooltip = require('__internal/ui/tooltip/m_tooltip'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const keyboardMock = require('../../helpers/keyboardMock.js'); const dataUtils = require('core/element_data'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.RTL.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.RTL.tests.js index 2d30b47853ce..123285126aaa 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.RTL.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.RTL.tests.js @@ -1,6 +1,6 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { createWrapper, initTestMarkup, isDesktopEnvironment } from '../../helpers/scheduler/helpers.js'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import '__internal/scheduler/m_scheduler'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.adaptivity.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.adaptivity.tests.js index 8807bc417173..325a994a7173 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.adaptivity.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.adaptivity.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { createWrapper, initTestMarkup, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js index 1c0a2a7b6e09..2a409d4a2e75 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js @@ -2,11 +2,11 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; import devices from '__internal/core/m_devices'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import dblclickEvent from 'events/dblclick'; -import fx from 'animation/fx'; +import dblclickEvent from 'common/core/events/core/events/dblclick'; +import fx from 'common/core/animation/fx'; import AgendaAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_agenda'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import dataUtils from 'core/element_data'; import { createWrapper, SchedulerTestWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentCollector.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentCollector.tests.js index a7d60dbb6649..9d8c2b74fe2f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentCollector.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentCollector.tests.js @@ -1,13 +1,13 @@ import $ from 'jquery'; -import translator from 'animation/translator'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import fx from 'common/core/animation/fx'; import { createWrapper } from '../../helpers/scheduler/helpers.js'; import themes from 'ui/themes'; import { CompactAppointmentsHelper } from '__internal/scheduler/m_compact_appointments_helper'; import Widget from 'ui/widget/ui.widget'; import Color from 'color'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import AppointmentAdapter from '__internal/scheduler/m_appointment_adapter'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentTooltip.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentTooltip.tests.js index 9738705dc927..89a059ea6519 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentTooltip.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentTooltip.tests.js @@ -3,10 +3,10 @@ import dateSerialization from 'core/utils/date_serialization'; import Tooltip from 'ui/tooltip'; import { hide } from '__internal/ui/tooltip/m_tooltip'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import fx from 'animation/fx'; -import dateLocalization from 'localization/date'; -import messageLocalization from 'localization/message'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import dateLocalization from 'common/core/localization/date'; +import messageLocalization from 'common/core/localization/message'; +import { DataSource } from 'common/data/data_source/data_source'; import keyboardMock from '../../helpers/keyboardMock.js'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointments.crossScrollingEnabled.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointments.crossScrollingEnabled.tests.js index 12de53f4bd51..3a1c712c31dc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointments.crossScrollingEnabled.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointments.crossScrollingEnabled.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import translator from 'animation/translator'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import devices from '__internal/core/m_devices'; import { initTestMarkup, createWrapper } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js index 92e022999c98..55fceff27c50 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js @@ -1,10 +1,10 @@ import { getOuterHeight, getOuterWidth, getWidth, getHeight } from 'core/utils/size'; import $ from 'jquery'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; -import translator from 'animation/translator'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import dataUtils from 'core/element_data'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dateNavigator.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dateNavigator.tests.js index 860dbaac525e..49b56c8c4b02 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dateNavigator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dateNavigator.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import '__internal/scheduler/m_scheduler'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js index a91264398963..c143f21ce6b2 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js @@ -1,6 +1,6 @@ import { initTestMarkup, createWrapper } from '../../helpers/scheduler/helpers.js'; -import dateLocalization from 'localization/date'; -import fx from 'animation/fx'; +import dateLocalization from 'common/core/localization/date'; +import fx from 'common/core/animation/fx'; import { dateToMilliseconds as toMs } from 'core/utils/date'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.multiWeekAppointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.multiWeekAppointments.tests.js index ad7735085df0..f8223015ffce 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.multiWeekAppointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.multiWeekAppointments.tests.js @@ -1,10 +1,10 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; import { initTestMarkup, createWrapper } from '../../helpers/scheduler/helpers.js'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import Color from 'color'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import '__internal/scheduler/m_scheduler'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.optionChange.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.optionChange.tests.js index c98c1bdd2520..34df43b98cbf 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.optionChange.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.optionChange.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import '__internal/scheduler/m_scheduler'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js index 54c9878baa39..8b272c1d7699 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js @@ -9,9 +9,9 @@ QUnit.testStart(function() { require('generic_light.css!'); -const fx = require('animation/fx'); -const dragEvents = require('events/drag'); -const DataSource = require('data/data_source/data_source').DataSource; +const fx = require('common/core/animation/fx'); +const dragEvents = require('common/core/events/core/events/drag'); +const DataSource = require('common/data/data_source/data_source').DataSource; require('__internal/scheduler/m_scheduler'); require('ui/drop_down_button'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js index deed380449a0..0c75dcc2ed0f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js @@ -1,12 +1,12 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import dblclickEvent from 'events/dblclick'; +import dblclickEvent from 'common/core/events/core/events/dblclick'; import Color from 'color'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'events/drag'; -import translator from 'animation/translator'; -import { DataSource } from 'data/data_source/data_source'; +import dragEvents from 'common/core/events/core/events/drag'; +import translator from 'common/core/animation/translator'; +import { DataSource } from 'common/data/data_source/data_source'; import dateSerialization from 'core/utils/date_serialization'; import { createWrapper, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.dataSource.tests.js index 6f0a1bf4d54b..dfcd1070325d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.dataSource.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.dataSource.tests.js @@ -1,6 +1,6 @@ import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; -import fx from 'animation/fx'; -import CustomStore from 'data/custom_store'; +import fx from 'common/core/animation/fx'; +import { CustomStore } from 'common/data/custom_store'; const moduleConfig = { beforeEach() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.tests.js index 82de6fb8c0be..c13dcbc6cc68 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.tests.js @@ -3,12 +3,12 @@ import devices from '__internal/core/m_devices'; import 'generic_light.css!'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { getOuterHeight } from 'core/utils/size'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import Color from 'color'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.timeline.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.timeline.tests.js index 5ffb1fb6412f..b657c3880d4f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.timeline.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.timeline.tests.js @@ -9,8 +9,8 @@ QUnit.testStart(() => { import 'generic_light.css!'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import devices from '__internal/core/m_devices'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.viewSwitcher.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.viewSwitcher.tests.js index c0bb30d79b4a..de69d636a4f4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.viewSwitcher.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.viewSwitcher.tests.js @@ -11,7 +11,7 @@ require('generic_light.css!'); require('ui/drop_down_button'); const noop = require('core/utils/common').noop; -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; require('__internal/scheduler/m_scheduler'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js index f9e0e5b51679..9506bb2493f4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js @@ -1,16 +1,16 @@ import $ from 'jquery'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import { createWrapper, CLASSES, initTestMarkup, isDesktopEnvironment } from '../../helpers/scheduler/helpers.js'; import keyboardMock from '../../helpers/keyboardMock.js'; import localization from 'localization'; -import eventsEngine from 'events/core/events_engine'; -import fx from 'animation/fx'; +import eventsEngine from 'common/core/events/core/events/core/events_engine'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'events/drag'; -import CustomStore from 'data/custom_store'; +import dragEvents from 'common/core/events/core/events/drag'; +import { CustomStore } from 'common/data/custom_store'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import { getOuterHeight, getInnerHeight, getOuterWidth } from 'core/utils/size'; const SELECTED_CELL_CLASS = CLASSES.selectedCell.slice(1); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/keyboardNavigation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/keyboardNavigation.tests.js index e10bab9864a1..b086b19552c0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/keyboardNavigation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/keyboardNavigation.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import $ from 'jquery'; import keyboardMock from '../../helpers/keyboardMock.js'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/layoutManager.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/layoutManager.tests.js index 48029d5231f4..f6dba4a3fa63 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/layoutManager.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/layoutManager.tests.js @@ -5,7 +5,7 @@ import '__internal/scheduler/m_scheduler'; import $ from 'jquery'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import AppointmentLayoutManager from '__internal/scheduler/m_appointments_layout_manager'; import BaseAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_base'; @@ -14,7 +14,7 @@ import HorizontalAppointmentsStrategy from '__internal/scheduler/appointments/re import HorizontalMonthLineAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line'; import Color from 'color'; import dataUtils from 'core/element_data'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import { SchedulerTestWrapper } from '../../helpers/scheduler/helpers.js'; const APPOINTMENT_DEFAULT_LEFT_OFFSET = 26; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/loading.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/loading.tests.js index dadcef0df999..44f42af161a7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/loading.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/loading.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const loading = require('__internal/scheduler/m_loading'); const viewPort = require('core/utils/view_port').value; -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const LoadPanel = require('ui/load_panel'); QUnit.module('loading tests', { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/pacificTime.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/pacificTime.tests.js index 4cf3509202e3..0ee4c5f70869 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/pacificTime.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/pacificTime.tests.js @@ -1,6 +1,6 @@ import { initTestMarkup, createWrapper, isDesktopEnvironment, CLASSES } from '../../helpers/scheduler/helpers.js'; import pointerMock from '../../helpers/pointerMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; import { getRecurrenceProcessor } from '__internal/scheduler/m_recurrence'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/perfomance.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/perfomance.tests.js index 40b15c59f759..fb018a5a2957 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/perfomance.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/perfomance.tests.js @@ -3,10 +3,10 @@ import '__internal/scheduler/m_scheduler'; import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import { SchedulerTestWrapper } from '../../helpers/scheduler/helpers.js'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceDialog.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceDialog.tests.js index 2f348043ff0f..ae32ab6226a4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceDialog.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceDialog.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'generic_light.css!'; import { createWrapper, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js index a5568c9817a2..42f0c320a0c3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js @@ -8,7 +8,7 @@ import ButtonGroup from 'ui/button_group'; import DateBox from 'ui/date_box'; import { getRecurrenceProcessor } from '__internal/scheduler/m_recurrence'; import { createTimeZoneCalculator } from '__internal/scheduler/r1/timezone_calculator/index.js'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; const FREQUENCY_EDITOR = 'dx-recurrence-selectbox-freq'; const REPEAT_COUNT_EDITOR = 'dx-recurrence-numberbox-repeat-count'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/resourceManager.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/resourceManager.tests.js index 615573335171..e3bfd926801b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/resourceManager.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/resourceManager.tests.js @@ -16,8 +16,8 @@ import { getDataAccessors, loadResources } from '__internal/scheduler/resources/m_utils'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; const testData = { rooms: [{ diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollTo.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollTo.tests.js index 6c342c9eb544..ff263e9731bd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollTo.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollTo.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'generic_light.css!'; import $ from 'jquery'; import errors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js index 2afcf8232c09..3dcfc368b394 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js @@ -1,5 +1,5 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import errors from 'ui/widget/ui.errors'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/subscribes.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/subscribes.tests.js index 6e679236c11d..39230f2ad22e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/subscribes.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/subscribes.tests.js @@ -7,7 +7,7 @@ import { } from '__internal/scheduler/appointments/m_settings_generator'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dateUtils from 'core/utils/date'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js index 7150489f25ad..086abb0dd47e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js @@ -5,7 +5,7 @@ import SchedulerTimelineWeek from '__internal/scheduler/workspaces/m_timeline_we import SchedulerTimelineWorkWeek from '__internal/scheduler/workspaces/m_timeline_work_week'; import SchedulerTimelineMonth from '__internal/scheduler/workspaces/m_timeline_month'; import dataUtils from 'core/element_data'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import SchedulerWorkSpaceVerticalStrategy from '__internal/scheduler/workspaces/m_work_space_grouped_strategy_vertical'; import SchedulerWorkSpaceHorizontalStrategy from '__internal/scheduler/workspaces/m_work_space_grouped_strategy_horizontal'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js index 56880cc842ca..aabcda2ca518 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js @@ -1,7 +1,7 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import dateUtils from 'core/utils/date'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import '__internal/scheduler/workspaces/m_timeline'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js index eb5ea7986f2c..1079381eaf67 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js @@ -1,6 +1,6 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { CLASSES, createWrapper, @@ -9,12 +9,12 @@ import { } from '../../helpers/scheduler/helpers.js'; import pointerMock from '../../helpers/pointerMock.js'; import dateUtils from 'core/utils/date'; -import dateLocalization from 'localization/date'; -import translator from 'animation/translator'; +import dateLocalization from 'common/core/localization/date'; +import translator from 'common/core/animation/translator'; import { hide } from '__internal/ui/tooltip/m_tooltip'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import dragEvents from 'events/drag'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import dragEvents from 'common/core/events/core/events/drag'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; const { testStart, test, module } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellTemplate.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellTemplate.tests.js index 447a6cfdda22..3f1170a82e6c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellTemplate.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellTemplate.tests.js @@ -1,6 +1,6 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellsSelection.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellsSelection.tests.js index a75c337466ca..d5e4324c3a88 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellsSelection.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellsSelection.tests.js @@ -1,5 +1,5 @@ import 'generic_light.css!'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { createWrapper, initTestMarkup, CLASSES, isDesktopEnvironment } from '../../helpers/scheduler/helpers.js'; const { test, module, testStart } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js index 9227eaf30754..33bfec9efc43 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js @@ -4,7 +4,7 @@ import { getWindow } from 'core/utils/window'; import 'generic_light.css!'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { createWrapper, initTestMarkup, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.tests.js index b71feb807567..a361ac90a46d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import { VirtualScrollingDispatcher } from '__internal/scheduler/workspaces/m_virtual_scrolling'; import domAdapter from '__internal/core/m_dom_adapter'; -import eventsEngine from 'events/core/events_engine'; -import { addNamespace } from 'events/utils/index'; +import eventsEngine from 'common/core/events/core/events_engine'; +import { addNamespace } from 'common/core/events/utils/index'; const { module, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js index ab03e67c0fcd..7a267060e3fa 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js @@ -2,7 +2,7 @@ import dateUtils from 'core/utils/date'; import resizeCallbacks from 'core/utils/resize_callbacks'; import 'generic_light.css!'; import $ from 'jquery'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import '__internal/scheduler/workspaces/m_work_space_day'; import '__internal/scheduler/workspaces/m_work_space_week'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js index d81c7a7a320c..bff37947d477 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js @@ -1,9 +1,9 @@ import { getOuterHeight } from 'core/utils/size'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/core/events/drag'; import 'generic_light.css!'; import $ from 'jquery'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import '__internal/scheduler/workspaces/m_work_space_day'; const CELL_CLASS = 'dx-scheduler-date-table-cell'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup.tests.js index 6bcfadcc8848..300ba086289b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import SchedulerWorkSpace from '__internal/scheduler/workspaces/m_work_space'; import SchedulerWorkSpaceHorizontalStrategy from '__internal/scheduler/workspaces/m_work_space_grouped_strategy_horizontal'; import SchedulerWorkSpaceVerticalStrategy from '__internal/scheduler/workspaces/m_work_space_grouped_strategy_vertical'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import devices from '__internal/core/m_devices'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js index fbd0ce283580..728071bd5b47 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js @@ -1,5 +1,5 @@ import dateUtils from 'core/utils/date'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js index 22f38d83e963..1bc35007c3c1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js @@ -1,6 +1,6 @@ import { getOuterWidth } from 'core/utils/size'; import devices from '__internal/core/m_devices'; -import { triggerHidingEvent, triggerResizeEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerResizeEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/dataController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/dataController.tests.js index 7e8d942a9b96..48c13f570c10 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/dataController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/dataController.tests.js @@ -1,9 +1,9 @@ import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; import Guid from 'core/guid'; -import query from 'data/query'; +import query from 'common/data/query'; import { setupTreeListModules } from '../../helpers/treeListMocks.js'; const createDataSource = function(data, storeOptions, dataSourceOptions) { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js index a3a6894bb894..739ec19cbfa7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js @@ -13,9 +13,9 @@ QUnit.testStart(function() { import 'generic_light.css!'; import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { setupTreeListModules } from '../../helpers/treeListMocks.js'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/gridView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/gridView.tests.js index 3a7873ec60d1..c674df72460d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/gridView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/gridView.tests.js @@ -13,7 +13,7 @@ QUnit.testStart(function() { import 'generic_light.css!'; import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { setupTreeListModules, MockColumnsController, MockDataController } from '../../helpers/treeListMocks.js'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/headerPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/headerPanel.tests.js index 86a3f4e6250d..58be3c61f0fb 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/headerPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/headerPanel.tests.js @@ -13,7 +13,7 @@ QUnit.testStart(function() { import 'generic_light.css!'; import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { setupTreeListModules, MockColumnsController, MockDataController } from '../../helpers/treeListMocks.js'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js index 51ca79a39314..fe7bb1de5abb 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js @@ -13,7 +13,7 @@ QUnit.testStart(function() { import 'generic_light.css!'; import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { noop } from 'core/utils/common'; import { setupTreeListModules, MockColumnsController, MockDataController } from '../../helpers/treeListMocks.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.integration.tests.js index 1c4d0a63d6e6..aee3b13368cc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.integration.tests.js @@ -1,6 +1,6 @@ import 'ui/tree_list'; import { baseModuleConfig } from '../../helpers/dataGridHelper.js'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import $ from 'jquery'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.tests.js index 74ab81b9dde9..75b0c86e86e9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.tests.js @@ -17,8 +17,8 @@ QUnit.testStart(function() { import 'generic_light.css!'; import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import fx from 'animation/fx'; -import ArrayStore from 'data/array_store'; +import fx from 'common/core/animation/fx'; +import ArrayStore from 'common/data/array_store'; import { setupTreeListModules } from '../../helpers/treeListMocks.js'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/treeList.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/treeList.tests.js index 7cc3faaffd12..ebe22bfc8aec 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/treeList.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/treeList.tests.js @@ -16,14 +16,14 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; import devices from '__internal/core/m_devices'; import { getOuterHeight } from 'core/utils/size'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { TreeListWrapper } from '../../helpers/wrappers/dataGridWrappers.js'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import TreeList from '__internal/grids/tree_list/m_widget'; import pointerMock from '../../helpers/pointerMock.js'; import { CLICK_EVENT } from '../../helpers/grid/keyboardNavigationHelper.js'; -import { createEvent } from 'events/utils/index'; +import { createEvent } from 'common/core/events/utils/index'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/accordion.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/accordion.tests.js index 3bfd4c50eb28..a9d3879c71d1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/accordion.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/accordion.tests.js @@ -1,14 +1,14 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'generic_light.css!'; import config from 'core/config'; import { getHeight } from 'core/utils/size'; import { deferUpdate, noop } from 'core/utils/common'; import { extend } from 'core/utils/extend'; import { isRenderer } from 'core/utils/type'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; -import holdEvent from 'events/hold'; -import { triggerShownEvent } from 'events/visibility_change'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import holdEvent from 'common/core/events/hold'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import Accordion from 'ui/accordion'; import themes from 'ui/themes'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/actionSheet.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/actionSheet.tests.js index 1e545c20d3ad..6ed74a4cff0e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/actionSheet.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/actionSheet.tests.js @@ -1,8 +1,8 @@ import { getWidth, getHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import fx from 'animation/fx'; -import positionUtils from 'animation/position'; -import holdEvent from 'events/hold'; +import fx from 'common/core/animation/fx'; +import positionUtils from 'common/core/animation/position'; +import holdEvent from 'common/core/events/hold'; import pointerMock from '../../helpers/pointerMock.js'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/animator.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/animator.tests.js index 6ce5ac0fea35..356f079812fe 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/animator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/animator.tests.js @@ -1,5 +1,5 @@ import Animator from '__internal/ui/scroll_view/m_animator'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; const REQEST_ANIMATION_FRAME_TIMEOUT = 10; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/box.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/box.tests.js index dadff813e2d9..ba5e00cb6453 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/box.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/box.tests.js @@ -1,4 +1,4 @@ -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/box'; import 'ui/scroll_view/ui.scrollable'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/button.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/button.tests.js index 57114da29bf7..8b2e356fe17e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/button.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/button.tests.js @@ -7,7 +7,7 @@ import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import * as checkStyleHelper from '../../helpers/checkStyleHelper.js'; import localization from 'localization'; -import ja from 'localization/messages/ja.json!'; +import ja from 'common/core/localization/messages/ja.json!'; import { Deferred } from 'core/utils/deferred'; import dxButton from 'ui/button'; import { isRenderer } from 'core/utils/type'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.selection.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.selection.tests.js index 5cbaec03068d..0711e1b30500 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.selection.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.selection.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/button'; import 'ui/button_group'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.tests.js index 2acd972a81b1..18721695eb82 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.tests.js @@ -3,7 +3,7 @@ import $ from 'jquery'; import 'ui/button'; import 'ui/button_group'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import registerKeyHandlerTestHelper from '../../helpers/registerKeyHandlerTestHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/chat.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/chat.tests.js index d41f75c374b3..e4a5d2ca92a9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/chat.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/chat.tests.js @@ -5,14 +5,14 @@ import MessageList from '__internal/ui/chat/messagelist'; import AlertList from '__internal/ui/chat/alertlist'; import MessageBox, { TYPING_END_DELAY } from '__internal/ui/chat/messagebox'; import keyboardMock from '../../../helpers/keyboardMock.js'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import dataUtils from 'core/element_data'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; const CHAT_MESSAGEGROUP_CLASS = 'dx-chat-messagegroup'; const CHAT_MESSAGELIST_CLASS = 'dx-chat-messagelist'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageGroup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageGroup.tests.js index 2594b6320469..9d625b283669 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageGroup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageGroup.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import MessageGroup from '__internal/ui/chat/messagegroup'; import ChatAvatar from '__internal/ui/chat/avatar'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; const AVATAR_CLASS = 'dx-avatar'; const CHAT_MESSAGEGROUP_TIME_CLASS = 'dx-chat-messagegroup-time'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageList.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageList.tests.js index 9a65da738ce6..5ffaa56a993d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageList.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageList.tests.js @@ -14,7 +14,7 @@ import MessageGroup from '__internal/ui/chat/messagegroup'; import TypingIndicator from '__internal/ui/chat/typingindicator'; import devices from '__internal/core/m_devices'; import localization from 'localization'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; const CHAT_MESSAGELIST_CONTENT_CLASS = 'dx-chat-messagelist-content'; const CHAT_MESSAGELIST_EMPTY_MESSAGE_CLASS = 'dx-chat-messagelist-empty-message'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js index 200ca0c4e072..72e8890f6bc7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js @@ -4,11 +4,11 @@ import domAdapter from '__internal/core/m_dom_adapter'; import resizeCallbacks from 'core/utils/resize_callbacks'; import support from '__internal/core/utils/m_support'; import { implementationsMap, getWidth, getHeight } from 'core/utils/size'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import ContextMenu from 'ui/context_menu'; -import { addNamespace } from 'events/utils/index'; -import contextMenuEvent from 'events/contextmenu'; -import holdEvent from 'events/hold'; +import { addNamespace } from 'common/core/events/utils/index'; +import contextMenuEvent from 'common/core/events/contextmenu'; +import holdEvent from 'common/core/events/hold'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import keyboardMock from '../../helpers/keyboardMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.animation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.animation.tests.js index 632dd1dfcbd4..c76ddd1b3ec8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.animation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.animation.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import TransitionExecutorModule from 'animation/transition_executor/transition_executor'; +import TransitionExecutorModule from 'common/core/animation/transition_executor/transition_executor'; import 'ui/defer_rendering'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.tests.js index 27bd29c0465b..7532f603f6f1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import TransitionExecutorModule from 'animation/transition_executor/transition_executor'; +import TransitionExecutorModule from 'common/core/animation/transition_executor/transition_executor'; import dataUtils from 'core/element_data'; import 'ui/defer_rendering'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/diagramParts/dataBinding.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/diagramParts/dataBinding.tests.js index d84e50e012c8..8adecd44f449 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/diagramParts/dataBinding.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/diagramParts/dataBinding.tests.js @@ -2,8 +2,8 @@ import $ from 'jquery'; const { test } = QUnit; import 'ui/diagram'; -import DataSource from 'data/data_source'; -import ArrayStore from 'data/array_store'; +import DataSource from 'common/data/data_source'; +import ArrayStore from 'common/data/array_store'; import { DiagramCommand } from 'devexpress-diagram'; import { Consts } from '../../../helpers/diagramHelpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/draggable.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/draggable.tests.js index ca6e3f1840c0..4773e8b148ed 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/draggable.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/draggable.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; import pointerMock from '../../helpers/pointerMock.js'; import viewPort from 'core/utils/view_port'; -import GestureEmitter from 'events/gesture/emitter.gesture.js'; -import animationFrame from 'animation/frame'; -import translator from 'animation/translator'; -import fx from 'animation/fx'; +import GestureEmitter from 'common/core/events/gesture/emitter.gesture.js'; +import animationFrame from 'common/core/animation/frame'; +import translator from 'common/core/animation/translator'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; import 'generic_light.css!'; import 'ui/draggable'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.scenarios.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.scenarios.tests.js index af522b075b55..e78d9004381d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.scenarios.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.scenarios.tests.js @@ -15,7 +15,7 @@ import 'ui/tree_view'; import 'generic_light.css!'; import dxDrawer from 'ui/drawer'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; const moduleConfig = { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.tests.js index 6cd1cb92aa91..4daa246b1172 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.tests.js @@ -1,13 +1,13 @@ import { getHeight, getWidth, getOuterWidth } from 'core/utils/size'; -import fx from 'animation/fx'; -import translator from 'animation/translator'; +import fx from 'common/core/animation/fx'; +import translator from 'common/core/animation/translator'; import 'generic_light.css!'; import config from 'core/config'; import resizeCallbacks from 'core/utils/resize_callbacks'; import typeUtils from 'core/utils/type'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; -import eventsEngine from 'events/core/events_engine'; -import visibilityChange from 'events/visibility_change'; +import eventsEngine from 'common/core/events/core/events_engine'; +import visibilityChange from 'common/core/events/visibility_change'; import $ from 'jquery'; import Button from 'ui/button'; import Drawer from 'ui/drawer'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.markup.tests.js index 4e0f2794616b..f832cc762498 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.markup.tests.js @@ -2,7 +2,7 @@ import { getHeight, getOuterWidth, getWidth } from 'core/utils/size'; import $ from 'jquery'; import DropDownButton from 'ui/drop_down_button'; import windowUtils from 'core/utils/window'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.tests.js index 802fb7ad746f..6f78358fb9dd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.tests.js @@ -3,11 +3,11 @@ import $ from 'jquery'; import DropDownButton from 'ui/drop_down_button'; import typeUtils, { isRenderer } from 'core/utils/type'; import config from 'core/config'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import keyboardMock from '../../helpers/keyboardMock.js'; -import ArrayStore from 'data/array_store'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import ArrayStore from 'common/data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import { extend } from 'core/utils/extend'; import devices from '__internal/core/m_devices'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/adaptivity.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/adaptivity.tests.js index dbd20e5dd2b9..4838c746a60f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/adaptivity.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/adaptivity.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import resizeCallbacks from 'core/utils/resize_callbacks'; import 'ui/file_manager'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { FileManagerWrapper, createTestFileSystem, Consts } from '../../../helpers/fileManagerHelpers.js'; import { implementationsMap, getOuterWidth } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/arrayProvider.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/arrayProvider.tests.js index d4e076adef7f..ebbb2a90f8f1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/arrayProvider.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/arrayProvider.tests.js @@ -1,9 +1,9 @@ const { test } = QUnit; import 'ui/file_manager'; -import ObjectFileSystemProvider from 'file_management/object_provider'; -import FileSystemItem from 'file_management/file_system_item'; -import ErrorCode from 'file_management/error_codes'; +import ObjectFileSystemProvider from 'common/file_management/object_provider'; +import FileSystemItem from 'common/file_management/file_system_item'; +import ErrorCode from 'common/file_management/error_codes'; import { fileSaver } from 'exporter/file_saver'; import { createUploaderFiles, createUploadInfo } from '../../../helpers/fileManagerHelpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/common.tests.js index f6376ca0306c..85fdeec257ce 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/common.tests.js @@ -1,6 +1,6 @@ const { test } = QUnit; -import { getPathParts, getEscapedFileName } from 'file_management/utils'; -import FileSystemItem from 'file_management/file_system_item'; +import { getPathParts, getEscapedFileName } from 'common/file_management/utils'; +import FileSystemItem from 'common/file_management/file_system_item'; QUnit.module('Common tests', () => { test('getPathParts() function must correctly separate path string', function(assert) { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/contextMenu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/contextMenu.tests.js index 7dc4b80f182d..7c5784cab477 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/contextMenu.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/contextMenu.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; const { test } = QUnit; import 'ui/file_manager'; -import fx from 'animation/fx'; -import pointerEvents from 'events/pointer'; +import fx from 'common/core/animation/fx'; +import pointerEvents from 'common/core/events/pointer'; import { Consts, FileManagerWrapper, createTestFileSystem, isDesktopDevice } from '../../../helpers/fileManagerHelpers.js'; const moduleConfig = { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/customProvider.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/customProvider.tests.js index 24084abe19d4..6b3f3ae0b6ed 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/customProvider.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/customProvider.tests.js @@ -1,6 +1,6 @@ import { when } from 'core/utils/deferred'; -import FileSystemItem from 'file_management/file_system_item'; -import CustomFileSystemProvider from 'file_management/custom_provider'; +import FileSystemItem from 'common/file_management/file_system_item'; +import CustomFileSystemProvider from 'common/file_management/custom_provider'; import { createSampleFileItems } from '../../../helpers/fileManagerHelpers.js'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/detailsView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/detailsView.tests.js index 3bbab7800c31..e0858c41dc17 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/detailsView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/detailsView.tests.js @@ -1,9 +1,9 @@ import $ from 'jquery'; import 'ui/file_manager'; -import fx from 'animation/fx'; -import pointerEvents from 'events/pointer'; +import fx from 'common/core/animation/fx'; +import pointerEvents from 'common/core/events/pointer'; import localization from 'localization'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import { FileManagerWrapper, createTestFileSystem, isDesktopDevice, createHugeFileSystem } from '../../../helpers/fileManagerHelpers.js'; import { triggerCellClick } from '../../../helpers/fileManager/events.js'; import { implementationsMap } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editing.tests.js index 6011f2b4e1e2..79ce79de050a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editing.tests.js @@ -1,12 +1,12 @@ import $ from 'jquery'; import 'ui/file_manager'; import FileUploader from 'ui/file_uploader'; -import fx from 'animation/fx'; -import pointerEvents from 'events/pointer'; -import ObjectFileSystemProvider from 'file_management/object_provider'; -import CustomFileSystemProvider from 'file_management/custom_provider'; -import FileSystemError from 'file_management/error.js'; -import ErrorCode from 'file_management/error_codes'; +import fx from 'common/core/animation/fx'; +import pointerEvents from 'common/core/events/pointer'; +import ObjectFileSystemProvider from 'common/file_management/object_provider'; +import CustomFileSystemProvider from 'common/file_management/custom_provider'; +import FileSystemError from 'common/file_management/error.js'; +import ErrorCode from 'common/file_management/error_codes'; import { Consts, FileManagerWrapper, FileManagerProgressPanelWrapper, createTestFileSystem, createUploaderFiles, stubFileReader, getDropFileEvent } from '../../../helpers/fileManagerHelpers.js'; import NoDuplicatesFileProvider from '../../../helpers/fileManager/file_provider.no_duplicates.js'; import SlowFileProvider from '../../../helpers/fileManager/file_provider.slow.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingEvents.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingEvents.tests.js index eb1fe03603b4..888cc2083442 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingEvents.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingEvents.tests.js @@ -1,9 +1,9 @@ const { test } = QUnit; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import FileUploader from 'ui/file_uploader'; -import ObjectFileSystemProvider from 'file_management/object_provider'; +import ObjectFileSystemProvider from 'common/file_management/object_provider'; import { createTestFileSystem, createEditingEvents, createUploaderFiles, stubFileReader, FileManagerWrapper, FileManagerProgressPanelWrapper } from '../../../helpers/fileManagerHelpers.js'; import { extend } from 'core/utils/extend'; import { Deferred } from 'core/utils/deferred'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js index f03cdfabb2c9..f7021d07d0b7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { Deferred } from 'core/utils/deferred'; -import ObjectFileSystemProvider from 'file_management/object_provider'; -import ErrorCode from 'file_management/error_codes'; +import ObjectFileSystemProvider from 'common/file_management/object_provider'; +import ErrorCode from 'common/file_management/error_codes'; import { FileItemsController } from 'ui/file_manager/file_items_controller'; import { createTestFileSystem, createUploaderFiles, stubFileReader, createEditingEvents } from '../../../helpers/fileManagerHelpers.js'; import TestFileSystemProvider from '../../../helpers/fileManager/file_provider.test.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/fileItemsController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/fileItemsController.tests.js index 977c6b78af8a..2057c4210e61 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/fileItemsController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/fileItemsController.tests.js @@ -1,7 +1,7 @@ const { test } = QUnit; import { FileItemsController } from 'ui/file_manager/file_items_controller'; -import ErrorCode from 'file_management/error_codes'; +import ErrorCode from 'common/file_management/error_codes'; import { createUploaderFiles, createUploadInfo, stubFileReader, createEditingEvents } from '../../../helpers/fileManagerHelpers.js'; import { isString } from 'core/utils/type'; import { extend } from 'core/utils/extend'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/markup.tests.js index 1e45a7232e97..dae688fb8a16 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/markup.tests.js @@ -1,7 +1,7 @@ const { test } = QUnit; import $ from 'jquery'; import 'ui/file_manager'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import windowUtils from 'core/utils/window'; import { FileManagerWrapper, createTestFileSystem, Consts, isDesktopDevice } from '../../../helpers/fileManagerHelpers.js'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/navigation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/navigation.tests.js index 5091f952c79f..54ecc1d5acdc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/navigation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/navigation.tests.js @@ -1,12 +1,12 @@ import $ from 'jquery'; const { test } = QUnit; import 'ui/file_manager'; -import FileSystemError from 'file_management/error.js'; -import CustomFileSystemProvider from 'file_management/custom_provider'; -import ObjectFileSystemProvider from 'file_management/object_provider.js'; +import FileSystemError from 'common/file_management/error.js'; +import CustomFileSystemProvider from 'common/file_management/custom_provider'; +import ObjectFileSystemProvider from 'common/file_management/object_provider.js'; import { FileItemsController } from 'ui/file_manager/file_items_controller'; import FileManagerBreadcrumbs from 'ui/file_manager/ui.file_manager.breadcrumbs'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { FileManagerWrapper, FileManagerBreadcrumbsWrapper, FileManagerProgressPanelWrapper, createTestFileSystem } from '../../../helpers/fileManagerHelpers.js'; import SlowFileProvider from '../../../helpers/fileManager/file_provider.slow.js'; import { implementationsMap } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/progressPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/progressPanel.tests.js index fa250f296d37..9dcab75072e9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/progressPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/progressPanel.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import FileUploader from 'ui/file_uploader'; import resizeCallbacks from 'core/utils/resize_callbacks'; import { createTestFileSystem, createUploaderFiles, FileManagerProgressPanelWrapper, FileManagerWrapper } from '../../../helpers/fileManagerHelpers.js'; @@ -7,7 +7,7 @@ import FileManagerProgressPanelMock from '../../../helpers/fileManager/notificat import FileManagerLogger from '../../../helpers/fileManager/logger.js'; import { CLICK_EVENT } from '../../../helpers/grid/keyboardNavigationHelper.js'; import SlowFileProvider from '../../../helpers/fileManager/file_provider.slow.js'; -import CustomFileSystemProvider from 'file_management/custom_provider'; +import CustomFileSystemProvider from 'common/file_management/custom_provider'; import { implementationsMap } from 'core/utils/size'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/remoteProvider.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/remoteProvider.tests.js index 97c4248a9eeb..7b70e25396cc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/remoteProvider.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/remoteProvider.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import 'ui/file_manager'; -import FileSystemItem from 'file_management/file_system_item'; +import FileSystemItem from 'common/file_management/file_system_item'; -import RemoteFileSystemProvider from 'file_management/remote_provider'; +import RemoteFileSystemProvider from 'common/file_management/remote_provider'; import ajaxMock from '../../../helpers/ajaxMock.js'; import { createSampleFileItems, generateString, createFileObject } from '../../../helpers/fileManagerHelpers.js'; import { when } from 'core/utils/deferred'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/scroll.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/scroll.tests.js index 1513bf6dbf57..9b8f00fef4d9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/scroll.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/scroll.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; const { test } = QUnit; import 'ui/file_manager'; -import fx from 'animation/fx'; -import pointerEvents from 'events/pointer'; +import fx from 'common/core/animation/fx'; +import pointerEvents from 'common/core/events/pointer'; import { FileManagerWrapper, FileManagerProgressPanelWrapper, createTestFileSystem, createHugeFileSystem, Consts } from '../../../helpers/fileManagerHelpers.js'; import { CLICK_EVENT } from '../../../helpers/grid/keyboardNavigationHelper.js'; import { implementationsMap } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/selection.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/selection.tests.js index 150ea384eaf5..76d3bb33ae63 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/selection.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/selection.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; const { test } = QUnit; import 'ui/file_manager'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { FileManagerWrapper, createTestFileSystem, isDesktopDevice } from '../../../helpers/fileManagerHelpers.js'; import { triggerCellClick } from '../../../helpers/fileManager/events.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/thumbnailsView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/thumbnailsView.tests.js index 6682e6aa1ae7..99db0116d6cf 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/thumbnailsView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/thumbnailsView.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import 'ui/file_manager'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { FileManagerWrapper, createTestFileSystem, isDesktopDevice } from '../../../helpers/fileManagerHelpers.js'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/toolbar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/toolbar.tests.js index 6342300c06e2..0179d6333cdc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/toolbar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/toolbar.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import 'ui/file_manager'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { Consts, FileManagerWrapper, createTestFileSystem } from '../../../helpers/fileManagerHelpers.js'; import { implementationsMap } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/filterBuilderParts/utilsTests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/filterBuilderParts/utilsTests.js index d8cec614de70..94ace09cb88d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/filterBuilderParts/utilsTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/filterBuilderParts/utilsTests.js @@ -1,7 +1,7 @@ import * as utils from '__internal/filter_builder/m_utils'; import * as between from '__internal/filter_builder/m_between'; -import CustomStore from 'data/custom_store'; -import messageLocalization from 'localization/message'; +import { CustomStore } from 'common/data/custom_store'; +import messageLocalization from 'common/core/localization/message'; import fields from '../../../helpers/filterBuilderTestData.js'; import filterUtils from 'ui/shared/filtering'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/gallery.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/gallery.tests.js index d3eeceb49356..df62a05aecd2 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/gallery.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/gallery.tests.js @@ -1,10 +1,10 @@ import { getHeight, getOuterHeight, getOuterWidth, getWidth } from 'core/utils/size'; import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import visibilityChange from 'events/visibility_change'; -import ArrayStore from 'data/array_store'; -import fx from 'animation/fx'; -import animationFrame from 'animation/frame'; +import { DataSource } from 'common/data/data_source/data_source'; +import visibilityChange from 'common/core/events/visibility_change'; +import ArrayStore from 'common/data/array_store'; +import fx from 'common/core/animation/fx'; +import animationFrame from 'common/core/animation/frame'; import resizeCallbacks from 'core/utils/resize_callbacks'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/clientSideEvents.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/clientSideEvents.tests.js index 17779645422a..1bde62f8e235 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/clientSideEvents.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/clientSideEvents.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import 'ui/gantt'; import { Consts, options, data, getGanttViewCore, showTaskEditDialog, getDependencyElements } from '../../../helpers/ganttHelpers.js'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/dialogs.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/dialogs.tests.js index 51eb9231e147..2b8e36b7424c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/dialogs.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/dialogs.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import 'ui/gantt'; import { Consts, data, options, showTaskEditDialog, getGanttViewCore } from '../../../helpers/ganttHelpers.js'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/editDataSources.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/editDataSources.tests.js index 3522835b2a85..8f90e5d3fb00 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/editDataSources.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/editDataSources.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import ArrayStore from 'common/data/array_store'; import 'ui/gantt'; import { Consts, getGanttViewCore } from '../../../helpers/ganttHelpers.js'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/refresh.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/refresh.tests.js index d1e45eea134d..4918e83f446b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/refresh.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/refresh.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/gantt'; import { Consts, options, data, showTaskEditDialog } from '../../../helpers/ganttHelpers.js'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/init_dispose_widget_bundled_tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/init_dispose_widget_bundled_tests.js index 286feb077c36..a214f7b0928b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/init_dispose_widget_bundled_tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/init_dispose_widget_bundled_tests.js @@ -1,5 +1,5 @@ import GoogleStaticProvider from '__internal/ui/map/m_provider.google_static'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { each } from 'core/utils/iterator'; import 'bundles/modules/parts/widgets-web'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js index 807aaa6620bd..73d02c4d7201 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { isRenderer } from 'core/utils/type'; import { noop } from 'core/utils/common'; import config from 'core/config'; @@ -7,20 +7,20 @@ import devices from '__internal/core/m_devices'; import resizeCallbacks from 'core/utils/resize_callbacks'; import errors from 'ui/widget/ui.errors'; import executeAsyncMock from '../../../helpers/executeAsyncMock.js'; -import fx from 'animation/fx'; -import holdEvent from 'events/hold'; +import fx from 'common/core/animation/fx'; +import holdEvent from 'common/core/events/hold'; import keyboardMock from '../../../helpers/keyboardMock.js'; import pointerMock from '../../../helpers/pointerMock.js'; import registerComponent from 'core/component_registrator'; -import swipeEvents from 'events/swipe'; +import swipeEvents from 'common/core/events/swipe'; import themes from 'ui/themes'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import DOMComponent from 'core/dom_component'; import List from 'ui/list'; import { setScrollView } from '__internal/ui/list/m_list.base'; import ScrollView from 'ui/scroll_view'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import ariaAccessibilityTestHelper from '../../../helpers/ariaAccessibilityTestHelper.js'; import { reorderingPointerMock } from './utils.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingTests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingTests.js index 550556a2730f..9816363ccd2c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingTests.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import typeUtils from 'core/utils/type'; import executeAsyncMock from '../../../helpers/executeAsyncMock.js'; import keyboardMock from '../../../helpers/keyboardMock.js'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; import 'ui/list'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingUITests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingUITests.js index bbcc804710e8..a12b3f76a8bc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingUITests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingUITests.js @@ -1,20 +1,20 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import errors from 'ui/widget/ui.errors'; -import translator from 'animation/translator'; -import holdEvent from 'events/hold'; +import translator from 'common/core/animation/translator'; +import holdEvent from 'common/core/events/hold'; import { noop } from 'core/utils/common'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import pointerMock from '../../../helpers/pointerMock.js'; -import contextMenuEvent from 'events/contextmenu'; +import contextMenuEvent from 'common/core/events/contextmenu'; import keyboardMock from '../../../helpers/keyboardMock.js'; import { registry, register } from '__internal/ui/list/m_list.edit.decorator_registry'; import SwitchableEditDecorator from '__internal/ui/list/m_list.edit.decorator.switchable'; import SwitchableButtonEditDecorator from '__internal/ui/list/m_list.edit.decorator.switchable.button'; import themes from 'ui/themes'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; import { reorderingPointerMock, toSelector } from './utils.js'; import 'ui/action_sheet'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/liveUpdateTests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/liveUpdateTests.js index 76a8b639f54f..cf8c3b7a1c66 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/liveUpdateTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/liveUpdateTests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; import 'ui/list'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadIndicator.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadIndicator.tests.js index 12940d53773e..9d3b4cf64939 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadIndicator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadIndicator.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import support from '__internal/core/utils/m_support'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import 'ui/load_indicator'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadPanel.tests.js index 2215b6bb36e3..3c642c01eee5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadPanel.tests.js @@ -1,9 +1,9 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; import keyboardMock from '../../helpers/keyboardMock.js'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import uiErrors from 'ui/widget/ui.errors'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'generic_light.css!'; import 'ui/load_panel'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.markup.tests.js index fadda5c4eee6..2806e2db9734 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.markup.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import Menu from '__internal/ui/menu/m_menu'; import '__internal/ui/menu/m_submenu'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.tests.js index 7e01fcaa7b66..b79a8a248707 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import renderer from 'core/renderer'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; @@ -10,10 +10,10 @@ import domAdapter from '__internal/core/m_dom_adapter'; import Menu from '__internal/ui/menu/m_menu'; import keyboardMock from '../../helpers/keyboardMock.js'; import fixtures from '../../helpers/positionFixtures.js'; -import CustomStore from 'data/custom_store'; -import ArrayStore from 'data/array_store'; -import eventsEngine from 'events/core/events_engine'; -import { DataSource } from 'data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import ArrayStore from 'common/data/array_store'; +import eventsEngine from 'common/core/events/core/events_engine'; +import { DataSource } from 'common/data/data_source/data_source'; import * as checkStyleHelper from '../../helpers/checkStyleHelper.js'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.integration.tests.js index 2cbdbd8e9ac5..fd1b2985c3a1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.integration.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { animation, _translator } from '__internal/ui/multi_view/m_multi_view.animation'; import 'ui/multi_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.tests.js index d797a9dfe085..8a39512a008c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.tests.js @@ -1,11 +1,11 @@ -import fx from 'animation/fx'; -import translator from 'animation/translator'; +import fx from 'common/core/animation/fx'; +import translator from 'common/core/animation/translator'; import 'generic_light.css!'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import { isRenderer } from 'core/utils/type'; -import Swipeable from 'events/gesture/swipeable'; -import { triggerShownEvent } from 'events/visibility_change'; +import Swipeable from 'common/core/events/gesture/swipeable'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/multi_view'; import { animation } from '__internal/ui/multi_view/m_multi_view.animation'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/optionChanged_bundled.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/optionChanged_bundled.tests.js index d2912bcf6b75..bc28d7d5f7d1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/optionChanged_bundled.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/optionChanged_bundled.tests.js @@ -3,9 +3,9 @@ import $ from 'jquery'; import { Component } from 'core/component'; import devices from '__internal/core/m_devices'; import GoogleStaticProvider from '__internal/ui/map/m_provider.google_static'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import '../../helpers/ignoreQuillTimers.js'; import 'bundles/modules/parts/widgets-web'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js index 0b8dc41d9569..c3b03339b674 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js @@ -1,7 +1,7 @@ import { getWidth, getHeight, getOuterWidth } from 'core/utils/size'; -import fx from 'animation/fx'; -import positionUtils from 'animation/position'; -import { locate } from 'animation/translator'; +import fx from 'common/core/animation/fx'; +import positionUtils from 'common/core/animation/position'; +import { locate } from 'common/core/animation/translator'; import 'generic_light.css!'; import config from 'core/config'; import devices from '__internal/core/m_devices'; @@ -9,10 +9,10 @@ import { Template } from 'core/templates/template'; import resizeCallbacks from 'core/utils/resize_callbacks'; import { isRenderer } from 'core/utils/type'; import { value as viewPort } from 'core/utils/view_port'; -import eventsEngine from 'events/core/events_engine'; -import visibilityChange, { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import eventsEngine from 'common/core/events/core/events_engine'; +import visibilityChange, { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; -import { hideCallback as hideTopOverlayCallback } from 'mobile/hide_callback'; +import { hideCallback as hideTopOverlayCallback } from 'common/core/environment/hide_callback'; import errors from 'core/errors'; import uiErrors from 'ui/widget/ui.errors'; import Overlay from 'ui/overlay/ui.overlay'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popover.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popover.tests.js index a09aeda81aae..6407421084f5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popover.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popover.tests.js @@ -1,9 +1,9 @@ import { getHeight, getWidth, getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; import fixtures from '../../helpers/positionFixtures.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import positionUtils from 'animation/position'; +import positionUtils from 'common/core/animation/position'; import uiErrors from 'ui/widget/ui.errors'; import Popover from 'ui/popover'; import { getBoundingRect } from 'core/utils/position'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.materialTheme.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.materialTheme.tests.js index 4cde1ded0993..c25926819f97 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.materialTheme.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.materialTheme.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { value as viewPort } from 'core/utils/view_port'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js index 54d1e9f36c06..79c984441973 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js @@ -10,7 +10,7 @@ import { import $ from 'jquery'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { value as viewPort } from 'core/utils/view_port'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; @@ -23,7 +23,7 @@ import windowUtils from '__internal/core/utils/m_window'; import uiErrors from 'ui/widget/ui.errors'; import themes from 'ui/themes'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import visibilityChangeUtils from 'events/visibility_change'; +import visibilityChangeUtils from 'common/core/events/visibility_change'; import domAdapter from '__internal/core/m_dom_adapter'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/progressBar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/progressBar.tests.js index e1b4cf69eaf3..fc3371b1f3ee 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/progressBar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/progressBar.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/progress_bar'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizable.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizable.tests.js index 3f04ec9b0a29..63f0eef12e6c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizable.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizable.tests.js @@ -1,5 +1,5 @@ -import translator from 'animation/translator'; -import visibilityChange from 'events/visibility_change'; +import translator from 'common/core/animation/translator'; +import visibilityChange from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/resizable'; import pointerMock from '../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.markup.tests.js index 17c7780ab58e..e60f48fd7536 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.markup.tests.js @@ -2,9 +2,9 @@ import $ from 'jquery'; import 'ui/splitter'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import ResizeHandle from '__internal/ui/splitter/resize_handle'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; QUnit.testStart(function() { const markup = diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.tests.js index 58e32799d4e4..338b560c25af 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.tests.js @@ -1,10 +1,10 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import pointerMock from '../../helpers/pointerMock.js'; import ResizeHandle from '__internal/ui/splitter/resize_handle'; -import { name as DOUBLE_CLICK_EVENT } from 'events/double_click'; +import { name as DOUBLE_CLICK_EVENT } from 'common/core/events/double_click'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/responsiveBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/responsiveBox.tests.js index a2e7bc820e2c..a9146aabf51e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/responsiveBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/responsiveBox.tests.js @@ -6,7 +6,7 @@ import ResponsiveBox from 'ui/responsive_box'; import responsiveBoxScreenMock from '../../helpers/responsiveBoxScreenMock.js'; import dxButton from 'ui/button'; import 'ui/box'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import domAdapter from '__internal/core/m_dom_adapter'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollView.tests.js index 0b4585ed517e..4a427cab5341 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollView.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import renderer from 'core/renderer'; import { noop } from 'core/utils/common'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'events/core/events_engine'; -import messageLocalization from 'localization/message'; +import eventsEngine from 'common/core/events/core/events_engine'; +import messageLocalization from 'common/core/localization/message'; import themes from 'ui/themes'; import pointerMock from '../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.actions.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.actions.tests.js index 0c2c47ce45cb..7abe7db46727 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.actions.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.actions.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import pointerMock from '../../../helpers/pointerMock.js'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.dynamic.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.dynamic.tests.js index 718c333c79a3..69713f341355 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.dynamic.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.dynamic.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import resizeCallbacks from 'core/utils/resize_callbacks'; import pointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js index 8ed7d7646478..d509a85b9306 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js @@ -1,13 +1,13 @@ -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; import 'generic_light.css!'; import devices from '__internal/core/m_devices'; import domUtils from '__internal/core/utils/m_dom'; import styleUtils from 'core/utils/style'; import support from '__internal/core/utils/m_support'; -import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; -import initMobileViewport from 'mobile/init_mobile_viewport'; +import initMobileViewport from 'common/core/environment/init_mobile_viewport'; import Scrollable from 'ui/scroll_view/ui.scrollable'; import pointerMock from '../../../helpers/pointerMock.js'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.mouseWheel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.mouseWheel.tests.js index 3390caf34a1d..b5d55b29f49e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.mouseWheel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.mouseWheel.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import devices from '__internal/core/m_devices'; import pointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.rtl.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.rtl.tests.js index aa60848560dd..3ff9108055fd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.rtl.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.rtl.tests.js @@ -1,6 +1,6 @@ -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import 'generic_light.css!'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import Scrollable from 'ui/scroll_view/ui.scrollable'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollbar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollbar.tests.js index 8bbffbf11d93..5c9225a0ba6d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollbar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollbar.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import devices from '__internal/core/m_devices'; import Scrollbar from '__internal/ui/scroll_view/m_scrollbar'; import pointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollingByThumb.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollingByThumb.tests.js index c77d8c5f7791..88a6a904f272 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollingByThumb.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollingByThumb.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import Scrollbar from '__internal/ui/scroll_view/m_scrollbar'; import pointerMock from '../../../helpers/pointerMock.js'; import Scrollable from 'ui/scroll_view/ui.scrollable'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.useNative.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.useNative.tests.js index b9bd6580b16a..1cc00c4e5afc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.useNative.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.useNative.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import pointerMock from '../../../helpers/pointerMock.js'; import Scrollable from 'ui/scroll_view/ui.scrollable'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/selection.test.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/selection.test.js index 5443a3199ab7..0c447c1acc6a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/selection.test.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/selection.test.js @@ -2,9 +2,9 @@ import $ from 'jquery'; import errors from 'ui/widget/ui.errors'; import Selection from '__internal/ui/selection/m_selection'; import Guid from 'core/guid'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import ArrayStore from 'common/data/array_store'; const createDataSource = function(data, storeOptions, dataSourceOptions) { const arrayStore = new ArrayStore(storeOptions ? $.extend(true, { data: data }, storeOptions) : data); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/sortable.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/sortable.tests.js index d8f19c79683f..afcf528bde09 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/sortable.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/sortable.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; import 'ui/sortable'; import 'ui/scroll_view'; -import fx from 'animation/fx'; -import animationFrame from 'animation/frame'; +import fx from 'common/core/animation/fx'; +import animationFrame from 'common/core/animation/frame'; import browser from 'core/utils/browser'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import viewPort from 'core/utils/view_port'; import devices from '__internal/core/m_devices'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/speedDialAction.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/speedDialAction.tests.js index 2af32bbbf09e..798ce2d71f80 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/speedDialAction.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/speedDialAction.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import config from 'core/config'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import SpeedDialItem from '__internal/ui/speed_dial_action/m_speed_dial_item'; import { logger } from 'core/utils/console'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/splitter.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/splitter.tests.js index 69a8e7893c33..2afc216148fe 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/splitter.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/splitter.tests.js @@ -1,13 +1,13 @@ import $ from 'jquery'; import Splitter from 'ui/splitter'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; import { isRenderer, isNumeric } from 'core/utils/type'; import config from 'core/config'; -import { createEvent } from 'events/utils/index'; -import { name as DOUBLE_CLICK_EVENT } from 'events/double_click'; -import { name as CLICK_EVENT } from 'events/click'; +import { createEvent } from 'common/core/events/utils/index'; +import { name as DOUBLE_CLICK_EVENT } from 'common/core/events/double_click'; +import { name as CLICK_EVENT } from 'common/core/events/click'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/swipeable.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/swipeable.tests.js index 7b7871d7e46a..642f8fb0440f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/swipeable.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/swipeable.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; -import Swipeable from 'events/gesture/swipeable'; -import swipeEvents from 'events/swipe'; +import Swipeable from 'common/core/events/gesture/swipeable'; +import swipeEvents from 'common/core/events/swipe'; import pointerMock from '../../helpers/pointerMock.js'; QUnit.module('swipeable', { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.repaintChangesOnly.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.repaintChangesOnly.tests.js index 8d57efe630de..e257e1a14fe0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.repaintChangesOnly.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.repaintChangesOnly.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/tab_panel'; QUnit.module('repaintChangesOnly', { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.tests.js index eddb25133241..c3565886e8a2 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import { deferUpdate } from 'core/utils/common'; @@ -10,7 +10,7 @@ import TabPanel from 'ui/tab_panel'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import registerKeyHandlerTestHelper from '../../helpers/registerKeyHandlerTestHelper.js'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; QUnit.testStart(() => { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.width.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.width.tests.js index 1cc8ffb73487..46810c56ff84 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.width.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.width.tests.js @@ -1,7 +1,7 @@ import { getOuterWidth } from 'core/utils/size'; import 'generic_light.css!'; -import { triggerResizeEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerResizeEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/tab_panel'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js index acade277387a..018160e8f483 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js @@ -1,9 +1,9 @@ import 'generic_light.css!'; import themes from 'ui/themes'; import { extend } from 'core/utils/extend'; -import { DataSource } from 'data/data_source/data_source'; -import holdEvent from 'events/hold'; -import { triggerShownEvent } from 'events/visibility_change'; +import { DataSource } from 'common/data/data_source/data_source'; +import holdEvent from 'common/core/events/hold'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/responsive_box'; import 'ui/tabs'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.width.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.width.tests.js index 3ca58b50c6c2..ba3d813e308f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.width.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.width.tests.js @@ -1,5 +1,5 @@ import 'generic_light.css!'; -import { triggerResizeEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerResizeEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/tabs'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tileView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tileView.tests.js index fd557ec0ca3e..5f66c2ca2ec1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tileView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tileView.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import globalConfig from 'core/config'; import keyboardMock from '../../helpers/keyboardMock.js'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { isRenderer } from 'core/utils/type'; import { deferUpdate } from 'core/utils/common'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toast.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toast.tests.js index fa96b9decf0d..b961b10e3180 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toast.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toast.tests.js @@ -1,7 +1,7 @@ import { getWidth, getHeight, getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { value as setViewPort } from 'core/utils/view_port'; import Toast from 'ui/toast'; import devices from 'core/devices.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.disabled.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.disabled.tests.js index ce46b6c3f17f..8dd187aca0fa 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.disabled.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.disabled.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import 'ui/toolbar'; import 'ui/toolbar/ui.toolbar.base'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import 'ui/button_group'; import 'ui/text_box'; @@ -17,7 +17,7 @@ import 'ui/menu'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; const moduleConfig = { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.menu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.menu.tests.js index 013ac6314df4..b013fb7b4ddc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.menu.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.menu.tests.js @@ -1,7 +1,7 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import ArrayStore from 'data/array_store'; -import fx from 'animation/fx'; +import ArrayStore from 'common/data/array_store'; +import fx from 'common/core/animation/fx'; import Button from 'ui/button'; import Popup from 'ui/popup'; import DropDownMenu from '__internal/ui/toolbar/internal/m_toolbar.menu'; @@ -10,7 +10,7 @@ import executeAsyncMock from '../../helpers/executeAsyncMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; import config from 'core/config'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { isRenderer } from 'core/utils/type'; import themes from 'ui/themes'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.tests.js index 72e64c685afb..8236ef1c985f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import ToolbarBase from '__internal/ui/toolbar/m_toolbar.base'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import resizeCallbacks from 'core/utils/resize_callbacks'; import themes from 'ui/themes'; import { deferUpdate } from 'core/utils/common'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbarParts/toolbar.themes.sharedTests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbarParts/toolbar.themes.sharedTests.js index 922c39d11a26..80db9043bc4b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbarParts/toolbar.themes.sharedTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbarParts/toolbar.themes.sharedTests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import Toolbar from 'ui/toolbar'; const BUTTON_CLASS = 'dx-button'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tooltip.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tooltip.tests.js index aa76389e1416..296a064268d6 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tooltip.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tooltip.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import Tooltip from 'ui/tooltip'; import renderer from 'core/renderer'; import uiErrors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.checkboxes.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.checkboxes.tests.js index f556caac8c24..a53038734cdb 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.checkboxes.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.checkboxes.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import TreeViewTestWrapper from '../../helpers/TreeViewTestHelper.js'; import { Deferred } from 'core/utils/deferred'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import { DATA, data2 } from './treeViewParts/testData.js'; import localization from 'localization'; import 'ui/tree_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.expanded.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.expanded.tests.js index c749df0433ad..2440a4d59d81 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.expanded.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.expanded.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import TreeViewTestWrapper from '../../helpers/TreeViewTestHelper.js'; import { noop } from 'core/utils/common'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { DATA } from './treeViewParts/testData.js'; import { makeSlowDataSource } from './treeViewParts/testUtils.js'; import 'ui/tree_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js index a5a470ad0342..967d64ee1c0f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js @@ -1,8 +1,8 @@ /* global stripFunctions */ import $ from 'jquery'; -import CustomStore from 'data/custom_store'; -import ArrayStore from 'data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import ArrayStore from 'common/data/array_store'; import 'ui/tree_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/accessibility.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/accessibility.js index 996adf6395b4..0eba897beccc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/accessibility.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/accessibility.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import TreeView from 'ui/tree_view'; import ariaAccessibilityTestHelper from '../../../helpers/ariaAccessibilityTestHelper.js'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; const { module, test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/animation.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/animation.js index 2386ab4bfc19..25714187aae5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/animation.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/animation.js @@ -1,7 +1,7 @@ /* global internals */ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../../helpers/keyboardMock.js'; QUnit.module('Animation', { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/events.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/events.js index e764d016cdd1..e333a7a541bc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/events.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/events.js @@ -3,11 +3,11 @@ import $ from 'jquery'; import commonUtils from 'core/utils/common'; import typeUtils from 'core/utils/type'; -import holdEvent from 'events/hold'; +import holdEvent from 'common/core/events/hold'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; -import contextMenuEvent from 'events/contextmenu'; -import dblclickEvent from 'events/dblclick'; +import fx from 'common/core/animation/fx'; +import contextMenuEvent from 'common/core/events/contextmenu'; +import dblclickEvent from 'common/core/events/dblclick'; import TreeViewTestWrapper from '../../../helpers/TreeViewTestHelper.js'; const createInstance = (options) => new TreeViewTestWrapper(options); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/initialization.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/initialization.js index 694ba7278fbc..8b9650374fdc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/initialization.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/initialization.js @@ -1,6 +1,6 @@ /* global initTree */ -import ArrayStore from 'data/array_store'; -import { DataSource } from 'data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; import TreeViewTestWrapper from '../../../helpers/TreeViewTestHelper.js'; import $ from 'jquery'; QUnit.module('Initialization', () => { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/keyboardNavigation.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/keyboardNavigation.js index 1e05073c92b4..3e66f5311cd3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/keyboardNavigation.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/keyboardNavigation.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import devices from '__internal/core/m_devices'; import keyboardMock from '../../../helpers/keyboardMock.js'; import { isRenderer } from 'core/utils/type'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/rendering.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/rendering.js index d77447be17ab..fcd1cfddcc40 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/rendering.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/rendering.js @@ -3,10 +3,10 @@ import $ from 'jquery'; import commonUtils from 'core/utils/common'; import { isFunction } from 'core/utils/type'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import TreeViewTestWrapper from '../../../helpers/TreeViewTestHelper.js'; const NODE_LOAD_INDICATOR_CLASS = 'dx-treeview-node-loadindicator'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/selection.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/selection.js index d90f4910e9c4..0771e3bccd94 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/selection.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/selection.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import keyboardMock from '../../../helpers/keyboardMock.js'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import TreeViewTestWrapper from '../../../helpers/TreeViewTestHelper.js'; const { module, test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/testUtils.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/testUtils.js index 2991f798d60a..91413a0149ae 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/testUtils.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/testUtils.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import CustomStore from 'data/custom_store'; -import ArrayStore from 'data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import ArrayStore from 'common/data/array_store'; export const makeSlowDataSource = (data) => { return { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/virtualMode.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/virtualMode.js index 96409d06fe08..1a217b818bf9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/virtualMode.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/virtualMode.js @@ -2,13 +2,13 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import dblclickEvent from 'events/dblclick'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import dblclickEvent from 'common/core/events/dblclick'; import TreeView from 'ui/tree_view'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import TreeViewTestWrapper from '../../../helpers/TreeViewTestHelper.js'; import LoadIndicator from 'ui/load_indicator'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidget.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidget.tests.js index 14a0f679139f..5bea6cd8e5ea 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidget.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidget.tests.js @@ -3,12 +3,12 @@ import { noop } from 'core/utils/common'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import registerComponent from 'core/component_registrator'; -import { DataSource } from 'data/data_source/data_source'; -import Store from 'data/abstract_store'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import Store from 'common/data/abstract_store'; +import ArrayStore from 'common/data/array_store'; import { setTemplateEngine } from 'core/templates/template_engine_registry'; import support from '__internal/core/utils/m_support'; -import holdEvent from 'events/hold'; +import holdEvent from 'common/core/events/hold'; import CollectionWidget from 'ui/collection/ui.collection_widget.edit'; import List from 'ui/list'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/editingTests.js b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/editingTests.js index 6fcf86c77c57..91b8870e57ea 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/editingTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/editingTests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import CollectionWidget from 'ui/collection/ui.collection_widget.edit'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import executeAsyncMock from '../../../helpers/executeAsyncMock.js'; import keyboardMock from '../../../helpers/keyboardMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/liveUpdateTests.js b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/liveUpdateTests.js index 6d01ba87c210..b18ee15d8ef0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/liveUpdateTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/liveUpdateTests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import CollectionWidget from 'ui/collection/ui.collection_widget.live_update'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; const { module, test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/dialog.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/dialog.tests.js index d53fbd6f6f20..156fe7316ef8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/dialog.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/dialog.tests.js @@ -4,7 +4,7 @@ import devices from '__internal/core/m_devices'; import { alert, confirm, custom } from 'ui/dialog'; import domUtils from '__internal/core/utils/m_dom'; import errors from 'ui/widget/ui.errors'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; import { value as viewPort } from 'core/utils/view_port'; import domAdapter from '__internal/core/m_dom_adapter'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/floatingActionButtonRepaint.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/floatingActionButtonRepaint.tests.js index e89538151d6f..7682004820ac 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/floatingActionButtonRepaint.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/floatingActionButtonRepaint.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import config from 'core/config'; import repaintFloatingActionButton from 'ui/speed_dial_action/repaint_floating_action_button'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/speed_dial_action'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/hideToasts.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/hideToasts.tests.js index 42764de09e88..86cb76ca9d2b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/hideToasts.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/hideToasts.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import notify from 'ui/notify'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import hideToasts from 'ui/toast/hide_toasts'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js index afa01c4ea2c1..038b2f801ecf 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import HierarchicalCollectionWidget from 'ui/hierarchical_collection/ui.hierarchical_collection_widget'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; const DISABLED_STATE_CLASS = 'dx-state-disabled'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js index 27347eabf7a1..4ffaddf4654a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import HierarchicalDataAdapter from '__internal/ui/hierarchical_collection/m_data_adapter'; -import { processRequestResultLock } from 'data/utils'; +import { processRequestResultLock } from 'common/data/utils'; import HierarchicalCollectionTestHelper from './hierarchicalCollectionTestHelper.js'; import errors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/keyboardProcessor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/keyboardProcessor.tests.js index 72044865678f..fd104853ace6 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/keyboardProcessor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/keyboardProcessor.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import KeyboardProcessor from 'events/core/keyboard_processor'; +import KeyboardProcessor from 'common/core/events/core/keyboard_processor'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/notify.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/notify.tests.js index bc77b7bd7f1d..c960f9adc11a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/notify.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/notify.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import notify from 'ui/notify'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { value as viewPort } from 'core/utils/view_port'; import { isPlainObject } from 'core/utils/type'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/tooltip.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/tooltip.tests.js index 5149503d9ec0..9ab72d865498 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/tooltip.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/tooltip.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import Tooltip from 'ui/tooltip'; import { show } from '__internal/ui/tooltip/m_tooltip'; import viewPort from 'core/utils/view_port'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; function checkTooltip(assert) { const $testContent = $('.dx-popup-content').find('.test-content'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js index 616099e6a8aa..4c23b34429a3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js @@ -6,7 +6,7 @@ import { extend } from 'core/utils/extend'; import { TemplateBase } from 'core/templates/template_base'; import { Template } from 'core/templates/template'; import DataHelperMixin from 'data_helper'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.utils/utils.inkRipple.tests.js b/packages/devextreme/testing/tests/DevExpress.utils/utils.inkRipple.tests.js index 44ec872ea0ab..ce7e9d86dcc5 100644 --- a/packages/devextreme/testing/tests/DevExpress.utils/utils.inkRipple.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.utils/utils.inkRipple.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); const inkRipple = require('ui/widget/utils.ink_ripple'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const INKRIPPLE_CLASS = 'dx-inkripple'; const INKRIPPLE_WAVE_CLASS = 'dx-inkripple-wave'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js index 53a73ac4c48d..3d647e934993 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js @@ -2,7 +2,7 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; const vizMocks = require('../../helpers/vizMocks.js'); const commons = require('./chartParts/commons.js'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; const { BaseChart } = require('__internal/viz/chart_components/m_base_chart'); const rendererModule = require('viz/core/renderers/renderer'); const layoutManagerModule = require('viz/chart_components/layout_manager'); @@ -516,7 +516,7 @@ QUnit.test('not hide on resize, when resize', function(assert) { }); QUnit.test('Schedule loading indicator hiding on data source changed event', function(assert) { - const DataSource = require('data/data_source/data_source').DataSource; + const DataSource = require('common/data/data_source/data_source').DataSource; const dataSource = new DataSource({ load: function() { return []; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.tests.js index 7229bfee3640..2514bd7b64fa 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.tests.js @@ -15,7 +15,7 @@ const Legend = vizMocks.Legend; const ChartTitle = vizMocks.Title; const Axis = vizMocks.stubClass(axisModule.Axis); const Range = vizMocks.stubClass(rangeModule.Range); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; const DataSourceMock = vizMocks.stubClass(DataSource); require('viz/chart'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chartInteraction.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chartInteraction.tests.js index af04c50dc2ad..18a6afc7c339 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chartInteraction.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chartInteraction.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import devices from '__internal/core/m_devices'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import errors from 'core/errors'; import 'viz/chart'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chartSync.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chartSync.tests.js index 5fbca7ff30ca..cb0506e6c71d 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chartSync.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chartSync.tests.js @@ -18,7 +18,7 @@ const layoutManagerModule = require('viz/chart_components/layout_manager'); const LayoutManager = vizMocks.stubClass(layoutManagerModule.LayoutManager); let validateData; // It lives outside of a test context because of "resetMocksInChart" which lives outside of a test context const dataValidatorModule = require('viz/components/data_validator'); -const CustomStore = require('data/custom_store'); +const CustomStore = require('common/data/custom_store').CustomStore; const chartThemeManagerModule = require('viz/components/chart_theme_manager'); const scrollBarModule = require('viz/chart_components/scroll_bar'); const ScrollBar = scrollBarModule.ScrollBar; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js index a070e3347a7d..40bfa6c14132 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js @@ -8,7 +8,7 @@ import { BaseChart } from '__internal/viz/chart_components/m_base_chart'; import labelModule from 'viz/series/points/label'; import dataValidatorModule from 'viz/components/data_validator'; import translator1DModule from 'viz/translators/translator1d'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import chartThemeManagerModule from 'viz/components/chart_theme_manager'; import layoutManagerModule from 'viz/chart_components/layout_manager'; import trackerModule from 'viz/chart_components/tracker'; @@ -19,7 +19,7 @@ import { } from '../../helpers/chartMocks.js'; import TemplateManagerModule from '__internal/core/m_template_manager'; import graphicObjects from '__internal/common/m_charts'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events/core/events_engine'; import devices from '__internal/core/m_devices'; const LabelCtor = new vizMocks.ObjectPool(labelModule.Label); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js index 1e766568996b..981537943a34 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js @@ -3,7 +3,7 @@ import vizMocks from '../../helpers/vizMocks.js'; import { ScrollBar } from 'viz/chart_components/scroll_bar'; import translator2DModule from 'viz/translators/translator2d'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/core/events/drag'; const Translator = vizMocks.stubClass(translator2DModule.Translator2D); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js index 972fe2ef4d0d..7315a69c5680 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js @@ -6,7 +6,7 @@ import axisModule from 'viz/axes/base_axis'; import { Crosshair } from 'viz/chart_components/crosshair'; import trackers from 'viz/chart_components/tracker'; import { MockAxis } from '../../helpers/chartMocks.js'; -import holdEvent from 'events/hold'; +import holdEvent from 'common/core/events/core/events/hold'; import errors from 'core/errors'; function getEvent(type, params) { diff --git a/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js index 33b7f15e44f5..c292e501eb2b 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js @@ -4,7 +4,7 @@ import rendererModule from 'viz/core/renderers/renderer'; import TooltipModule from 'viz/core/tooltip'; import vizMocks from '../../helpers/vizMocks.js'; import pointerMock from '../../helpers/pointerMock.js'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events/core/events_engine'; import { getDocument } from 'core/dom_adapter'; import devices from '__internal/core/m_devices'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.core/loadingIndicator.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.core/loadingIndicator.integration.tests.js index 5b4140afe64b..6b1d9a40c5fa 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.core/loadingIndicator.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.core/loadingIndicator.integration.tests.js @@ -3,7 +3,7 @@ require('viz/tree_map/tree_map'); const $ = require('jquery'); const vizMocks = require('../../helpers/vizMocks.js'); const loadingIndicatorModule = require('viz/core/loading_indicator'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; $('#qunit-fixture').append('
'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js index 6a152c63a7b8..12d69cb0cad6 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js @@ -3,8 +3,8 @@ const common = require('./commonParts/common.js'); const createFunnel = common.createFunnel; const environment = common.environment; const trackerModule = require('viz/funnel/tracker'); -const clickEventName = require('events/click').name; -const pointerEvents = require('events/pointer'); +const clickEventName = require('common/core/events/core/events/click').name; +const pointerEvents = require('common/core/events/core/events/pointer'); const labelModule = require('viz/series/points/label'); const vizMocks = require('../../helpers/vizMocks.js'); const Label = labelModule.Label; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.gauges/tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.gauges/tracker.tests.js index 1b3363b38881..b74b11e33c1c 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.gauges/tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.gauges/tracker.tests.js @@ -2,7 +2,7 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; const vizMocks = require('../../helpers/vizMocks.js'); const Tracker = require('viz/gauges/tracker'); -const pointerEvents = require('events/pointer'); +const pointerEvents = require('common/core/events/pointer'); QUnit.module('Tracker', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part1.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part1.tests.js index 8f67f9e2a78a..202c2f5411e8 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part1.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part1.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); const trackerModule = require('viz/range_selector/tracker'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; const seriesDataSourceModule = require('viz/range_selector/series_data_source'); const commons = require('./rangeSelectorParts/commons.js'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part2.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part2.tests.js index 66b53a83f0c5..f30fac4fb796 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part2.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part2.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const commons = require('./rangeSelectorParts/commons.js'); const seriesDataSourceModule = require('viz/range_selector/series_data_source'); -const dataSourceModule = require('data/data_source/data_source'); +const dataSourceModule = require('common/data/data_source/data_source'); const _SeriesDataSource = seriesDataSourceModule.SeriesDataSource; const dateUtils = require('core/utils/date'); const vizMocks = require('../../helpers/vizMocks.js'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js index 45ccd3a191d7..066708ca35d9 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js @@ -4,8 +4,8 @@ import { DEBUG_stub_createIncidentOccurred, DEBUG_restore_createIncidentOccurred import commons from './rangeSelectorParts/commons.js'; import slidersControllerModule from 'viz/range_selector/sliders_controller'; import seriesDataSourceModule from 'viz/range_selector/series_data_source'; -import { DataSource } from 'data/data_source/data_source'; -import dateLocalization from 'localization/date'; +import { DataSource } from 'common/data/data_source/data_source'; +import dateLocalization from 'common/core/localization/date'; import axisModule from 'viz/axes/base_axis'; const _SeriesDataSource = seriesDataSourceModule.SeriesDataSource; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/range_selector.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/range_selector.integration.tests.js index b326cc17975e..bb7be9472727 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/range_selector.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/range_selector.integration.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import 'viz/range_selector/range_selector'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; QUnit.testStart(function() { const markup = diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/tracker.tests.js index b61aed28566b..d3a52e1291f8 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/tracker.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const pointerEvents = require('events/pointer'); +const pointerEvents = require('common/core/events/pointer'); const trackerModule = require('viz/range_selector/tracker'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js index 1313bbbbde8e..52364a182d3d 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js @@ -1,7 +1,7 @@ /* global currentAssert */ const $ = require('jquery'); -const animationFrame = require('animation/frame'); +const animationFrame = require('common/core/animation/frame'); const commonUtils = require('core/utils/common'); const typeUtils = require('core/utils/type'); const animationModule = require('viz/core/renderers/animation'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.renderers/SvgElement.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.renderers/SvgElement.tests.js index e1ee76ce0aa4..5d113cb9924b 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.renderers/SvgElement.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.renderers/SvgElement.tests.js @@ -2,7 +2,7 @@ import jQuery from 'jquery'; import typeUtils from 'core/utils/type'; import rendererModule from 'viz/core/renderers/renderer'; import coreRenderer from 'core/renderer'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import domAdapter from '__internal/core/m_dom_adapter'; import Color from 'color'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.sankey/sankey.tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.sankey/sankey.tracker.tests.js index 372dc7123474..cfe4d9e8199b 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.sankey/sankey.tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.sankey/sankey.tracker.tests.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import common, { createSankey, environment } from './commonParts/common.js'; import trackerModule from 'viz/sankey/tracker'; import tooltipModule from 'viz/core/tooltip'; -import { name as clickEventName } from 'events/click'; -import pointerEvents from 'events/pointer'; +import { name as clickEventName } from 'common/core/events/click'; +import pointerEvents from 'common/core/events/pointer'; import { setTooltipCustomOptions } from 'viz/sankey/tooltip'; import domAdapter from '__internal/core/m_dom_adapter'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/baseSparklineTooltipEvents.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/baseSparklineTooltipEvents.tests.js index 9c6c48ed38ab..0bbc8be3d200 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/baseSparklineTooltipEvents.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/baseSparklineTooltipEvents.tests.js @@ -3,7 +3,7 @@ const $ = require('jquery'); const vizMocks = require('../../helpers/vizMocks.js'); const rendererModule = require('viz/core/renderers/renderer'); -const pointerEvents = require('events/pointer'); +const pointerEvents = require('common/core/events/pointer'); require('viz/sparkline'); require('viz/bullet'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js index 691cd7511c7e..16d0f1f00652 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js @@ -8,7 +8,7 @@ const rendererModule = require('viz/core/renderers/renderer'); const dataValidatorModule = require('viz/components/data_validator'); const translator2DModule = require('viz/translators/translator2d'); const seriesModule = require('viz/series/base_series'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; require('viz/sparkline'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.treeMap/tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.treeMap/tracker.tests.js index 3349058cba6f..3144a0c5ff70 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.treeMap/tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.treeMap/tracker.tests.js @@ -4,8 +4,8 @@ const $ = require('jquery'); const trackerModule = require('viz/tree_map/tracker'); const tooltipModule = require('viz/core/tooltip'); -const clickEventName = require('events/click').name; -const pointerEvents = require('events/pointer'); +const clickEventName = require('common/core/events/click').name; +const pointerEvents = require('common/core/events/pointer'); const dxTreeMap = require('viz/tree_map/tree_map'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.treeMap/treeMap.base.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.treeMap/treeMap.base.tests.js index 36f5a8ebdfc3..be089a9c83e4 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.treeMap/treeMap.base.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.treeMap/treeMap.base.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const common = require('./commonParts/common.js'); const themeModule = require('viz/themes'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; function createDataSource(value) { return new DataSource({ diff --git a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/map.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/map.integration.tests.js index ec5b0954966e..9b9883d31a5c 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/map.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/map.integration.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import CustomStore from 'data/custom_store'; -import DataSource from 'data/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import DataSource from 'common/data/data_source'; import { projection } from 'viz/vector_map/projection'; const simpleProjection = projection({ aspectRatio: 4 / 3, diff --git a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer.tests.js index 6c53d4a603ee..7bc8257484a2 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer.tests.js @@ -11,7 +11,7 @@ let stubSelectStrategy; let StubMapLayerElement; let StubProxy; const projectionModule = require('viz/vector_map/projection.main'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; const baseThemeManagerModule = require('viz/core/base_theme_manager'); const vizMocks = require('../../helpers/vizMocks.js'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer_new.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer_new.tests.js index f13b7a33fbec..445590248afa 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer_new.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer_new.tests.js @@ -7,7 +7,7 @@ const controlBarModule = require('viz/vector_map/control_bar/control_bar'); const legendModule = require('viz/vector_map/legend'); const tooltipModule = require('viz/core/tooltip'); const tooltipViewerModule = require('viz/vector_map/tooltip_viewer'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; const exportMenuModule = require('viz/core/export'); // TODO maybe if you test layer - you should create exact layer? const rendererModule = require('viz/core/renderers/renderer'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/tracker.tests.js index 611197e8e10f..adb782eeaa39 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/tracker.tests.js @@ -9,7 +9,7 @@ import { noop } from 'core/utils/common'; import vizMocks from '../../helpers/vizMocks.js'; import trackerModule from 'viz/vector_map/tracker'; import eventEmitterModule from 'viz/vector_map/event_emitter'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; const FOCUS_OFF_DELAY = 100; From eb3e1f86bc6c11dde10d5432f95f321ab5d4f08a Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Thu, 14 Nov 2024 16:16:32 +0400 Subject: [PATCH 04/38] fight ciruclar references in data --- packages/devextreme/js/__internal/core/utils/m_support.ts | 3 +-- .../js/__internal/data/data_source/m_data_source.ts | 3 +-- .../devextreme/js/__internal/data/data_source/m_utils.ts | 5 ++--- packages/devextreme/js/__internal/data/m_array_store.ts | 3 ++- packages/devextreme/js/__internal/data/m_local_store.ts | 3 +-- packages/devextreme/js/__internal/data/odata/m_context.ts | 2 +- packages/devextreme/js/__internal/data/odata/m_store.ts | 3 ++- packages/devextreme/js/__internal/data_controller.ts | 2 +- .../grids/data_grid/grouping/m_grouping_expanded.ts | 3 ++- .../js/__internal/grids/data_grid/summary/m_summary.ts | 4 +++- .../grids/grid_core/data_controller/m_data_controller.ts | 3 ++- .../data_source_adapter/m_data_source_adapter.ts | 3 +-- .../grids/grid_core/header_filter/m_header_filter.ts | 3 ++- .../js/__internal/grids/grid_core/search/m_search.ts | 2 +- .../pivot_grid/field_chooser/m_field_chooser_base.ts | 2 +- .../grids/pivot_grid/local_store/m_local_store.ts | 5 ++++- .../js/__internal/grids/pivot_grid/m_widget_utils.ts | 2 +- .../data_source_adapter/m_data_source_adapter.ts | 4 +++- .../js/__internal/scheduler/appointment_popup/m_form.ts | 2 +- .../appointments/data_provider/m_appointment_filter.ts | 8 +++++++- .../m_strategy_horizontal_month_line.ts | 3 ++- packages/devextreme/js/__internal/ui/chat/chat.ts | 2 +- .../__internal/ui/collection/m_collection_widget.base.ts | 2 +- .../js/__internal/ui/drop_down_editor/m_drop_down_list.ts | 2 +- .../js/__internal/ui/editor/m_data_expression.ts | 4 +++- .../ui/hierarchical_collection/m_data_adapter.ts | 4 +++- .../js/__internal/ui/list/m_list.edit.strategy.grouped.ts | 2 +- .../ui/selection/m_selection.strategy.deferred.ts | 3 ++- .../ui/selection/m_selection.strategy.standard.ts | 3 ++- .../js/__internal/ui/selection/m_selection.strategy.ts | 4 +++- .../js/ui/file_manager/ui.file_manager.item_list.js | 2 +- packages/devextreme/js/ui/gantt/ui.gantt.treelist.js | 3 ++- 32 files changed, 61 insertions(+), 38 deletions(-) diff --git a/packages/devextreme/js/__internal/core/utils/m_support.ts b/packages/devextreme/js/__internal/core/utils/m_support.ts index ac8e89e57662..720ea36d07e6 100644 --- a/packages/devextreme/js/__internal/core/utils/m_support.ts +++ b/packages/devextreme/js/__internal/core/utils/m_support.ts @@ -1,4 +1,4 @@ -import { devices } from '@js/common/core/environment'; +import devices from '@js/common/core/environment/devices'; import domAdapter from '@js/core/dom_adapter'; import callOnce from '@js/core/utils/call_once'; import { styleProp, stylePropPrefix } from '@js/core/utils/style'; @@ -19,7 +19,6 @@ const supportProp = function (prop) { }; const isNativeScrollingSupported = function () { - // @ts-expect-error mac doesnt exist in public type const { platform, mac: isMac } = devices.real(); const isNativeScrollDevice = platform === 'ios' || platform === 'android' || isMac; diff --git a/packages/devextreme/js/__internal/data/data_source/m_data_source.ts b/packages/devextreme/js/__internal/data/data_source/m_data_source.ts index be9ab21092f0..292ccff274d8 100644 --- a/packages/devextreme/js/__internal/data/data_source/m_data_source.ts +++ b/packages/devextreme/js/__internal/data/data_source/m_data_source.ts @@ -1,5 +1,5 @@ -import { CustomStore } from '@js/common/data'; import { applyBatch } from '@js/common/data/array_utils'; +import { CustomStore } from '@js/common/data/custom_store'; import OperationManager from '@js/common/data/data_source/operation_manager'; import { CANCELED_TOKEN, @@ -373,7 +373,6 @@ export const DataSource = Class.inherit({ delete options.refresh; delete options.pageIndex; delete options.searchString; - // @ts-expect-error const shouldForceByKey = () => (store instanceof CustomStore) && !store._byKeyViaLoad(); (() => { diff --git a/packages/devextreme/js/__internal/data/data_source/m_utils.ts b/packages/devextreme/js/__internal/data/data_source/m_utils.ts index c870ac67ad42..be6b86eb648b 100644 --- a/packages/devextreme/js/__internal/data/data_source/m_utils.ts +++ b/packages/devextreme/js/__internal/data/data_source/m_utils.ts @@ -1,5 +1,6 @@ -import { ArrayStore, CustomStore } from '@js/common/data'; import Store from '@js/common/data/abstract_store'; +import ArrayStore from '@js/common/data/array_store'; +import { CustomStore } from '@js/common/data/custom_store'; import { normalizeSortingInfo } from '@js/common/data/utils'; import ajaxUtils from '@js/core/utils/ajax'; import { extend } from '@js/core/utils/extend'; @@ -64,7 +65,6 @@ const createCustomStoreFromLoadFunc = (options) => { // eslint-disable-next-line @typescript-eslint/no-dynamic-delete delete options[this]; }); - // @ts-expect-error return new CustomStore(storeConfig); }; @@ -110,7 +110,6 @@ export const normalizeDataSourceOptions = (options, normalizationOptions) => { if ('load' in options) { store = createCustomStoreFromLoadFunc(options); } else if (Array.isArray(store)) { - // @ts-expect-error store = new ArrayStore(store); } else if (isPlainObject(store)) { store = createStoreFromConfig(extend({}, store)); diff --git a/packages/devextreme/js/__internal/data/m_array_store.ts b/packages/devextreme/js/__internal/data/m_array_store.ts index 1033bed83641..0829663950c2 100644 --- a/packages/devextreme/js/__internal/data/m_array_store.ts +++ b/packages/devextreme/js/__internal/data/m_array_store.ts @@ -1,9 +1,9 @@ -import { query as Query } from '@js/common/data'; import Store from '@js/common/data/abstract_store'; import { applyBatch, indexByKey, insert, remove, update, } from '@js/common/data/array_utils'; import { errors } from '@js/common/data/errors'; +import Query from '@js/common/data/query'; import { rejectedPromise, trivialPromise } from '@js/common/data/utils'; // @ts-expect-error @@ -26,6 +26,7 @@ const ArrayStore = Store.inherit({ }, createQuery() { + // @ts-expect-error return Query(this._array, { errorHandler: this._errorHandler, }); diff --git a/packages/devextreme/js/__internal/data/m_local_store.ts b/packages/devextreme/js/__internal/data/m_local_store.ts index 88f176493373..6bf755e1db08 100644 --- a/packages/devextreme/js/__internal/data/m_local_store.ts +++ b/packages/devextreme/js/__internal/data/m_local_store.ts @@ -1,5 +1,5 @@ import eventsEngine from '@js/common/core/events/core/events_engine'; -import { ArrayStore } from '@js/common/data'; +import ArrayStore from '@js/common/data/array_store'; import { errors } from '@js/common/data/errors'; import Class from '@js/core/class'; import domAdapter from '@js/core/dom_adapter'; @@ -88,7 +88,6 @@ const DomLocalStoreBackend = LocalStoreBackend.inherit({ const localStoreBackends = { dom: DomLocalStoreBackend, }; -// @ts-expect-error const LocalStore = ArrayStore.inherit({ ctor(options) { diff --git a/packages/devextreme/js/__internal/data/odata/m_context.ts b/packages/devextreme/js/__internal/data/odata/m_context.ts index 5e46acd82570..d8ea84c46b9a 100644 --- a/packages/devextreme/js/__internal/data/odata/m_context.ts +++ b/packages/devextreme/js/__internal/data/odata/m_context.ts @@ -1,7 +1,7 @@ import '@js/common/data/odata/query_adapter'; -import { ODataStore } from '@js/common/data'; import RequestDispatcher from '@js/common/data/odata/request_dispatcher'; +import ODataStore from '@js/common/data/odata/store'; import Class from '@js/core/class'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; diff --git a/packages/devextreme/js/__internal/data/odata/m_store.ts b/packages/devextreme/js/__internal/data/odata/m_store.ts index 49c2982e4528..9d13335a1c3e 100644 --- a/packages/devextreme/js/__internal/data/odata/m_store.ts +++ b/packages/devextreme/js/__internal/data/odata/m_store.ts @@ -1,9 +1,9 @@ import '@js/common/data/odata/query_adapter'; -import { query } from '@js/common/data'; import Store from '@js/common/data/abstract_store'; import { errors } from '@js/common/data/errors'; import RequestDispatcher from '@js/common/data/odata/request_dispatcher'; +import query from '@js/common/data/query'; import config from '@js/core/config'; import { Deferred, when } from '@js/core/utils/deferred'; import { isDefined } from '@js/core/utils/type'; @@ -128,6 +128,7 @@ const ODataStore = Store.inherit({ } } + // @ts-expect-error return query(url, queryOptions); }, diff --git a/packages/devextreme/js/__internal/data_controller.ts b/packages/devextreme/js/__internal/data_controller.ts index 27d3cc1cd485..941aa26d9b66 100644 --- a/packages/devextreme/js/__internal/data_controller.ts +++ b/packages/devextreme/js/__internal/data_controller.ts @@ -1,6 +1,6 @@ import { Deferred } from '@js/core/utils/deferred'; -import { ArrayStore } from '../common/data'; +import ArrayStore from '../common/data/array_store'; import { DataSource } from '../common/data/data_source/data_source'; import { normalizeDataSourceOptions } from '../common/data/data_source/utils'; import { extend } from '../core/utils/extend'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts index 32dc9e30c3da..86133e053ac0 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts @@ -1,4 +1,4 @@ -import { query as dataQuery } from '@js/common/data'; +import dataQuery from '@js/common/data/query'; import storeHelper from '@js/common/data/store_helper'; import { keysEqual } from '@js/common/data/utils'; import { toComparable } from '@js/core/utils/data'; @@ -287,6 +287,7 @@ export class GroupingHelper extends GroupingHelperCore { if (groupCount) { let { data } = options; + // @ts-expect-error const query = dataQuery(data); storeHelper.multiLevelGroup(query, groups).enumerate().done((groupedData) => { data = groupedData; diff --git a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts index ee73a2917d83..307de0b4286c 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts @@ -1,6 +1,6 @@ /* eslint-disable max-classes-per-file */ import messageLocalization from '@js/common/core/localization/message'; -import { query as dataQuery } from '@js/common/data'; +import dataQuery from '@js/common/data/query'; import storeHelper from '@js/common/data/store_helper'; import { normalizeSortingInfo } from '@js/common/data/utils'; import $ from '@js/core/renderer'; @@ -127,6 +127,7 @@ const sortGroupsBySummaryCore = function (items, groups, sortByGroups) { let query; if (group && sorts && sorts.length) { + // @ts-expect-error query = dataQuery(items); each(sorts, function (index) { if (index === 0) { @@ -339,6 +340,7 @@ const dataSourceAdapterExtender = (Base: ModuleType) => class } private sortLastLevelGroupItems(items, groups, paths) { + // @ts-expect-error const groupedItems = storeHelper.multiLevelGroup(dataQuery(items), groups).toArray(); let result = []; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts index dec26e1f58d0..ce924bf71a0e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/method-signature-style */ -import { ArrayStore, CustomStore } from '@js/common/data'; +import ArrayStore from '@js/common/data/array_store'; +import { CustomStore } from '@js/common/data/custom_store'; import $ from '@js/core/renderer'; import { findChanges } from '@js/core/utils/array_compare'; import { deferRender, equalByValue } from '@js/core/utils/common'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts index 6e327b7d403e..3b6c735dcb9a 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-dynamic-delete */ -import { ArrayStore } from '@js/common/data'; +import ArrayStore from '@js/common/data/array_store'; import { applyBatch } from '@js/common/data/array_utils'; import Callbacks from '@js/core/utils/callbacks'; import { getKeyHash } from '@js/core/utils/common'; @@ -529,7 +529,6 @@ export default class DataSourceAdapter extends modules.Controller { options.data = this._cachedStoreData = this._cachedStoreData.concat(options.data); } } - // @ts-expect-error new ArrayStore(options.data).load(loadOptions).done((data) => { options.data = data; if (needStoreCache) { diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts index be85d2b8b756..9701c24a428c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts @@ -3,8 +3,8 @@ import { name as clickEventName } from '@js/common/core/events/click'; import eventsEngine from '@js/common/core/events/core/events_engine'; import dateLocalization from '@js/common/core/localization/date'; import messageLocalization from '@js/common/core/localization/message'; -import { query as dataQuery } from '@js/common/data'; import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; +import dataQuery from '@js/common/data/query'; import storeHelper from '@js/common/data/store_helper'; import { compileGetter } from '@js/core/utils/data'; import { Deferred } from '@js/core/utils/deferred'; @@ -62,6 +62,7 @@ function ungroupUTCDates(items, dateParts?, dates?) { function convertDataFromUTCToLocal(data, column) { const dates = ungroupUTCDates(data); + // @ts-expect-error const query = dataQuery(dates); const group = gridCoreUtils.getHeaderFilterGroupParameters({ ...column, diff --git a/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts b/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts index 68b333b53419..bf39e10ba154 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts @@ -1,7 +1,7 @@ /* eslint-disable max-classes-per-file */ /* eslint-disable @typescript-eslint/method-signature-style */ import messageLocalization from '@js/common/core/localization/message'; -import { query as dataQuery } from '@js/common/data'; +import dataQuery from '@js/common/data/query'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { compileGetter, toComparable } from '@js/core/utils/data'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts index 97457a57e1e8..ff723ee78737 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts @@ -2,7 +2,7 @@ import { name as clickEventName } from '@js/common/core/events/click'; import eventsEngine from '@js/common/core/events/core/events_engine'; import localizationMessage from '@js/common/core/localization/message'; -import { ArrayStore } from '@js/common/data'; +import ArrayStore from '@js/common/data/array_store'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { Deferred } from '@js/core/utils/deferred'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts b/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts index 8c40d6bcc4a6..174166bf6091 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts @@ -1,5 +1,7 @@ -import { ArrayStore, CustomStore, query as dataQuery } from '@js/common/data'; +import ArrayStore from '@js/common/data/array_store'; +import { CustomStore } from '@js/common/data/custom_store'; import { DataSource } from '@js/common/data/data_source/data_source'; +import dataQuery from '@js/common/data/query'; // eslint-disable-next-line import/extensions import { aggregators } from '@js/common/data/utils'; import Class from '@js/core/class'; @@ -422,6 +424,7 @@ const LocalStore = Class.inherit((function () { if (dataSource.store() instanceof CustomStore && filter) { filter = processFilter(filter, fieldSelectors); + // @ts-expect-error return dataQuery(dataSource.items()).filter(filter).toArray(); } diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts index 74032611b459..45ecb4607f9f 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts @@ -1,5 +1,5 @@ import localizationDate from '@js/common/core/localization/date'; -import { ArrayStore } from '@js/common/data'; +import ArrayStore from '@js/common/data/array_store'; import { DataSource } from '@js/common/data/data_source/data_source'; import domAdapter from '@js/core/dom_adapter'; import coreAjaxUtils from '@js/core/utils/ajax'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts index 22142820ca32..edb94858ebfa 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts @@ -1,6 +1,6 @@ -import { query } from '@js/common/data'; import ArrayStore from '@js/common/data/array_store'; import { createObjectWithChanges } from '@js/common/data/array_utils'; +import query from '@js/common/data/query'; import storeHelper from '@js/common/data/store_helper'; import { equalByValue } from '@js/core/utils/common'; import { compileGetter, compileSetter } from '@js/core/utils/data'; @@ -36,6 +36,7 @@ const getChildKeys = function (that, keys) { // @ts-expect-error const applySorting = (data: any[], sort: any): any => queryByOptions( + // @ts-expect-error query(data), { sort, @@ -436,6 +437,7 @@ class DataSourceAdapterTreeList extends DataSourceAdapter { this.loadFromStore(loadOptions, store).done((loadedData) => { if (loadedData.length) { if (needLocalFiltering) { + // @ts-expect-error loadedData = query(loadedData).filter(filter).toArray(); } this._loadParentsOrChildren(concatLoadedData(loadedData), options, needChildren).done(d.resolve).fail(d.reject); diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts index 9b04d677e6e4..1e8803c7d47f 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts +++ b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts @@ -5,7 +5,7 @@ import '@js/ui/switch'; import '@js/ui/select_box'; import messageLocalization from '@js/common/core/localization/message'; -import { DataSource } from '@js/common/data'; +import DataSource from '@js/common/data/data_source'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts b/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts index fd8871d1ef2b..2593c049ee71 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts @@ -1,5 +1,5 @@ /* eslint-disable max-classes-per-file */ -import { query } from '@js/common/data'; +import query from '@js/common/data/query'; import { wrapToArray } from '@js/core/utils/array'; import dateUtils from '@js/core/utils/date'; import { each, map } from '@js/core/utils/iterator'; @@ -348,14 +348,18 @@ export class AppointmentFilterBaseStrategy { filterPreparedItems(filterOptions, preparedItems) { const combinedFilter = this._createAppointmentFilter(filterOptions); + // @ts-expect-error return query(preparedItems) + // @ts-expect-error .filter(combinedFilter) .toArray(); } filterAllDayAppointments(preparedItems) { const combinedFilter = this._createAllDayAppointmentFilter(); + // @ts-expect-error return query(preparedItems) + // @ts-expect-error .filter(combinedFilter) .toArray() .map(({ rawAppointment }) => rawAppointment); @@ -452,7 +456,9 @@ export class AppointmentFilterVirtualStrategy extends AppointmentFilterBaseStrat combinedFilters.push(filter); }); + // @ts-expect-error return query(itemsToFilter) + // @ts-expect-error .filter(combinedFilters) .toArray(); } diff --git a/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts b/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts index fff21cf6d952..033968f99373 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts @@ -1,4 +1,4 @@ -import { query } from '@js/common/data'; +import query from '@js/common/data/query'; import dateUtils from '@js/core/utils/date'; import { sortAppointmentsByStartDate } from '../data_provider/m_utils'; @@ -65,6 +65,7 @@ class HorizontalMonthLineRenderingStrategy extends HorizontalAppointmentsStrateg let result = super._getSortedPositions(map); if (!skipSorting) { + // @ts-expect-error result = query(result).sortBy('top').thenBy('left').thenBy('cellPosition') .thenBy('i') .toArray(); diff --git a/packages/devextreme/js/__internal/ui/chat/chat.ts b/packages/devextreme/js/__internal/ui/chat/chat.ts index 388b0c86af1a..d3c8aa0f114f 100644 --- a/packages/devextreme/js/__internal/ui/chat/chat.ts +++ b/packages/devextreme/js/__internal/ui/chat/chat.ts @@ -1,7 +1,7 @@ import { Guid } from '@js/common'; import messageLocalization from '@js/common/core/localization/message'; import type { DataSourceOptions } from '@js/common/data'; -import { DataHelperMixin } from '@js/common/data'; +import DataHelperMixin from '@js/common/data/data_helper'; import registerComponent from '@js/core/component_registrator'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; diff --git a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts index b02e0f294113..a5c410bd3806 100644 --- a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts +++ b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts @@ -5,7 +5,7 @@ import holdEvent from '@js/common/core/events/hold'; import pointerEvents from '@js/common/core/events/pointer'; import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; import messageLocalization from '@js/common/core/localization/message'; -import { DataHelperMixin } from '@js/common/data'; +import DataHelperMixin from '@js/common/data/data_helper'; import Action from '@js/core/action'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts index fedff530d680..13c7999b3a69 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts @@ -1,7 +1,7 @@ import eventsEngine from '@js/common/core/events/core/events_engine'; import { addNamespace } from '@js/common/core/events/utils/index'; import messageLocalization from '@js/common/core/localization/message'; -import { query as dataQuery } from '@js/common/data'; +import dataQuery from '@js/common/data/query'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import Guid from '@js/core/guid'; diff --git a/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts b/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts index e754a1a477eb..fae1c38874c6 100644 --- a/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts +++ b/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts @@ -1,4 +1,6 @@ -import { ArrayStore, DataHelperMixin, DataSource } from '@js/common/data'; +import ArrayStore from '@js/common/data/array_store'; +import DataHelperMixin from '@js/common/data/data_helper'; +import DataSource from '@js/common/data/data_source'; import { ensureDefined, noop } from '@js/core/utils/common'; import { compileGetter, diff --git a/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts b/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts index e3af15f04f54..38db373c7b0e 100644 --- a/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts +++ b/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts @@ -1,4 +1,4 @@ -import { query } from '@js/common/data'; +import query from '@js/common/data/query'; import storeHelper from '@js/common/data/store_helper'; import Class from '@js/core/class'; import { noop } from '@js/core/utils/common'; @@ -374,6 +374,7 @@ const DataAdapter = Class.inherit({ }, getChildrenNodes(parentKey) { + // @ts-expect-error return query(this._dataStructure, { langParams: this.options.langParams }).filter(['internalFields.parentKey', parentKey]).toArray(); }, @@ -479,6 +480,7 @@ const DataAdapter = Class.inherit({ dataStructure = dataStructure || this._initialDataStructure; + // @ts-expect-error return query(dataStructure, { langParams: this.options.langParams }).filter(criteria).toArray(); }, diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts index 72bfa9613cbe..9dc94180c61f 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts @@ -1,4 +1,4 @@ -import { query } from '@js/common/data'; +import query from '@js/common/data/query'; import storeHelper from '@js/common/data/store_helper'; import $ from '@js/core/renderer'; import { each } from '@js/core/utils/iterator'; diff --git a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts index dd7d7d65771b..45b1014aa0c6 100644 --- a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts +++ b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts @@ -1,4 +1,4 @@ -import { query as dataQuery } from '@js/common/data'; +import dataQuery from '@js/common/data/query'; import type { DeferredObj } from '@js/core/utils/deferred'; import { Deferred } from '@js/core/utils/deferred'; import { isString } from '@js/core/utils/type'; @@ -82,6 +82,7 @@ export default class DeferredStrategy extends SelectionStrategy { }, }, }; + // @ts-expect-error return !!dataQuery([itemData], queryParams).filter(selectionFilter).toArray().length; } diff --git a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts index e7eadf838005..7f8ea7c23963 100644 --- a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts +++ b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts @@ -1,4 +1,4 @@ -import { query as dataQuery } from '@js/common/data'; +import dataQuery from '@js/common/data/query'; import { getUniqueValues, removeDuplicates } from '@js/core/utils/array'; import { isKeysEqual } from '@js/core/utils/array_compare'; import { getKeyHash } from '@js/core/utils/common'; @@ -115,6 +115,7 @@ export default class StandardStrategy extends SelectionStrategy { if (isDeselect) { const { selectedItems } = this.options; deselectedItems = combinedFilter && keys.length !== selectedItems.length + // @ts-expect-error ? dataQuery(selectedItems).filter(combinedFilter).toArray() : selectedItems.slice(0); } diff --git a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts index 2af464bca86d..8f9a2eed529f 100644 --- a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts +++ b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts @@ -1,4 +1,4 @@ -import { query as dataQuery } from '@js/common/data'; +import dataQuery from '@js/common/data/query'; import { equalByValue, getKeyHash, @@ -156,6 +156,7 @@ export default class SelectionStrategy { if (localFilter && !isSelectAll) { filteredItems = filteredItems.filter(localFilter); } else if (needLoadAllData) { + // @ts-expect-error filteredItems = dataQuery(filteredItems).filter(remoteFilter).toArray(); } @@ -196,6 +197,7 @@ export default class SelectionStrategy { let selectedItems = this.options.ignoreDisabledItems ? this.options.selectedItems : this.options.selectedItems.filter((item) => !item?.disabled); if (dataFilter) { + // @ts-expect-error selectedItems = dataQuery(selectedItems).filter(dataFilter).toArray(); } diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js index 8985811a3d7a..7f22babf96b3 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js @@ -7,7 +7,7 @@ import eventsEngine from '../../common/core/events/core/events_engine'; import { getImageContainer } from '../../core/utils/icon'; import devices from '../../core/devices'; -import { CustomStore } from '../../common/data'; +import { CustomStore } from '../../common/data/custom_store'; import Widget from '../widget/ui.widget'; const FILE_MANAGER_FILES_VIEW_CLASS = 'dx-filemanager-files-view'; diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js b/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js index 2203e0cf5911..6523f8585c10 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js @@ -4,7 +4,8 @@ import dxTreeList from '../tree_list'; import { getBoundingRect } from '../../core/utils/position'; import { isDefined } from '../../core/utils/type'; import { GanttHelper } from './ui.gantt.helper'; -import { DataSource, ArrayStore } from '../../common/data'; +import DataSource from '../../common/data/data_source'; +import ArrayStore from '../../common/data/array_store'; import { compileGetter } from '../../core/utils/data'; import { GanttTreeListNodesState } from './ui.gantt.treelist.nodes_state'; From 833330a5ba3f2efe44a91bccc60ea66e82dad44e Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Thu, 14 Nov 2024 18:36:59 +0400 Subject: [PATCH 05/38] e2e compilation cases --- e2e/compilation-cases/data/data_source.ts | 21 +++++++++++---------- e2e/compilation-cases/data/stores.ts | 10 +++++++--- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/e2e/compilation-cases/data/data_source.ts b/e2e/compilation-cases/data/data_source.ts index 833d4350e6fc..119fe29a6cca 100644 --- a/e2e/compilation-cases/data/data_source.ts +++ b/e2e/compilation-cases/data/data_source.ts @@ -1,6 +1,17 @@ /* eslint-disable import/named */ /* eslint-disable @typescript-eslint/no-type-alias */ /* eslint-disable @typescript-eslint/no-unsafe-return */ +import { + Store, + DataSource, + CustomStore, + ArrayStore, + ODataStore, + LocalStore, + DataSourceOptionsStub, + DataSourceLike, +} from 'devextreme/common/data'; + import { AnotherType, ANY, @@ -11,16 +22,6 @@ import { SomeType, } from '../consts'; -import DataSource, { - DataSourceLike, - DataSourceOptionsStub, -} from 'devextreme/data/data_source'; -import CustomStore from 'devextreme/data/custom_store'; -import ArrayStore from 'devextreme/data/array_store'; -import ODataStore from 'devextreme/data/odata/store'; -import LocalStore from 'devextreme/data/local_store'; -import { Store } from 'devextreme/data/index'; - export function promiseResolveAcceptsMultipleArguments() { const callback: (a: any, b: any) => void = ANY; const dataSource: DataSource = ANY; diff --git a/e2e/compilation-cases/data/stores.ts b/e2e/compilation-cases/data/stores.ts index 7ee011fd9056..35781a8da55b 100644 --- a/e2e/compilation-cases/data/stores.ts +++ b/e2e/compilation-cases/data/stores.ts @@ -3,8 +3,13 @@ // eslint-disable-next-line import/no-extraneous-dependencies import $ from 'jquery'; import { HttpClient } from '@angular/common/http'; -import CustomStore from 'devextreme/data/custom_store'; -import { Store, StoreOptions } from 'devextreme/data'; +import { + Store, + StoreOptions, + CustomStore, + LoadResult, +} from 'devextreme/common/data'; + import { ANY, assertType, @@ -12,7 +17,6 @@ import { notNever, toAssertion, } from '../consts'; -import type { LoadResult } from 'devextreme/common/data/custom-store'; export async function infersTItemFromComplexLoadResult() { const store = new CustomStore({ From 09fe4999876c894b3881a1e9898cdd193de95791 Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Thu, 14 Nov 2024 18:37:22 +0400 Subject: [PATCH 06/38] events utils --- .../js/__internal/ui/date_range_box/m_multiselect_date_box.ts | 2 +- packages/devextreme/js/bundles/modules/core.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts b/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts index 71733688e805..ef6369966465 100644 --- a/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts +++ b/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts @@ -1,6 +1,6 @@ // eslint-disable-next-line max-classes-per-file import eventsEngine from '@js/common/core/events/core/events_engine'; -import { addNamespace } from '@js/common/core/events/utils'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { getWidth } from '@js/core/utils/size'; // eslint-disable-next-line @typescript-eslint/consistent-type-imports diff --git a/packages/devextreme/js/bundles/modules/core.js b/packages/devextreme/js/bundles/modules/core.js index 91d94e2657b1..d50aaaefd35b 100644 --- a/packages/devextreme/js/bundles/modules/core.js +++ b/packages/devextreme/js/bundles/modules/core.js @@ -79,7 +79,7 @@ DevExpress.AnimationPresetCollection = require('../../common/core/animation/pres DevExpress.events = require('../../common/core/events'); DevExpress.events.click = require('../../common/core/events/click'); -DevExpress.events.utils = require('../../common/core/events/utils'); +DevExpress.events.utils = require('../../common/core/events/utils/index'); DevExpress.events.GestureEmitter = require('../../common/core/events/gesture/emitter.gesture'); DevExpress.localization = require('../../common/core/localization'); From e3c2c00f9d4ae31bc7ca5e529440b8709a89e8d4 Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Thu, 14 Nov 2024 18:37:37 +0400 Subject: [PATCH 07/38] modules metadata --- .../build/gulp/modules_metadata.json | 102 +++++++----------- 1 file changed, 41 insertions(+), 61 deletions(-) diff --git a/packages/devextreme/build/gulp/modules_metadata.json b/packages/devextreme/build/gulp/modules_metadata.json index b29735d5bebe..859fcca2e11d 100644 --- a/packages/devextreme/build/gulp/modules_metadata.json +++ b/packages/devextreme/build/gulp/modules_metadata.json @@ -1,25 +1,25 @@ [ { - "name": "animation/frame", + "name": "common/core/animation/frame", "exports": { "cancelAnimationFrame": { "path": "utils.cancelAnimationFrame" }, "requestAnimationFrame": { "path": "utils.requestAnimationFrame" } } }, { - "name": "animation/fx", + "name": "common/core/animation/fx", "exports": { "default": { "path": "fx" } } }, { - "name": "animation/presets", + "name": "common/core/animation/presets", "exports": { "default": { "path": "animationPresets" } } }, { - "name": "animation/transition_executor", + "name": "common/core/animation/transition_executor", "exports": { "default": { "path": "TransitionExecutor" } } @@ -31,15 +31,19 @@ } }, { - "name": "core/config", + "name": "common", "exports": { - "default": { "path": "config" } + "config": { "path": "config" }, + "Guid": { "path": "data.Guid" }, + "setTemplateEngine": { "path": "setTemplateEngine" } } }, { - "name": "core/devices", + "name": "common/core/environment", "exports": { - "default": { "path": "devices" } + "devices": { "path": "devices" }, + "hide_top_overlay": { "path": "hideTopOverlay" }, + "init_mobile_viewport": { "path": "utils.initMobileViewport" } } }, { @@ -56,125 +60,113 @@ } }, { - "name": "core/guid", - "exports": { - "default": { "path": "data.Guid" } - } - }, - { - "name": "core/set_template_engine", - "exports": { - "default": { "path": "setTemplateEngine" } - } - }, - { - "name": "data/apply_changes", + "name": "common/data/apply_changes", "exports": { "default": { "path": "data.applyChanges" } } }, { - "name": "data/array_store", + "name": "common/data/array_store", "exports": { "default": { "path": "data.ArrayStore" } } }, { - "name": "data/custom_store", + "name": "common/data/custom_store", "exports": { "default": { "path": "data.CustomStore" } } }, { - "name": "data/data_source", + "name": "common/data/data_source", "exports": { "default": { "path": "data.DataSource" } } }, { - "name": "data/endpoint_selector", + "name": "common/data/endpoint_selector", "exports": { "default": { "path": "EndpointSelector" } } }, { - "name": "data/errors", + "name": "common/data/errors", "exports": { "errorHandler": { "path": "data.errorHandler" } } }, { - "name": "data/index", + "name": "common/data", "exports": { "LoadOptions": { "path": "data.LoadOptions", "exportAs": "type" } } }, { - "name": "data/local_store", + "name": "common/data/local_store", "exports": { "default": { "path": "data.LocalStore" } } }, { - "name": "data/odata/context", + "name": "common/data/odata/context", "exports": { "default": { "path": "data.ODataContext" } } }, { - "name": "data/odata/store", + "name": "common/data/odata/store", "exports": { "default": { "path": "data.ODataStore" } } }, { - "name": "data/odata/utils", + "name": "common/data/odata/utils", "exports": { "EdmLiteral": { "path": "data.EdmLiteral" }, "keyConverters": { "path": "data.utils.odata.keyConverters" } } }, { - "name": "data/query", + "name": "common/data/query", "exports": { "default": { "path": "data.query" } } }, { - "name": "data/utils", + "name": "common/data/utils", "exports": { "base64_encode": { "path": "data.base64_encode" } } }, { - "name": "events/click" + "name": "common/core/events/click" }, { - "name": "events/contextmenu" + "name": "common/core/events/contextmenu" }, { - "name": "events/dblclick" + "name": "common/core/events/dblclick" }, { - "name": "events/drag" + "name": "common/core/events/drag" }, { - "name": "events/hold" + "name": "common/core/events/hold" }, { - "name": "events/hover" + "name": "common/core/events/hover" }, { - "name": "events/pointer" + "name": "common/core/events/pointer" }, { - "name": "events/swipe" + "name": "common/core/events/swipe" }, { - "name": "events/transform" + "name": "common/core/events/transform" }, { - "name": "events", + "name": "common/core/events", "exports": { "on": { "path": "events.on" }, "one": { "path": "events.one" }, @@ -184,31 +176,31 @@ } }, { - "name": "file_management/error", + "name": "common/file_management/error", "exports": { "default": { "path": "fileManagement.FileSystemError" } } }, { - "name": "file_management/file_system_item", + "name": "common/file_management/file_system_item", "exports": { "default": { "path": "fileManagement.FileSystemItem" } } }, { - "name": "file_management/custom_provider", + "name": "common/file_management/custom_provider", "exports": { "default": { "path": "fileManagement.CustomFileSystemProvider" } } }, { - "name": "file_management/object_provider", + "name": "common/file_management/object_provider", "exports": { "default": { "path": "fileManagement.ObjectFileSystemProvider" } } }, { - "name": "file_management/remote_provider", + "name": "common/file_management/remote_provider", "exports": { "default": { "path": "fileManagement.RemoteFileSystemProvider" } } @@ -217,7 +209,7 @@ "name": "integration/jquery" }, { - "name": "localization", + "name": "common/core/localization", "exports": { "loadMessages": { "path": "localization.loadMessages" }, "formatMessage": { "path": "localization.formatMessage" }, @@ -228,18 +220,6 @@ "locale": { "path": "localization.locale" } } }, - { - "name": "mobile/hide_top_overlay", - "exports": { - "default": { "path": "hideTopOverlay" } - } - }, - { - "name": "mobile/init_mobile_viewport", - "exports": { - "default": { "path": "utils.initMobileViewport" } - } - }, { "name": "ui/speed_dial_action", "exports": { From 05dd44e129219e1841b1b98f564bcb290ce6c17b Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Thu, 14 Nov 2024 19:06:36 +0400 Subject: [PATCH 08/38] imports in tests: fix autoreplace traces - events --- .../numberBoxParts/common.tests.js | 4 ++-- .../tests/DevExpress.ui.widgets.editors/slider.tests.js | 4 ++-- .../textEditorParts/common.tests.js | 4 ++-- .../DevExpress.ui.widgets.editors/validationGroup.tests.js | 2 +- .../testing/tests/DevExpress.ui.widgets.form/form.tests.js | 2 +- .../htmlEditorParts/events.tests.js | 4 ++-- .../htmlEditorParts/mentionModule.tests.js | 4 ++-- .../htmlEditorParts/resizingIntegration.tests.js | 2 +- .../htmlEditorParts/resizingModule.tests.js | 2 +- .../htmlEditorParts/tableContextMenuIntegration.tests.js | 4 ++-- .../DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js | 2 +- .../tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js | 4 ++-- .../allDayAppointments.common-1.tests.js | 2 +- .../allDayAppointments.dragging.tests.js | 2 +- .../DevExpress.ui.widgets.scheduler/appointments.tests.js | 4 ++-- .../common.initialization.tests.js | 2 +- .../DevExpress.ui.widgets.scheduler/common.options.tests.js | 2 +- .../tests/DevExpress.ui.widgets.scheduler/common.tests.js | 2 +- .../tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js | 2 +- .../dragAndDropAppointments.tests.js | 2 +- .../integration.agenda.tests.js | 2 +- .../integration.recurrenceRuleValidation.tests.js | 2 +- .../integration.recurringAppointments.tests.js | 4 ++-- .../integration.workSpace.tests.js | 4 ++-- .../tests/DevExpress.ui.widgets.scheduler/timeline.tests.js | 2 +- .../tests/DevExpress.ui.widgets.scheduler/timezones.tests.js | 2 +- .../DevExpress.ui.widgets.scheduler/workSpace.day.tests.js | 2 +- .../testing/tests/DevExpress.viz.charts/pieChart.tests.js | 2 +- .../testing/tests/DevExpress.viz.charts/scrollBar.tests.js | 2 +- .../testing/tests/DevExpress.viz.charts/tracker.tests.js | 2 +- .../tests/DevExpress.viz.core/annotations.plugins.tests.js | 2 +- .../tests/DevExpress.viz.funnel/funnel.tracker.tests.js | 4 ++-- 32 files changed, 43 insertions(+), 43 deletions(-) diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js index 3e5106f017a7..e12ac51610be 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import SpinButton from '__internal/ui/number_box/m_number_box.spin'; import config from 'core/config'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'common/core/events/core/events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import keyboardMock from '../../../helpers/keyboardMock.js'; import pointerMock from '../../../helpers/pointerMock.js'; -import { normalizeKeyName } from 'common/core/events/core/events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'ui/number_box'; import 'ui/validator'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js index 478097cd38a5..e0c1e58c4698 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js @@ -3,7 +3,7 @@ import positionUtils from 'common/core/animation/position'; import 'generic_light.css!'; import config from 'core/config'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import { triggerShownEvent } from 'common/core/events/core/events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import { hideCallback as hideTopOverlayCallback } from 'common/core/environment/hide_callback'; import 'ui/slider'; @@ -11,7 +11,7 @@ import SliderTooltip from '__internal/ui/slider/m_slider_tooltip'; import SliderHandle from '__internal/ui/slider/m_slider_handle'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; -import { normalizeKeyName } from 'common/core/events/core/events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; const { module, testStart, test, testInActiveWindow } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js index bdaf9b3da942..40bf5e1f5dc8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import eventsEngine from 'common/core/events/core/events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import domUtils from '__internal/core/utils/m_dom'; import devices from '__internal/core/m_devices'; import pointerMock from '../../../helpers/pointerMock.js'; @@ -8,7 +8,7 @@ import caretWorkaround from './caretWorkaround.js'; import themes from 'ui/themes'; import config from 'core/config'; import consoleUtils from 'core/utils/console'; -import { normalizeKeyName } from 'common/core/events/core/events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import { getWidth, implementationsMap } from 'core/utils/size'; import TextEditor from '__internal/ui/text_box/m_text_editor'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js index 5cecf12abca9..7a92ddb0f4e1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js @@ -1,6 +1,6 @@ import Class from 'core/class'; import { Deferred } from 'core/utils/deferred'; -import { triggerShownEvent } from 'common/core/events/core/events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import DefaultAdapter from '__internal/ui/validation/m_default_adapter'; import ValidationEngine from 'ui/validation_engine'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js index d98c1a4e9411..ce3da955d02c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js @@ -5,7 +5,7 @@ import domAdapter from '__internal/core/m_dom_adapter'; import resizeCallbacks from '__internal/core/utils/m_resize_callbacks'; import typeUtils from 'core/utils/type'; import { extend } from 'core/utils/extend'; -import visibilityEventsModule from 'common/core/events/core/events/visibility_change'; +import visibilityEventsModule from 'common/core/events/visibility_change'; import { EDITORS_WITHOUT_LABELS } from '__internal/ui/form/m_form.layout_manager.utils'; import 'generic_light.css!'; import $ from 'jquery'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js index ed1a4260281b..93bd269bf0cf 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import 'ui/html_editor'; import { deferUpdate } from 'core/utils/common'; -import { Event as dxEvent } from 'common/core/events/core/events/index'; +import { Event as dxEvent } from 'common/core/events/index'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'common/core/events/core/events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import keyboardMock from '../../../helpers/keyboardMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js index 0a224b23454b..ec01696c301b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js @@ -5,8 +5,8 @@ import Mentions from '__internal/ui/html_editor/modules/m_mentions'; import { noop } from 'core/utils/common'; import devices from '__internal/core/m_devices'; -import { Event as dxEvent } from 'common/core/events/core/events/index'; -import { normalizeKeyName } from 'common/core/events/core/events/utils/index'; +import { Event as dxEvent } from 'common/core/events/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import Quill from 'devextreme-quill'; const SUGGESTION_LIST_CLASS = 'dx-suggestion-list'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js index c6daf0746069..013b88b365f9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/html_editor'; -import { name as clickEvent } from 'common/core/events/core/events/click'; +import { name as clickEvent } from 'common/core/events/click'; import PointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js index e1369ccc73b4..c0746beff649 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js @@ -3,7 +3,7 @@ import Quill from 'devextreme-quill'; import Resizing from '__internal/ui/html_editor/modules/m_resizing'; import devices from '__internal/core/m_devices'; -import { name as clickEvent } from 'common/core/events/core/events/click'; +import { name as clickEvent } from 'common/core/events/click'; import PointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js index d668d00cb367..e39f1cc280eb 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/html_editor'; -import { createEvent } from 'common/core/events/core/events/utils/index'; -import eventsEngine from 'common/core/events/core/events/core/events_engine'; +import { createEvent } from 'common/core/events/utils/index'; +import eventsEngine from 'common/core/events/core/events_engine'; const tableMarkup = '\ before table text
\ diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js index 33052ccfdb7a..231994df9bc9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js @@ -10,7 +10,7 @@ import { isDefined } from 'core/utils/type'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; import renderer from 'core/renderer'; -import { triggerShownEvent } from 'common/core/events/core/events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js index 99b2c2467842..45633cf2b948 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js @@ -16,7 +16,7 @@ QUnit.testStart(function() { }); import fx from 'common/core/animation/fx'; -import eventsEngine from 'common/core/events/core/events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; @@ -29,7 +29,7 @@ import { } from 'core/utils/size'; import { isRenderer } from 'core/utils/type'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; -import { triggerShownEvent } from 'common/core/events/core/events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import dateLocalization from 'common/core/localization/date'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js index 1214331f42c8..0bb5897746cd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js @@ -1,7 +1,7 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; import translator from 'common/core/animation/translator'; -import dblclickEvent from 'common/core/events/core/events/dblclick'; +import dblclickEvent from 'common/core/events/dblclick'; import fx from 'common/core/animation/fx'; import { DataSource } from 'common/data/data_source/data_source'; import { CustomStore } from 'common/data/custom_store'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js index e81fb5e57877..9c87513ac4c9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js @@ -2,7 +2,7 @@ import { getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'common/core/events/core/events/drag'; +import dragEvents from 'common/core/events/drag'; import { DataSource } from 'common/data/data_source/data_source'; import dataUtils from 'core/element_data'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js index 072bbd61df6c..f03db0b2147f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js @@ -9,8 +9,8 @@ import '__internal/scheduler/workspaces/m_work_space_week'; import VerticalAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_vertical'; import HorizontalMonthAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month'; import SchedulerAppointments from '__internal/scheduler/appointments/m_appointment_collection'; -import eventsEngine from 'common/core/events/core/events/core/events_engine'; -import dblclickEvent from 'common/core/events/core/events/dblclick'; +import eventsEngine from 'common/core/events/core/events_engine'; +import dblclickEvent from 'common/core/events/dblclick'; import translator from 'common/core/animation/translator'; import dataCoreUtils from 'core/utils/data'; import commonUtils from 'core/utils/common'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js index 7d194e231af3..bd87840ab89a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js @@ -1,7 +1,7 @@ import fx from 'common/core/animation/fx'; import { DataSource } from 'common/data/data_source/data_source'; -import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/core/events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import { AppointmentDataProvider } from '__internal/scheduler/appointments/data_provider/m_appointment_data_provider'; import errors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js index 6ced74f6674f..42d65aaeaa37 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js @@ -4,7 +4,7 @@ import devices from '__internal/core/m_devices'; import { CustomStore } from 'common/data/custom_store'; import { DataSource } from 'common/data/data_source/data_source'; -import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/core/events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import dxSchedulerWorkSpaceDay from '__internal/scheduler/workspaces/m_work_space_day'; import errors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js index 432641261764..5520801da509 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js @@ -7,7 +7,7 @@ import { CustomStore } from 'common/data/custom_store'; import { DataSource } from 'common/data/data_source/data_source'; import timeZoneDataUtils from '__internal/scheduler/timezones/m_utils_timezones_data'; -import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/core/events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import { getTimeZones } from 'time_zone_utils'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js index 18f1573748bc..c8aa780d4d35 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js @@ -13,7 +13,7 @@ import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; import { CustomStore } from 'common/data/custom_store'; import { noop } from 'core/utils/common'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'common/core/events/core/events/drag'; +import dragEvents from 'common/core/events/drag'; const { module, test, testStart } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js index 367412dc280c..22639ee2083c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js @@ -5,7 +5,7 @@ import browser from 'core/utils/browser'; import { DataSource } from 'common/data/data_source/data_source'; import translator from 'common/core/animation/translator'; import config from 'core/config'; -import dragEvents from 'common/core/events/core/events/drag'; +import dragEvents from 'common/core/events/drag'; import dataUtils from 'core/element_data'; import Color from 'color'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js index 2a409d4a2e75..1626ceb4c9f4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js @@ -2,7 +2,7 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; import devices from '__internal/core/m_devices'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import dblclickEvent from 'common/core/events/core/events/dblclick'; +import dblclickEvent from 'common/core/events/dblclick'; import fx from 'common/core/animation/fx'; import AgendaAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_agenda'; import { DataSource } from 'common/data/data_source/data_source'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js index 8b272c1d7699..9088f23acc68 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js @@ -10,7 +10,7 @@ QUnit.testStart(function() { require('generic_light.css!'); const fx = require('common/core/animation/fx'); -const dragEvents = require('common/core/events/core/events/drag'); +const dragEvents = require('common/core/events/drag'); const DataSource = require('common/data/data_source/data_source').DataSource; require('__internal/scheduler/m_scheduler'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js index 0c75dcc2ed0f..413d64817d9b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js @@ -1,10 +1,10 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import dblclickEvent from 'common/core/events/core/events/dblclick'; +import dblclickEvent from 'common/core/events/dblclick'; import Color from 'color'; import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'common/core/events/core/events/drag'; +import dragEvents from 'common/core/events/drag'; import translator from 'common/core/animation/translator'; import { DataSource } from 'common/data/data_source/data_source'; import dateSerialization from 'core/utils/date_serialization'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js index 9506bb2493f4..8ff5de049bfe 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js @@ -3,10 +3,10 @@ import dateLocalization from 'common/core/localization/date'; import { createWrapper, CLASSES, initTestMarkup, isDesktopEnvironment } from '../../helpers/scheduler/helpers.js'; import keyboardMock from '../../helpers/keyboardMock.js'; import localization from 'localization'; -import eventsEngine from 'common/core/events/core/events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'common/core/events/core/events/drag'; +import dragEvents from 'common/core/events/drag'; import { CustomStore } from 'common/data/custom_store'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js index aabcda2ca518..551178c100a0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js @@ -1,7 +1,7 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import dateUtils from 'core/utils/date'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/core/events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import '__internal/scheduler/workspaces/m_timeline'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js index 1079381eaf67..f291df8d07c4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js @@ -14,7 +14,7 @@ import translator from 'common/core/animation/translator'; import { hide } from '__internal/ui/tooltip/m_tooltip'; import { DataSource } from 'common/data/data_source/data_source'; import ArrayStore from 'common/data/array_store'; -import dragEvents from 'common/core/events/core/events/drag'; +import dragEvents from 'common/core/events/drag'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; const { testStart, test, module } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js index bff37947d477..b0d7d2a776b7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js @@ -1,5 +1,5 @@ import { getOuterHeight } from 'core/utils/size'; -import dragEvents from 'common/core/events/core/events/drag'; +import dragEvents from 'common/core/events/drag'; import 'generic_light.css!'; import $ from 'jquery'; import resizeCallbacks from 'core/utils/resize_callbacks'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js index 40bfa6c14132..a8b8754837f9 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js @@ -19,7 +19,7 @@ import { } from '../../helpers/chartMocks.js'; import TemplateManagerModule from '__internal/core/m_template_manager'; import graphicObjects from '__internal/common/m_charts'; -import eventsEngine from 'common/core/events/core/events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import devices from '__internal/core/m_devices'; const LabelCtor = new vizMocks.ObjectPool(labelModule.Label); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js index 981537943a34..bfbb7dbfbffc 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js @@ -3,7 +3,7 @@ import vizMocks from '../../helpers/vizMocks.js'; import { ScrollBar } from 'viz/chart_components/scroll_bar'; import translator2DModule from 'viz/translators/translator2d'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'common/core/events/core/events/drag'; +import dragEvents from 'common/core/events/drag'; const Translator = vizMocks.stubClass(translator2DModule.Translator2D); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js index 7315a69c5680..ea50c540fd12 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js @@ -6,7 +6,7 @@ import axisModule from 'viz/axes/base_axis'; import { Crosshair } from 'viz/chart_components/crosshair'; import trackers from 'viz/chart_components/tracker'; import { MockAxis } from '../../helpers/chartMocks.js'; -import holdEvent from 'common/core/events/core/events/hold'; +import holdEvent from 'common/core/events/hold'; import errors from 'core/errors'; function getEvent(type, params) { diff --git a/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js index c292e501eb2b..3ddf3e76c8da 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js @@ -4,7 +4,7 @@ import rendererModule from 'viz/core/renderers/renderer'; import TooltipModule from 'viz/core/tooltip'; import vizMocks from '../../helpers/vizMocks.js'; import pointerMock from '../../helpers/pointerMock.js'; -import eventsEngine from 'common/core/events/core/events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import { getDocument } from 'core/dom_adapter'; import devices from '__internal/core/m_devices'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js index 12d69cb0cad6..b5c2398f9854 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js @@ -3,8 +3,8 @@ const common = require('./commonParts/common.js'); const createFunnel = common.createFunnel; const environment = common.environment; const trackerModule = require('viz/funnel/tracker'); -const clickEventName = require('common/core/events/core/events/click').name; -const pointerEvents = require('common/core/events/core/events/pointer'); +const clickEventName = require('common/core/events/click').name; +const pointerEvents = require('common/core/events/pointer'); const labelModule = require('viz/series/points/label'); const vizMocks = require('../../helpers/vizMocks.js'); const Label = labelModule.Label; From c1e7c1179e3dd7f152ecb5c1286323c17bd7ac6d Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Thu, 14 Nov 2024 19:30:02 +0400 Subject: [PATCH 09/38] modules metadata - more fixes --- .../build/gulp/modules_metadata.json | 29 +++++-------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/packages/devextreme/build/gulp/modules_metadata.json b/packages/devextreme/build/gulp/modules_metadata.json index 859fcca2e11d..670bbc20ebf5 100644 --- a/packages/devextreme/build/gulp/modules_metadata.json +++ b/packages/devextreme/build/gulp/modules_metadata.json @@ -42,8 +42,8 @@ "name": "common/core/environment", "exports": { "devices": { "path": "devices" }, - "hide_top_overlay": { "path": "hideTopOverlay" }, - "init_mobile_viewport": { "path": "utils.initMobileViewport" } + "hideTopOverlay": { "path": "hideTopOverlay" }, + "initMobileViewport": { "path": "utils.initMobileViewport" } } }, { @@ -89,16 +89,14 @@ "default": { "path": "EndpointSelector" } } }, - { - "name": "common/data/errors", - "exports": { - "errorHandler": { "path": "data.errorHandler" } - } - }, { "name": "common/data", "exports": { - "LoadOptions": { "path": "data.LoadOptions", "exportAs": "type" } + "LoadOptions": { "path": "data.LoadOptions", "exportAs": "type" }, + "errorHandler": { "path": "data.errorHandler" }, + "EdmLiteral": { "path": "data.EdmLiteral" }, + "keyConverters": { "path": "data.utils.odata.keyConverters" }, + "base64_encode": { "path": "data.base64_encode" } } }, { @@ -119,25 +117,12 @@ "default": { "path": "data.ODataStore" } } }, - { - "name": "common/data/odata/utils", - "exports": { - "EdmLiteral": { "path": "data.EdmLiteral" }, - "keyConverters": { "path": "data.utils.odata.keyConverters" } - } - }, { "name": "common/data/query", "exports": { "default": { "path": "data.query" } } }, - { - "name": "common/data/utils", - "exports": { - "base64_encode": { "path": "data.base64_encode" } - } - }, { "name": "common/core/events/click" }, From b7958276d7c0f531b41bcdb2113ccf6af7e4fc61 Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Thu, 14 Nov 2024 19:48:36 +0400 Subject: [PATCH 10/38] fix odatastore inheritance --- packages/devextreme/js/common/data.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devextreme/js/common/data.d.ts b/packages/devextreme/js/common/data.d.ts index aa1e53119fd6..7d96ea1f6bad 100644 --- a/packages/devextreme/js/common/data.d.ts +++ b/packages/devextreme/js/common/data.d.ts @@ -1534,7 +1534,7 @@ export class ODataContext { export interface ODataStoreOptions< TItem = any, TKey = any, -> extends StoreOptionsBase { +> extends AbstractStoreOptions { /** * @docid * @type_function_param1_field params:object @@ -1609,7 +1609,7 @@ export interface ODataStoreOptions< export class ODataStore< TItem = any, TKey = any, -> extends StoreBase { +> extends AbstractStore { constructor(options?: ODataStoreOptions); /** * @docid From a976760c2de7299f4bf95fae2858f68366807f55 Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Thu, 14 Nov 2024 20:11:48 +0400 Subject: [PATCH 11/38] more fixes --- packages/devextreme/js/pdf_exporter.js | 4 ++++ .../testing/tests/DevExpress.data/storeCustom.tests.js | 2 +- .../tests/DevExpress.localization/localization.intl.tests.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/devextreme/js/pdf_exporter.js b/packages/devextreme/js/pdf_exporter.js index f45868b39e0d..e4c51779877d 100644 --- a/packages/devextreme/js/pdf_exporter.js +++ b/packages/devextreme/js/pdf_exporter.js @@ -2,3 +2,7 @@ export { exportGantt, exportDataGrid, } from './common/export/pdf'; + +export { + exportDataGrid as exportDataGridWithAutoTable, +} from './exporter/jspdf/autotable/export_data_grid'; diff --git a/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js b/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js index 307ad2d2b331..77d783ec7864 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); const CustomStore = require('common/data/custom_store').CustomStore; -const { isLoadResultObject, isGroupItemsArray, isItemsArray } = require('common/data/custom-store'); +const { isLoadResultObject, isGroupItemsArray, isItemsArray } = require('common/data/custom_store'); const processRequestResultLock = require('common/data/utils').processRequestResultLock; const config = require('core/config'); const ERRORS = { diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js index ff25519e862b..67bfb491acee 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js @@ -6,7 +6,7 @@ import numberLocalization from 'common/core/localization/number'; import intlDateLocalization from 'common/core/localization/intl/date'; import intlNumberLocalization from 'common/core/localization/intl/number'; import { locale } from 'common/core/localization/core'; -import { disableIntl } from 'localization'; +import { disableIntl } from 'common/core/localization'; import config from 'core/config'; import ExcelJSLocalizationFormatTests from '../DevExpress.exporter/exceljsParts/exceljs.format.tests.js'; From 43446255d5d47713181e9dad36104560a24dbc68 Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Fri, 15 Nov 2024 12:52:25 +0400 Subject: [PATCH 12/38] try bag js files in module metadata --- .../build/gulp/modules_metadata.json | 122 +++--------------- 1 file changed, 21 insertions(+), 101 deletions(-) diff --git a/packages/devextreme/build/gulp/modules_metadata.json b/packages/devextreme/build/gulp/modules_metadata.json index 670bbc20ebf5..8d76e988d392 100644 --- a/packages/devextreme/build/gulp/modules_metadata.json +++ b/packages/devextreme/build/gulp/modules_metadata.json @@ -1,27 +1,12 @@ [ { - "name": "common/core/animation/frame", + "name": "common/core/animation", "exports": { "cancelAnimationFrame": { "path": "utils.cancelAnimationFrame" }, - "requestAnimationFrame": { "path": "utils.requestAnimationFrame" } - } - }, - { - "name": "common/core/animation/fx", - "exports": { - "default": { "path": "fx" } - } - }, - { - "name": "common/core/animation/presets", - "exports": { - "default": { "path": "animationPresets" } - } - }, - { - "name": "common/core/animation/transition_executor", - "exports": { - "default": { "path": "TransitionExecutor" } + "requestAnimationFrame": { "path": "utils.requestAnimationFrame" }, + "fx": { "path": "fx" }, + "animationPresets": { "path": "animationPresets" }, + "TransitionExecutor": { "path": "TransitionExecutor" } } }, { @@ -59,36 +44,6 @@ "dxElement": { "path": "core.dxElement", "exportAs": "type" } } }, - { - "name": "common/data/apply_changes", - "exports": { - "default": { "path": "data.applyChanges" } - } - }, - { - "name": "common/data/array_store", - "exports": { - "default": { "path": "data.ArrayStore" } - } - }, - { - "name": "common/data/custom_store", - "exports": { - "default": { "path": "data.CustomStore" } - } - }, - { - "name": "common/data/data_source", - "exports": { - "default": { "path": "data.DataSource" } - } - }, - { - "name": "common/data/endpoint_selector", - "exports": { - "default": { "path": "EndpointSelector" } - } - }, { "name": "common/data", "exports": { @@ -96,31 +51,16 @@ "errorHandler": { "path": "data.errorHandler" }, "EdmLiteral": { "path": "data.EdmLiteral" }, "keyConverters": { "path": "data.utils.odata.keyConverters" }, - "base64_encode": { "path": "data.base64_encode" } - } - }, - { - "name": "common/data/local_store", - "exports": { - "default": { "path": "data.LocalStore" } - } - }, - { - "name": "common/data/odata/context", - "exports": { - "default": { "path": "data.ODataContext" } - } - }, - { - "name": "common/data/odata/store", - "exports": { - "default": { "path": "data.ODataStore" } - } - }, - { - "name": "common/data/query", - "exports": { - "default": { "path": "data.query" } + "base64_encode": { "path": "data.base64_encode" }, + "applyChanges": { "path": "data.applyChanges" }, + "ArrayStore": { "path": "data.ArrayStore" }, + "CustomStore": { "path": "data.CustomStore" }, + "DataSource": { "path": "data.DataSource" }, + "EndpointSelector": { "path": "EndpointSelector" }, + "LocalStore": { "path": "data.LocalStore" }, + "ODataContext": { "path": "data.ODataContext" }, + "ODataStore": { "path": "data.ODataStore" }, + "query": { "path": "data.query" } } }, { @@ -161,33 +101,13 @@ } }, { - "name": "common/file_management/error", - "exports": { - "default": { "path": "fileManagement.FileSystemError" } - } - }, - { - "name": "common/file_management/file_system_item", - "exports": { - "default": { "path": "fileManagement.FileSystemItem" } - } - }, - { - "name": "common/file_management/custom_provider", - "exports": { - "default": { "path": "fileManagement.CustomFileSystemProvider" } - } - }, - { - "name": "common/file_management/object_provider", - "exports": { - "default": { "path": "fileManagement.ObjectFileSystemProvider" } - } - }, - { - "name": "common/file_management/remote_provider", + "name": "common/file_management", "exports": { - "default": { "path": "fileManagement.RemoteFileSystemProvider" } + "FileSystemError": { "path": "fileManagement.FileSystemError" }, + "FileSystemItem": { "path": "fileManagement.FileSystemItem" }, + "CustomFileSystemProvider": { "path": "fileManagement.CustomFileSystemProvider" }, + "ObjectFileSystemProvider": { "path": "fileManagement.ObjectFileSystemProvider" }, + "RemoteFileSystemProvider": { "path": "fileManagement.RemoteFileSystemProvider" } } }, { From a3c6c947c6e1103a2fd7a7d76fe9e4048858d809 Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Mon, 18 Nov 2024 17:41:05 +0400 Subject: [PATCH 13/38] regenerate all + bump tools --- .../src/common/core/animation/index.ts | 12 +++++ .../src/common/core/animation/ng-package.json | 5 ++ .../src/common/core/environment/index.ts | 9 ++++ .../common/core/environment/ng-package.json | 5 ++ .../src/common/core/events/index.ts | 17 +++++++ .../src/common/core/events/index/index.ts | 3 ++ .../common/core/events/index/ng-package.json | 5 ++ .../src/common/core/events/ng-package.json | 5 ++ .../src/common/core/localization/index.ts | 10 ++++ .../common/core/localization/ng-package.json | 5 ++ .../src/common/data/index.ts | 47 +++++++++++++++++++ .../src/common/data/ng-package.json | 5 ++ .../src/common/export/excel/index.ts | 11 +++++ .../src/common/export/excel/ng-package.json | 5 ++ .../src/common/export/index.ts | 3 ++ .../src/common/export/ng-package.json | 5 ++ .../src/common/export/pdf/index.ts | 9 ++++ .../src/common/export/pdf/ng-package.json | 5 ++ .../src/common/file_management/index.ts | 13 +++++ .../common/file_management/ng-package.json | 5 ++ .../devextreme-angular/src/common/index.ts | 7 +++ .../src/ui/accordion/index.ts | 2 +- .../src/ui/action-sheet/index.ts | 2 +- .../src/ui/action-sheet/nested/item-dxi.ts | 2 +- .../src/ui/autocomplete/index.ts | 2 +- .../src/ui/autocomplete/nested/animation.ts | 2 +- .../src/ui/autocomplete/nested/collision.ts | 2 +- .../autocomplete/nested/drop-down-options.ts | 5 +- .../src/ui/autocomplete/nested/from.ts | 2 +- .../src/ui/autocomplete/nested/hide.ts | 2 +- .../src/ui/autocomplete/nested/position.ts | 2 +- .../src/ui/autocomplete/nested/show.ts | 2 +- .../src/ui/autocomplete/nested/to.ts | 2 +- .../src/ui/bar-gauge/index.ts | 2 +- .../src/ui/bar-gauge/nested/label.ts | 2 +- .../src/ui/bar-gauge/nested/legend.ts | 2 +- .../src/ui/bar-gauge/nested/tooltip.ts | 2 +- .../devextreme-angular/src/ui/box/index.ts | 2 +- .../devextreme-angular/src/ui/bullet/index.ts | 2 +- .../src/ui/bullet/nested/tooltip.ts | 2 +- .../devextreme-angular/src/ui/chart/index.ts | 4 +- .../src/ui/chart/nested/argument-axis.ts | 2 +- .../src/ui/chart/nested/axis-label.ts | 2 +- .../nested/common-series-settings-label.ts | 2 +- .../ui/chart/nested/common-series-settings.ts | 2 +- .../src/ui/chart/nested/crosshair.ts | 2 +- .../ui/chart/nested/horizontal-line-label.ts | 2 +- .../src/ui/chart/nested/horizontal-line.ts | 2 +- .../src/ui/chart/nested/label.ts | 2 +- .../src/ui/chart/nested/series-dxi.ts | 2 +- .../src/ui/chart/nested/tooltip.ts | 2 +- .../src/ui/chart/nested/value-axis-dxi.ts | 2 +- .../src/ui/chart/nested/vertical-line.ts | 2 +- .../devextreme-angular/src/ui/chat/index.ts | 4 +- .../src/ui/circular-gauge/index.ts | 2 +- .../src/ui/circular-gauge/nested/label.ts | 2 +- .../src/ui/circular-gauge/nested/scale.ts | 2 +- .../nested/subvalue-indicator.ts | 2 +- .../src/ui/circular-gauge/nested/text.ts | 2 +- .../src/ui/circular-gauge/nested/tooltip.ts | 2 +- .../circular-gauge/nested/value-indicator.ts | 2 +- .../src/ui/color-box/nested/animation.ts | 2 +- .../src/ui/color-box/nested/collision.ts | 2 +- .../ui/color-box/nested/drop-down-options.ts | 5 +- .../src/ui/color-box/nested/from.ts | 2 +- .../src/ui/color-box/nested/hide.ts | 2 +- .../src/ui/color-box/nested/position.ts | 2 +- .../src/ui/color-box/nested/show.ts | 2 +- .../src/ui/color-box/nested/to.ts | 2 +- .../src/ui/context-menu/index.ts | 7 ++- .../src/ui/context-menu/nested/animation.ts | 2 +- .../src/ui/context-menu/nested/collision.ts | 2 +- .../src/ui/context-menu/nested/from.ts | 2 +- .../src/ui/context-menu/nested/hide.ts | 2 +- .../src/ui/context-menu/nested/position.ts | 2 +- .../src/ui/context-menu/nested/show.ts | 2 +- .../src/ui/context-menu/nested/to.ts | 2 +- .../src/ui/data-grid/index.ts | 8 ++-- .../src/ui/data-grid/nested/animation.ts | 2 +- .../src/ui/data-grid/nested/collision.ts | 2 +- .../src/ui/data-grid/nested/column-chooser.ts | 2 +- .../src/ui/data-grid/nested/column-dxi.ts | 4 +- .../data-grid/nested/column-header-filter.ts | 2 +- .../src/ui/data-grid/nested/column-lookup.ts | 2 +- .../src/ui/data-grid/nested/field-dxi.ts | 4 +- .../src/ui/data-grid/nested/field-lookup.ts | 2 +- .../data-grid/nested/filter-builder-popup.ts | 5 +- .../src/ui/data-grid/nested/from.ts | 2 +- .../src/ui/data-grid/nested/group-item-dxi.ts | 2 +- .../src/ui/data-grid/nested/header-filter.ts | 2 +- .../src/ui/data-grid/nested/hide.ts | 2 +- .../src/ui/data-grid/nested/lookup.ts | 2 +- .../src/ui/data-grid/nested/popup.ts | 5 +- .../src/ui/data-grid/nested/position.ts | 2 +- .../src/ui/data-grid/nested/row-dragging.ts | 2 +- .../src/ui/data-grid/nested/show.ts | 2 +- .../src/ui/data-grid/nested/summary.ts | 2 +- .../src/ui/data-grid/nested/to.ts | 2 +- .../src/ui/data-grid/nested/total-item-dxi.ts | 2 +- .../src/ui/date-box/index.ts | 2 +- .../src/ui/date-box/nested/animation.ts | 2 +- .../src/ui/date-box/nested/collision.ts | 2 +- .../ui/date-box/nested/drop-down-options.ts | 5 +- .../src/ui/date-box/nested/from.ts | 2 +- .../src/ui/date-box/nested/hide.ts | 2 +- .../src/ui/date-box/nested/position.ts | 2 +- .../src/ui/date-box/nested/show.ts | 2 +- .../src/ui/date-box/nested/to.ts | 2 +- .../src/ui/date-range-box/index.ts | 2 +- .../src/ui/date-range-box/nested/animation.ts | 2 +- .../src/ui/date-range-box/nested/collision.ts | 2 +- .../nested/drop-down-options.ts | 5 +- .../src/ui/date-range-box/nested/from.ts | 2 +- .../src/ui/date-range-box/nested/hide.ts | 2 +- .../src/ui/date-range-box/nested/position.ts | 2 +- .../src/ui/date-range-box/nested/show.ts | 2 +- .../src/ui/date-range-box/nested/to.ts | 2 +- .../src/ui/defer-rendering/index.ts | 4 +- .../ui/defer-rendering/nested/animation.ts | 2 +- .../ui/defer-rendering/nested/collision.ts | 2 +- .../src/ui/defer-rendering/nested/from.ts | 2 +- .../src/ui/defer-rendering/nested/position.ts | 2 +- .../src/ui/defer-rendering/nested/to.ts | 2 +- .../src/ui/diagram/index.ts | 2 +- .../src/ui/diagram/nested/edges.ts | 2 +- .../src/ui/diagram/nested/nodes.ts | 2 +- .../devextreme-angular/src/ui/drawer/index.ts | 2 +- .../src/ui/drop-down-box/index.ts | 2 +- .../src/ui/drop-down-box/nested/animation.ts | 2 +- .../src/ui/drop-down-box/nested/collision.ts | 2 +- .../drop-down-box/nested/drop-down-options.ts | 5 +- .../src/ui/drop-down-box/nested/from.ts | 2 +- .../src/ui/drop-down-box/nested/hide.ts | 2 +- .../src/ui/drop-down-box/nested/position.ts | 2 +- .../src/ui/drop-down-box/nested/show.ts | 2 +- .../src/ui/drop-down-box/nested/to.ts | 2 +- .../src/ui/drop-down-button/index.ts | 2 +- .../ui/drop-down-button/nested/animation.ts | 2 +- .../ui/drop-down-button/nested/collision.ts | 2 +- .../nested/drop-down-options.ts | 5 +- .../src/ui/drop-down-button/nested/from.ts | 2 +- .../src/ui/drop-down-button/nested/hide.ts | 2 +- .../ui/drop-down-button/nested/position.ts | 2 +- .../src/ui/drop-down-button/nested/show.ts | 2 +- .../src/ui/drop-down-button/nested/to.ts | 2 +- .../src/ui/file-uploader/index.ts | 2 +- .../src/ui/filter-builder/nested/field-dxi.ts | 4 +- .../src/ui/filter-builder/nested/lookup.ts | 2 +- .../src/ui/form/nested/tab-panel-options.ts | 2 +- .../devextreme-angular/src/ui/funnel/index.ts | 4 +- .../src/ui/funnel/nested/label.ts | 2 +- .../src/ui/funnel/nested/tooltip.ts | 2 +- .../src/ui/gallery/index.ts | 2 +- .../devextreme-angular/src/ui/gantt/index.ts | 2 +- .../src/ui/gantt/nested/column-dxi.ts | 4 +- .../ui/gantt/nested/column-header-filter.ts | 2 +- .../src/ui/gantt/nested/dependencies.ts | 2 +- .../src/ui/gantt/nested/header-filter.ts | 2 +- .../ui/gantt/nested/resource-assignments.ts | 2 +- .../src/ui/gantt/nested/resources.ts | 2 +- .../src/ui/gantt/nested/tasks.ts | 2 +- .../nested/file-uploader-options.ts | 2 +- .../src/ui/html-editor/nested/mention-dxi.ts | 2 +- .../src/ui/html-editor/nested/variables.ts | 2 +- .../src/ui/linear-gauge/index.ts | 2 +- .../src/ui/linear-gauge/nested/label.ts | 2 +- .../src/ui/linear-gauge/nested/scale.ts | 2 +- .../linear-gauge/nested/subvalue-indicator.ts | 2 +- .../src/ui/linear-gauge/nested/text.ts | 2 +- .../src/ui/linear-gauge/nested/tooltip.ts | 2 +- .../ui/linear-gauge/nested/value-indicator.ts | 2 +- .../devextreme-angular/src/ui/list/index.ts | 2 +- .../src/ui/load-panel/index.ts | 5 +- .../src/ui/load-panel/nested/animation.ts | 2 +- .../src/ui/load-panel/nested/collision.ts | 2 +- .../src/ui/load-panel/nested/from.ts | 2 +- .../src/ui/load-panel/nested/hide.ts | 2 +- .../src/ui/load-panel/nested/position.ts | 2 +- .../src/ui/load-panel/nested/show.ts | 2 +- .../src/ui/load-panel/nested/to.ts | 2 +- .../devextreme-angular/src/ui/lookup/index.ts | 2 +- .../src/ui/lookup/nested/animation.ts | 2 +- .../src/ui/lookup/nested/collision.ts | 2 +- .../src/ui/lookup/nested/drop-down-options.ts | 5 +- .../src/ui/lookup/nested/from.ts | 2 +- .../src/ui/lookup/nested/hide.ts | 2 +- .../src/ui/lookup/nested/position.ts | 2 +- .../src/ui/lookup/nested/show.ts | 2 +- .../src/ui/lookup/nested/to.ts | 2 +- .../devextreme-angular/src/ui/menu/index.ts | 4 +- .../src/ui/menu/nested/animation.ts | 2 +- .../src/ui/menu/nested/collision.ts | 2 +- .../src/ui/menu/nested/from.ts | 2 +- .../src/ui/menu/nested/hide.ts | 2 +- .../src/ui/menu/nested/position.ts | 2 +- .../src/ui/menu/nested/show.ts | 2 +- .../src/ui/menu/nested/to.ts | 2 +- .../src/ui/multi-view/index.ts | 2 +- .../src/ui/nested/argument-axis.ts | 2 +- .../src/ui/nested/base/animation-config.ts | 2 +- .../src/ui/nested/base/animation-state.ts | 2 +- .../base/chart-common-series-settings.ts | 2 +- .../src/ui/nested/base/chart-series-dxi.ts | 2 +- .../ui/nested/base/data-grid-column-dxi.ts | 2 +- .../nested/base/filter-builder-field-dxi.ts | 2 +- .../src/ui/nested/base/gauge-indicator.ts | 2 +- .../src/ui/nested/base/popup-options.ts | 3 +- .../src/ui/nested/base/position-config.ts | 2 +- .../src/ui/nested/collision.ts | 2 +- .../src/ui/nested/column-chooser.ts | 2 +- .../src/ui/nested/crosshair.ts | 2 +- .../src/ui/nested/drop-down-options.ts | 2 +- .../src/ui/nested/filter-builder-popup.ts | 2 +- .../src/ui/nested/group-item-dxi.ts | 2 +- .../src/ui/nested/horizontal-line.ts | 2 +- .../devextreme-angular/src/ui/nested/label.ts | 2 +- .../src/ui/nested/legend.ts | 2 +- .../src/ui/nested/marker.ts | 2 +- .../devextreme-angular/src/ui/nested/popup.ts | 2 +- .../devextreme-angular/src/ui/nested/scale.ts | 2 +- .../src/ui/nested/slider-marker.ts | 2 +- .../src/ui/nested/summary.ts | 2 +- .../devextreme-angular/src/ui/nested/text.ts | 2 +- .../src/ui/nested/tooltip.ts | 2 +- .../src/ui/nested/total-item-dxi.ts | 2 +- .../src/ui/nested/value-axis-dxi.ts | 2 +- .../src/ui/nested/value-axis.ts | 2 +- .../src/ui/nested/vertical-line.ts | 2 +- .../src/ui/number-box/index.ts | 2 +- .../src/ui/pagination/index.ts | 2 +- .../src/ui/pie-chart/index.ts | 4 +- .../nested/common-series-settings.ts | 2 +- .../src/ui/pie-chart/nested/label.ts | 2 +- .../src/ui/pie-chart/nested/series-dxi.ts | 2 +- .../src/ui/pie-chart/nested/tooltip.ts | 2 +- .../src/ui/polar-chart/index.ts | 4 +- .../ui/polar-chart/nested/argument-axis.ts | 2 +- .../src/ui/polar-chart/nested/axis-label.ts | 2 +- .../nested/common-series-settings-label.ts | 2 +- .../nested/common-series-settings.ts | 2 +- .../src/ui/polar-chart/nested/label.ts | 2 +- .../src/ui/polar-chart/nested/series-dxi.ts | 2 +- .../src/ui/polar-chart/nested/tooltip.ts | 2 +- .../src/ui/polar-chart/nested/value-axis.ts | 2 +- .../src/ui/popover/index.ts | 5 +- .../src/ui/popover/nested/animation.ts | 2 +- .../src/ui/popover/nested/collision.ts | 2 +- .../src/ui/popover/nested/from.ts | 2 +- .../src/ui/popover/nested/hide.ts | 2 +- .../src/ui/popover/nested/position.ts | 2 +- .../src/ui/popover/nested/show.ts | 2 +- .../src/ui/popover/nested/to.ts | 2 +- .../src/ui/popup/component.ts | 5 +- .../src/ui/popup/nested/animation.ts | 2 +- .../src/ui/popup/nested/collision.ts | 2 +- .../src/ui/popup/nested/from.ts | 2 +- .../src/ui/popup/nested/hide.ts | 2 +- .../src/ui/popup/nested/position.ts | 2 +- .../src/ui/popup/nested/show.ts | 2 +- .../src/ui/popup/nested/to.ts | 2 +- .../src/ui/radio-group/index.ts | 2 +- .../src/ui/range-selector/index.ts | 4 +- .../nested/common-series-settings-label.ts | 2 +- .../nested/common-series-settings.ts | 2 +- .../src/ui/range-selector/nested/label.ts | 2 +- .../ui/range-selector/nested/marker-label.ts | 2 +- .../src/ui/range-selector/nested/marker.ts | 2 +- .../ui/range-selector/nested/scale-label.ts | 2 +- .../src/ui/range-selector/nested/scale.ts | 2 +- .../ui/range-selector/nested/series-dxi.ts | 2 +- .../ui/range-selector/nested/slider-marker.ts | 2 +- .../src/ui/range-slider/index.ts | 2 +- .../src/ui/range-slider/nested/label.ts | 2 +- .../src/ui/range-slider/nested/tooltip.ts | 2 +- .../src/ui/responsive-box/index.ts | 2 +- .../devextreme-angular/src/ui/sankey/index.ts | 4 +- .../src/ui/sankey/nested/tooltip.ts | 2 +- .../src/ui/scheduler/index.ts | 4 +- .../scheduler/nested/appointment-dragging.ts | 2 +- .../src/ui/scheduler/nested/resource-dxi.ts | 2 +- .../src/ui/select-box/index.ts | 2 +- .../src/ui/select-box/nested/animation.ts | 2 +- .../src/ui/select-box/nested/collision.ts | 2 +- .../ui/select-box/nested/drop-down-options.ts | 5 +- .../src/ui/select-box/nested/from.ts | 2 +- .../src/ui/select-box/nested/hide.ts | 2 +- .../src/ui/select-box/nested/position.ts | 2 +- .../src/ui/select-box/nested/show.ts | 2 +- .../src/ui/select-box/nested/to.ts | 2 +- .../devextreme-angular/src/ui/slider/index.ts | 2 +- .../src/ui/slider/nested/label.ts | 2 +- .../src/ui/slider/nested/tooltip.ts | 2 +- .../src/ui/sparkline/index.ts | 4 +- .../src/ui/sparkline/nested/tooltip.ts | 2 +- .../src/ui/splitter/index.ts | 2 +- .../src/ui/tab-panel/index.ts | 2 +- .../devextreme-angular/src/ui/tabs/index.ts | 2 +- .../src/ui/tag-box/index.ts | 2 +- .../src/ui/tag-box/nested/animation.ts | 2 +- .../src/ui/tag-box/nested/collision.ts | 2 +- .../ui/tag-box/nested/drop-down-options.ts | 5 +- .../src/ui/tag-box/nested/from.ts | 2 +- .../src/ui/tag-box/nested/hide.ts | 2 +- .../src/ui/tag-box/nested/position.ts | 2 +- .../src/ui/tag-box/nested/show.ts | 2 +- .../src/ui/tag-box/nested/to.ts | 2 +- .../src/ui/tile-view/index.ts | 2 +- .../devextreme-angular/src/ui/toast/index.ts | 5 +- .../src/ui/toast/nested/animation.ts | 2 +- .../src/ui/toast/nested/collision.ts | 2 +- .../src/ui/toast/nested/from.ts | 2 +- .../src/ui/toast/nested/hide.ts | 2 +- .../src/ui/toast/nested/position.ts | 2 +- .../src/ui/toast/nested/show.ts | 2 +- .../src/ui/toast/nested/to.ts | 2 +- .../src/ui/toolbar/index.ts | 2 +- .../src/ui/tooltip/index.ts | 5 +- .../src/ui/tooltip/nested/animation.ts | 2 +- .../src/ui/tooltip/nested/collision.ts | 2 +- .../src/ui/tooltip/nested/from.ts | 2 +- .../src/ui/tooltip/nested/hide.ts | 2 +- .../src/ui/tooltip/nested/position.ts | 2 +- .../src/ui/tooltip/nested/show.ts | 2 +- .../src/ui/tooltip/nested/to.ts | 2 +- .../src/ui/tree-list/index.ts | 6 +-- .../src/ui/tree-list/nested/animation.ts | 2 +- .../src/ui/tree-list/nested/button-dxi.ts | 2 +- .../src/ui/tree-list/nested/collision.ts | 2 +- .../src/ui/tree-list/nested/column-chooser.ts | 2 +- .../src/ui/tree-list/nested/column-dxi.ts | 4 +- .../tree-list/nested/column-header-filter.ts | 2 +- .../src/ui/tree-list/nested/column-lookup.ts | 2 +- .../src/ui/tree-list/nested/field-dxi.ts | 4 +- .../src/ui/tree-list/nested/field-lookup.ts | 2 +- .../tree-list/nested/filter-builder-popup.ts | 5 +- .../src/ui/tree-list/nested/from.ts | 2 +- .../src/ui/tree-list/nested/header-filter.ts | 2 +- .../src/ui/tree-list/nested/hide.ts | 2 +- .../src/ui/tree-list/nested/lookup.ts | 2 +- .../src/ui/tree-list/nested/popup.ts | 5 +- .../src/ui/tree-list/nested/position.ts | 2 +- .../src/ui/tree-list/nested/row-dragging.ts | 2 +- .../src/ui/tree-list/nested/show.ts | 2 +- .../src/ui/tree-list/nested/to.ts | 2 +- .../src/ui/tree-map/index.ts | 4 +- .../src/ui/tree-map/nested/tooltip.ts | 2 +- .../src/ui/tree-view/index.ts | 2 +- .../src/ui/validator/index.ts | 2 +- .../src/ui/vector-map/index.ts | 2 +- .../src/ui/vector-map/nested/layer-dxi.ts | 2 +- packages/devextreme-react/src/accordion.ts | 2 +- packages/devextreme-react/src/action-sheet.ts | 5 +- packages/devextreme-react/src/autocomplete.ts | 8 ++-- packages/devextreme-react/src/bar-gauge.ts | 5 +- packages/devextreme-react/src/box.ts | 2 +- packages/devextreme-react/src/bullet.ts | 5 +- packages/devextreme-react/src/button-group.ts | 3 +- packages/devextreme-react/src/chart.ts | 5 +- .../devextreme-react/src/circular-gauge.ts | 5 +- packages/devextreme-react/src/color-box.ts | 8 ++-- .../src/common/core/animation.ts | 12 +++++ .../src/common/core/environment.ts | 9 ++++ .../src/common/core/events.ts | 17 +++++++ .../src/common/core/events/index.ts | 3 ++ .../src/common/core/localization.ts | 10 ++++ packages/devextreme-react/src/common/data.ts | 47 +++++++++++++++++++ .../devextreme-react/src/common/export.ts | 3 ++ .../src/common/export/excel.ts | 11 +++++ .../devextreme-react/src/common/export/pdf.ts | 9 ++++ .../src/common/file_management.ts | 13 +++++ packages/devextreme-react/src/common/index.ts | 7 +++ packages/devextreme-react/src/context-menu.ts | 6 +-- packages/devextreme-react/src/data-grid.ts | 12 ++--- packages/devextreme-react/src/date-box.ts | 8 ++-- .../devextreme-react/src/date-range-box.ts | 8 ++-- .../devextreme-react/src/defer-rendering.ts | 3 +- packages/devextreme-react/src/diagram.ts | 5 +- .../devextreme-react/src/drop-down-box.ts | 8 ++-- .../devextreme-react/src/drop-down-button.ts | 8 ++-- .../devextreme-react/src/filter-builder.ts | 7 ++- packages/devextreme-react/src/form.ts | 5 +- packages/devextreme-react/src/funnel.ts | 5 +- packages/devextreme-react/src/gallery.ts | 2 +- packages/devextreme-react/src/gantt.ts | 7 ++- packages/devextreme-react/src/html-editor.ts | 7 ++- packages/devextreme-react/src/linear-gauge.ts | 5 +- packages/devextreme-react/src/list.ts | 3 +- packages/devextreme-react/src/load-panel.ts | 3 +- packages/devextreme-react/src/lookup.ts | 8 ++-- packages/devextreme-react/src/menu.ts | 6 +-- packages/devextreme-react/src/multi-view.ts | 2 +- packages/devextreme-react/src/number-box.ts | 3 +- packages/devextreme-react/src/pie-chart.ts | 5 +- packages/devextreme-react/src/polar-chart.ts | 5 +- packages/devextreme-react/src/popover.ts | 6 +-- packages/devextreme-react/src/popup.ts | 6 +-- packages/devextreme-react/src/radio-group.ts | 2 +- .../devextreme-react/src/range-selector.ts | 2 +- packages/devextreme-react/src/range-slider.ts | 2 +- .../devextreme-react/src/responsive-box.ts | 2 +- packages/devextreme-react/src/sankey.ts | 5 +- packages/devextreme-react/src/scheduler.ts | 7 ++- packages/devextreme-react/src/select-box.ts | 8 ++-- packages/devextreme-react/src/slider.ts | 2 +- packages/devextreme-react/src/sparkline.ts | 5 +- packages/devextreme-react/src/splitter.ts | 2 +- packages/devextreme-react/src/tab-panel.ts | 2 +- packages/devextreme-react/src/tabs.ts | 2 +- packages/devextreme-react/src/tag-box.ts | 8 ++-- packages/devextreme-react/src/text-box.ts | 3 +- packages/devextreme-react/src/tile-view.ts | 2 +- packages/devextreme-react/src/toast.ts | 3 +- packages/devextreme-react/src/toolbar.ts | 3 +- packages/devextreme-react/src/tooltip.ts | 3 +- packages/devextreme-react/src/tree-list.ts | 12 ++--- packages/devextreme-react/src/tree-map.ts | 5 +- packages/devextreme-react/src/tree-view.ts | 3 +- .../src/validation-summary.ts | 2 +- packages/devextreme-react/src/vector-map.ts | 5 +- .../src/common/core/animation.ts | 12 +++++ .../src/common/core/environment.ts | 9 ++++ .../devextreme-vue/src/common/core/events.ts | 17 +++++++ .../src/common/core/events/index.ts | 3 ++ .../src/common/core/localization.ts | 10 ++++ packages/devextreme-vue/src/common/data.ts | 47 +++++++++++++++++++ packages/devextreme-vue/src/common/export.ts | 3 ++ .../devextreme-vue/src/common/export/excel.ts | 11 +++++ .../devextreme-vue/src/common/export/pdf.ts | 9 ++++ .../src/common/file_management.ts | 13 +++++ packages/devextreme-vue/src/common/index.ts | 7 +++ packages/devextreme/ts/dx.all.d.ts | 4 +- 431 files changed, 958 insertions(+), 564 deletions(-) create mode 100644 packages/devextreme-angular/src/common/core/animation/index.ts create mode 100644 packages/devextreme-angular/src/common/core/animation/ng-package.json create mode 100644 packages/devextreme-angular/src/common/core/environment/index.ts create mode 100644 packages/devextreme-angular/src/common/core/environment/ng-package.json create mode 100644 packages/devextreme-angular/src/common/core/events/index.ts create mode 100644 packages/devextreme-angular/src/common/core/events/index/index.ts create mode 100644 packages/devextreme-angular/src/common/core/events/index/ng-package.json create mode 100644 packages/devextreme-angular/src/common/core/events/ng-package.json create mode 100644 packages/devextreme-angular/src/common/core/localization/index.ts create mode 100644 packages/devextreme-angular/src/common/core/localization/ng-package.json create mode 100644 packages/devextreme-angular/src/common/data/index.ts create mode 100644 packages/devextreme-angular/src/common/data/ng-package.json create mode 100644 packages/devextreme-angular/src/common/export/excel/index.ts create mode 100644 packages/devextreme-angular/src/common/export/excel/ng-package.json create mode 100644 packages/devextreme-angular/src/common/export/index.ts create mode 100644 packages/devextreme-angular/src/common/export/ng-package.json create mode 100644 packages/devextreme-angular/src/common/export/pdf/index.ts create mode 100644 packages/devextreme-angular/src/common/export/pdf/ng-package.json create mode 100644 packages/devextreme-angular/src/common/file_management/index.ts create mode 100644 packages/devextreme-angular/src/common/file_management/ng-package.json create mode 100644 packages/devextreme-react/src/common/core/animation.ts create mode 100644 packages/devextreme-react/src/common/core/environment.ts create mode 100644 packages/devextreme-react/src/common/core/events.ts create mode 100644 packages/devextreme-react/src/common/core/events/index.ts create mode 100644 packages/devextreme-react/src/common/core/localization.ts create mode 100644 packages/devextreme-react/src/common/data.ts create mode 100644 packages/devextreme-react/src/common/export.ts create mode 100644 packages/devextreme-react/src/common/export/excel.ts create mode 100644 packages/devextreme-react/src/common/export/pdf.ts create mode 100644 packages/devextreme-react/src/common/file_management.ts create mode 100644 packages/devextreme-vue/src/common/core/animation.ts create mode 100644 packages/devextreme-vue/src/common/core/environment.ts create mode 100644 packages/devextreme-vue/src/common/core/events.ts create mode 100644 packages/devextreme-vue/src/common/core/events/index.ts create mode 100644 packages/devextreme-vue/src/common/core/localization.ts create mode 100644 packages/devextreme-vue/src/common/data.ts create mode 100644 packages/devextreme-vue/src/common/export.ts create mode 100644 packages/devextreme-vue/src/common/export/excel.ts create mode 100644 packages/devextreme-vue/src/common/export/pdf.ts create mode 100644 packages/devextreme-vue/src/common/file_management.ts diff --git a/packages/devextreme-angular/src/common/core/animation/index.ts b/packages/devextreme-angular/src/common/core/animation/index.ts new file mode 100644 index 000000000000..9014c94673c5 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/animation/index.ts @@ -0,0 +1,12 @@ +export { + AnimationConfig, + animationPresets, + AnimationState, + cancelAnimationFrame, + CollisionResolution, + CollisionResolutionCombination, + fx, + PositionConfig, + requestAnimationFrame, + TransitionExecutor, +} from 'devextreme/common/core/animation'; diff --git a/packages/devextreme-angular/src/common/core/animation/ng-package.json b/packages/devextreme-angular/src/common/core/animation/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/animation/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/environment/index.ts b/packages/devextreme-angular/src/common/core/environment/index.ts new file mode 100644 index 000000000000..3937d076e3d3 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/environment/index.ts @@ -0,0 +1,9 @@ +export { + Device, + devices, + DevicesObject, + dxSchedulerTimeZone, + getTimeZones, + hideTopOverlay, + initMobileViewport, +} from 'devextreme/common/core/environment'; diff --git a/packages/devextreme-angular/src/common/core/environment/ng-package.json b/packages/devextreme-angular/src/common/core/environment/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/environment/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/events/index.ts b/packages/devextreme-angular/src/common/core/events/index.ts new file mode 100644 index 000000000000..470c888f7af7 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/events/index.ts @@ -0,0 +1,17 @@ +export { + AsyncCancelable, + Cancelable, + ChangedOptionInfo, + DxEvent, + event, + EventInfo, + EventObject, + InitializedEventInfo, + ItemInfo, + NativeEventInfo, + off, + on, + one, + trigger, + triggerHandler, +} from 'devextreme/common/core/events'; diff --git a/packages/devextreme-angular/src/common/core/events/index/index.ts b/packages/devextreme-angular/src/common/core/events/index/index.ts new file mode 100644 index 000000000000..af278532b171 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/events/index/index.ts @@ -0,0 +1,3 @@ +export { + eventsHandler, +} from 'devextreme/common/core/events/index'; diff --git a/packages/devextreme-angular/src/common/core/events/index/ng-package.json b/packages/devextreme-angular/src/common/core/events/index/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/events/index/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/events/ng-package.json b/packages/devextreme-angular/src/common/core/events/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/events/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/localization/index.ts b/packages/devextreme-angular/src/common/core/localization/index.ts new file mode 100644 index 000000000000..e2fe4bb70025 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/localization/index.ts @@ -0,0 +1,10 @@ +export { + Format, + formatDate, + formatMessage, + formatNumber, + loadMessages, + locale, + parseDate, + parseNumber, +} from 'devextreme/common/core/localization'; diff --git a/packages/devextreme-angular/src/common/core/localization/ng-package.json b/packages/devextreme-angular/src/common/core/localization/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/localization/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/data/index.ts b/packages/devextreme-angular/src/common/data/index.ts new file mode 100644 index 000000000000..f3cfe138bc73 --- /dev/null +++ b/packages/devextreme-angular/src/common/data/index.ts @@ -0,0 +1,47 @@ +export { + applyChanges, + ArrayStore, + ArrayStoreOptions, + base64_encode, + compileGetter, + compileSetter, + CustomStore, + CustomStoreOptions, + DataHelperMixin, + DataSource, + DataSourceLike, + DataSourceOptions, + EdmLiteral, + EndpointSelector, + errorHandler, + FilterDescriptor, + GroupDescriptor, + GroupingInterval, + GroupItem, + isGroupItemsArray, + isItemsArray, + isLoadResultObject, + keyConverters, + LangParams, + LoadOptions, + LoadResult, + LoadResultObject, + LocalStore, + LocalStoreOptions, + ODataContext, + ODataContextOptions, + ODataStore, + ODataStoreOptions, + query, + Query, + ResolvedData, + SearchOperation, + SelectDescriptor, + setErrorHandler, + SortDescriptor, + Store, + StoreBase, + StoreOptions, + StoreOptionsBase, + SummaryDescriptor, +} from 'devextreme/common/data'; diff --git a/packages/devextreme-angular/src/common/data/ng-package.json b/packages/devextreme-angular/src/common/data/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/data/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/export/excel/index.ts b/packages/devextreme-angular/src/common/export/excel/index.ts new file mode 100644 index 000000000000..6b235fb7d6b3 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/excel/index.ts @@ -0,0 +1,11 @@ +export { + CellAddress, + CellRange, + DataGridCell, + ExcelExportBaseProps, + ExcelExportDataGridProps, + ExcelExportPivotGridProps, + exportDataGrid, + exportPivotGrid, + PivotGridCell, +} from 'devextreme/common/export/excel'; diff --git a/packages/devextreme-angular/src/common/export/excel/ng-package.json b/packages/devextreme-angular/src/common/export/excel/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/excel/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/export/index.ts b/packages/devextreme-angular/src/common/export/index.ts new file mode 100644 index 000000000000..38b5d035c33c --- /dev/null +++ b/packages/devextreme-angular/src/common/export/index.ts @@ -0,0 +1,3 @@ +export { + ExportLoadPanel, +} from 'devextreme/common/export'; diff --git a/packages/devextreme-angular/src/common/export/ng-package.json b/packages/devextreme-angular/src/common/export/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/export/pdf/index.ts b/packages/devextreme-angular/src/common/export/pdf/index.ts new file mode 100644 index 000000000000..95c06666158b --- /dev/null +++ b/packages/devextreme-angular/src/common/export/pdf/index.ts @@ -0,0 +1,9 @@ +export { + Cell, + DataGridCell, + exportDataGrid, + exportGantt, + PdfExportDataGridProps, + PdfExportGanttFont, + PdfExportGanttProps, +} from 'devextreme/common/export/pdf'; diff --git a/packages/devextreme-angular/src/common/export/pdf/ng-package.json b/packages/devextreme-angular/src/common/export/pdf/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/pdf/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/file_management/index.ts b/packages/devextreme-angular/src/common/file_management/index.ts new file mode 100644 index 000000000000..73f25410f594 --- /dev/null +++ b/packages/devextreme-angular/src/common/file_management/index.ts @@ -0,0 +1,13 @@ +export { + CustomFileSystemProvider, + CustomFileSystemProviderOptions, + FileSystemError, + FileSystemItem, + FileSystemProviderBase, + FileSystemProviderBaseOptions, + ObjectFileSystemProvider, + ObjectFileSystemProviderOptions, + RemoteFileSystemProvider, + RemoteFileSystemProviderOptions, + UploadInfo, +} from 'devextreme/common/file_management'; diff --git a/packages/devextreme-angular/src/common/file_management/ng-package.json b/packages/devextreme-angular/src/common/file_management/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/file_management/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index ccdb9057c493..575b2d797e21 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -5,21 +5,26 @@ export { ButtonType, CompareRule, ComparisonOperator, + config, CustomRule, DataStructure, DataType, + DefaultOptionsRule, Direction, DisplayMode, DragDirection, Draggable, DragHighlight, + DxPromise, EditorStyle, EmailRule, ExportFormat, FieldChooserLayout, FirstDayOfWeek, + FloatingActionButtonDirection, Format, GlobalConfig, + Guid, HorizontalAlignment, HorizontalEdge, LabelMode, @@ -41,6 +46,7 @@ export { ScrollMode, SearchMode, SelectAllMode, + setTemplateEngine, SimplifiedSearchMode, SingleMultipleAllOrNone, SingleMultipleOrNone, @@ -54,6 +60,7 @@ export { SubmenuShowMode, TabsIconPosition, TabsStyle, + template, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme-angular/src/ui/accordion/index.ts b/packages/devextreme-angular/src/ui/accordion/index.ts index 6dc92455660b..be9991f2e15e 100644 --- a/packages/devextreme-angular/src/ui/accordion/index.ts +++ b/packages/devextreme-angular/src/ui/accordion/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/accordion'; import DataSource from 'devextreme/data/data_source'; import { dxAccordionItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, ItemTitleClickEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/ui/accordion'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import DxAccordion from 'devextreme/ui/accordion'; diff --git a/packages/devextreme-angular/src/ui/action-sheet/index.ts b/packages/devextreme-angular/src/ui/action-sheet/index.ts index b8124896b9f4..7c56b614b02b 100644 --- a/packages/devextreme-angular/src/ui/action-sheet/index.ts +++ b/packages/devextreme-angular/src/ui/action-sheet/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/action_sheet'; import DataSource from 'devextreme/data/data_source'; import { dxActionSheetItem, CancelClickEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent } from 'devextreme/ui/action_sheet'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import DxActionSheet from 'devextreme/ui/action_sheet'; diff --git a/packages/devextreme-angular/src/ui/action-sheet/nested/item-dxi.ts b/packages/devextreme-angular/src/ui/action-sheet/nested/item-dxi.ts index 575663e2d67d..1e2405909913 100644 --- a/packages/devextreme-angular/src/ui/action-sheet/nested/item-dxi.ts +++ b/packages/devextreme-angular/src/ui/action-sheet/nested/item-dxi.ts @@ -16,7 +16,7 @@ import { import { DOCUMENT } from '@angular/common'; -import { NativeEventInfo } from 'devextreme/events/index'; +import { NativeEventInfo } from 'devextreme/common/core/events'; import { ButtonStyle, ButtonType } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/autocomplete/index.ts b/packages/devextreme-angular/src/ui/autocomplete/index.ts index 31fee36f04bc..a8ac7afc15e6 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/index.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/index.ts @@ -29,7 +29,7 @@ import { DropDownPredefinedButton } from 'devextreme/ui/drop_down_editor/ui.drop import { TextEditorButton, LabelMode, SimplifiedSearchMode, EditorStyle, ValidationMessageMode, Mode, Position, ValidationStatus } from 'devextreme/common'; import { CollectionWidgetItem } from 'devextreme/ui/collection/ui.collection_widget.base'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, OptionChangedEvent, PasteEvent, SelectionChangedEvent, ValueChangedEvent } from 'devextreme/ui/autocomplete'; diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts index 05a49a13f7dd..0953f1a1a004 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts index f5126f4c9957..2e129d0ac7c1 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts index a1d375dcdfff..3a9c3186f860 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts @@ -22,11 +22,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts index 54ce1c662675..6d8dc118d5cf 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts index 74b61fe5d3ab..9c532f71abd7 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts index 9405f811d75f..f199249dd61b 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts index f612fb5564d7..d22f90790723 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts index 64b733e9b604..a15af212abc5 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/bar-gauge/index.ts b/packages/devextreme-angular/src/ui/bar-gauge/index.ts index e6b4592062ad..49e6e94b53ce 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/index.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/index.ts @@ -22,7 +22,7 @@ import { import { AnimationEaseMode, Font, DashStyle, Palette, PaletteExtensionMode, ShiftLabelOverlap, Theme, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { BarGaugeBarInfo, BarGaugeLegendItem, DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/bar_gauge'; import DxBarGauge from 'devextreme/viz/bar_gauge'; diff --git a/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts b/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts index 3c031d962378..f7560007f376 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts b/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts index 12dd055a8faf..ff86c5503627 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts @@ -17,7 +17,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { BarGaugeBarInfo, BarGaugeLegendItem } from 'devextreme/viz/bar_gauge'; import { HorizontalAlignment, Position, Orientation, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts b/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts index 40a4c62e6593..250fa8bbf6ec 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/box/index.ts b/packages/devextreme-angular/src/ui/box/index.ts index 0530be2ea9ec..70370dbed769 100644 --- a/packages/devextreme-angular/src/ui/box/index.ts +++ b/packages/devextreme-angular/src/ui/box/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/box'; import DataSource from 'devextreme/data/data_source'; import { Distribution, CrosswiseDistribution, dxBoxItem, BoxDirection, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent } from 'devextreme/ui/box'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import DxBox from 'devextreme/ui/box'; diff --git a/packages/devextreme-angular/src/ui/bullet/index.ts b/packages/devextreme-angular/src/ui/bullet/index.ts index f809df9ddf53..31b3405d3944 100644 --- a/packages/devextreme-angular/src/ui/bullet/index.ts +++ b/packages/devextreme-angular/src/ui/bullet/index.ts @@ -19,7 +19,7 @@ import { import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/bullet'; import { Theme, DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxBullet from 'devextreme/viz/bullet'; diff --git a/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts b/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts index f44c3042bea2..a174f9387ffc 100644 --- a/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/index.ts b/packages/devextreme-angular/src/ui/chart/index.ts index 4494c09e7bbd..2bd28f0530e1 100644 --- a/packages/devextreme-angular/src/ui/chart/index.ts +++ b/packages/devextreme-angular/src/ui/chart/index.ts @@ -27,9 +27,9 @@ import * as CommonChartTypes from 'devextreme/common/charts'; import { AnimationEaseMode, TimeInterval, ChartsDataType, ScaleBreak, ScaleBreakLineStyle, DashStyle, Font, RelativePosition, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, ChartsAxisLabelOverlap, TextOverflow, WordWrap, AxisScaleType, VisualRangeUpdateMode, ChartsColor, SeriesHoverMode, HatchDirection, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType, SeriesLabel, SeriesPoint, LegendItem, LegendHoverMode, Palette, PaletteExtensionMode, ChartsLabelOverlap, Theme } from 'devextreme/common/charts'; import { dxChartAnnotationConfig, AggregatedPointsPosition, ChartLabelDisplayMode, dxChartCommonAnnotationConfig, chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, FinancialChartReductionLevel, chartPointObject, ArgumentAxisClickEvent, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, OptionChangedEvent, PointClickEvent, PointHoverChangedEvent, PointSelectionChangedEvent, SeriesClickEvent, SeriesHoverChangedEvent, SeriesSelectionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent, ChartTooltipLocation, ChartZoomAndPanMode, EventKeyModifier } from 'devextreme/viz/chart'; import { HorizontalAlignment, VerticalAlignment, Position, ExportFormat, Orientation, VerticalEdge, SingleOrMultiple } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { ChartSeries } from 'devextreme/viz/common'; import DxChart from 'devextreme/viz/chart'; diff --git a/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts b/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts index 07a34a2ae592..be0dc37a5606 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts @@ -23,7 +23,7 @@ import * as CommonChartTypes from 'devextreme/common/charts'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { TimeInterval, ChartsDataType, ScaleBreak, ScaleBreakLineStyle, DashStyle, Font, RelativePosition, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, ChartsAxisLabelOverlap, TextOverflow, WordWrap, AxisScaleType, VisualRangeUpdateMode } from 'devextreme/common/charts'; import { HorizontalAlignment, VerticalAlignment, Position } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/axis-label.ts b/packages/devextreme-angular/src/ui/chart/nested/axis-label.ts index e029b1c99a90..6e322dc076f6 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/axis-label.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/axis-label.ts @@ -21,7 +21,7 @@ import { DOCUMENT } from '@angular/common'; import { HorizontalAlignment, Position } from 'devextreme/common'; import { ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { Font, ChartsAxisLabelOverlap, RelativePosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/common-series-settings-label.ts b/packages/devextreme-angular/src/ui/chart/nested/common-series-settings-label.ts index 653960933dd8..3aa1257cf3f8 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/common-series-settings-label.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/common-series-settings-label.ts @@ -15,7 +15,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font, RelativePosition } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts index 4a7b2ab1fd50..5b14d47032ae 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts @@ -17,7 +17,7 @@ import { import { chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts b/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts index f72f38b67343..39830b0a17c9 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { chartPointObject } from 'devextreme/viz/chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/horizontal-line-label.ts b/packages/devextreme-angular/src/ui/chart/nested/horizontal-line-label.ts index 0b05dc4539e2..0e80954b30aa 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/horizontal-line-label.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/horizontal-line-label.ts @@ -16,7 +16,7 @@ import { import { chartPointObject } from 'devextreme/viz/chart'; import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts b/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts index 68ce7faa2ef5..c2c28da8c72f 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { chartPointObject } from 'devextreme/viz/chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/label.ts b/packages/devextreme-angular/src/ui/chart/nested/label.ts index f8b166a145c9..4d4d4f318601 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/label.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/label.ts @@ -21,7 +21,7 @@ import { DOCUMENT } from '@angular/common'; import { Font, RelativePosition, ChartsAxisLabelOverlap, TextOverflow, WordWrap, DashStyle } from 'devextreme/common/charts'; import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common'; import { ChartLabelDisplayMode } from 'devextreme/viz/chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts index e01a29fea933..cbc8463f7271 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts @@ -15,7 +15,7 @@ import { import { chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts b/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts index 30b9488b3b05..159fac95755f 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font } from 'devextreme/common/charts'; import { ChartTooltipLocation } from 'devextreme/viz/chart'; diff --git a/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts b/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts index 45cf04d3f7a6..31156ae930f3 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts @@ -21,7 +21,7 @@ import * as CommonChartTypes from 'devextreme/common/charts'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { ScaleBreak, ScaleBreakLineStyle, DashStyle, Font, RelativePosition, DiscreteAxisDivisionMode, ChartsAxisLabelOverlap, TextOverflow, WordWrap, TimeInterval, AxisScaleType, ChartsDataType, VisualRangeUpdateMode } from 'devextreme/common/charts'; import { HorizontalAlignment, VerticalAlignment, Position } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts b/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts index 77b0d6d99f0d..b8cb87725a27 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { chartPointObject } from 'devextreme/viz/chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chat/index.ts b/packages/devextreme-angular/src/ui/chat/index.ts index 130a45304484..05dcb4938699 100644 --- a/packages/devextreme-angular/src/ui/chat/index.ts +++ b/packages/devextreme-angular/src/ui/chat/index.ts @@ -25,8 +25,8 @@ import { import DataSource from 'devextreme/data/data_source'; import { Alert, Message, DisposingEvent, InitializedEvent, MessageEnteredEvent, OptionChangedEvent, TypingEndEvent, TypingStartEvent, User } from 'devextreme/ui/chat'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; -import { Format } from 'devextreme/localization'; +import { Store } from 'devextreme/common/data'; +import { Format } from 'devextreme/common/core/localization'; import DxChat from 'devextreme/ui/chat'; diff --git a/packages/devextreme-angular/src/ui/circular-gauge/index.ts b/packages/devextreme-angular/src/ui/circular-gauge/index.ts index 2b0018e383ee..8fb541bdca3a 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/index.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/index.ts @@ -23,7 +23,7 @@ import { import { AnimationEaseMode, Font, ChartsColor, Palette, PaletteExtensionMode, LabelOverlap, Theme, TextOverflow, WordWrap, DashStyle } from 'devextreme/common/charts'; import { ExportFormat, HorizontalAlignment, VerticalEdge } from 'devextreme/common'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, CircularGaugeElementOrientation, CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { GaugeIndicator } from 'devextreme/viz/gauges/base_gauge'; import DxCircularGauge from 'devextreme/viz/circular_gauge'; diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts index c6146bdb857f..1f849eecb21a 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; import { diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts index 5c333f7867ff..46a851b24c80 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { CircularGaugeLabelOverlap, CircularGaugeElementOrientation } from 'devextreme/viz/circular_gauge'; import { diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts index 7514b1c26f16..a3fab690eb86 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts @@ -16,7 +16,7 @@ import { import { ChartsColor, Palette, Font } from 'devextreme/common/charts'; import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts index 2f2c724587c7..c5b26f387f86 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts index 2aa92c806253..7cf8df6aba42 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts index c884eaaad999..78b0128b1b35 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts @@ -16,7 +16,7 @@ import { import { ChartsColor, Palette, Font } from 'devextreme/common/charts'; import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/animation.ts b/packages/devextreme-angular/src/ui/color-box/nested/animation.ts index 17e6fdaf455f..efa548f41597 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/collision.ts b/packages/devextreme-angular/src/ui/color-box/nested/collision.ts index 6b91b5e9a69f..b2a7380744fc 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts index 705976f9b24c..ab6f0b85b8ab 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts @@ -22,11 +22,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/color-box/nested/from.ts b/packages/devextreme-angular/src/ui/color-box/nested/from.ts index 153eca2035c8..6327ea7bd6fa 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/hide.ts b/packages/devextreme-angular/src/ui/color-box/nested/hide.ts index 31807132def2..e9980912df78 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/color-box/nested/position.ts b/packages/devextreme-angular/src/ui/color-box/nested/position.ts index c868a6cdbfec..a7fc8ea8074d 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/show.ts b/packages/devextreme-angular/src/ui/color-box/nested/show.ts index 1c8f66266247..927924fb2fa2 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/color-box/nested/to.ts b/packages/devextreme-angular/src/ui/color-box/nested/to.ts index a7b9b3051f3f..9d4b13663230 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/index.ts b/packages/devextreme-angular/src/ui/context-menu/index.ts index 2ba095b072c4..99f7cfdf4468 100644 --- a/packages/devextreme-angular/src/ui/context-menu/index.ts +++ b/packages/devextreme-angular/src/ui/context-menu/index.ts @@ -24,12 +24,11 @@ import { export { ExplicitTypes } from 'devextreme/ui/context_menu'; import DataSource from 'devextreme/data/data_source'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/common/core/events'; import { dxContextMenuItem, ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemRenderedEvent, OptionChangedEvent, PositioningEvent, SelectionChangedEvent, ShowingEvent, ShownEvent, ContextSubmenuDirection } from 'devextreme/ui/context_menu'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; -import { PositionConfig } from 'devextreme/animation/position'; +import { Store } from 'devextreme/common/data'; import { SingleOrNone, SubmenuShowMode } from 'devextreme/common'; import DxContextMenu from 'devextreme/ui/context_menu'; diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts b/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts index 3a4b35d6ae27..7594966972fa 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts b/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts index 5a545dec5ade..f79e7ebb3cb9 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/from.ts b/packages/devextreme-angular/src/ui/context-menu/nested/from.ts index a843a8b291c0..f59884706bc3 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/from.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts b/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts index 76255d0fed32..b6f569ec7eae 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/position.ts b/packages/devextreme-angular/src/ui/context-menu/nested/position.ts index 362c1f0cb085..748a7a42bc70 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/position.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/show.ts b/packages/devextreme-angular/src/ui/context-menu/nested/show.ts index 1ea02551ade3..a0183da6a6e7 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/show.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/to.ts b/packages/devextreme-angular/src/ui/context-menu/nested/to.ts index 2a62ccce7f31..6ff30d7125ea 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/to.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/index.ts b/packages/devextreme-angular/src/ui/data-grid/index.ts index cb73f73643b1..339b6f97448c 100644 --- a/packages/devextreme-angular/src/ui/data-grid/index.ts +++ b/packages/devextreme-angular/src/ui/data-grid/index.ts @@ -28,16 +28,16 @@ import dxDataGrid from 'devextreme/ui/data_grid'; import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, ColumnResizeMode, DataChange, GridsEditMode, NewRowPosition, GridsEditRefreshMode, StartEditAction, GridBase, ApplyFilterMode, GroupExpandMode, HeaderFilterSearchConfig, EnterKeyAction, EnterKeyDirection, Pager, DataRenderMode, SelectionColumnDisplayMode, StateStoreType, SummaryType } from 'devextreme/common/grids'; -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { SortOrder, Mode, DragDirection, DragHighlight, ScrollbarMode, SingleMultipleOrNone, SelectAllMode, HorizontalAlignment } from 'devextreme/common'; import { dxDataGridColumn, dxDataGridRowObject, DataGridExportFormat, AdaptiveDetailRowPreparingEvent, CellClickEvent, CellDblClickEvent, CellHoverChangedEvent, CellPreparedEvent, ContentReadyEvent, ContextMenuPreparingEvent, DataErrorOccurredEvent, DisposingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, EditorPreparedEvent, EditorPreparingEvent, ExportingEvent, FocusedCellChangedEvent, FocusedCellChangingEvent, FocusedRowChangedEvent, FocusedRowChangingEvent, InitializedEvent, InitNewRowEvent, KeyDownEvent, OptionChangedEvent, RowClickEvent, RowCollapsedEvent, RowCollapsingEvent, RowDblClickEvent, RowExpandedEvent, RowExpandingEvent, RowInsertedEvent, RowInsertingEvent, RowPreparedEvent, RowRemovedEvent, RowRemovingEvent, RowUpdatedEvent, RowUpdatingEvent, RowValidatingEvent, SavedEvent, SavingEvent, SelectionChangedEvent, ToolbarPreparingEvent, DataGridScrollMode, SelectionSensitivity, dxDataGridToolbar } from 'devextreme/ui/data_grid'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { dxFormOptions } from 'devextreme/ui/form'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { dxFilterBuilderOptions } from 'devextreme/ui/filter_builder'; -import { event } from 'devextreme/events/index'; -import { Format } from 'devextreme/localization'; +import { event } from 'devextreme/common/core/events'; +import { Format } from 'devextreme/common/core/localization'; import DxDataGrid from 'devextreme/ui/data_grid'; diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts b/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts index 0e47d8ab5bf9..160a4e032aa1 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts b/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts index b9d4a89d65ff..1aee9afb4442 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts b/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts index ca1d8d41e4dd..5990d158da3c 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts @@ -15,7 +15,7 @@ import { import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig } from 'devextreme/common/grids'; -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { SortOrder } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts index 671f1861226f..e06617f9232f 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts @@ -21,10 +21,10 @@ import * as CommonTypes from 'devextreme/common'; import { HorizontalAlignment, DataType, SearchMode, SortOrder } from 'devextreme/common'; import { DataGridPredefinedColumnButton, dxDataGridColumnButton, dxDataGridColumn, DataGridCommandColumnType } from 'devextreme/ui/data_grid'; import { FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { dxFormSimpleItem } from 'devextreme/ui/form'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/column-header-filter.ts b/packages/devextreme-angular/src/ui/data-grid/nested/column-header-filter.ts index c67caec662a6..23534b21f741 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/column-header-filter.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/column-header-filter.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig } from 'devextreme/common/grids'; import { SearchMode } from 'devextreme/common'; diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/column-lookup.ts b/packages/devextreme-angular/src/ui/data-grid/nested/column-lookup.ts index e4c73857cb8b..ee309f848af5 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/column-lookup.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/column-lookup.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts index 200376dfee4c..b21de22ab720 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts @@ -14,9 +14,9 @@ import { import { DataType } from 'devextreme/common'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/field-lookup.ts b/packages/devextreme-angular/src/ui/data-grid/nested/field-lookup.ts index c66acc45a70c..104800813cfa 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/field-lookup.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/field-lookup.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts b/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts index 56ef89ad8f5b..20311cbb5ec0 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts @@ -19,11 +19,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/from.ts b/packages/devextreme-angular/src/ui/data-grid/nested/from.ts index 35ac8347631e..b3c614629467 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/from.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts index 28b64dd4ccc1..ec16af30e49e 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts @@ -13,7 +13,7 @@ import { import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/header-filter.ts b/packages/devextreme-angular/src/ui/data-grid/nested/header-filter.ts index a00bb312e01f..6f97ffc6169a 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/header-filter.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/header-filter.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, HeaderFilterSearchConfig } from 'devextreme/common/grids'; import { SearchMode } from 'devextreme/common'; diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts b/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts index 100b25b03d7d..30b53359f0f2 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/lookup.ts b/packages/devextreme-angular/src/ui/data-grid/nested/lookup.ts index 48d72bc32b5f..9a9fd5efacf3 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/lookup.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/lookup.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts b/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts index 0ebef132c2b3..8b87c46a5091 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts @@ -22,11 +22,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/position.ts b/packages/devextreme-angular/src/ui/data-grid/nested/position.ts index e91c6fe35523..a97f07d52165 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/position.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/row-dragging.ts b/packages/devextreme-angular/src/ui/data-grid/nested/row-dragging.ts index 92b57f53eca7..77fefa4fb0d9 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/row-dragging.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/row-dragging.ts @@ -18,7 +18,7 @@ import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; import { DragDirection, DragHighlight } from 'devextreme/common'; import { GridBase } from 'devextreme/common/grids'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/common/core/events'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/show.ts b/packages/devextreme-angular/src/ui/data-grid/nested/show.ts index 257067fb9748..eda205474729 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/show.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts b/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts index 18c76d902d1f..faf42826c052 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts @@ -19,7 +19,7 @@ import { import dxDataGrid from 'devextreme/ui/data_grid'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { HorizontalAlignment } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/to.ts b/packages/devextreme-angular/src/ui/data-grid/nested/to.ts index ee98029726ab..9c2c85a94905 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/to.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts index 870cfd595f20..d912608733ac 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts @@ -14,7 +14,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/index.ts b/packages/devextreme-angular/src/ui/date-box/index.ts index ebf9b047aade..7c5d2ee31505 100644 --- a/packages/devextreme-angular/src/ui/date-box/index.ts +++ b/packages/devextreme-angular/src/ui/date-box/index.ts @@ -28,7 +28,7 @@ import dxDateBox from 'devextreme/ui/date_box'; import { ApplyValueMode, TextEditorButton, LabelMode, EditorStyle, ValidationMessageMode, Mode, Position, ValidationStatus } from 'devextreme/common'; import { DropDownPredefinedButton } from 'devextreme/ui/drop_down_editor/ui.drop_down_editor'; import { dxCalendarOptions } from 'devextreme/ui/calendar'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, OptionChangedEvent, PasteEvent, ValueChangedEvent, DatePickerType, DateType } from 'devextreme/ui/date_box'; diff --git a/packages/devextreme-angular/src/ui/date-box/nested/animation.ts b/packages/devextreme-angular/src/ui/date-box/nested/animation.ts index 44b52ee168a3..e4098f25e80b 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/collision.ts b/packages/devextreme-angular/src/ui/date-box/nested/collision.ts index 9fc9e5a49952..f295cc9a4276 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts index 4e6f15ca3766..90a1df5b01ea 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts @@ -22,11 +22,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/date-box/nested/from.ts b/packages/devextreme-angular/src/ui/date-box/nested/from.ts index 14f8a16f2eab..7755cc879f71 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/hide.ts b/packages/devextreme-angular/src/ui/date-box/nested/hide.ts index 5cdca518af54..e79f9ea03eb6 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/date-box/nested/position.ts b/packages/devextreme-angular/src/ui/date-box/nested/position.ts index f668ab56626d..e5ba8c6be6f6 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/show.ts b/packages/devextreme-angular/src/ui/date-box/nested/show.ts index 965f23179de4..db9a83fee1ce 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/date-box/nested/to.ts b/packages/devextreme-angular/src/ui/date-box/nested/to.ts index d354fb9adeff..26f927f858e6 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/index.ts b/packages/devextreme-angular/src/ui/date-range-box/index.ts index 17ed3de6c059..a457b2e7525b 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/index.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/index.ts @@ -27,7 +27,7 @@ import { import { ApplyValueMode, TextEditorButton, LabelMode, EditorStyle, ValidationMessageMode, Mode, Position, ValidationStatus } from 'devextreme/common'; import { DropDownPredefinedButton } from 'devextreme/ui/drop_down_editor/ui.drop_down_editor'; import { dxCalendarOptions } from 'devextreme/ui/calendar'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, OptionChangedEvent, PasteEvent, ValueChangedEvent } from 'devextreme/ui/date_range_box'; diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts index 3f73fa4bd6b3..70af37164f88 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts index 1ff952ce579b..afa98b591c22 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts index 99ec00b6e941..1f8d238c6db5 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts @@ -22,11 +22,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts index 0207d77f4b67..432c15d7564b 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts index 8188e978b63e..b3b160576e49 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts index 1f7613b959a4..37f6437612b5 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts index 9dc70f99e7d8..0b1534035978 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts index b8d6422ac390..81387cd87520 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/index.ts b/packages/devextreme-angular/src/ui/defer-rendering/index.ts index 8542e8a4bd30..f6ec63404caf 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/index.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/index.ts @@ -17,9 +17,9 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, RenderedEvent, ShownEvent } from 'devextreme/ui/defer_rendering'; -import { DxPromise } from 'devextreme/core/utils/deferred'; +import { DxPromise } from 'devextreme/common'; import DxDeferRendering from 'devextreme/ui/defer_rendering'; diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts index b8a057314a3d..465536f13366 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts index 85417424ea71..b4f2f9c8ee0c 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts index ed0b403192c7..5bf137547e7f 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts index 1e8a23218e8c..0800808757c7 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts index 045b06934978..c6d052ce5b90 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/diagram/index.ts b/packages/devextreme-angular/src/ui/diagram/index.ts index be4fec2036ed..d7e755991abf 100644 --- a/packages/devextreme-angular/src/ui/diagram/index.ts +++ b/packages/devextreme-angular/src/ui/diagram/index.ts @@ -25,7 +25,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { AutoZoomMode, Command, CustomCommand, ShapeCategory, ToolboxDisplayMode, ShapeType, ConnectorLineEnd, ConnectorLineType, DataLayoutType, ContentReadyEvent, CustomCommandEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemDblClickEvent, OptionChangedEvent, RequestEditOperationEvent, RequestLayoutUpdateEvent, SelectionChangedEvent, PanelVisibility, Units } from 'devextreme/ui/diagram'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { Orientation, PageOrientation } from 'devextreme/common'; import DxDiagram from 'devextreme/ui/diagram'; diff --git a/packages/devextreme-angular/src/ui/diagram/nested/edges.ts b/packages/devextreme-angular/src/ui/diagram/nested/edges.ts index d8bfd9906585..5bed2189ecf1 100644 --- a/packages/devextreme-angular/src/ui/diagram/nested/edges.ts +++ b/packages/devextreme-angular/src/ui/diagram/nested/edges.ts @@ -16,7 +16,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/diagram/nested/nodes.ts b/packages/devextreme-angular/src/ui/diagram/nested/nodes.ts index 95e49ff6f694..28c3d46e29a1 100644 --- a/packages/devextreme-angular/src/ui/diagram/nested/nodes.ts +++ b/packages/devextreme-angular/src/ui/diagram/nested/nodes.ts @@ -18,7 +18,7 @@ import DataSource from 'devextreme/data/data_source'; import { DataLayoutType } from 'devextreme/ui/diagram'; import { Orientation } from 'devextreme/common'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drawer/index.ts b/packages/devextreme-angular/src/ui/drawer/index.ts index 053816ce6a0f..dff296ad0f80 100644 --- a/packages/devextreme-angular/src/ui/drawer/index.ts +++ b/packages/devextreme-angular/src/ui/drawer/index.ts @@ -17,7 +17,7 @@ import { } from '@angular/core'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/common/core/events'; import { DisposingEvent, InitializedEvent, OptionChangedEvent, OpenedStateMode, PanelLocation, RevealMode } from 'devextreme/ui/drawer'; import DxDrawer from 'devextreme/ui/drawer'; diff --git a/packages/devextreme-angular/src/ui/drop-down-box/index.ts b/packages/devextreme-angular/src/ui/drop-down-box/index.ts index e7b8e5162ff4..6aa29886868c 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/index.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/index.ts @@ -28,7 +28,7 @@ import DataSource from 'devextreme/data/data_source'; import { DropDownPredefinedButton } from 'devextreme/ui/drop_down_editor/ui.drop_down_editor'; import { TextEditorButton, LabelMode, EditorStyle, ValidationMessageMode, Mode, Position, ValidationStatus } from 'devextreme/common'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { ChangeEvent, ClosedEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, OptionChangedEvent, PasteEvent, ValueChangedEvent } from 'devextreme/ui/drop_down_box'; diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts index f4357f00e3fc..0b9911cc3fe3 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts index 46c782f70fd3..733a0006099c 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts index 61ed85322d1a..fe30330f9cc0 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts @@ -22,11 +22,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts index 0f9a2ae35b13..739262cdb6ce 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts index 84bd2aa37da8..b166131c7f6b 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts index 014e0c6946ec..be2f0d4975cc 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts index f44e7d7bb8d6..fd58c8b41bf5 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts index f4235b576860..8ef6ad765f6e 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/index.ts b/packages/devextreme-angular/src/ui/drop-down-button/index.ts index 38dca07540d6..5f1b2b3abed8 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/index.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/index.ts @@ -25,7 +25,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { dxDropDownButtonItem, ButtonClickEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/ui/drop_down_button'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { ButtonStyle, ButtonType } from 'devextreme/common'; diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts index 781529c8020a..8d8cd936e825 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts index a2c31d7d31f9..b1c7c167e2e0 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts index 61fe5cced05e..f4d7d0d65197 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts @@ -22,11 +22,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts index 8b3d9f53f4e6..55ff680aae74 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts index 0b1b5f03aad2..8c68b022f457 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts index a20075abb9b5..e1b2d36af4df 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts index e85d7ffd3989..c7b67a45e6d1 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts index db2ced937087..d88f223fc5cb 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/file-uploader/index.ts b/packages/devextreme-angular/src/ui/file-uploader/index.ts index d3d48e667c76..df6531441c84 100644 --- a/packages/devextreme-angular/src/ui/file-uploader/index.ts +++ b/packages/devextreme-angular/src/ui/file-uploader/index.ts @@ -22,7 +22,7 @@ import { } from '@angular/core'; -import UploadInfo from 'devextreme/file_management/upload_info'; +import { UploadInfo } from 'devextreme/common/file_management'; import { BeforeSendEvent, ContentReadyEvent, DisposingEvent, DropZoneEnterEvent, DropZoneLeaveEvent, FilesUploadedEvent, InitializedEvent, OptionChangedEvent, ProgressEvent, UploadAbortedEvent, UploadedEvent, UploadErrorEvent, UploadStartedEvent, ValueChangedEvent, UploadHttpMethod, FileUploadMode } from 'devextreme/ui/file_uploader'; import { ValidationStatus } from 'devextreme/common'; diff --git a/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts index 5f78539ce8fd..a567c205c9e8 100644 --- a/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts @@ -14,9 +14,9 @@ import { import { DataType } from 'devextreme/common'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/filter-builder/nested/lookup.ts b/packages/devextreme-angular/src/ui/filter-builder/nested/lookup.ts index c53aade2d46d..173b3137f5c7 100644 --- a/packages/devextreme-angular/src/ui/filter-builder/nested/lookup.ts +++ b/packages/devextreme-angular/src/ui/filter-builder/nested/lookup.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/form/nested/tab-panel-options.ts b/packages/devextreme-angular/src/ui/form/nested/tab-panel-options.ts index 2c88494fa037..3718f1a76442 100644 --- a/packages/devextreme-angular/src/ui/form/nested/tab-panel-options.ts +++ b/packages/devextreme-angular/src/ui/form/nested/tab-panel-options.ts @@ -22,7 +22,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { dxTabPanelItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent, SelectionChangedEvent, SelectionChangingEvent, TitleClickEvent, TitleHoldEvent, TitleRenderedEvent } from 'devextreme/ui/tab_panel'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { TabsIconPosition, TabsStyle, Position } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/funnel/index.ts b/packages/devextreme-angular/src/ui/funnel/index.ts index 73880049619e..5dab895f89b0 100644 --- a/packages/devextreme-angular/src/ui/funnel/index.ts +++ b/packages/devextreme-angular/src/ui/funnel/index.ts @@ -23,10 +23,10 @@ import { import DataSource from 'devextreme/data/data_source'; import { FunnelAlgorithm, dxFunnelItem, FunnelLegendItem, DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, HoverChangedEvent, IncidentOccurredEvent, InitializedEvent, ItemClickEvent, LegendClickEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/viz/funnel'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { ExportFormat, HorizontalEdge, HorizontalAlignment, Position, Orientation, VerticalEdge, SingleMultipleOrNone } from 'devextreme/common'; import { HatchDirection, DashStyle, Font, LabelPosition, TextOverflow, WordWrap, Palette, PaletteExtensionMode, ShiftLabelOverlap, Theme } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxFunnel from 'devextreme/viz/funnel'; diff --git a/packages/devextreme-angular/src/ui/funnel/nested/label.ts b/packages/devextreme-angular/src/ui/funnel/nested/label.ts index 0c05a4adc84b..fb2972425491 100644 --- a/packages/devextreme-angular/src/ui/funnel/nested/label.ts +++ b/packages/devextreme-angular/src/ui/funnel/nested/label.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { dxFunnelItem } from 'devextreme/viz/funnel'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { HorizontalEdge } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts b/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts index 835371e807ff..a7954d27429e 100644 --- a/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { dxFunnelItem } from 'devextreme/viz/funnel'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/gallery/index.ts b/packages/devextreme-angular/src/ui/gallery/index.ts index 93a21ebd9d68..fc6c7b4ed292 100644 --- a/packages/devextreme-angular/src/ui/gallery/index.ts +++ b/packages/devextreme-angular/src/ui/gallery/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/gallery'; import DataSource from 'devextreme/data/data_source'; import { dxGalleryItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/ui/gallery'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import DxGallery from 'devextreme/ui/gallery'; diff --git a/packages/devextreme-angular/src/ui/gantt/index.ts b/packages/devextreme-angular/src/ui/gantt/index.ts index ae2633e6fd0f..6ffa9c194ff7 100644 --- a/packages/devextreme-angular/src/ui/gantt/index.ts +++ b/packages/devextreme-angular/src/ui/gantt/index.ts @@ -25,7 +25,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { dxGanttColumn, dxGanttContextMenu, dxGanttFilterRow, dxGanttHeaderFilter, ContentReadyEvent, ContextMenuPreparingEvent, CustomCommandEvent, DependencyDeletedEvent, DependencyDeletingEvent, DependencyInsertedEvent, DependencyInsertingEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, ResourceAssignedEvent, ResourceAssigningEvent, ResourceDeletedEvent, ResourceDeletingEvent, ResourceInsertedEvent, ResourceInsertingEvent, ResourceManagerDialogShowingEvent, ResourceUnassignedEvent, ResourceUnassigningEvent, ScaleCellPreparedEvent, SelectionChangedEvent, TaskClickEvent, TaskDblClickEvent, TaskDeletedEvent, TaskDeletingEvent, TaskEditDialogShowingEvent, TaskInsertedEvent, TaskInsertingEvent, TaskMovingEvent, TaskUpdatedEvent, TaskUpdatingEvent, GanttScaleType, dxGanttSorting, dxGanttStripLine, GanttTaskTitlePosition, dxGanttToolbar } from 'devextreme/ui/gantt'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { FirstDayOfWeek } from 'devextreme/common'; import DxGantt from 'devextreme/ui/gantt'; diff --git a/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts b/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts index a918dd31e800..498265bffd54 100644 --- a/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts +++ b/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts @@ -16,9 +16,9 @@ import { import { HorizontalAlignment, DataType, SearchMode, SortOrder } from 'devextreme/common'; import { FilterOperation, FilterType, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/gantt/nested/column-header-filter.ts b/packages/devextreme-angular/src/ui/gantt/nested/column-header-filter.ts index 29838b59d91b..d1dc2de7697f 100644 --- a/packages/devextreme-angular/src/ui/gantt/nested/column-header-filter.ts +++ b/packages/devextreme-angular/src/ui/gantt/nested/column-header-filter.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig } from 'devextreme/common/grids'; import { SearchMode } from 'devextreme/common'; diff --git a/packages/devextreme-angular/src/ui/gantt/nested/dependencies.ts b/packages/devextreme-angular/src/ui/gantt/nested/dependencies.ts index e51eb5933403..3b96861abc46 100644 --- a/packages/devextreme-angular/src/ui/gantt/nested/dependencies.ts +++ b/packages/devextreme-angular/src/ui/gantt/nested/dependencies.ts @@ -16,7 +16,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/gantt/nested/header-filter.ts b/packages/devextreme-angular/src/ui/gantt/nested/header-filter.ts index 714a38014a40..8e6af4c35762 100644 --- a/packages/devextreme-angular/src/ui/gantt/nested/header-filter.ts +++ b/packages/devextreme-angular/src/ui/gantt/nested/header-filter.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, HeaderFilterSearchConfig } from 'devextreme/common/grids'; import { SearchMode } from 'devextreme/common'; import { dxGanttHeaderFilterTexts } from 'devextreme/ui/gantt'; diff --git a/packages/devextreme-angular/src/ui/gantt/nested/resource-assignments.ts b/packages/devextreme-angular/src/ui/gantt/nested/resource-assignments.ts index 06683ed9057e..4d9ad8fcb058 100644 --- a/packages/devextreme-angular/src/ui/gantt/nested/resource-assignments.ts +++ b/packages/devextreme-angular/src/ui/gantt/nested/resource-assignments.ts @@ -16,7 +16,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/gantt/nested/resources.ts b/packages/devextreme-angular/src/ui/gantt/nested/resources.ts index 483d2f018678..3a5039f86fa0 100644 --- a/packages/devextreme-angular/src/ui/gantt/nested/resources.ts +++ b/packages/devextreme-angular/src/ui/gantt/nested/resources.ts @@ -16,7 +16,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/gantt/nested/tasks.ts b/packages/devextreme-angular/src/ui/gantt/nested/tasks.ts index 53e636878ce1..2c8cd201100b 100644 --- a/packages/devextreme-angular/src/ui/gantt/nested/tasks.ts +++ b/packages/devextreme-angular/src/ui/gantt/nested/tasks.ts @@ -16,7 +16,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/html-editor/nested/file-uploader-options.ts b/packages/devextreme-angular/src/ui/html-editor/nested/file-uploader-options.ts index 7f033f2bc456..09fd1ee725f6 100644 --- a/packages/devextreme-angular/src/ui/html-editor/nested/file-uploader-options.ts +++ b/packages/devextreme-angular/src/ui/html-editor/nested/file-uploader-options.ts @@ -16,7 +16,7 @@ import { -import UploadInfo from 'devextreme/file_management/upload_info'; +import { UploadInfo } from 'devextreme/common/file_management'; import { BeforeSendEvent, ContentReadyEvent, DisposingEvent, DropZoneEnterEvent, DropZoneLeaveEvent, FilesUploadedEvent, InitializedEvent, OptionChangedEvent, ProgressEvent, UploadAbortedEvent, UploadedEvent, UploadErrorEvent, UploadStartedEvent, ValueChangedEvent, UploadHttpMethod, FileUploadMode } from 'devextreme/ui/file_uploader'; import { ValidationStatus } from 'devextreme/common'; diff --git a/packages/devextreme-angular/src/ui/html-editor/nested/mention-dxi.ts b/packages/devextreme-angular/src/ui/html-editor/nested/mention-dxi.ts index f9854c839850..10f0dde9e62c 100644 --- a/packages/devextreme-angular/src/ui/html-editor/nested/mention-dxi.ts +++ b/packages/devextreme-angular/src/ui/html-editor/nested/mention-dxi.ts @@ -18,7 +18,7 @@ import { DOCUMENT } from '@angular/common'; import DataSource from 'devextreme/data/data_source'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/html-editor/nested/variables.ts b/packages/devextreme-angular/src/ui/html-editor/nested/variables.ts index d3bf29bc7016..d317f3686d0f 100644 --- a/packages/devextreme-angular/src/ui/html-editor/nested/variables.ts +++ b/packages/devextreme-angular/src/ui/html-editor/nested/variables.ts @@ -16,7 +16,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/index.ts b/packages/devextreme-angular/src/ui/linear-gauge/index.ts index b370530cfe7e..1e5c288ef831 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/index.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/index.ts @@ -23,7 +23,7 @@ import { import { AnimationEaseMode, Font, ChartsColor, Palette, PaletteExtensionMode, LabelOverlap, Theme, TextOverflow, WordWrap, DashStyle } from 'devextreme/common/charts'; import { ExportFormat, Orientation, HorizontalAlignment, VerticalAlignment, VerticalEdge } from 'devextreme/common'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/linear_gauge'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { GaugeIndicator } from 'devextreme/viz/gauges/base_gauge'; import DxLinearGauge from 'devextreme/viz/linear_gauge'; diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts index 96f74dcec348..28632aa4d778 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts index c766ac842cfc..58c1a6f1df91 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts index 3384cebac527..7a93ee9fc71c 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts @@ -16,7 +16,7 @@ import { import { ChartsColor, Palette, Font } from 'devextreme/common/charts'; import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts index 80329ef6bdd6..5fa1f10a102a 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts index 982a5fb06475..26713d4276bb 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts index 57808a3c4ed4..61d93efc1c45 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts @@ -16,7 +16,7 @@ import { import { ChartsColor, Palette, Font } from 'devextreme/common/charts'; import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/list/index.ts b/packages/devextreme-angular/src/ui/list/index.ts index e33195b6ceb5..0d2c2f25da7c 100644 --- a/packages/devextreme-angular/src/ui/list/index.ts +++ b/packages/devextreme-angular/src/ui/list/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/list'; import DataSource from 'devextreme/data/data_source'; import { dxListItem, ItemDeleteMode, ListMenuMode, ContentReadyEvent, DisposingEvent, GroupRenderedEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemDeletedEvent, ItemDeletingEvent, ItemHoldEvent, ItemRenderedEvent, ItemReorderedEvent, ItemSwipeEvent, OptionChangedEvent, PageLoadingEvent, PullRefreshEvent, ScrollEvent, SelectAllValueChangedEvent, SelectionChangedEvent, SelectionChangingEvent } from 'devextreme/ui/list'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { dxSortableOptions } from 'devextreme/ui/sortable'; import { PageLoadMode, SearchMode, SelectAllMode, SingleMultipleAllOrNone, ScrollbarMode } from 'devextreme/common'; import { dxTextBoxOptions } from 'devextreme/ui/text_box'; diff --git a/packages/devextreme-angular/src/ui/load-panel/index.ts b/packages/devextreme-angular/src/ui/load-panel/index.ts index 022b1a9ccabe..e198e543873b 100644 --- a/packages/devextreme-angular/src/ui/load-panel/index.ts +++ b/packages/devextreme-angular/src/ui/load-panel/index.ts @@ -17,11 +17,10 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/common/core/events'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent } from 'devextreme/ui/load_panel'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import DxLoadPanel from 'devextreme/ui/load_panel'; diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts b/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts index 2cb5791080dc..c7cff62b2841 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts b/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts index 7109f2eb3c11..995b9f1624aa 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/from.ts b/packages/devextreme-angular/src/ui/load-panel/nested/from.ts index 53f095a9513f..d01f068fd4cf 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/from.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts b/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts index 3addc875e492..c67345051c2b 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/position.ts b/packages/devextreme-angular/src/ui/load-panel/nested/position.ts index f2896806b615..1abc67b6f244 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/position.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/show.ts b/packages/devextreme-angular/src/ui/load-panel/nested/show.ts index 21b4ba122e75..ef0fd098d6be 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/show.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/to.ts b/packages/devextreme-angular/src/ui/load-panel/nested/to.ts index ce9bb916da11..da284d7812e9 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/to.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/index.ts b/packages/devextreme-angular/src/ui/lookup/index.ts index 38b4de5b29ab..760f261fa7de 100644 --- a/packages/devextreme-angular/src/ui/lookup/index.ts +++ b/packages/devextreme-angular/src/ui/lookup/index.ts @@ -28,7 +28,7 @@ import DataSource from 'devextreme/data/data_source'; import { ApplyValueMode, LabelMode, PageLoadMode, SimplifiedSearchMode, EditorStyle, ValidationMessageMode, Mode, Position, ValidationStatus } from 'devextreme/common'; import { CollectionWidgetItem } from 'devextreme/ui/collection/ui.collection_widget.base'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { dxPopoverOptions } from 'devextreme/ui/popover'; import { ClosedEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, OpenedEvent, OptionChangedEvent, PageLoadingEvent, PullRefreshEvent, ScrollEvent, SelectionChangedEvent, ValueChangedEvent } from 'devextreme/ui/lookup'; diff --git a/packages/devextreme-angular/src/ui/lookup/nested/animation.ts b/packages/devextreme-angular/src/ui/lookup/nested/animation.ts index 900c13f36186..05c6d7cc4ecb 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/collision.ts b/packages/devextreme-angular/src/ui/lookup/nested/collision.ts index 753713672a8c..9908a9cfe74d 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts index 193d199a0394..af2ea9b2d4f1 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts @@ -19,11 +19,10 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/common/core/events'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from 'devextreme/ui/popover'; import { Position } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/lookup/nested/from.ts b/packages/devextreme-angular/src/ui/lookup/nested/from.ts index 36e9627ed2df..2aec82a953d3 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/from.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/hide.ts b/packages/devextreme-angular/src/ui/lookup/nested/hide.ts index da1d44676aae..e4be9750b683 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/lookup/nested/position.ts b/packages/devextreme-angular/src/ui/lookup/nested/position.ts index 302ed789f4f5..87d896602897 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/position.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/show.ts b/packages/devextreme-angular/src/ui/lookup/nested/show.ts index 7f2ee01e84f7..49ffef9c6145 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/show.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/lookup/nested/to.ts b/packages/devextreme-angular/src/ui/lookup/nested/to.ts index e5e04fce98ec..89b998e5ecb2 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/to.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/index.ts b/packages/devextreme-angular/src/ui/menu/index.ts index db41fafbbb49..def12b3c730b 100644 --- a/packages/devextreme-angular/src/ui/menu/index.ts +++ b/packages/devextreme-angular/src/ui/menu/index.ts @@ -24,10 +24,10 @@ import { export { ExplicitTypes } from 'devextreme/ui/menu'; import DataSource from 'devextreme/data/data_source'; -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { dxMenuItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemRenderedEvent, OptionChangedEvent, SelectionChangedEvent, SubmenuHiddenEvent, SubmenuHidingEvent, SubmenuShowingEvent, SubmenuShownEvent, SubmenuDirection } from 'devextreme/ui/menu'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { Orientation, SingleOrNone, SubmenuShowMode } from 'devextreme/common'; import DxMenu from 'devextreme/ui/menu'; diff --git a/packages/devextreme-angular/src/ui/menu/nested/animation.ts b/packages/devextreme-angular/src/ui/menu/nested/animation.ts index cd7e878fc913..a98dab3094cd 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/collision.ts b/packages/devextreme-angular/src/ui/menu/nested/collision.ts index f11ee240aa26..a7c6e8af4beb 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/from.ts b/packages/devextreme-angular/src/ui/menu/nested/from.ts index f173416ca0de..6235dab8a5dd 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/from.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/hide.ts b/packages/devextreme-angular/src/ui/menu/nested/hide.ts index 73047a4e778a..86811db81e82 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/menu/nested/position.ts b/packages/devextreme-angular/src/ui/menu/nested/position.ts index 7787511df6cc..5949479c0abe 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/position.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/show.ts b/packages/devextreme-angular/src/ui/menu/nested/show.ts index e320f5dfb2b0..53329bb95207 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/show.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/menu/nested/to.ts b/packages/devextreme-angular/src/ui/menu/nested/to.ts index 37871e39905d..3445d880111c 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/to.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/multi-view/index.ts b/packages/devextreme-angular/src/ui/multi-view/index.ts index b586263e14b2..395d39bc2dba 100644 --- a/packages/devextreme-angular/src/ui/multi-view/index.ts +++ b/packages/devextreme-angular/src/ui/multi-view/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/multi_view'; import DataSource from 'devextreme/data/data_source'; import { dxMultiViewItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/ui/multi_view'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import DxMultiView from 'devextreme/ui/multi_view'; diff --git a/packages/devextreme-angular/src/ui/nested/argument-axis.ts b/packages/devextreme-angular/src/ui/nested/argument-axis.ts index 161d9aa70846..8a2b3b8fef76 100644 --- a/packages/devextreme-angular/src/ui/nested/argument-axis.ts +++ b/packages/devextreme-angular/src/ui/nested/argument-axis.ts @@ -21,7 +21,7 @@ import { import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common'; import { ArgumentAxisHoverMode, AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, RelativePosition, ScaleBreak, ScaleBreakLineStyle, TextOverflow, TimeInterval, VisualRange, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/base/animation-config.ts b/packages/devextreme-angular/src/ui/nested/base/animation-config.ts index 859514f90e03..5f63df1cbb0b 100644 --- a/packages/devextreme-angular/src/ui/nested/base/animation-config.ts +++ b/packages/devextreme-angular/src/ui/nested/base/animation-config.ts @@ -5,9 +5,9 @@ import { Component, } from '@angular/core'; -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; import { AnimationEaseMode } from 'devextreme/common/charts'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; @Component({ template: '' diff --git a/packages/devextreme-angular/src/ui/nested/base/animation-state.ts b/packages/devextreme-angular/src/ui/nested/base/animation-state.ts index 48d3349934e2..9d5c2c2466de 100644 --- a/packages/devextreme-angular/src/ui/nested/base/animation-state.ts +++ b/packages/devextreme-angular/src/ui/nested/base/animation-state.ts @@ -5,7 +5,7 @@ import { Component, } from '@angular/core'; -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; @Component({ template: '' diff --git a/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts b/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts index b8427cc08ad9..7d37c32de86f 100644 --- a/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts @@ -7,7 +7,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, ChartsDataType, DashStyle, Font, HatchDirection, LabelPosition, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, TextOverflow, ValueErrorBarDisplayMode, ValueErrorBarType, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; diff --git a/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts b/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts index 38e4a2acb339..b6a09e261006 100644 --- a/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts @@ -7,7 +7,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, ChartsDataType, DashStyle, Font, HatchDirection, LabelPosition, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, TextOverflow, ValueErrorBarDisplayMode, ValueErrorBarType, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; diff --git a/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts b/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts index 465fd6e907c0..ef55b211cdb5 100644 --- a/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts @@ -6,10 +6,10 @@ import { } from '@angular/core'; import { AsyncRule, CompareRule, CustomRule, DataType, EmailRule, HorizontalAlignment, NumericRule, PatternRule, RangeRule, RequiredRule, SearchMode, SortOrder, StringLengthRule } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { ColumnHeaderFilterSearchConfig, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, SelectedFilterOperation } from 'devextreme/common/grids'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { DataGridCommandColumnType, DataGridPredefinedColumnButton, dxDataGridColumn, dxDataGridColumnButton } from 'devextreme/ui/data_grid'; import { SimpleItem } from 'devextreme/ui/form'; import { dxTreeListColumn, dxTreeListColumnButton, TreeListCommandColumnType, TreeListPredefinedColumnButton } from 'devextreme/ui/tree_list'; diff --git a/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts b/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts index 2be58f7a5be1..a6cc2ae12485 100644 --- a/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts @@ -6,9 +6,9 @@ import { } from '@angular/core'; import { DataType } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; import { format } from 'devextreme/ui/widget/ui.widget'; diff --git a/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts b/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts index b808425e48db..78d398d6d07c 100644 --- a/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts +++ b/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts @@ -7,7 +7,7 @@ import { import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; import { ChartsColor, Font, Palette } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; @Component({ template: '' diff --git a/packages/devextreme-angular/src/ui/nested/base/popup-options.ts b/packages/devextreme-angular/src/ui/nested/base/popup-options.ts index 148143298022..ed8c7cc868ff 100644 --- a/packages/devextreme-angular/src/ui/nested/base/popup-options.ts +++ b/packages/devextreme-angular/src/ui/nested/base/popup-options.ts @@ -5,9 +5,8 @@ import { Component, } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { Position, PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from 'devextreme/ui/popover'; import { ToolbarLocation } from 'devextreme/ui/popup'; diff --git a/packages/devextreme-angular/src/ui/nested/base/position-config.ts b/packages/devextreme-angular/src/ui/nested/base/position-config.ts index f838b71c3506..c0e802676268 100644 --- a/packages/devextreme-angular/src/ui/nested/base/position-config.ts +++ b/packages/devextreme-angular/src/ui/nested/base/position-config.ts @@ -5,8 +5,8 @@ import { Component, } from '@angular/core'; -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; @Component({ diff --git a/packages/devextreme-angular/src/ui/nested/collision.ts b/packages/devextreme-angular/src/ui/nested/collision.ts index 1c795c5c8d35..903767654a73 100644 --- a/packages/devextreme-angular/src/ui/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/column-chooser.ts b/packages/devextreme-angular/src/ui/nested/column-chooser.ts index 1365e382fcd7..3e4fa34a6efe 100644 --- a/packages/devextreme-angular/src/ui/nested/column-chooser.ts +++ b/packages/devextreme-angular/src/ui/nested/column-chooser.ts @@ -14,8 +14,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { SortOrder } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig } from 'devextreme/common/grids'; import { UserDefinedElement } from 'devextreme/core/element'; diff --git a/packages/devextreme-angular/src/ui/nested/crosshair.ts b/packages/devextreme-angular/src/ui/nested/crosshair.ts index 4ebdfbfb59bf..477682bfc464 100644 --- a/packages/devextreme-angular/src/ui/nested/crosshair.ts +++ b/packages/devextreme-angular/src/ui/nested/crosshair.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/nested/drop-down-options.ts index 3f0a050b4109..f6496c54d1f6 100644 --- a/packages/devextreme-angular/src/ui/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/nested/drop-down-options.ts @@ -19,8 +19,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts b/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts index 8fbb64ea323f..353146f654cd 100644 --- a/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts +++ b/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts @@ -19,8 +19,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts b/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts index 52dc82043c6b..8adde0461d43 100644 --- a/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts @@ -12,8 +12,8 @@ import { +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/horizontal-line.ts b/packages/devextreme-angular/src/ui/nested/horizontal-line.ts index 80f837bfbb98..b0c033ffb200 100644 --- a/packages/devextreme-angular/src/ui/nested/horizontal-line.ts +++ b/packages/devextreme-angular/src/ui/nested/horizontal-line.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/label.ts b/packages/devextreme-angular/src/ui/nested/label.ts index 75c69f62901c..563517b58ba1 100644 --- a/packages/devextreme-angular/src/ui/nested/label.ts +++ b/packages/devextreme-angular/src/ui/nested/label.ts @@ -20,7 +20,7 @@ import { DOCUMENT } from '@angular/common'; import { HorizontalAlignment, HorizontalEdge, Position, VerticalAlignment, VerticalEdge } from 'devextreme/common'; import { ChartsAxisLabelOverlap, DashStyle, Font, LabelOverlap, LabelPosition, RelativePosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { LabelLocation } from 'devextreme/ui/form'; import { ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; diff --git a/packages/devextreme-angular/src/ui/nested/legend.ts b/packages/devextreme-angular/src/ui/nested/legend.ts index 8cf1ed2c4038..d006e72bc1f2 100644 --- a/packages/devextreme-angular/src/ui/nested/legend.ts +++ b/packages/devextreme-angular/src/ui/nested/legend.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment, Orientation, Position, VerticalEdge } from 'devextreme/common'; import { DashStyle, Font, LegendHoverMode, RelativePosition } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PieChartLegendHoverMode } from 'devextreme/viz/pie_chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/marker.ts b/packages/devextreme-angular/src/ui/nested/marker.ts index 173b9dcf3be4..245c671f5e35 100644 --- a/packages/devextreme-angular/src/ui/nested/marker.ts +++ b/packages/devextreme-angular/src/ui/nested/marker.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/popup.ts b/packages/devextreme-angular/src/ui/nested/popup.ts index 2b5b38c36f40..c9840eeaf512 100644 --- a/packages/devextreme-angular/src/ui/nested/popup.ts +++ b/packages/devextreme-angular/src/ui/nested/popup.ts @@ -19,8 +19,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/scale.ts b/packages/devextreme-angular/src/ui/nested/scale.ts index 56bea2049279..3b1d47833168 100644 --- a/packages/devextreme-angular/src/ui/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/nested/scale.ts @@ -19,7 +19,7 @@ import { import { HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; import { ChartsDataType, DiscreteAxisDivisionMode, Font, LabelOverlap, ScaleBreak, ScaleBreakLineStyle, TimeInterval } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { CircularGaugeElementOrientation, CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; import { AxisScale } from 'devextreme/viz/range_selector'; diff --git a/packages/devextreme-angular/src/ui/nested/slider-marker.ts b/packages/devextreme-angular/src/ui/nested/slider-marker.ts index 0da3ebd79507..78272623c01d 100644 --- a/packages/devextreme-angular/src/ui/nested/slider-marker.ts +++ b/packages/devextreme-angular/src/ui/nested/slider-marker.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/summary.ts b/packages/devextreme-angular/src/ui/nested/summary.ts index de507d25dc21..0b3c0a05b433 100644 --- a/packages/devextreme-angular/src/ui/nested/summary.ts +++ b/packages/devextreme-angular/src/ui/nested/summary.ts @@ -18,8 +18,8 @@ import { import { HorizontalAlignment } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/text.ts b/packages/devextreme-angular/src/ui/nested/text.ts index 22fd2330441e..5c54bb0697f1 100644 --- a/packages/devextreme-angular/src/ui/nested/text.ts +++ b/packages/devextreme-angular/src/ui/nested/text.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/tooltip.ts b/packages/devextreme-angular/src/ui/nested/tooltip.ts index 885756c84840..024ccec46dd2 100644 --- a/packages/devextreme-angular/src/ui/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/nested/tooltip.ts @@ -16,8 +16,8 @@ import { import { TooltipShowMode, VerticalEdge } from 'devextreme/common'; import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { ChartTooltipLocation } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts b/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts index 274918db3850..8360826e4c03 100644 --- a/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts @@ -13,8 +13,8 @@ import { import { HorizontalAlignment } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts b/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts index 439e3cc53aac..cf0e23dd86d8 100644 --- a/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts @@ -19,7 +19,7 @@ import { import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common'; import { AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, RelativePosition, ScaleBreak, ScaleBreakLineStyle, TextOverflow, TimeInterval, VisualRange, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/value-axis.ts b/packages/devextreme-angular/src/ui/nested/value-axis.ts index a4c12614ba46..9742edbbfdd0 100644 --- a/packages/devextreme-angular/src/ui/nested/value-axis.ts +++ b/packages/devextreme-angular/src/ui/nested/value-axis.ts @@ -20,7 +20,7 @@ import { import { AxisScaleType, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, TimeInterval, VisualRange } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ValueAxisVisualRangeUpdateMode } from 'devextreme/viz/polar_chart'; import { ChartAxisScale } from 'devextreme/viz/range_selector'; diff --git a/packages/devextreme-angular/src/ui/nested/vertical-line.ts b/packages/devextreme-angular/src/ui/nested/vertical-line.ts index 3d0da13e4fdc..b8fb96f249a6 100644 --- a/packages/devextreme-angular/src/ui/nested/vertical-line.ts +++ b/packages/devextreme-angular/src/ui/nested/vertical-line.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/number-box/index.ts b/packages/devextreme-angular/src/ui/number-box/index.ts index d6c39f0ae2e6..da92d1b40943 100644 --- a/packages/devextreme-angular/src/ui/number-box/index.ts +++ b/packages/devextreme-angular/src/ui/number-box/index.ts @@ -26,7 +26,7 @@ import { import { NumberBoxPredefinedButton, NumberBoxType, ChangeEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OptionChangedEvent, PasteEvent, ValueChangedEvent } from 'devextreme/ui/number_box'; import { TextEditorButton, LabelMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxNumberBox from 'devextreme/ui/number_box'; diff --git a/packages/devextreme-angular/src/ui/pagination/index.ts b/packages/devextreme-angular/src/ui/pagination/index.ts index 73177e097030..9dff7b407b9f 100644 --- a/packages/devextreme-angular/src/ui/pagination/index.ts +++ b/packages/devextreme-angular/src/ui/pagination/index.ts @@ -21,7 +21,7 @@ import { import { DisplayMode } from 'devextreme/common'; -import { EventInfo } from 'devextreme/events/index'; +import { EventInfo } from 'devextreme/common/core/events'; import DxPagination from 'devextreme/ui/pagination'; diff --git a/packages/devextreme-angular/src/ui/pie-chart/index.ts b/packages/devextreme-angular/src/ui/pie-chart/index.ts index f4fe3a97df1d..7a194ea54529 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/index.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/index.ts @@ -25,9 +25,9 @@ import { import DataSource from 'devextreme/data/data_source'; import { AnimationEaseMode, ChartsDataType, DashStyle, ChartsColor, HatchDirection, Font, LabelPosition, TextOverflow, WordWrap, SeriesLabel, SeriesPoint, Palette, PaletteExtensionMode, ShiftLabelOverlap, Theme } from 'devextreme/common/charts'; import { dxPieChartAnnotationConfig, dxPieChartCommonAnnotationConfig, PieChartSeriesInteractionMode, SmallValuesGroupingMode, PieChartLegendItem, PieChartLegendHoverMode, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, OptionChangedEvent, PointClickEvent, PointHoverChangedEvent, PointSelectionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, PieChartSegmentDirection, PieChartSeries, PieChartType } from 'devextreme/viz/pie_chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge, SingleOrMultiple } from 'devextreme/common'; import DxPieChart from 'devextreme/viz/pie_chart'; diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts index eee8b3abc395..3d43f7a13380 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts @@ -16,7 +16,7 @@ import { import { ChartsDataType, DashStyle, ChartsColor, HatchDirection, Font, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts index ecac58d09e53..c59524fbf495 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts index d7e525417730..38b5741a3f45 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts @@ -14,7 +14,7 @@ import { import { ChartsDataType, DashStyle, ChartsColor, HatchDirection, Font, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts index c7f46210a58e..3ff86be913d3 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/index.ts b/packages/devextreme-angular/src/ui/polar-chart/index.ts index d214bda9aa7c..82fc0b44755c 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/index.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/index.ts @@ -26,9 +26,9 @@ import DataSource from 'devextreme/data/data_source'; import * as CommonChartTypes from 'devextreme/common/charts'; import { AnimationEaseMode, ChartsDataType, DashStyle, Font, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, LabelOverlap, TimeInterval, AxisScaleType, ChartsColor, SeriesHoverMode, HatchDirection, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType, SeriesLabel, SeriesPoint, LegendItem, LegendHoverMode, Palette, PaletteExtensionMode, Theme, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { dxPolarChartAnnotationConfig, dxPolarChartCommonAnnotationConfig, PolarChartSeriesType, ArgumentAxisClickEvent, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, OptionChangedEvent, PointClickEvent, PointHoverChangedEvent, PointSelectionChangedEvent, SeriesClickEvent, SeriesHoverChangedEvent, SeriesSelectionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent, PolarChartSeries, ValueAxisVisualRangeUpdateMode } from 'devextreme/viz/polar_chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge, SingleOrMultiple } from 'devextreme/common'; import DxPolarChart from 'devextreme/viz/polar_chart'; diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts index 00b3d6735aae..dee78c55d0fa 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts @@ -18,7 +18,7 @@ import { import { ChartsDataType, DashStyle, Font, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, LabelOverlap, TimeInterval, AxisScaleType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/axis-label.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/axis-label.ts index ed0e7c37ea83..7fcac53012a4 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/axis-label.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/axis-label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings-label.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings-label.ts index 139a3857d52f..ff87a4b3d874 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings-label.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings-label.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font, RelativePosition } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts index 9baef2d25455..dfa61343c7b3 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts @@ -15,7 +15,7 @@ import { import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts index bd39d7126a31..7c022434c13d 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap, DashStyle, RelativePosition } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts index 02f5d7db1348..7f884bb86330 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts @@ -13,7 +13,7 @@ import { import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts index a76ca20604ed..fbf88b3c37d3 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts index 211b55872202..81b945ceac82 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts @@ -21,7 +21,7 @@ import { import * as CommonChartTypes from 'devextreme/common/charts'; import { DashStyle, Font, DiscreteAxisDivisionMode, LabelOverlap, TimeInterval, AxisScaleType, ChartsDataType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ValueAxisVisualRangeUpdateMode } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/popover/index.ts b/packages/devextreme-angular/src/ui/popover/index.ts index 6f8193921573..0ad662473023 100644 --- a/packages/devextreme-angular/src/ui/popover/index.ts +++ b/packages/devextreme-angular/src/ui/popover/index.ts @@ -22,11 +22,10 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/common/core/events'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from 'devextreme/ui/popover'; import { Position } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import DxPopover from 'devextreme/ui/popover'; diff --git a/packages/devextreme-angular/src/ui/popover/nested/animation.ts b/packages/devextreme-angular/src/ui/popover/nested/animation.ts index d784bdadaf04..38c8781c8890 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/collision.ts b/packages/devextreme-angular/src/ui/popover/nested/collision.ts index 8c5b8e2f0a31..52dab6839e2e 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/from.ts b/packages/devextreme-angular/src/ui/popover/nested/from.ts index dea87b235570..f888ecbc0634 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/from.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/hide.ts b/packages/devextreme-angular/src/ui/popover/nested/hide.ts index 418d365da7c7..5df21ee2d81f 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/popover/nested/position.ts b/packages/devextreme-angular/src/ui/popover/nested/position.ts index dd19514546e7..8ce3f2b2799f 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/position.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/show.ts b/packages/devextreme-angular/src/ui/popover/nested/show.ts index bb44b0f1fb69..d16201da11b1 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/show.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/popover/nested/to.ts b/packages/devextreme-angular/src/ui/popover/nested/to.ts index 4a9de746d777..5000a1ac3293 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/to.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/component.ts b/packages/devextreme-angular/src/ui/popup/component.ts index bf435f45b105..d7da57fa7984 100644 --- a/packages/devextreme-angular/src/ui/popup/component.ts +++ b/packages/devextreme-angular/src/ui/popup/component.ts @@ -22,10 +22,9 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import DxPopup from 'devextreme/ui/popup'; diff --git a/packages/devextreme-angular/src/ui/popup/nested/animation.ts b/packages/devextreme-angular/src/ui/popup/nested/animation.ts index c2630d3bfad1..a050f8eccd3d 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/collision.ts b/packages/devextreme-angular/src/ui/popup/nested/collision.ts index 9edb75160069..57363e68ef79 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/from.ts b/packages/devextreme-angular/src/ui/popup/nested/from.ts index be32f403443c..3834b7d3ee0a 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/from.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/hide.ts b/packages/devextreme-angular/src/ui/popup/nested/hide.ts index def87a09a119..536323c6753e 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/popup/nested/position.ts b/packages/devextreme-angular/src/ui/popup/nested/position.ts index bf86cf989b5a..f05a55f570ba 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/position.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/show.ts b/packages/devextreme-angular/src/ui/popup/nested/show.ts index 112f0385fc79..74261df2153e 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/show.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/popup/nested/to.ts b/packages/devextreme-angular/src/ui/popup/nested/to.ts index 45f10f0cfa6e..ad1ead9058aa 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/to.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/radio-group/index.ts b/packages/devextreme-angular/src/ui/radio-group/index.ts index d427bc25e307..cb839fa1dc23 100644 --- a/packages/devextreme-angular/src/ui/radio-group/index.ts +++ b/packages/devextreme-angular/src/ui/radio-group/index.ts @@ -27,7 +27,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { CollectionWidgetItem } from 'devextreme/ui/collection/ui.collection_widget.base'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { Orientation, ValidationMessageMode, Position, ValidationStatus } from 'devextreme/common'; import { ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent } from 'devextreme/ui/radio_group'; diff --git a/packages/devextreme-angular/src/ui/range-selector/index.ts b/packages/devextreme-angular/src/ui/range-selector/index.ts index f9ac9cf94332..050490a1b9de 100644 --- a/packages/devextreme-angular/src/ui/range-selector/index.ts +++ b/packages/devextreme-angular/src/ui/range-selector/index.ts @@ -30,8 +30,8 @@ import { dxChartCommonSeriesSettings } from 'devextreme/viz/chart'; import { Palette, PaletteExtensionMode, ChartsDataType, Font, TimeInterval, ScaleBreak, ScaleBreakLineStyle, DiscreteAxisDivisionMode, LabelOverlap, VisualRangeUpdateMode, Theme, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { ChartSeries } from 'devextreme/viz/common'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; -import { Format } from 'devextreme/localization'; +import { Store } from 'devextreme/common/data'; +import { Format } from 'devextreme/common/core/localization'; import DxRangeSelector from 'devextreme/viz/range_selector'; diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings-label.ts b/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings-label.ts index ca1ac88a2d85..e1a94f7bc716 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings-label.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings-label.ts @@ -15,7 +15,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font, RelativePosition } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts index c845f5c3da4f..9543a6420612 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts @@ -17,7 +17,7 @@ import { import { chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/label.ts b/packages/devextreme-angular/src/ui/range-selector/nested/label.ts index 31150268dba6..c03a0d07aba8 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/label.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/label.ts @@ -15,7 +15,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font, RelativePosition, LabelOverlap } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/marker-label.ts b/packages/devextreme-angular/src/ui/range-selector/nested/marker-label.ts index c92c350ab57a..9575932ec2c1 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/marker-label.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/marker-label.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts b/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts index 71f3cc27a0c2..b19a945a1b0d 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/scale-label.ts b/packages/devextreme-angular/src/ui/range-selector/nested/scale-label.ts index 2938e2ebfa96..393b0053f851 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/scale-label.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/scale-label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts b/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts index eff7923d23cb..ee2716f2c432 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts @@ -18,7 +18,7 @@ import { import { TimeInterval, ScaleBreak, ScaleBreakLineStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, ChartsDataType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { AxisScale } from 'devextreme/viz/range_selector'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts index d53e269f571d..5e2d146b86cb 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts @@ -15,7 +15,7 @@ import { import { chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts b/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts index 46af6f4e7164..5a15d3be666d 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-slider/index.ts b/packages/devextreme-angular/src/ui/range-slider/index.ts index 2c00152aca79..b32fd8c57c62 100644 --- a/packages/devextreme-angular/src/ui/range-slider/index.ts +++ b/packages/devextreme-angular/src/ui/range-slider/index.ts @@ -22,7 +22,7 @@ import { } from '@angular/core'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge, TooltipShowMode, ValidationMessageMode, Position, ValidationStatus, SliderValueChangeMode } from 'devextreme/common'; import { ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent } from 'devextreme/ui/range_slider'; diff --git a/packages/devextreme-angular/src/ui/range-slider/nested/label.ts b/packages/devextreme-angular/src/ui/range-slider/nested/label.ts index 2e031d4c1153..6357eccab218 100644 --- a/packages/devextreme-angular/src/ui/range-slider/nested/label.ts +++ b/packages/devextreme-angular/src/ui/range-slider/nested/label.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts b/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts index 47e5f948d0cc..6f11cabf389f 100644 --- a/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge, TooltipShowMode } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/responsive-box/index.ts b/packages/devextreme-angular/src/ui/responsive-box/index.ts index c869137924e5..ad364b66935f 100644 --- a/packages/devextreme-angular/src/ui/responsive-box/index.ts +++ b/packages/devextreme-angular/src/ui/responsive-box/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/responsive_box'; import DataSource from 'devextreme/data/data_source'; import { dxResponsiveBoxItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent } from 'devextreme/ui/responsive_box'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import DxResponsiveBox from 'devextreme/ui/responsive_box'; diff --git a/packages/devextreme-angular/src/ui/sankey/index.ts b/packages/devextreme-angular/src/ui/sankey/index.ts index 5a0fa72c86f1..2c4ec6758547 100644 --- a/packages/devextreme-angular/src/ui/sankey/index.ts +++ b/packages/devextreme-angular/src/ui/sankey/index.ts @@ -23,10 +23,10 @@ import { import DataSource from 'devextreme/data/data_source'; import { VerticalAlignment, ExportFormat, HorizontalAlignment, VerticalEdge } from 'devextreme/common'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { dxSankeyNode, SankeyColorMode, DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LinkClickEvent, LinkHoverEvent, NodeClickEvent, NodeHoverEvent, OptionChangedEvent } from 'devextreme/viz/sankey'; import { Font, TextOverflow, HatchDirection, Palette, PaletteExtensionMode, Theme, WordWrap, DashStyle } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxSankey from 'devextreme/viz/sankey'; diff --git a/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts b/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts index b61986a93759..c8537baafb1f 100644 --- a/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/scheduler/index.ts b/packages/devextreme-angular/src/ui/scheduler/index.ts index 7d088d319113..ce5ca2cd4378 100644 --- a/packages/devextreme-angular/src/ui/scheduler/index.ts +++ b/packages/devextreme-angular/src/ui/scheduler/index.ts @@ -27,9 +27,9 @@ import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; import DataSource from 'devextreme/data/data_source'; import { AllDayPanelMode, ViewType, dxSchedulerAppointment, CellAppointmentsLimit, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, RecurrenceEditMode, dxSchedulerScrolling } from 'devextreme/ui/scheduler'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/common/core/events'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { FirstDayOfWeek, Orientation } from 'devextreme/common'; import DxScheduler from 'devextreme/ui/scheduler'; diff --git a/packages/devextreme-angular/src/ui/scheduler/nested/appointment-dragging.ts b/packages/devextreme-angular/src/ui/scheduler/nested/appointment-dragging.ts index a1c8bec4678d..9949f6be5ac0 100644 --- a/packages/devextreme-angular/src/ui/scheduler/nested/appointment-dragging.ts +++ b/packages/devextreme-angular/src/ui/scheduler/nested/appointment-dragging.ts @@ -17,7 +17,7 @@ import { import dxScheduler from 'devextreme/ui/scheduler'; import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/common/core/events'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/scheduler/nested/resource-dxi.ts b/packages/devextreme-angular/src/ui/scheduler/nested/resource-dxi.ts index 27acee8622c9..8c2483403f56 100644 --- a/packages/devextreme-angular/src/ui/scheduler/nested/resource-dxi.ts +++ b/packages/devextreme-angular/src/ui/scheduler/nested/resource-dxi.ts @@ -14,7 +14,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/index.ts b/packages/devextreme-angular/src/ui/select-box/index.ts index 1f924f35bf68..036c92471b53 100644 --- a/packages/devextreme-angular/src/ui/select-box/index.ts +++ b/packages/devextreme-angular/src/ui/select-box/index.ts @@ -29,7 +29,7 @@ import { DropDownPredefinedButton } from 'devextreme/ui/drop_down_editor/ui.drop import { TextEditorButton, LabelMode, SimplifiedSearchMode, EditorStyle, ValidationMessageMode, Mode, Position, ValidationStatus } from 'devextreme/common'; import { CollectionWidgetItem } from 'devextreme/ui/collection/ui.collection_widget.base'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CustomItemCreatingEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, OptionChangedEvent, PasteEvent, SelectionChangedEvent, ValueChangedEvent } from 'devextreme/ui/select_box'; diff --git a/packages/devextreme-angular/src/ui/select-box/nested/animation.ts b/packages/devextreme-angular/src/ui/select-box/nested/animation.ts index a7b9b5fe87d6..34ca3515b53b 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/collision.ts b/packages/devextreme-angular/src/ui/select-box/nested/collision.ts index 140a6d979619..0f1cde5cf6b5 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts index 3c671c6655ac..da4af775bb78 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts @@ -22,11 +22,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/select-box/nested/from.ts b/packages/devextreme-angular/src/ui/select-box/nested/from.ts index a59a2637f568..d33c1f81df37 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/hide.ts b/packages/devextreme-angular/src/ui/select-box/nested/hide.ts index 65b786caf822..89c672c2aedb 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/select-box/nested/position.ts b/packages/devextreme-angular/src/ui/select-box/nested/position.ts index c2b86c2f83cc..1ae4c8b36b48 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/show.ts b/packages/devextreme-angular/src/ui/select-box/nested/show.ts index 964efc86c600..8d3befd818cc 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/select-box/nested/to.ts b/packages/devextreme-angular/src/ui/select-box/nested/to.ts index 3f32772932ff..4a9297f5b6da 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/slider/index.ts b/packages/devextreme-angular/src/ui/slider/index.ts index f9aff56fc538..e358987f24fb 100644 --- a/packages/devextreme-angular/src/ui/slider/index.ts +++ b/packages/devextreme-angular/src/ui/slider/index.ts @@ -22,7 +22,7 @@ import { } from '@angular/core'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge, TooltipShowMode, ValidationMessageMode, Position, ValidationStatus, SliderValueChangeMode } from 'devextreme/common'; import { ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent } from 'devextreme/ui/slider'; diff --git a/packages/devextreme-angular/src/ui/slider/nested/label.ts b/packages/devextreme-angular/src/ui/slider/nested/label.ts index a3d55351985e..6742dd91e95e 100644 --- a/packages/devextreme-angular/src/ui/slider/nested/label.ts +++ b/packages/devextreme-angular/src/ui/slider/nested/label.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts b/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts index 836389384ec7..d3fd30f1d7a6 100644 --- a/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge, TooltipShowMode } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/sparkline/index.ts b/packages/devextreme-angular/src/ui/sparkline/index.ts index d296dcdb2d3b..a54b3812e8da 100644 --- a/packages/devextreme-angular/src/ui/sparkline/index.ts +++ b/packages/devextreme-angular/src/ui/sparkline/index.ts @@ -22,10 +22,10 @@ import { import DataSource from 'devextreme/data/data_source'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, SparklineType } from 'devextreme/viz/sparkline'; import { PointSymbol, Theme, DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxSparkline from 'devextreme/viz/sparkline'; diff --git a/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts b/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts index 281e8b9b7d07..b767a362b104 100644 --- a/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/splitter/index.ts b/packages/devextreme-angular/src/ui/splitter/index.ts index c700134759db..dc10cae08082 100644 --- a/packages/devextreme-angular/src/ui/splitter/index.ts +++ b/packages/devextreme-angular/src/ui/splitter/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/splitter'; import DataSource from 'devextreme/data/data_source'; import { dxSplitterItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemCollapsedEvent, ItemContextMenuEvent, ItemExpandedEvent, ItemRenderedEvent, OptionChangedEvent, ResizeEvent, ResizeEndEvent, ResizeStartEvent } from 'devextreme/ui/splitter'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { Orientation } from 'devextreme/common'; import DxSplitter from 'devextreme/ui/splitter'; diff --git a/packages/devextreme-angular/src/ui/tab-panel/index.ts b/packages/devextreme-angular/src/ui/tab-panel/index.ts index 35b1cad60c16..8f7de34e9a25 100644 --- a/packages/devextreme-angular/src/ui/tab-panel/index.ts +++ b/packages/devextreme-angular/src/ui/tab-panel/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/tab_panel'; import DataSource from 'devextreme/data/data_source'; import { dxTabPanelItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent, SelectionChangedEvent, SelectionChangingEvent, TitleClickEvent, TitleHoldEvent, TitleRenderedEvent } from 'devextreme/ui/tab_panel'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { TabsIconPosition, TabsStyle, Position } from 'devextreme/common'; import DxTabPanel from 'devextreme/ui/tab_panel'; diff --git a/packages/devextreme-angular/src/ui/tabs/index.ts b/packages/devextreme-angular/src/ui/tabs/index.ts index ce5b4da56dbe..a8862e9529cb 100644 --- a/packages/devextreme-angular/src/ui/tabs/index.ts +++ b/packages/devextreme-angular/src/ui/tabs/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/tabs'; import DataSource from 'devextreme/data/data_source'; import { dxTabsItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent, SelectionChangedEvent, SelectionChangingEvent } from 'devextreme/ui/tabs'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { TabsIconPosition, Orientation, SingleOrMultiple, TabsStyle } from 'devextreme/common'; import DxTabs from 'devextreme/ui/tabs'; diff --git a/packages/devextreme-angular/src/ui/tag-box/index.ts b/packages/devextreme-angular/src/ui/tag-box/index.ts index 1af6813afe7f..6999e4e56b58 100644 --- a/packages/devextreme-angular/src/ui/tag-box/index.ts +++ b/packages/devextreme-angular/src/ui/tag-box/index.ts @@ -29,7 +29,7 @@ import { ApplyValueMode, TextEditorButton, LabelMode, SimplifiedSearchMode, Sele import { DropDownPredefinedButton } from 'devextreme/ui/drop_down_editor/ui.drop_down_editor'; import { CollectionWidgetItem } from 'devextreme/ui/collection/ui.collection_widget.base'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { ChangeEvent, ClosedEvent, ContentReadyEvent, CustomItemCreatingEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, MultiTagPreparingEvent, OpenedEvent, OptionChangedEvent, SelectAllValueChangedEvent, SelectionChangedEvent, ValueChangedEvent } from 'devextreme/ui/tag_box'; diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts b/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts index 8f4d9c9aa83f..9e1c688b3b02 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts b/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts index c75faa719140..85c893579381 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts index 85a863201d05..5bb1037c832e 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts @@ -22,11 +22,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/from.ts b/packages/devextreme-angular/src/ui/tag-box/nested/from.ts index 5dd638ed90e6..3291f16a0602 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts b/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts index 8baefb8950a0..8ad992628548 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/position.ts b/packages/devextreme-angular/src/ui/tag-box/nested/position.ts index 6181878d06bb..120b1cd0e98b 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/show.ts b/packages/devextreme-angular/src/ui/tag-box/nested/show.ts index b9207fd4dce2..f91b97713945 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/to.ts b/packages/devextreme-angular/src/ui/tag-box/nested/to.ts index ad95687a67b5..a03da04325ad 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tile-view/index.ts b/packages/devextreme-angular/src/ui/tile-view/index.ts index b910b5558da5..ddd086878980 100644 --- a/packages/devextreme-angular/src/ui/tile-view/index.ts +++ b/packages/devextreme-angular/src/ui/tile-view/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/tile_view'; import DataSource from 'devextreme/data/data_source'; import { dxTileViewItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent } from 'devextreme/ui/tile_view'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { Orientation, ScrollbarMode } from 'devextreme/common'; import DxTileView from 'devextreme/ui/tile_view'; diff --git a/packages/devextreme-angular/src/ui/toast/index.ts b/packages/devextreme-angular/src/ui/toast/index.ts index 237eee0a03d4..1cb34a95adb4 100644 --- a/packages/devextreme-angular/src/ui/toast/index.ts +++ b/packages/devextreme-angular/src/ui/toast/index.ts @@ -17,10 +17,9 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/common/core/events'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, ToastType } from 'devextreme/ui/toast'; -import { PositionConfig } from 'devextreme/animation/position'; import DxToast from 'devextreme/ui/toast'; diff --git a/packages/devextreme-angular/src/ui/toast/nested/animation.ts b/packages/devextreme-angular/src/ui/toast/nested/animation.ts index 06dd2a36410d..a0f9f1438029 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/collision.ts b/packages/devextreme-angular/src/ui/toast/nested/collision.ts index db4bc386a255..f92ec128eddf 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/from.ts b/packages/devextreme-angular/src/ui/toast/nested/from.ts index 05d6130081b4..418751d7b926 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/from.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/hide.ts b/packages/devextreme-angular/src/ui/toast/nested/hide.ts index 1a52b282afa4..1246163797e0 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/toast/nested/position.ts b/packages/devextreme-angular/src/ui/toast/nested/position.ts index c25e1fe24c7b..7dd608676487 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/position.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/show.ts b/packages/devextreme-angular/src/ui/toast/nested/show.ts index 993a9b4b7691..e11095bacde9 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/show.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/toast/nested/to.ts b/packages/devextreme-angular/src/ui/toast/nested/to.ts index 879deac6622e..e7b55d3f52c1 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/to.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toolbar/index.ts b/packages/devextreme-angular/src/ui/toolbar/index.ts index 86537b50411a..976adcb65722 100644 --- a/packages/devextreme-angular/src/ui/toolbar/index.ts +++ b/packages/devextreme-angular/src/ui/toolbar/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/toolbar'; import DataSource from 'devextreme/data/data_source'; import { dxToolbarItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent } from 'devextreme/ui/toolbar'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import DxToolbar from 'devextreme/ui/toolbar'; diff --git a/packages/devextreme-angular/src/ui/tooltip/index.ts b/packages/devextreme-angular/src/ui/tooltip/index.ts index 11a57be8f40b..11f052ca71f4 100644 --- a/packages/devextreme-angular/src/ui/tooltip/index.ts +++ b/packages/devextreme-angular/src/ui/tooltip/index.ts @@ -17,11 +17,10 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/common/core/events'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent } from 'devextreme/ui/tooltip'; import { Position } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import DxTooltip from 'devextreme/ui/tooltip'; diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts b/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts index 270af13dfbda..23c9849f2d78 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts b/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts index ed6b3416ac00..2639bce9ef13 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/from.ts b/packages/devextreme-angular/src/ui/tooltip/nested/from.ts index 5144c70872ae..79c86175fa6f 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/from.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts b/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts index 099fe1dd9a87..3a401c65a4b8 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/position.ts b/packages/devextreme-angular/src/ui/tooltip/nested/position.ts index 63b651d776f2..27f33da4338a 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/position.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/show.ts b/packages/devextreme-angular/src/ui/tooltip/nested/show.ts index adca2825ebed..1b71b964d33e 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/show.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/to.ts b/packages/devextreme-angular/src/ui/tooltip/nested/to.ts index 9d90b605e8b5..2efe0dd47553 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/to.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/index.ts b/packages/devextreme-angular/src/ui/tree-list/index.ts index b324ada9952e..fce738652333 100644 --- a/packages/devextreme-angular/src/ui/tree-list/index.ts +++ b/packages/devextreme-angular/src/ui/tree-list/index.ts @@ -28,15 +28,15 @@ import dxTreeList from 'devextreme/ui/tree_list'; import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, ColumnResizeMode, DataChange, GridsEditMode, GridsEditRefreshMode, StartEditAction, GridBase, ApplyFilterMode, HeaderFilterSearchConfig, EnterKeyAction, EnterKeyDirection, Pager, DataRenderMode, StateStoreType } from 'devextreme/common/grids'; -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { SortOrder, Mode, DataStructure, DragDirection, DragHighlight, ScrollMode, ScrollbarMode, SingleMultipleOrNone } from 'devextreme/common'; import { dxTreeListColumn, dxTreeListRowObject, TreeListFilterMode, AdaptiveDetailRowPreparingEvent, CellClickEvent, CellDblClickEvent, CellHoverChangedEvent, CellPreparedEvent, ContentReadyEvent, ContextMenuPreparingEvent, DataErrorOccurredEvent, DisposingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, EditorPreparedEvent, EditorPreparingEvent, FocusedCellChangedEvent, FocusedCellChangingEvent, FocusedRowChangedEvent, FocusedRowChangingEvent, InitializedEvent, InitNewRowEvent, KeyDownEvent, NodesInitializedEvent, OptionChangedEvent, RowClickEvent, RowCollapsedEvent, RowCollapsingEvent, RowDblClickEvent, RowExpandedEvent, RowExpandingEvent, RowInsertedEvent, RowInsertingEvent, RowPreparedEvent, RowRemovedEvent, RowRemovingEvent, RowUpdatedEvent, RowUpdatingEvent, RowValidatingEvent, SavedEvent, SavingEvent, SelectionChangedEvent, ToolbarPreparingEvent, dxTreeListToolbar } from 'devextreme/ui/tree_list'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { dxFormOptions } from 'devextreme/ui/form'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { dxFilterBuilderOptions } from 'devextreme/ui/filter_builder'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/common/core/events'; import DxTreeList from 'devextreme/ui/tree_list'; diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts b/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts index 54d3f19ca2bd..0a6824844552 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/button-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/button-dxi.ts index ee808b103129..fcfcb1c8dc24 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/button-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/button-dxi.ts @@ -18,7 +18,7 @@ import { DOCUMENT } from '@angular/common'; import dxTreeList from 'devextreme/ui/tree_list'; import { dxTreeListColumn, dxTreeListRowObject, TreeListPredefinedColumnButton } from 'devextreme/ui/tree_list'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/common/core/events'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts b/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts index e9c9a7d53b97..46468bc320db 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts b/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts index fad9cbc4661f..e6e5ea981f8e 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts @@ -15,7 +15,7 @@ import { import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig } from 'devextreme/common/grids'; -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { SortOrder } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts index cb0d8c652c79..20aa4df8a9c5 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts @@ -21,10 +21,10 @@ import * as CommonTypes from 'devextreme/common'; import { HorizontalAlignment, DataType, SearchMode, SortOrder } from 'devextreme/common'; import { dxTreeListColumnButton, TreeListPredefinedColumnButton, dxTreeListColumn, TreeListCommandColumnType } from 'devextreme/ui/tree_list'; import { FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { dxFormSimpleItem } from 'devextreme/ui/form'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/column-header-filter.ts b/packages/devextreme-angular/src/ui/tree-list/nested/column-header-filter.ts index dc78fc94bd71..a79bf6ab3bd4 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/column-header-filter.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/column-header-filter.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig } from 'devextreme/common/grids'; import { SearchMode } from 'devextreme/common'; diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/column-lookup.ts b/packages/devextreme-angular/src/ui/tree-list/nested/column-lookup.ts index 04cdacdcba69..aee1d60eee21 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/column-lookup.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/column-lookup.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts index 2344562fd990..8792a59010bf 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts @@ -14,9 +14,9 @@ import { import { DataType } from 'devextreme/common'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/field-lookup.ts b/packages/devextreme-angular/src/ui/tree-list/nested/field-lookup.ts index 21af03264832..c595c988a66e 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/field-lookup.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/field-lookup.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts b/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts index 360b5ea82dbd..36448f1778e5 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts @@ -19,11 +19,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/from.ts b/packages/devextreme-angular/src/ui/tree-list/nested/from.ts index 24e6b43c3f34..bc9d851683d7 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/from.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/header-filter.ts b/packages/devextreme-angular/src/ui/tree-list/nested/header-filter.ts index fb1f7e0a8072..501378e7e0e3 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/header-filter.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/header-filter.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, HeaderFilterSearchConfig } from 'devextreme/common/grids'; import { SearchMode } from 'devextreme/common'; diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts b/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts index 050dc41d4f5a..b93ff8cf7c8c 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/lookup.ts b/packages/devextreme-angular/src/ui/tree-list/nested/lookup.ts index 7993d837ce68..b58b18d24c7a 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/lookup.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/lookup.ts @@ -15,7 +15,7 @@ import { import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts b/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts index 329bd9500597..56ec83c6bbe0 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts @@ -22,11 +22,10 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event, EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/position.ts b/packages/devextreme-angular/src/ui/tree-list/nested/position.ts index 88ed7d08bb5c..314d3115cc42 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/position.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/row-dragging.ts b/packages/devextreme-angular/src/ui/tree-list/nested/row-dragging.ts index d0c5e3323b5d..ec6f63f1248a 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/row-dragging.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/row-dragging.ts @@ -18,7 +18,7 @@ import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; import { DragDirection, DragHighlight } from 'devextreme/common'; import { GridBase } from 'devextreme/common/grids'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/common/core/events'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/show.ts b/packages/devextreme-angular/src/ui/tree-list/nested/show.ts index 39a5b26d6913..944c53a59ad5 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/show.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/to.ts b/packages/devextreme-angular/src/ui/tree-list/nested/to.ts index 035eabc3a27b..10f6b797162a 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/to.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-map/index.ts b/packages/devextreme-angular/src/ui/tree-map/index.ts index 80aa452da90f..9230b43bda5d 100644 --- a/packages/devextreme-angular/src/ui/tree-map/index.ts +++ b/packages/devextreme-angular/src/ui/tree-map/index.ts @@ -24,9 +24,9 @@ import DataSource from 'devextreme/data/data_source'; import { Palette, PaletteExtensionMode, Font, TextOverflow, Theme, WordWrap, DashStyle } from 'devextreme/common/charts'; import { TreeMapColorizerType, TreeMapLayoutAlgorithm, TreeMapLayoutDirection, ClickEvent, DisposingEvent, DrawnEvent, DrillEvent, ExportedEvent, ExportingEvent, FileSavingEvent, HoverChangedEvent, IncidentOccurredEvent, InitializedEvent, NodesInitializedEvent, NodesRenderingEvent, OptionChangedEvent, SelectionChangedEvent, dxTreeMapNode } from 'devextreme/viz/tree_map'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { ExportFormat, SingleMultipleOrNone, HorizontalAlignment, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxTreeMap from 'devextreme/viz/tree_map'; diff --git a/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts b/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts index bb46b8444e6d..7d3d0e9d1a87 100644 --- a/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { dxTreeMapNode } from 'devextreme/viz/tree_map'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-view/index.ts b/packages/devextreme-angular/src/ui/tree-view/index.ts index f55cc0577a4f..59b325e383d5 100644 --- a/packages/devextreme-angular/src/ui/tree-view/index.ts +++ b/packages/devextreme-angular/src/ui/tree-view/index.ts @@ -26,7 +26,7 @@ export { ExplicitTypes } from 'devextreme/ui/tree_view'; import DataSource from 'devextreme/data/data_source'; import { dxTreeViewNode, dxTreeViewItem, TreeViewExpandEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemCollapsedEvent, ItemContextMenuEvent, ItemExpandedEvent, ItemHoldEvent, ItemRenderedEvent, ItemSelectionChangedEvent, OptionChangedEvent, SelectAllValueChangedEvent, SelectionChangedEvent, TreeViewCheckBoxMode } from 'devextreme/ui/tree_view'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { DataStructure, ScrollDirection, SearchMode, SingleOrMultiple } from 'devextreme/common'; import { dxTextBoxOptions } from 'devextreme/ui/text_box'; diff --git a/packages/devextreme-angular/src/ui/validator/index.ts b/packages/devextreme-angular/src/ui/validator/index.ts index 7e2e6108c70a..e2a7c2a6f7db 100644 --- a/packages/devextreme-angular/src/ui/validator/index.ts +++ b/packages/devextreme-angular/src/ui/validator/index.ts @@ -26,7 +26,7 @@ import { import * as CommonTypes from 'devextreme/common'; -import { EventInfo } from 'devextreme/events/index'; +import { EventInfo } from 'devextreme/common/core/events'; import DxValidator from 'devextreme/ui/validator'; diff --git a/packages/devextreme-angular/src/ui/vector-map/index.ts b/packages/devextreme-angular/src/ui/vector-map/index.ts index 2261d6215ba7..aef4c10b75b2 100644 --- a/packages/devextreme-angular/src/ui/vector-map/index.ts +++ b/packages/devextreme-angular/src/ui/vector-map/index.ts @@ -26,7 +26,7 @@ import DataSource from 'devextreme/data/data_source'; import { dxVectorMapAnnotationConfig, dxVectorMapCommonAnnotationConfig, MapLayerElement, VectorMapMarkerType, VectorMapLayerType, VectorMapLegendItem, VectorMapMarkerShape, CenterChangedEvent, ClickEvent, DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, SelectionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomFactorChangedEvent } from 'devextreme/viz/vector_map'; import { HorizontalAlignment, VerticalEdge, ExportFormat, SingleMultipleOrNone, Position, Orientation } from 'devextreme/common'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { Font, Palette, DashStyle, Theme, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { VectorMapProjection, VectorMapProjectionConfig } from 'devextreme/viz/vector_map/projection'; diff --git a/packages/devextreme-angular/src/ui/vector-map/nested/layer-dxi.ts b/packages/devextreme-angular/src/ui/vector-map/nested/layer-dxi.ts index bef4d341f28e..5dc7482a2437 100644 --- a/packages/devextreme-angular/src/ui/vector-map/nested/layer-dxi.ts +++ b/packages/devextreme-angular/src/ui/vector-map/nested/layer-dxi.ts @@ -15,7 +15,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { MapLayerElement, VectorMapMarkerType, VectorMapLayerType } from 'devextreme/viz/vector_map'; import { DataSourceOptions } from 'devextreme/data/data_source'; -import { Store } from 'devextreme/data/store'; +import { Store } from 'devextreme/common/data'; import { Font, Palette } from 'devextreme/common/charts'; import { SingleMultipleOrNone } from 'devextreme/common'; diff --git a/packages/devextreme-react/src/accordion.ts b/packages/devextreme-react/src/accordion.ts index 20a1cbbc5bbc..2ec57dba5f21 100644 --- a/packages/devextreme-react/src/accordion.ts +++ b/packages/devextreme-react/src/accordion.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxAccordionItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, ItemTitleClickEvent } from "devextreme/ui/accordion"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/action-sheet.ts b/packages/devextreme-react/src/action-sheet.ts index ccdf5b015571..3233b4ff60cf 100644 --- a/packages/devextreme-react/src/action-sheet.ts +++ b/packages/devextreme-react/src/action-sheet.ts @@ -10,10 +10,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxActionSheetItem, CancelClickEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/action_sheet"; -import type { NativeEventInfo } from "devextreme/events/index"; -import type { ButtonStyle, ButtonType } from "devextreme/common"; +import type { NativeEventInfo } from "devextreme/common/core/events"; +import type { ButtonStyle, template, ButtonType } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/autocomplete.ts b/packages/devextreme-react/src/autocomplete.ts index 6e968e1342ee..beca08e8f91b 100644 --- a/packages/devextreme-react/src/autocomplete.ts +++ b/packages/devextreme-react/src/autocomplete.ts @@ -10,11 +10,9 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/autocomplete"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event, EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; diff --git a/packages/devextreme-react/src/bar-gauge.ts b/packages/devextreme-react/src/bar-gauge.ts index 3b873c46f29c..a6c571afd8d0 100644 --- a/packages/devextreme-react/src/bar-gauge.ts +++ b/packages/devextreme-react/src/bar-gauge.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent, BarGaugeBarInfo, BarGaugeLegendItem } from "devextreme/viz/bar_gauge"; import type { AnimationEaseMode, Font as ChartsFont, TextOverflow, WordWrap, DashStyle } from "devextreme/common/charts"; -import type { HorizontalAlignment, VerticalEdge, ExportFormat, Format as CommonFormat, Position, Orientation } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { HorizontalAlignment, VerticalEdge, ExportFormat, Format as CommonFormat, Position, template, Orientation } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/box.ts b/packages/devextreme-react/src/box.ts index bfc0fb2c1451..99c0f2ba0cdc 100644 --- a/packages/devextreme-react/src/box.ts +++ b/packages/devextreme-react/src/box.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxBoxItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, dxBoxOptions } from "devextreme/ui/box"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/bullet.ts b/packages/devextreme-react/src/bullet.ts index e9f7bdca1143..4e8af405a8d0 100644 --- a/packages/devextreme-react/src/bullet.ts +++ b/packages/devextreme-react/src/bullet.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent } from "devextreme/viz/bullet"; import type { DashStyle, Font as ChartsFont } from "devextreme/common/charts"; -import type { Format as CommonFormat } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as CommonFormat, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/button-group.ts b/packages/devextreme-react/src/button-group.ts index 7b793ba37864..cc4890c95fda 100644 --- a/packages/devextreme-react/src/button-group.ts +++ b/packages/devextreme-react/src/button-group.ts @@ -10,8 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent } from "devextreme/ui/button_group"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; -import type { ButtonType } from "devextreme/common"; +import type { template, ButtonType } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/chart.ts b/packages/devextreme-react/src/chart.ts index c4b6d8b69dbb..e06cd5fc6206 100644 --- a/packages/devextreme-react/src/chart.ts +++ b/packages/devextreme-react/src/chart.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { ArgumentAxisClickEvent, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, PointClickEvent, SeriesClickEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent, chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, dxChartAnnotationConfig, AggregatedPointsPosition, ChartLabelDisplayMode, FinancialChartReductionLevel, chartPointObject, ChartTooltipLocation, ChartZoomAndPanMode, EventKeyModifier } from "devextreme/viz/chart"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, TimeInterval, ChartsDataType, ScaleBreak, ScaleBreakLineStyle, RelativePosition, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, ChartsAxisLabelOverlap, AxisScaleType, VisualRangeUpdateMode, ChartsColor, SeriesHoverMode, HatchDirection, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType, LegendItem, LegendHoverMode } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; -import type { HorizontalAlignment, VerticalAlignment, Format as CommonFormat, Position, VerticalEdge, ExportFormat, Orientation } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { template, HorizontalAlignment, VerticalAlignment, Format as CommonFormat, Position, VerticalEdge, ExportFormat, Orientation } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { ChartSeries } from "devextreme/viz/common"; import type * as CommonChartTypes from "devextreme/common/charts"; diff --git a/packages/devextreme-react/src/circular-gauge.ts b/packages/devextreme-react/src/circular-gauge.ts index 19be891c22cc..5509ec7be869 100644 --- a/packages/devextreme-react/src/circular-gauge.ts +++ b/packages/devextreme-react/src/circular-gauge.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent, CircularGaugeLabelOverlap, CircularGaugeElementOrientation } from "devextreme/viz/circular_gauge"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, LabelOverlap, ChartsColor, Palette, PaletteExtensionMode, TextOverflow, WordWrap } from "devextreme/common/charts"; -import type { ExportFormat, Format as CommonFormat, HorizontalEdge, VerticalEdge, HorizontalAlignment } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { ExportFormat, Format as CommonFormat, HorizontalEdge, VerticalEdge, HorizontalAlignment, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/color-box.ts b/packages/devextreme-react/src/color-box.ts index 2a623a732ded..a899a1074a6b 100644 --- a/packages/devextreme-react/src/color-box.ts +++ b/packages/devextreme-react/src/color-box.ts @@ -10,11 +10,9 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/color_box"; import type { DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, ContentReadyEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event, EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/common/core/animation.ts b/packages/devextreme-react/src/common/core/animation.ts new file mode 100644 index 000000000000..65dbc2236713 --- /dev/null +++ b/packages/devextreme-react/src/common/core/animation.ts @@ -0,0 +1,12 @@ +export { + AnimationConfig, + animationPresets, + AnimationState, + cancelAnimationFrame, + CollisionResolution, + CollisionResolutionCombination, + fx, + PositionConfig, + requestAnimationFrame, + TransitionExecutor, +} from "devextreme/common/core/animation"; diff --git a/packages/devextreme-react/src/common/core/environment.ts b/packages/devextreme-react/src/common/core/environment.ts new file mode 100644 index 000000000000..4c093b9aef9f --- /dev/null +++ b/packages/devextreme-react/src/common/core/environment.ts @@ -0,0 +1,9 @@ +export { + Device, + devices, + DevicesObject, + dxSchedulerTimeZone, + getTimeZones, + hideTopOverlay, + initMobileViewport, +} from "devextreme/common/core/environment"; diff --git a/packages/devextreme-react/src/common/core/events.ts b/packages/devextreme-react/src/common/core/events.ts new file mode 100644 index 000000000000..e2b3a4c8b302 --- /dev/null +++ b/packages/devextreme-react/src/common/core/events.ts @@ -0,0 +1,17 @@ +export { + AsyncCancelable, + Cancelable, + ChangedOptionInfo, + DxEvent, + event, + EventInfo, + EventObject, + InitializedEventInfo, + ItemInfo, + NativeEventInfo, + off, + on, + one, + trigger, + triggerHandler, +} from "devextreme/common/core/events"; diff --git a/packages/devextreme-react/src/common/core/events/index.ts b/packages/devextreme-react/src/common/core/events/index.ts new file mode 100644 index 000000000000..66a97c12acbf --- /dev/null +++ b/packages/devextreme-react/src/common/core/events/index.ts @@ -0,0 +1,3 @@ +export { + eventsHandler, +} from "devextreme/common/core/events/index"; diff --git a/packages/devextreme-react/src/common/core/localization.ts b/packages/devextreme-react/src/common/core/localization.ts new file mode 100644 index 000000000000..8dd8ec2ad04b --- /dev/null +++ b/packages/devextreme-react/src/common/core/localization.ts @@ -0,0 +1,10 @@ +export { + Format, + formatDate, + formatMessage, + formatNumber, + loadMessages, + locale, + parseDate, + parseNumber, +} from "devextreme/common/core/localization"; diff --git a/packages/devextreme-react/src/common/data.ts b/packages/devextreme-react/src/common/data.ts new file mode 100644 index 000000000000..3c5560b87f84 --- /dev/null +++ b/packages/devextreme-react/src/common/data.ts @@ -0,0 +1,47 @@ +export { + applyChanges, + ArrayStore, + ArrayStoreOptions, + base64_encode, + compileGetter, + compileSetter, + CustomStore, + CustomStoreOptions, + DataHelperMixin, + DataSource, + DataSourceLike, + DataSourceOptions, + EdmLiteral, + EndpointSelector, + errorHandler, + FilterDescriptor, + GroupDescriptor, + GroupingInterval, + GroupItem, + isGroupItemsArray, + isItemsArray, + isLoadResultObject, + keyConverters, + LangParams, + LoadOptions, + LoadResult, + LoadResultObject, + LocalStore, + LocalStoreOptions, + ODataContext, + ODataContextOptions, + ODataStore, + ODataStoreOptions, + query, + Query, + ResolvedData, + SearchOperation, + SelectDescriptor, + setErrorHandler, + SortDescriptor, + Store, + StoreBase, + StoreOptions, + StoreOptionsBase, + SummaryDescriptor, +} from "devextreme/common/data"; diff --git a/packages/devextreme-react/src/common/export.ts b/packages/devextreme-react/src/common/export.ts new file mode 100644 index 000000000000..7c4d2823d9cc --- /dev/null +++ b/packages/devextreme-react/src/common/export.ts @@ -0,0 +1,3 @@ +export { + ExportLoadPanel, +} from "devextreme/common/export"; diff --git a/packages/devextreme-react/src/common/export/excel.ts b/packages/devextreme-react/src/common/export/excel.ts new file mode 100644 index 000000000000..0811477e2db8 --- /dev/null +++ b/packages/devextreme-react/src/common/export/excel.ts @@ -0,0 +1,11 @@ +export { + CellAddress, + CellRange, + DataGridCell, + ExcelExportBaseProps, + ExcelExportDataGridProps, + ExcelExportPivotGridProps, + exportDataGrid, + exportPivotGrid, + PivotGridCell, +} from "devextreme/common/export/excel"; diff --git a/packages/devextreme-react/src/common/export/pdf.ts b/packages/devextreme-react/src/common/export/pdf.ts new file mode 100644 index 000000000000..dc2228cc16c7 --- /dev/null +++ b/packages/devextreme-react/src/common/export/pdf.ts @@ -0,0 +1,9 @@ +export { + Cell, + DataGridCell, + exportDataGrid, + exportGantt, + PdfExportDataGridProps, + PdfExportGanttFont, + PdfExportGanttProps, +} from "devextreme/common/export/pdf"; diff --git a/packages/devextreme-react/src/common/file_management.ts b/packages/devextreme-react/src/common/file_management.ts new file mode 100644 index 000000000000..af0107843475 --- /dev/null +++ b/packages/devextreme-react/src/common/file_management.ts @@ -0,0 +1,13 @@ +export { + CustomFileSystemProvider, + CustomFileSystemProviderOptions, + FileSystemError, + FileSystemItem, + FileSystemProviderBase, + FileSystemProviderBaseOptions, + ObjectFileSystemProvider, + ObjectFileSystemProviderOptions, + RemoteFileSystemProvider, + RemoteFileSystemProviderOptions, + UploadInfo, +} from "devextreme/common/file_management"; diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index 4cddfd8869c9..28987394c82e 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -5,21 +5,26 @@ export { ButtonType, CompareRule, ComparisonOperator, + config, CustomRule, DataStructure, DataType, + DefaultOptionsRule, Direction, DisplayMode, DragDirection, Draggable, DragHighlight, + DxPromise, EditorStyle, EmailRule, ExportFormat, FieldChooserLayout, FirstDayOfWeek, + FloatingActionButtonDirection, Format, GlobalConfig, + Guid, HorizontalAlignment, HorizontalEdge, LabelMode, @@ -41,6 +46,7 @@ export { ScrollMode, SearchMode, SelectAllMode, + setTemplateEngine, SimplifiedSearchMode, SingleMultipleAllOrNone, SingleMultipleOrNone, @@ -54,6 +60,7 @@ export { SubmenuShowMode, TabsIconPosition, TabsStyle, + template, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme-react/src/context-menu.ts b/packages/devextreme-react/src/context-menu.ts index 2465a8e627b0..aed0d6d798ff 100644 --- a/packages/devextreme-react/src/context-menu.ts +++ b/packages/devextreme-react/src/context-menu.ts @@ -10,11 +10,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxContextMenuItem, ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemRenderedEvent, PositioningEvent, ShowingEvent, ShownEvent } from "devextreme/ui/context_menu"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment, SubmenuShowMode } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, Direction, template, PositionAlignment, SubmenuShowMode } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/data-grid.ts b/packages/devextreme-react/src/data-grid.ts index a8537858c8cc..f0c7be53aa87 100644 --- a/packages/devextreme-react/src/data-grid.ts +++ b/packages/devextreme-react/src/data-grid.ts @@ -11,17 +11,15 @@ import NestedOption from "./core/nested-option"; import type { dxDataGridColumn, AdaptiveDetailRowPreparingEvent, CellClickEvent, CellDblClickEvent, CellPreparedEvent, ContentReadyEvent, ContextMenuPreparingEvent, DataErrorOccurredEvent, DisposingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, EditorPreparedEvent, EditorPreparingEvent, ExportingEvent, FocusedCellChangingEvent, FocusedRowChangingEvent, InitializedEvent, InitNewRowEvent, KeyDownEvent, RowClickEvent, RowCollapsedEvent, RowCollapsingEvent, RowDblClickEvent, RowExpandedEvent, RowExpandingEvent, RowInsertedEvent, RowInsertingEvent, RowPreparedEvent, RowRemovedEvent, RowRemovingEvent, RowUpdatedEvent, RowUpdatingEvent, RowValidatingEvent, SavedEvent, SavingEvent, ToolbarPreparingEvent, dxDataGridRowObject, DataGridPredefinedColumnButton, ColumnButtonClickEvent, dxDataGridColumnButton, DataGridCommandColumnType, SelectionSensitivity, DataGridExportFormat, DataGridPredefinedToolbarItem, DataGridScrollMode, dxDataGridToolbarItem } from "devextreme/ui/data_grid"; import type { DataChange, DataChangeType, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation, ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, HeaderFilterSearchConfig, SelectionColumnDisplayMode, GridsEditMode, NewRowPosition, GridsEditRefreshMode, StartEditAction, GridBase, ApplyFilterMode, GroupExpandMode, SummaryType, EnterKeyAction, EnterKeyDirection, PagerPageSize, DataRenderMode, StateStoreType } from "devextreme/common/grids"; -import type { Mode, ValidationRuleType, HorizontalAlignment, VerticalAlignment, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, SingleMultipleOrNone, SelectAllMode, PositionAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollbarMode } from "devextreme/common"; +import type { Mode, ValidationRuleType, HorizontalAlignment, VerticalAlignment, template, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, SingleMultipleOrNone, SelectAllMode, PositionAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollbarMode } from "devextreme/common"; import type { ContentReadyEvent as FilterBuilderContentReadyEvent, DisposingEvent as FilterBuilderDisposingEvent, EditorPreparedEvent as FilterBuilderEditorPreparedEvent, EditorPreparingEvent as FilterBuilderEditorPreparingEvent, InitializedEvent as FilterBuilderInitializedEvent, dxFilterBuilderField, FilterBuilderOperation, dxFilterBuilderCustomOperation, GroupOperation, OptionChangedEvent, ValueChangedEvent } from "devextreme/ui/filter_builder"; import type { ContentReadyEvent as FormContentReadyEvent, DisposingEvent as FormDisposingEvent, InitializedEvent as FormInitializedEvent, dxFormSimpleItem, dxFormOptions, OptionChangedEvent as FormOptionChangedEvent, dxFormGroupItem, dxFormTabbedItem, dxFormEmptyItem, dxFormButtonItem, LabelLocation, FormLabelMode, EditorEnterKeyEvent, FieldDataChangedEvent, FormItemComponent, FormItemType } from "devextreme/ui/form"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; import type { dxPopupOptions, dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; -import type { event, EventInfo } from "devextreme/events/index"; +import type { event, EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; diff --git a/packages/devextreme-react/src/date-box.ts b/packages/devextreme-react/src/date-box.ts index a95259345931..59250351866b 100644 --- a/packages/devextreme-react/src/date-box.ts +++ b/packages/devextreme-react/src/date-box.ts @@ -11,11 +11,9 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/date_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, OptionChangedEvent as ButtonOptionChangedEvent, ClickEvent } from "devextreme/ui/button"; import type { DisposingEvent as CalendarDisposingEvent, InitializedEvent as CalendarInitializedEvent, ValueChangedEvent as CalendarValueChangedEvent, DisabledDate, CalendarZoomLevel, OptionChangedEvent, CalendarSelectionMode, WeekNumberRule } from "devextreme/ui/calendar"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, FirstDayOfWeek, ValidationMessageMode, Position as CommonPosition, ValidationStatus, Format, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, FirstDayOfWeek, ValidationMessageMode, Position as CommonPosition, ValidationStatus, Format, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event, EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/date-range-box.ts b/packages/devextreme-react/src/date-range-box.ts index 066d3d9adf30..c84d3238839b 100644 --- a/packages/devextreme-react/src/date-range-box.ts +++ b/packages/devextreme-react/src/date-range-box.ts @@ -11,11 +11,9 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/date_range_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, OptionChangedEvent as ButtonOptionChangedEvent, ClickEvent } from "devextreme/ui/button"; import type { DisposingEvent as CalendarDisposingEvent, InitializedEvent as CalendarInitializedEvent, ValueChangedEvent as CalendarValueChangedEvent, DisabledDate, CalendarZoomLevel, OptionChangedEvent, CalendarSelectionMode, WeekNumberRule } from "devextreme/ui/calendar"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, FirstDayOfWeek, ValidationMessageMode, Position as CommonPosition, ValidationStatus, Format, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, FirstDayOfWeek, ValidationMessageMode, Position as CommonPosition, ValidationStatus, Format, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event, EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/defer-rendering.ts b/packages/devextreme-react/src/defer-rendering.ts index 4b35f95f5991..1635440aaada 100644 --- a/packages/devextreme-react/src/defer-rendering.ts +++ b/packages/devextreme-react/src/defer-rendering.ts @@ -9,9 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, RenderedEvent, ShownEvent } from "devextreme/ui/defer_rendering"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, AnimationState, AnimationType, CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { Direction, HorizontalAlignment, VerticalAlignment, PositionAlignment } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/diagram.ts b/packages/devextreme-react/src/diagram.ts index e4047b6cf0ab..bf7e18e8670d 100644 --- a/packages/devextreme-react/src/diagram.ts +++ b/packages/devextreme-react/src/diagram.ts @@ -9,11 +9,10 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, CustomCommandEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemDblClickEvent, RequestEditOperationEvent, RequestLayoutUpdateEvent, DataLayoutType, Command as DiagramCommand, CustomCommand, ShapeCategory, ToolboxDisplayMode, ShapeType, dxDiagramShape, ConnectorLineEnd, ConnectorLineType, PanelVisibility } from "devextreme/ui/diagram"; -import type { Orientation, ToolbarItemLocation } from "devextreme/common"; +import type { Orientation, ToolbarItemLocation, template } from "devextreme/common"; import type { dxSVGElement } from "devextreme/core/element"; -import type { template } from "devextreme/core/templates/template"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; import type DataSource from "devextreme/data/data_source"; diff --git a/packages/devextreme-react/src/drop-down-box.ts b/packages/devextreme-react/src/drop-down-box.ts index c79e93cf6e0c..abd3c89da52f 100644 --- a/packages/devextreme-react/src/drop-down-box.ts +++ b/packages/devextreme-react/src/drop-down-box.ts @@ -10,11 +10,9 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/drop_down_box"; import type { DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, ContentReadyEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event, EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/drop-down-button.ts b/packages/devextreme-react/src/drop-down-button.ts index 550797ada27d..52a9c41a11d5 100644 --- a/packages/devextreme-react/src/drop-down-button.ts +++ b/packages/devextreme-react/src/drop-down-button.ts @@ -9,11 +9,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ButtonClickEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent } from "devextreme/ui/drop_down_button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, PositionAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, template, PositionAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event, EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; diff --git a/packages/devextreme-react/src/filter-builder.ts b/packages/devextreme-react/src/filter-builder.ts index fb2bf41d88f5..c091efdb9108 100644 --- a/packages/devextreme-react/src/filter-builder.ts +++ b/packages/devextreme-react/src/filter-builder.ts @@ -9,11 +9,10 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, EditorPreparedEvent, EditorPreparingEvent, InitializedEvent, ValueChangedEvent, dxFilterBuilderField, FilterBuilderOperation } from "devextreme/ui/filter_builder"; -import type { DataType, Format as CommonFormat } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { DataType, template, Format as CommonFormat } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/form.ts b/packages/devextreme-react/src/form.ts index df4b103107cf..8795d3dfc043 100644 --- a/packages/devextreme-react/src/form.ts +++ b/packages/devextreme-react/src/form.ts @@ -11,11 +11,10 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, EditorEnterKeyEvent, InitializedEvent, FormItemType, dxFormButtonItem, dxFormEmptyItem, dxFormGroupItem, dxFormSimpleItem, dxFormTabbedItem, FormItemComponent, LabelLocation } from "devextreme/ui/form"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; import type { ContentReadyEvent as TabPanelContentReadyEvent, DisposingEvent as TabPanelDisposingEvent, InitializedEvent as TabPanelInitializedEvent, OptionChangedEvent as TabPanelOptionChangedEvent, dxTabPanelOptions, dxTabPanelItem, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, SelectionChangedEvent, SelectionChangingEvent, TitleClickEvent, TitleHoldEvent, TitleRenderedEvent } from "devextreme/ui/tab_panel"; -import type { ValidationRuleType, HorizontalAlignment, VerticalAlignment, ButtonStyle, ButtonType, ComparisonOperator, TabsIconPosition, TabsStyle, Position } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; +import type { ValidationRuleType, HorizontalAlignment, VerticalAlignment, ButtonStyle, template, ButtonType, ComparisonOperator, TabsIconPosition, TabsStyle, Position } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; import type DataSource from "devextreme/data/data_source"; diff --git a/packages/devextreme-react/src/funnel.ts b/packages/devextreme-react/src/funnel.ts index 6b056272ffa7..1420402a680a 100644 --- a/packages/devextreme-react/src/funnel.ts +++ b/packages/devextreme-react/src/funnel.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, ItemClickEvent, LegendClickEvent, dxFunnelItem, FunnelLegendItem } from "devextreme/viz/funnel"; import type { DashStyle, Font as ChartsFont, TextOverflow, WordWrap, HatchDirection, LabelPosition } from "devextreme/common/charts"; -import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge, HorizontalEdge, Position, Orientation } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge, HorizontalEdge, Position, template, Orientation } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/gallery.ts b/packages/devextreme-react/src/gallery.ts index 60b12c214861..a35001b635ce 100644 --- a/packages/devextreme-react/src/gallery.ts +++ b/packages/devextreme-react/src/gallery.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxGalleryItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/gallery"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/gantt.ts b/packages/devextreme-react/src/gantt.ts index 8f8fa8c1ee4b..cde1f5318c71 100644 --- a/packages/devextreme-react/src/gantt.ts +++ b/packages/devextreme-react/src/gantt.ts @@ -9,13 +9,12 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, ContextMenuPreparingEvent, CustomCommandEvent, DependencyDeletedEvent, DependencyDeletingEvent, DependencyInsertedEvent, DependencyInsertingEvent, DisposingEvent, InitializedEvent, ResourceAssignedEvent, ResourceAssigningEvent, ResourceDeletedEvent, ResourceDeletingEvent, ResourceInsertedEvent, ResourceInsertingEvent, ResourceManagerDialogShowingEvent, ResourceUnassignedEvent, ResourceUnassigningEvent, ScaleCellPreparedEvent, TaskClickEvent, TaskDblClickEvent, TaskDeletedEvent, TaskDeletingEvent, TaskEditDialogShowingEvent, TaskInsertedEvent, TaskInsertingEvent, TaskMovingEvent, TaskUpdatedEvent, TaskUpdatingEvent, dxGanttContextMenuItem, GanttPredefinedContextMenuItem, dxGanttFilterRowOperationDescriptions, dxGanttHeaderFilterTexts, GanttPredefinedToolbarItem, GanttScaleType, dxGanttToolbarItem } from "devextreme/ui/gantt"; -import type { HorizontalAlignment, DataType, Format as CommonFormat, SearchMode, SortOrder, ToolbarItemLocation, ToolbarItemComponent, SingleMultipleOrNone } from "devextreme/common"; +import type { HorizontalAlignment, template, DataType, Format as CommonFormat, SearchMode, SortOrder, ToolbarItemLocation, ToolbarItemComponent, SingleMultipleOrNone } from "devextreme/common"; import type { dxTreeListColumn, dxTreeListRowObject } from "devextreme/ui/tree_list"; -import type { template } from "devextreme/core/templates/template"; import type { FilterOperation, FilterType, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation, HeaderFilterSearchConfig } from "devextreme/common/grids"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; import type { dxContextMenuItem } from "devextreme/ui/context_menu"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/html-editor.ts b/packages/devextreme-react/src/html-editor.ts index d1971a16c4a4..4d7eebdedf47 100644 --- a/packages/devextreme-react/src/html-editor.ts +++ b/packages/devextreme-react/src/html-editor.ts @@ -10,14 +10,13 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, FocusInEvent, FocusOutEvent, InitializedEvent, ValueChangedEvent, HtmlEditorImageUploadMode, dxHtmlEditorImageUploadTabItem, HtmlEditorImageUploadTab, dxHtmlEditorTableContextMenuItem, HtmlEditorPredefinedContextMenuItem, HtmlEditorPredefinedToolbarItem, dxHtmlEditorToolbarItem } from "devextreme/ui/html_editor"; import type { ContentReadyEvent as FileUploaderContentReadyEvent, DisposingEvent as FileUploaderDisposingEvent, InitializedEvent as FileUploaderInitializedEvent, ValueChangedEvent as FileUploaderValueChangedEvent, BeforeSendEvent, DropZoneEnterEvent, DropZoneLeaveEvent, FilesUploadedEvent, OptionChangedEvent, ProgressEvent, UploadAbortedEvent, UploadedEvent, UploadErrorEvent, UploadStartedEvent, UploadHttpMethod, FileUploadMode, dxFileUploaderOptions } from "devextreme/ui/file_uploader"; -import type { ValidationStatus, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { UploadInfo } from "devextreme/common/file_management"; +import type { ValidationStatus, template, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; -import type UploadInfo from "devextreme/file_management/upload_info"; import type DataSource from "devextreme/data/data_source"; type ReplaceFieldTypes = { diff --git a/packages/devextreme-react/src/linear-gauge.ts b/packages/devextreme-react/src/linear-gauge.ts index 85d4ba287a59..55be571d0ac0 100644 --- a/packages/devextreme-react/src/linear-gauge.ts +++ b/packages/devextreme-react/src/linear-gauge.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent } from "devextreme/viz/linear_gauge"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, LabelOverlap, ChartsColor, Palette, PaletteExtensionMode, TextOverflow, WordWrap } from "devextreme/common/charts"; -import type { ExportFormat, Format as CommonFormat, Orientation, HorizontalAlignment, VerticalAlignment, HorizontalEdge, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { ExportFormat, Format as CommonFormat, Orientation, HorizontalAlignment, VerticalAlignment, HorizontalEdge, VerticalEdge, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/list.ts b/packages/devextreme-react/src/list.ts index 115851fb8970..e83415365b33 100644 --- a/packages/devextreme-react/src/list.ts +++ b/packages/devextreme-react/src/list.ts @@ -13,9 +13,8 @@ import type { dxListItem, ContentReadyEvent, DisposingEvent, GroupRenderedEvent, import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, OptionChangedEvent as ButtonOptionChangedEvent, ClickEvent } from "devextreme/ui/button"; import type { ContentReadyEvent as TextBoxContentReadyEvent, DisposingEvent as TextBoxDisposingEvent, InitializedEvent as TextBoxInitializedEvent, OptionChangedEvent as TextBoxOptionChangedEvent, TextBoxType, ChangeEvent, CopyEvent, CutEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InputEvent, KeyDownEvent, KeyUpEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/text_box"; import type { DisposingEvent as SortableDisposingEvent, InitializedEvent as SortableInitializedEvent, AddEvent, DragChangeEvent, DragEndEvent, DragMoveEvent, DragStartEvent, OptionChangedEvent, RemoveEvent, ReorderEvent } from "devextreme/ui/sortable"; -import type { TextEditorButtonLocation, DragDirection, DragHighlight, Orientation, ButtonStyle, ButtonType, TextBoxPredefinedButton, TextEditorButton, LabelMode, MaskMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from "devextreme/common"; +import type { TextEditorButtonLocation, template, DragDirection, DragHighlight, Orientation, ButtonStyle, ButtonType, TextBoxPredefinedButton, TextEditorButton, LabelMode, MaskMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/load-panel.ts b/packages/devextreme-react/src/load-panel.ts index 1931a98758c0..0c94781a31db 100644 --- a/packages/devextreme-react/src/load-panel.ts +++ b/packages/devextreme-react/src/load-panel.ts @@ -9,9 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { PositionAlignment, HorizontalAlignment, VerticalAlignment, Direction } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent } from "devextreme/ui/load_panel"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/lookup.ts b/packages/devextreme-react/src/lookup.ts index 90b75034912a..4d4100f9e325 100644 --- a/packages/devextreme-react/src/lookup.ts +++ b/packages/devextreme-react/src/lookup.ts @@ -10,11 +10,9 @@ import NestedOption from "./core/nested-option"; import type { ClosedEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, OpenedEvent, PageLoadingEvent, PullRefreshEvent, ScrollEvent, ValueChangedEvent } from "devextreme/ui/lookup"; import type { ContentReadyEvent as PopoverContentReadyEvent, DisposingEvent as PopoverDisposingEvent, InitializedEvent as PopoverInitializedEvent, HiddenEvent, HidingEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from "devextreme/ui/popover"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, Position as CommonPosition, Direction, PositionAlignment, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, template, Position as CommonPosition, Direction, PositionAlignment, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event } from "devextreme/common/core/events"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/menu.ts b/packages/devextreme-react/src/menu.ts index 7f0047324f5f..1fc037165ac8 100644 --- a/packages/devextreme-react/src/menu.ts +++ b/packages/devextreme-react/src/menu.ts @@ -10,11 +10,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxMenuItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemRenderedEvent, SubmenuHiddenEvent, SubmenuHidingEvent, SubmenuShowingEvent, SubmenuShownEvent } from "devextreme/ui/menu"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment, SubmenuShowMode } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, Direction, template, PositionAlignment, SubmenuShowMode } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/multi-view.ts b/packages/devextreme-react/src/multi-view.ts index 7654df8dc704..ac1eb16d0553 100644 --- a/packages/devextreme-react/src/multi-view.ts +++ b/packages/devextreme-react/src/multi-view.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxMultiViewItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/multi_view"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/number-box.ts b/packages/devextreme-react/src/number-box.ts index e4e1850a3cd7..e5fe00988f19 100644 --- a/packages/devextreme-react/src/number-box.ts +++ b/packages/devextreme-react/src/number-box.ts @@ -10,8 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/number_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { TextEditorButtonLocation, Format as CommonFormat, ButtonStyle, ButtonType } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; +import type { TextEditorButtonLocation, Format as CommonFormat, ButtonStyle, template, ButtonType } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/pie-chart.ts b/packages/devextreme-react/src/pie-chart.ts index 87f9e7aadc78..d6a07b402585 100644 --- a/packages/devextreme-react/src/pie-chart.ts +++ b/packages/devextreme-react/src/pie-chart.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, PointClickEvent, TooltipHiddenEvent, TooltipShownEvent, dxPieChartAnnotationConfig, PieChartAnnotationLocation, dxPieChartCommonAnnotationConfig, PieChartSeriesInteractionMode, SmallValuesGroupingMode, PieChartLegendItem, PieChartLegendHoverMode, PieChartSeries } from "devextreme/viz/pie_chart"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, ChartsDataType, ChartsColor, HatchDirection, LabelPosition } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; -import type { Format as CommonFormat, ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { template, Format as CommonFormat, ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/polar-chart.ts b/packages/devextreme-react/src/polar-chart.ts index 478f49b1624f..10eb641b5eb5 100644 --- a/packages/devextreme-react/src/polar-chart.ts +++ b/packages/devextreme-react/src/polar-chart.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { ArgumentAxisClickEvent, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, PointClickEvent, SeriesClickEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent, dxPolarChartAnnotationConfig, dxPolarChartCommonAnnotationConfig, PolarChartSeriesType, PolarChartSeries, ValueAxisVisualRangeUpdateMode } from "devextreme/viz/polar_chart"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, ChartsDataType, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, LabelOverlap, TimeInterval, AxisScaleType, ChartsColor, SeriesHoverMode, HatchDirection, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType, LegendItem, LegendHoverMode } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { Format as CommonFormat, ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from "devextreme/common"; +import type { template, Format as CommonFormat, ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type * as CommonChartTypes from "devextreme/common/charts"; diff --git a/packages/devextreme-react/src/popover.ts b/packages/devextreme-react/src/popover.ts index 77772afc929b..2944ec976a3e 100644 --- a/packages/devextreme-react/src/popover.ts +++ b/packages/devextreme-react/src/popover.ts @@ -8,12 +8,10 @@ import dxPopover, { import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component"; import NestedOption from "./core/nested-option"; -import type { Position as CommonPosition, HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { Position as CommonPosition, HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment, ToolbarItemLocation, template, ToolbarItemComponent } from "devextreme/common"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from "devextreme/ui/popover"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; -import type { template } from "devextreme/core/templates/template"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { ToolbarLocation } from "devextreme/ui/popup"; diff --git a/packages/devextreme-react/src/popup.ts b/packages/devextreme-react/src/popup.ts index 57d43b08d20a..c154741ec2c6 100644 --- a/packages/devextreme-react/src/popup.ts +++ b/packages/devextreme-react/src/popup.ts @@ -8,11 +8,9 @@ import dxPopup, { import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component"; import NestedOption from "./core/nested-option"; -import type { PositionAlignment, HorizontalAlignment, VerticalAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { PositionAlignment, HorizontalAlignment, VerticalAlignment, Direction, ToolbarItemLocation, template, ToolbarItemComponent } from "devextreme/common"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; -import type { template } from "devextreme/core/templates/template"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { ToolbarLocation } from "devextreme/ui/popup"; diff --git a/packages/devextreme-react/src/radio-group.ts b/packages/devextreme-react/src/radio-group.ts index 376c30251d61..b5bd19351d91 100644 --- a/packages/devextreme-react/src/radio-group.ts +++ b/packages/devextreme-react/src/radio-group.ts @@ -10,7 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ValueChangedEvent } from "devextreme/ui/radio_group"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/range-selector.ts b/packages/devextreme-react/src/range-selector.ts index 04fdcdac92eb..07dda4721180 100644 --- a/packages/devextreme-react/src/range-selector.ts +++ b/packages/devextreme-react/src/range-selector.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, ValueChangedEvent, BackgroundImageLocation, ValueChangedCallMode, ChartAxisScale, AxisScale } from "devextreme/viz/range_selector"; import type { chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, dxChartCommonSeriesSettings, FinancialChartReductionLevel } from "devextreme/viz/chart"; import type { Format as CommonFormat, SliderValueChangeMode, HorizontalAlignment, ExportFormat, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { DashStyle, ScaleBreakLineStyle, Palette, PaletteExtensionMode, ChartsDataType, ChartsColor, SeriesHoverMode, HatchDirection, Font as ChartsFont, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType, LabelOverlap, TimeInterval, ScaleBreak, DiscreteAxisDivisionMode, TextOverflow, WordWrap } from "devextreme/common/charts"; import type { ChartSeries } from "devextreme/viz/common"; diff --git a/packages/devextreme-react/src/range-slider.ts b/packages/devextreme-react/src/range-slider.ts index 06eb1e3f5726..7cfa337269c4 100644 --- a/packages/devextreme-react/src/range-slider.ts +++ b/packages/devextreme-react/src/range-slider.ts @@ -10,7 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ValueChangedEvent } from "devextreme/ui/range_slider"; import type { Format as CommonFormat, VerticalEdge, TooltipShowMode } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/responsive-box.ts b/packages/devextreme-react/src/responsive-box.ts index 652c2841cc8f..b54b1f17996e 100644 --- a/packages/devextreme-react/src/responsive-box.ts +++ b/packages/devextreme-react/src/responsive-box.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxResponsiveBoxItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/responsive_box"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/sankey.ts b/packages/devextreme-react/src/sankey.ts index b5d4eb4e7ee0..a2a6eb65ba34 100644 --- a/packages/devextreme-react/src/sankey.ts +++ b/packages/devextreme-react/src/sankey.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LinkClickEvent, NodeClickEvent, dxSankeyNode, SankeyColorMode } from "devextreme/viz/sankey"; import type { DashStyle, HatchDirection, Font as ChartsFont, TextOverflow, WordWrap } from "devextreme/common/charts"; -import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/scheduler.ts b/packages/devextreme-react/src/scheduler.ts index a7137a629e1f..321c0936fa89 100644 --- a/packages/devextreme-react/src/scheduler.ts +++ b/packages/devextreme-react/src/scheduler.ts @@ -9,11 +9,10 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ViewType, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, AllDayPanelMode, AppointmentTemplateData, AppointmentTooltipTemplateData, CellAppointmentsLimit, dxSchedulerScrolling } from "devextreme/ui/scheduler"; -import type { event } from "devextreme/events/index"; +import type { event } from "devextreme/common/core/events"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; -import type { ScrollMode, FirstDayOfWeek, Orientation } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; +import type { Store } from "devextreme/common/data"; +import type { ScrollMode, template, FirstDayOfWeek, Orientation } from "devextreme/common"; import type dxSortable from "devextreme/ui/sortable"; import type dxDraggable from "devextreme/ui/draggable"; diff --git a/packages/devextreme-react/src/select-box.ts b/packages/devextreme-react/src/select-box.ts index 16359d264bd5..28133ad14751 100644 --- a/packages/devextreme-react/src/select-box.ts +++ b/packages/devextreme-react/src/select-box.ts @@ -10,11 +10,9 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CustomItemCreatingEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/select_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event, EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; diff --git a/packages/devextreme-react/src/slider.ts b/packages/devextreme-react/src/slider.ts index a74eab576ad5..71c4245b0769 100644 --- a/packages/devextreme-react/src/slider.ts +++ b/packages/devextreme-react/src/slider.ts @@ -10,7 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ValueChangedEvent } from "devextreme/ui/slider"; import type { Format as CommonFormat, VerticalEdge, TooltipShowMode } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/sparkline.ts b/packages/devextreme-react/src/sparkline.ts index e471329f086e..78498e9233d7 100644 --- a/packages/devextreme-react/src/sparkline.ts +++ b/packages/devextreme-react/src/sparkline.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent } from "devextreme/viz/sparkline"; import type { DashStyle, Font as ChartsFont } from "devextreme/common/charts"; -import type { Format as CommonFormat } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as CommonFormat, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/splitter.ts b/packages/devextreme-react/src/splitter.ts index 7364dde388bf..c2514fdf1083 100644 --- a/packages/devextreme-react/src/splitter.ts +++ b/packages/devextreme-react/src/splitter.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxSplitterItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemCollapsedEvent, ItemContextMenuEvent, ItemExpandedEvent, ItemRenderedEvent, ResizeEvent, ResizeEndEvent, ResizeStartEvent, dxSplitterOptions } from "devextreme/ui/splitter"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/tab-panel.ts b/packages/devextreme-react/src/tab-panel.ts index 4164d1fcb4a4..89b26a2ba489 100644 --- a/packages/devextreme-react/src/tab-panel.ts +++ b/packages/devextreme-react/src/tab-panel.ts @@ -10,7 +10,7 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxTabPanelItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, SelectionChangingEvent, TitleClickEvent, TitleHoldEvent, TitleRenderedEvent } from "devextreme/ui/tab_panel"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; type ReplaceFieldTypes = { diff --git a/packages/devextreme-react/src/tabs.ts b/packages/devextreme-react/src/tabs.ts index d6d6ef54cdf1..8256de19f30c 100644 --- a/packages/devextreme-react/src/tabs.ts +++ b/packages/devextreme-react/src/tabs.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxTabsItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, SelectionChangingEvent } from "devextreme/ui/tabs"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/tag-box.ts b/packages/devextreme-react/src/tag-box.ts index 28e59fce03e1..9bd4aec45151 100644 --- a/packages/devextreme-react/src/tag-box.ts +++ b/packages/devextreme-react/src/tag-box.ts @@ -10,11 +10,9 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CustomItemCreatingEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, MultiTagPreparingEvent, OpenedEvent, SelectAllValueChangedEvent, ValueChangedEvent } from "devextreme/ui/tag_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event, EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; diff --git a/packages/devextreme-react/src/text-box.ts b/packages/devextreme-react/src/text-box.ts index 638b7e089fb5..e57e143d5ebd 100644 --- a/packages/devextreme-react/src/text-box.ts +++ b/packages/devextreme-react/src/text-box.ts @@ -10,8 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/text_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { TextEditorButtonLocation, ButtonStyle, ButtonType } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; +import type { TextEditorButtonLocation, ButtonStyle, template, ButtonType } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/tile-view.ts b/packages/devextreme-react/src/tile-view.ts index 2f65dd0837c7..a744f149259c 100644 --- a/packages/devextreme-react/src/tile-view.ts +++ b/packages/devextreme-react/src/tile-view.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxTileViewItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/tile_view"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/toast.ts b/packages/devextreme-react/src/toast.ts index 94151bbaa10e..9b617397d34c 100644 --- a/packages/devextreme-react/src/toast.ts +++ b/packages/devextreme-react/src/toast.ts @@ -8,9 +8,8 @@ import dxToast, { import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component"; import NestedOption from "./core/nested-option"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent } from "devextreme/ui/toast"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; import type { HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment } from "devextreme/common"; type ReplaceFieldTypes = { diff --git a/packages/devextreme-react/src/toolbar.ts b/packages/devextreme-react/src/toolbar.ts index c36af03d1dee..e1e423d59aba 100644 --- a/packages/devextreme-react/src/toolbar.ts +++ b/packages/devextreme-react/src/toolbar.ts @@ -10,8 +10,7 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxToolbarItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; -import type { ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; +import type { ToolbarItemLocation, template, ToolbarItemComponent } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; type ReplaceFieldTypes = { diff --git a/packages/devextreme-react/src/tooltip.ts b/packages/devextreme-react/src/tooltip.ts index 75b3182cf150..62d99865ebe5 100644 --- a/packages/devextreme-react/src/tooltip.ts +++ b/packages/devextreme-react/src/tooltip.ts @@ -9,9 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { Position as CommonPosition, HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent } from "devextreme/ui/tooltip"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/tree-list.ts b/packages/devextreme-react/src/tree-list.ts index 70e4a925d34b..8961d80af9b4 100644 --- a/packages/devextreme-react/src/tree-list.ts +++ b/packages/devextreme-react/src/tree-list.ts @@ -13,14 +13,12 @@ import type { dxTreeListColumn, AdaptiveDetailRowPreparingEvent, CellClickEvent, import type { DataChange, DataChangeType, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation, ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, GridsEditMode, GridsEditRefreshMode, StartEditAction, GridBase, ApplyFilterMode, HeaderFilterSearchConfig, EnterKeyAction, EnterKeyDirection, PagerPageSize, DataRenderMode, StateStoreType } from "devextreme/common/grids"; import type { ContentReadyEvent as FilterBuilderContentReadyEvent, DisposingEvent as FilterBuilderDisposingEvent, EditorPreparedEvent as FilterBuilderEditorPreparedEvent, EditorPreparingEvent as FilterBuilderEditorPreparingEvent, InitializedEvent as FilterBuilderInitializedEvent, dxFilterBuilderField, FilterBuilderOperation, dxFilterBuilderCustomOperation, GroupOperation, OptionChangedEvent, ValueChangedEvent } from "devextreme/ui/filter_builder"; import type { ContentReadyEvent as FormContentReadyEvent, DisposingEvent as FormDisposingEvent, InitializedEvent as FormInitializedEvent, dxFormSimpleItem, dxFormOptions, OptionChangedEvent as FormOptionChangedEvent, dxFormGroupItem, dxFormTabbedItem, dxFormEmptyItem, dxFormButtonItem, LabelLocation, FormLabelMode, EditorEnterKeyEvent, FieldDataChangedEvent, FormItemComponent, FormItemType } from "devextreme/ui/form"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { ValidationRuleType, HorizontalAlignment, VerticalAlignment, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, PositionAlignment, Mode, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollMode, ScrollbarMode, SingleMultipleOrNone } from "devextreme/common"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { ValidationRuleType, HorizontalAlignment, VerticalAlignment, template, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, PositionAlignment, Mode, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollMode, ScrollbarMode, SingleMultipleOrNone } from "devextreme/common"; +import type { event, EventInfo } from "devextreme/common/core/events"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; import type { dxPopupOptions, dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { Component } from "devextreme/core/component"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/tree-map.ts b/packages/devextreme-react/src/tree-map.ts index b5fee547ac6b..f3d8ac0d8fad 100644 --- a/packages/devextreme-react/src/tree-map.ts +++ b/packages/devextreme-react/src/tree-map.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { ClickEvent, DisposingEvent, DrawnEvent, DrillEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, NodesInitializedEvent, NodesRenderingEvent, TreeMapColorizerType, dxTreeMapNode } from "devextreme/viz/tree_map"; import type { DashStyle, Palette, PaletteExtensionMode, Font as ChartsFont, TextOverflow, WordWrap } from "devextreme/common/charts"; -import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/tree-view.ts b/packages/devextreme-react/src/tree-view.ts index 87ce7d4a12bd..ad79b0f61970 100644 --- a/packages/devextreme-react/src/tree-view.ts +++ b/packages/devextreme-react/src/tree-view.ts @@ -12,9 +12,8 @@ import NestedOption from "./core/nested-option"; import type { dxTreeViewItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemCollapsedEvent, ItemContextMenuEvent, ItemExpandedEvent, ItemHoldEvent, ItemRenderedEvent, SelectAllValueChangedEvent } from "devextreme/ui/tree_view"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; import type { ContentReadyEvent as TextBoxContentReadyEvent, DisposingEvent as TextBoxDisposingEvent, InitializedEvent as TextBoxInitializedEvent, OptionChangedEvent as TextBoxOptionChangedEvent, TextBoxType, ChangeEvent, CopyEvent, CutEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InputEvent, KeyDownEvent, KeyUpEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/text_box"; -import type { TextEditorButtonLocation, ButtonStyle, ButtonType, TextBoxPredefinedButton, TextEditorButton, LabelMode, MaskMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from "devextreme/common"; +import type { TextEditorButtonLocation, template, ButtonStyle, ButtonType, TextBoxPredefinedButton, TextEditorButton, LabelMode, MaskMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/validation-summary.ts b/packages/devextreme-react/src/validation-summary.ts index a9fce1865b99..1c573f9573ad 100644 --- a/packages/devextreme-react/src/validation-summary.ts +++ b/packages/devextreme-react/src/validation-summary.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent } from "devextreme/ui/validation_summary"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/vector-map.ts b/packages/devextreme-react/src/vector-map.ts index 154e0617f822..18814aac63f0 100644 --- a/packages/devextreme-react/src/vector-map.ts +++ b/packages/devextreme-react/src/vector-map.ts @@ -10,10 +10,9 @@ import NestedOption from "./core/nested-option"; import type { ClickEvent, DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent, dxVectorMapAnnotationConfig, MapLayerElement, VectorMapMarkerType, VectorMapLayerType, VectorMapLegendItem, VectorMapMarkerShape } from "devextreme/viz/vector_map"; import type { DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, Palette } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; -import type { HorizontalAlignment, VerticalEdge, ExportFormat, SingleMultipleOrNone, Position, Orientation } from "devextreme/common"; +import type { template, HorizontalAlignment, VerticalEdge, ExportFormat, SingleMultipleOrNone, Position, Orientation } from "devextreme/common"; import type { DataSourceOptions } from "devextreme/data/data_source"; -import type { Store } from "devextreme/data/store"; +import type { Store } from "devextreme/common/data"; import type DataSource from "devextreme/data/data_source"; diff --git a/packages/devextreme-vue/src/common/core/animation.ts b/packages/devextreme-vue/src/common/core/animation.ts new file mode 100644 index 000000000000..65dbc2236713 --- /dev/null +++ b/packages/devextreme-vue/src/common/core/animation.ts @@ -0,0 +1,12 @@ +export { + AnimationConfig, + animationPresets, + AnimationState, + cancelAnimationFrame, + CollisionResolution, + CollisionResolutionCombination, + fx, + PositionConfig, + requestAnimationFrame, + TransitionExecutor, +} from "devextreme/common/core/animation"; diff --git a/packages/devextreme-vue/src/common/core/environment.ts b/packages/devextreme-vue/src/common/core/environment.ts new file mode 100644 index 000000000000..4c093b9aef9f --- /dev/null +++ b/packages/devextreme-vue/src/common/core/environment.ts @@ -0,0 +1,9 @@ +export { + Device, + devices, + DevicesObject, + dxSchedulerTimeZone, + getTimeZones, + hideTopOverlay, + initMobileViewport, +} from "devextreme/common/core/environment"; diff --git a/packages/devextreme-vue/src/common/core/events.ts b/packages/devextreme-vue/src/common/core/events.ts new file mode 100644 index 000000000000..e2b3a4c8b302 --- /dev/null +++ b/packages/devextreme-vue/src/common/core/events.ts @@ -0,0 +1,17 @@ +export { + AsyncCancelable, + Cancelable, + ChangedOptionInfo, + DxEvent, + event, + EventInfo, + EventObject, + InitializedEventInfo, + ItemInfo, + NativeEventInfo, + off, + on, + one, + trigger, + triggerHandler, +} from "devextreme/common/core/events"; diff --git a/packages/devextreme-vue/src/common/core/events/index.ts b/packages/devextreme-vue/src/common/core/events/index.ts new file mode 100644 index 000000000000..66a97c12acbf --- /dev/null +++ b/packages/devextreme-vue/src/common/core/events/index.ts @@ -0,0 +1,3 @@ +export { + eventsHandler, +} from "devextreme/common/core/events/index"; diff --git a/packages/devextreme-vue/src/common/core/localization.ts b/packages/devextreme-vue/src/common/core/localization.ts new file mode 100644 index 000000000000..8dd8ec2ad04b --- /dev/null +++ b/packages/devextreme-vue/src/common/core/localization.ts @@ -0,0 +1,10 @@ +export { + Format, + formatDate, + formatMessage, + formatNumber, + loadMessages, + locale, + parseDate, + parseNumber, +} from "devextreme/common/core/localization"; diff --git a/packages/devextreme-vue/src/common/data.ts b/packages/devextreme-vue/src/common/data.ts new file mode 100644 index 000000000000..3c5560b87f84 --- /dev/null +++ b/packages/devextreme-vue/src/common/data.ts @@ -0,0 +1,47 @@ +export { + applyChanges, + ArrayStore, + ArrayStoreOptions, + base64_encode, + compileGetter, + compileSetter, + CustomStore, + CustomStoreOptions, + DataHelperMixin, + DataSource, + DataSourceLike, + DataSourceOptions, + EdmLiteral, + EndpointSelector, + errorHandler, + FilterDescriptor, + GroupDescriptor, + GroupingInterval, + GroupItem, + isGroupItemsArray, + isItemsArray, + isLoadResultObject, + keyConverters, + LangParams, + LoadOptions, + LoadResult, + LoadResultObject, + LocalStore, + LocalStoreOptions, + ODataContext, + ODataContextOptions, + ODataStore, + ODataStoreOptions, + query, + Query, + ResolvedData, + SearchOperation, + SelectDescriptor, + setErrorHandler, + SortDescriptor, + Store, + StoreBase, + StoreOptions, + StoreOptionsBase, + SummaryDescriptor, +} from "devextreme/common/data"; diff --git a/packages/devextreme-vue/src/common/export.ts b/packages/devextreme-vue/src/common/export.ts new file mode 100644 index 000000000000..7c4d2823d9cc --- /dev/null +++ b/packages/devextreme-vue/src/common/export.ts @@ -0,0 +1,3 @@ +export { + ExportLoadPanel, +} from "devextreme/common/export"; diff --git a/packages/devextreme-vue/src/common/export/excel.ts b/packages/devextreme-vue/src/common/export/excel.ts new file mode 100644 index 000000000000..0811477e2db8 --- /dev/null +++ b/packages/devextreme-vue/src/common/export/excel.ts @@ -0,0 +1,11 @@ +export { + CellAddress, + CellRange, + DataGridCell, + ExcelExportBaseProps, + ExcelExportDataGridProps, + ExcelExportPivotGridProps, + exportDataGrid, + exportPivotGrid, + PivotGridCell, +} from "devextreme/common/export/excel"; diff --git a/packages/devextreme-vue/src/common/export/pdf.ts b/packages/devextreme-vue/src/common/export/pdf.ts new file mode 100644 index 000000000000..dc2228cc16c7 --- /dev/null +++ b/packages/devextreme-vue/src/common/export/pdf.ts @@ -0,0 +1,9 @@ +export { + Cell, + DataGridCell, + exportDataGrid, + exportGantt, + PdfExportDataGridProps, + PdfExportGanttFont, + PdfExportGanttProps, +} from "devextreme/common/export/pdf"; diff --git a/packages/devextreme-vue/src/common/file_management.ts b/packages/devextreme-vue/src/common/file_management.ts new file mode 100644 index 000000000000..af0107843475 --- /dev/null +++ b/packages/devextreme-vue/src/common/file_management.ts @@ -0,0 +1,13 @@ +export { + CustomFileSystemProvider, + CustomFileSystemProviderOptions, + FileSystemError, + FileSystemItem, + FileSystemProviderBase, + FileSystemProviderBaseOptions, + ObjectFileSystemProvider, + ObjectFileSystemProviderOptions, + RemoteFileSystemProvider, + RemoteFileSystemProviderOptions, + UploadInfo, +} from "devextreme/common/file_management"; diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index 4cddfd8869c9..28987394c82e 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -5,21 +5,26 @@ export { ButtonType, CompareRule, ComparisonOperator, + config, CustomRule, DataStructure, DataType, + DefaultOptionsRule, Direction, DisplayMode, DragDirection, Draggable, DragHighlight, + DxPromise, EditorStyle, EmailRule, ExportFormat, FieldChooserLayout, FirstDayOfWeek, + FloatingActionButtonDirection, Format, GlobalConfig, + Guid, HorizontalAlignment, HorizontalEdge, LabelMode, @@ -41,6 +46,7 @@ export { ScrollMode, SearchMode, SelectAllMode, + setTemplateEngine, SimplifiedSearchMode, SingleMultipleAllOrNone, SingleMultipleOrNone, @@ -54,6 +60,7 @@ export { SubmenuShowMode, TabsIconPosition, TabsStyle, + template, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index 324c4b1f4080..f3a65cfa62b2 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -2204,7 +2204,7 @@ declare module DevExpress.common { * [descr:ODataStore] */ export class ODataStore extends DevExpress.data - .StoreBase { + .AbstractStore { constructor(options?: DevExpress.data.ODataStoreOptions); /** * [descr:ODataStore.byKey(key, extraOptions)] @@ -6209,7 +6209,7 @@ declare module DevExpress.data { * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. */ export interface ODataStoreOptions - extends DevExpress.data.Store.StoreOptionsBase { + extends AbstractStoreOptions { /** * [descr:ODataStoreOptions.beforeSend] */ From e3f06c32d532980dfbd5ec5bcc180a1be837735d Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Mon, 18 Nov 2024 17:56:16 +0400 Subject: [PATCH 14/38] lint --- .../js/__internal/scheduler/appointment_popup/m_popup.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts index 3fc42a2e4135..58211e07e350 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts +++ b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts @@ -1,9 +1,9 @@ import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import { Deferred, when } from '@js/core/utils/deferred'; -import messageLocalization from '@js/common/core/localization/message'; import Popup from '@js/ui/popup/ui.popup'; import { ExpressionUtils } from '@ts/scheduler/m_expression_utils'; import { From 056c45aa8c79ed653e52eedc25f1d8a9d9863c36 Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Tue, 19 Nov 2024 18:50:03 +0400 Subject: [PATCH 15/38] Demos: update data imports --- .../Demos/Autocomplete/Overview/Angular/app/app.component.ts | 3 +-- apps/demos/Demos/Autocomplete/Overview/React/App.tsx | 3 +-- apps/demos/Demos/Autocomplete/Overview/ReactJs/App.js | 3 +-- apps/demos/Demos/Autocomplete/Overview/Vue/App.vue | 3 +-- .../Demos/Charts/BarSparklines/Angular/app/app.component.ts | 3 +-- apps/demos/Demos/Charts/BarSparklines/React/App.tsx | 3 +-- apps/demos/Demos/Charts/BarSparklines/React/RowTemplate.tsx | 2 +- apps/demos/Demos/Charts/BarSparklines/ReactJs/App.js | 3 +-- apps/demos/Demos/Charts/BarSparklines/Vue/App.vue | 3 +-- .../ClientSideDataProcessing/Angular/app/app.component.ts | 4 +--- .../Demos/Charts/ClientSideDataProcessing/React/App.tsx | 3 +-- .../Demos/Charts/ClientSideDataProcessing/ReactJs/App.js | 3 +-- apps/demos/Demos/Charts/ClientSideDataProcessing/Vue/App.vue | 3 +-- .../Charts/LoadDataOnDemand/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Charts/LoadDataOnDemand/React/App.tsx | 2 +- apps/demos/Demos/Charts/LoadDataOnDemand/ReactJs/App.js | 2 +- apps/demos/Demos/Charts/LoadDataOnDemand/Vue/App.vue | 2 +- apps/demos/Demos/Charts/LoadDataOnDemand/test-code.js | 2 +- .../ServerSideDataProcessing/Angular/app/app.component.ts | 4 ++-- .../Demos/Charts/ServerSideDataProcessing/React/App.tsx | 4 ++-- .../Demos/Charts/ServerSideDataProcessing/ReactJs/App.js | 4 ++-- apps/demos/Demos/Charts/ServerSideDataProcessing/Vue/App.vue | 4 ++-- .../Demos/Charts/SignalRService/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Charts/SignalRService/React/App.tsx | 2 +- apps/demos/Demos/Charts/SignalRService/ReactJs/App.js | 2 +- apps/demos/Demos/Charts/SignalRService/Vue/App.vue | 2 +- .../ActionAndListsOverview/Angular/app/app.component.ts | 2 +- .../Common/ActionAndListsOverview/Angular/app/app.service.ts | 3 +-- apps/demos/Demos/Common/ActionAndListsOverview/React/App.tsx | 2 +- .../demos/Demos/Common/ActionAndListsOverview/ReactJs/App.js | 2 +- apps/demos/Demos/Common/ActionAndListsOverview/Vue/App.vue | 2 +- .../AdvancedMasterDetailView/Angular/app/app.component.ts | 2 +- .../Angular/app/detail-view/detail-view.component.ts | 2 +- .../DataGrid/CRUDOperations/Angular/app/app.component.ts | 4 ++-- apps/demos/Demos/DataGrid/CRUDOperations/React/App.tsx | 4 ++-- apps/demos/Demos/DataGrid/CRUDOperations/ReactJs/App.js | 4 ++-- apps/demos/Demos/DataGrid/CRUDOperations/Vue/App.vue | 4 ++-- .../CellEditingAndEditingAPI/Angular/app/app.component.ts | 2 +- .../Demos/DataGrid/CellEditingAndEditingAPI/React/App.tsx | 3 +-- .../Demos/DataGrid/CellEditingAndEditingAPI/ReactJs/App.js | 3 +-- .../Demos/DataGrid/CellEditingAndEditingAPI/Vue/App.vue | 3 +-- .../CollaborativeEditing/Angular/app/app.component.ts | 2 +- apps/demos/Demos/DataGrid/CollaborativeEditing/Vue/Grid.vue | 2 +- .../DataGrid/CustomDataSource/Angular/app/app.component.ts | 4 ++-- apps/demos/Demos/DataGrid/CustomDataSource/React/App.tsx | 4 ++-- apps/demos/Demos/DataGrid/CustomDataSource/ReactJs/App.js | 4 ++-- apps/demos/Demos/DataGrid/CustomDataSource/Vue/App.vue | 2 +- .../CustomEditors/Vue/EmployeeDropDownBoxComponent.vue | 2 +- .../DataGrid/CustomEditors/Vue/EmployeeTagBoxComponent.vue | 2 +- .../CustomNewRecordPosition/Angular/app/app.component.ts | 2 +- .../DataGrid/DataValidation/Angular/app/app.component.ts | 2 +- .../DataGrid/DeferredSelection/Angular/app/app.component.ts | 5 ++--- apps/demos/Demos/DataGrid/DeferredSelection/React/App.tsx | 4 ++-- apps/demos/Demos/DataGrid/DeferredSelection/ReactJs/App.js | 4 ++-- apps/demos/Demos/DataGrid/DeferredSelection/Vue/App.vue | 5 ++--- .../DataGrid/DnDBetweenGrids/Angular/app/app.component.ts | 2 +- apps/demos/Demos/DataGrid/DnDBetweenGrids/Vue/Grid.vue | 3 +-- .../DataGrid/EditStateManagement/Angular/app/app.service.ts | 2 +- .../Demos/DataGrid/EditStateManagement/React/reducer.ts | 2 +- .../Demos/DataGrid/EditStateManagement/ReactJs/reducer.js | 2 +- apps/demos/Demos/DataGrid/EditStateManagement/Vue/store.ts | 2 +- .../ExcelJSExportMultipleGrids/Angular/app/app.component.ts | 2 +- .../Demos/DataGrid/ExcelJSExportMultipleGrids/React/App.tsx | 2 +- .../Demos/DataGrid/ExcelJSExportMultipleGrids/ReactJs/App.js | 2 +- .../Demos/DataGrid/ExcelJSExportMultipleGrids/Vue/App.vue | 4 ++-- apps/demos/Demos/DataGrid/Filtering/Vue/App.vue | 2 +- .../Demos/DataGrid/FilteringAPI/Angular/app/app.component.ts | 4 ++-- apps/demos/Demos/DataGrid/FilteringAPI/React/App.tsx | 2 +- apps/demos/Demos/DataGrid/FilteringAPI/ReactJs/App.js | 2 +- apps/demos/Demos/DataGrid/FilteringAPI/Vue/App.vue | 4 ++-- .../Demos/DataGrid/FocusedRow/Angular/app/app.component.ts | 4 ++-- apps/demos/Demos/DataGrid/FocusedRow/React/App.tsx | 2 +- apps/demos/Demos/DataGrid/FocusedRow/ReactJs/App.js | 2 +- apps/demos/Demos/DataGrid/FocusedRow/Vue/App.vue | 4 ++-- .../HorizontalVirtualScrolling/Angular/app/app.component.ts | 2 +- .../DataGrid/InfiniteScrolling/Angular/app/app.component.ts | 2 +- .../Angular/app/detail-grid/detail-grid.component.ts | 3 +-- .../Demos/DataGrid/MasterDetailView/React/DetailTemplate.tsx | 3 +-- .../DataGrid/MasterDetailView/ReactJs/DetailTemplate.js | 3 +-- .../Demos/DataGrid/MasterDetailView/Vue/DetailTemplate.vue | 3 +-- .../Demos/DataGrid/OdataService/Angular/app/app.component.ts | 4 ++-- apps/demos/Demos/DataGrid/OdataService/React/App.tsx | 2 +- apps/demos/Demos/DataGrid/OdataService/ReactJs/App.js | 2 +- apps/demos/Demos/DataGrid/OdataService/Vue/App.vue | 4 ++-- .../Demos/DataGrid/Overview/Angular/app/app.component.ts | 2 +- .../demos/Demos/DataGrid/Overview/Angular/app/app.service.ts | 4 ++-- apps/demos/Demos/DataGrid/Overview/React/App.tsx | 2 +- apps/demos/Demos/DataGrid/Overview/ReactJs/App.js | 2 +- apps/demos/Demos/DataGrid/Overview/Vue/App.vue | 4 ++-- .../PDFExportMultipleGrids/Angular/app/app.component.ts | 4 ++-- .../Demos/DataGrid/PDFExportMultipleGrids/React/App.tsx | 2 +- .../Demos/DataGrid/PDFExportMultipleGrids/ReactJs/App.js | 2 +- apps/demos/Demos/DataGrid/PDFExportMultipleGrids/Vue/App.vue | 4 ++-- .../DataGrid/RealTimeUpdates/Angular/app/app.component.ts | 3 +-- .../DataGrid/RealTimeUpdates/Angular/app/app.service.ts | 2 +- apps/demos/Demos/DataGrid/RealTimeUpdates/React/App.tsx | 2 +- apps/demos/Demos/DataGrid/RealTimeUpdates/React/data.ts | 2 +- apps/demos/Demos/DataGrid/RealTimeUpdates/ReactJs/App.js | 2 +- apps/demos/Demos/DataGrid/RealTimeUpdates/ReactJs/data.js | 2 +- apps/demos/Demos/DataGrid/RealTimeUpdates/Vue/data.ts | 2 +- apps/demos/Demos/DataGrid/RemoteReordering/Vue/App.vue | 2 +- .../DataGrid/SignalRService/Angular/app/app.component.ts | 2 +- apps/demos/Demos/DataGrid/SignalRService/React/App.tsx | 2 +- apps/demos/Demos/DataGrid/SignalRService/ReactJs/App.js | 2 +- apps/demos/Demos/DataGrid/SignalRService/Vue/App.vue | 2 +- apps/demos/Demos/DataGrid/SignalRService/test-code.js | 2 +- .../ToolbarCustomization/Angular/app/app.component.ts | 2 +- apps/demos/Demos/DataGrid/ToolbarCustomization/React/App.tsx | 2 +- .../demos/Demos/DataGrid/ToolbarCustomization/ReactJs/App.js | 2 +- apps/demos/Demos/DataGrid/ToolbarCustomization/Vue/App.vue | 2 +- .../DataGrid/VirtualScrolling/Angular/app/app.component.ts | 2 +- .../Angular/app/detail-grid/detail-grid.component.ts | 2 +- apps/demos/Demos/DataGrid/WebAPIService/React/App.tsx | 2 +- apps/demos/Demos/DataGrid/WebAPIService/ReactJs/App.js | 2 +- .../Diagram/AdvancedDataBinding/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Diagram/AdvancedDataBinding/React/App.tsx | 2 +- apps/demos/Demos/Diagram/AdvancedDataBinding/ReactJs/App.js | 2 +- apps/demos/Demos/Diagram/AdvancedDataBinding/Vue/App.vue | 2 +- .../CustomShapesWithTemplates/Angular/app/app.component.ts | 2 +- .../Demos/Diagram/CustomShapesWithTemplates/React/App.tsx | 2 +- .../Demos/Diagram/CustomShapesWithTemplates/ReactJs/App.js | 2 +- .../Demos/Diagram/CustomShapesWithTemplates/Vue/App.vue | 2 +- .../Angular/app/app.component.ts | 2 +- .../CustomShapesWithTemplatesWithEditing/React/App.tsx | 2 +- .../CustomShapesWithTemplatesWithEditing/ReactJs/App.js | 2 +- .../Diagram/CustomShapesWithTemplatesWithEditing/Vue/App.vue | 2 +- .../Diagram/ImagesInShapes/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Diagram/ImagesInShapes/React/App.tsx | 2 +- apps/demos/Demos/Diagram/ImagesInShapes/ReactJs/App.js | 2 +- apps/demos/Demos/Diagram/ImagesInShapes/Vue/App.vue | 2 +- .../Demos/Diagram/ItemSelection/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Diagram/ItemSelection/React/App.tsx | 2 +- apps/demos/Demos/Diagram/ItemSelection/ReactJs/App.js | 2 +- apps/demos/Demos/Diagram/ItemSelection/Vue/App.vue | 2 +- .../Diagram/NodesAndEdgesArrays/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Diagram/NodesAndEdgesArrays/React/App.tsx | 2 +- apps/demos/Demos/Diagram/NodesAndEdgesArrays/ReactJs/App.js | 2 +- apps/demos/Demos/Diagram/NodesAndEdgesArrays/Vue/App.vue | 2 +- .../Angular/app/app.component.ts | 2 +- .../Diagram/NodesArrayHierarchicalStructure/React/App.tsx | 2 +- .../Diagram/NodesArrayHierarchicalStructure/ReactJs/App.js | 2 +- .../Diagram/NodesArrayHierarchicalStructure/Vue/App.vue | 2 +- .../NodesArrayPlainStructure/Angular/app/app.component.ts | 2 +- .../Demos/Diagram/NodesArrayPlainStructure/React/App.tsx | 2 +- .../Demos/Diagram/NodesArrayPlainStructure/ReactJs/App.js | 2 +- .../demos/Demos/Diagram/NodesArrayPlainStructure/Vue/App.vue | 2 +- .../OperationRestrictions/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Diagram/OperationRestrictions/React/App.tsx | 2 +- .../demos/Demos/Diagram/OperationRestrictions/ReactJs/App.js | 2 +- apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue | 2 +- .../Demos/Diagram/SimpleView/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Diagram/SimpleView/React/App.tsx | 2 +- apps/demos/Demos/Diagram/SimpleView/ReactJs/App.js | 2 +- apps/demos/Demos/Diagram/SimpleView/Vue/App.vue | 2 +- .../MultipleSelection/Angular/app/app.component.ts | 2 +- apps/demos/Demos/DropDownBox/MultipleSelection/React/App.tsx | 2 +- .../demos/Demos/DropDownBox/MultipleSelection/ReactJs/App.js | 2 +- apps/demos/Demos/DropDownBox/MultipleSelection/Vue/App.vue | 2 +- .../DropDownBox/SingleSelection/Angular/app/app.component.ts | 2 +- apps/demos/Demos/DropDownBox/SingleSelection/React/App.tsx | 2 +- apps/demos/Demos/DropDownBox/SingleSelection/ReactJs/App.js | 2 +- apps/demos/Demos/DropDownBox/SingleSelection/Vue/App.vue | 2 +- .../FilterBuilder/WithDataGrid/Angular/app/app.component.ts | 3 +-- apps/demos/Demos/FilterBuilder/WithDataGrid/React/App.tsx | 3 +-- apps/demos/Demos/FilterBuilder/WithDataGrid/ReactJs/App.js | 3 +-- apps/demos/Demos/FilterBuilder/WithDataGrid/Vue/App.vue | 3 +-- .../FilterBuilder/WithList/Angular/app/app.component.ts | 2 +- apps/demos/Demos/FilterBuilder/WithList/React/App.tsx | 2 +- apps/demos/Demos/FilterBuilder/WithList/ReactJs/App.js | 2 +- apps/demos/Demos/FilterBuilder/WithList/Vue/App.vue | 2 +- .../Demos/List/ListSelection/Angular/app/app.component.ts | 3 +-- apps/demos/Demos/List/ListSelection/React/App.tsx | 2 +- apps/demos/Demos/List/ListSelection/ReactJs/App.js | 2 +- apps/demos/Demos/List/ListSelection/Vue/App.vue | 2 +- .../List/ListWithSearchBar/Angular/app/app.component.ts | 2 +- apps/demos/Demos/List/WebAPI/Angular/app/app.component.ts | 2 +- apps/demos/Demos/List/WebAPI/React/App.tsx | 2 +- apps/demos/Demos/List/WebAPI/ReactJs/App.js | 2 +- apps/demos/Demos/List/WebAPI/Vue/App.vue | 2 +- apps/demos/Demos/Lookup/Basics/Angular/app/app.component.ts | 3 +-- apps/demos/Demos/Lookup/Basics/React/App.tsx | 3 +-- apps/demos/Demos/Lookup/Basics/ReactJs/App.js | 3 +-- apps/demos/Demos/Lookup/Basics/Vue/App.vue | 3 +-- .../Demos/PivotGrid/DrillDown/Angular/app/app.component.ts | 2 +- apps/demos/Demos/PivotGrid/DrillDown/React/App.tsx | 2 +- apps/demos/Demos/PivotGrid/DrillDown/Vue/App.vue | 2 +- .../Demos/Scheduler/Agenda/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Scheduler/Agenda/React/App.tsx | 2 +- apps/demos/Demos/Scheduler/Agenda/ReactJs/App.js | 2 +- apps/demos/Demos/Scheduler/Agenda/Vue/App.vue | 2 +- .../Scheduler/CellTemplates/Angular/app/app.component.ts | 2 +- .../CurrentTimeIndicator/Angular/app/app.component.ts | 2 +- .../CurrentTimeIndicator/React/AppointmentTemplate.tsx | 2 +- .../CurrentTimeIndicator/ReactJs/AppointmentTemplate.js | 2 +- .../CurrentTimeIndicator/Vue/AppointmentTemplate.vue | 2 +- .../Scheduler/CustomTemplates/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Scheduler/CustomTemplates/React/App.tsx | 2 +- .../Demos/Scheduler/CustomTemplates/React/Appointment.tsx | 4 ++-- .../Scheduler/CustomTemplates/React/AppointmentTooltip.tsx | 2 +- apps/demos/Demos/Scheduler/CustomTemplates/ReactJs/App.js | 2 +- .../Demos/Scheduler/CustomTemplates/ReactJs/Appointment.js | 4 ++-- .../Scheduler/CustomTemplates/ReactJs/AppointmentTooltip.js | 2 +- apps/demos/Demos/Scheduler/CustomTemplates/Vue/App.vue | 2 +- .../Scheduler/CustomTemplates/Vue/AppointmentTemplate.vue | 4 ++-- .../CustomTemplates/Vue/AppointmentTooltipTemplate.vue | 2 +- .../CustomizeIndividualViews/Angular/app/app.component.ts | 2 +- .../GoogleCalendarIntegration/Angular/app/app.component.ts | 3 +-- .../Demos/Scheduler/GoogleCalendarIntegration/React/App.tsx | 2 +- .../Demos/Scheduler/GoogleCalendarIntegration/ReactJs/App.js | 2 +- .../Demos/Scheduler/GoogleCalendarIntegration/Vue/App.vue | 2 +- .../Demos/Scheduler/Overview/Angular/app/app.component.ts | 2 +- .../Scheduler/TimeZonesSupport/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Scheduler/TimeZonesSupport/Vue/App.vue | 2 +- .../SelectBox/GroupedItems/Angular/app/app.component.ts | 3 +-- apps/demos/Demos/SelectBox/GroupedItems/React/App.tsx | 2 +- apps/demos/Demos/SelectBox/GroupedItems/ReactJs/App.js | 2 +- apps/demos/Demos/SelectBox/GroupedItems/Vue/App.vue | 2 +- .../Demos/SelectBox/Overview/Angular/app/app.component.ts | 2 +- apps/demos/Demos/SelectBox/Overview/React/App.tsx | 2 +- apps/demos/Demos/SelectBox/Overview/ReactJs/App.js | 2 +- apps/demos/Demos/SelectBox/Overview/Vue/App.vue | 2 +- .../SelectBox/SearchAndEditing/Angular/app/app.component.ts | 2 +- apps/demos/Demos/SelectBox/SearchAndEditing/React/App.tsx | 2 +- apps/demos/Demos/SelectBox/SearchAndEditing/ReactJs/App.js | 2 +- apps/demos/Demos/SelectBox/SearchAndEditing/Vue/App.vue | 2 +- apps/demos/Demos/TabPanel/SortableClosableTabs/React/App.tsx | 2 +- .../demos/Demos/TabPanel/SortableClosableTabs/ReactJs/App.js | 2 +- .../Demos/TagBox/GroupedItems/Angular/app/app.component.ts | 3 +-- apps/demos/Demos/TagBox/GroupedItems/React/App.tsx | 2 +- apps/demos/Demos/TagBox/GroupedItems/ReactJs/App.js | 2 +- .../demos/Demos/TagBox/Overview/Angular/app/app.component.ts | 2 +- apps/demos/Demos/TagBox/Overview/React/App.tsx | 2 +- apps/demos/Demos/TagBox/Overview/ReactJs/App.js | 2 +- .../Demos/Toolbar/Overview/Angular/app/app.component.ts | 2 +- apps/demos/Demos/Toolbar/Overview/React/App.tsx | 2 +- apps/demos/Demos/Toolbar/Overview/ReactJs/App.js | 2 +- apps/demos/Demos/Toolbar/Overview/Vue/App.vue | 2 +- .../Demos/TreeList/FilterPanel/Angular/app/app.component.ts | 2 +- .../TreeList/LoadDataOnDemand/Angular/app/app.component.ts | 2 +- .../Demos/TreeView/VirtualMode/Angular/app/app.component.ts | 3 +-- apps/demos/Demos/TreeView/VirtualMode/React/App.tsx | 3 +-- apps/demos/Demos/TreeView/VirtualMode/ReactJs/App.js | 3 +-- apps/demos/Demos/TreeView/VirtualMode/Vue/App.vue | 3 +-- apps/demos/configs/Angular/config.bundle.js | 4 ++-- apps/demos/configs/React/config.bundle.js | 4 ++-- apps/demos/configs/ReactJs/config.bundle.js | 4 ++-- apps/demos/configs/Vue/config.bundle.js | 4 ++-- 247 files changed, 280 insertions(+), 321 deletions(-) diff --git a/apps/demos/Demos/Autocomplete/Overview/Angular/app/app.component.ts b/apps/demos/Demos/Autocomplete/Overview/Angular/app/app.component.ts index 48ecfccb6752..bfe948611f50 100644 --- a/apps/demos/Demos/Autocomplete/Overview/Angular/app/app.component.ts +++ b/apps/demos/Demos/Autocomplete/Overview/Angular/app/app.component.ts @@ -4,8 +4,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { HttpClient, HttpClientModule, HttpParams } from '@angular/common/http'; import { lastValueFrom } from 'rxjs'; import { DxAutocompleteModule, DxTemplateModule } from 'devextreme-angular'; -import CustomStore from 'devextreme/data/custom_store'; -import ODataStore from 'devextreme/data/odata/store'; +import { CustomStore, ODataStore } from 'devextreme-angular/common/data'; import { Service } from './app.service'; if (!/localhost/.test(document.location.host)) { diff --git a/apps/demos/Demos/Autocomplete/Overview/React/App.tsx b/apps/demos/Demos/Autocomplete/Overview/React/App.tsx index a2acf77281c9..2565f3ffba1c 100644 --- a/apps/demos/Demos/Autocomplete/Overview/React/App.tsx +++ b/apps/demos/Demos/Autocomplete/Overview/React/App.tsx @@ -1,7 +1,6 @@ import React, { useCallback, useState } from 'react'; -import ODataStore from 'devextreme/data/odata/store'; +import { ODataStore, CustomStore } from 'devextreme-react/common/data/'; import { Autocomplete, AutocompleteTypes } from 'devextreme-react/autocomplete'; -import CustomStore from 'devextreme/data/custom_store'; import 'whatwg-fetch'; import { names, surnames, positions } from './data.ts'; diff --git a/apps/demos/Demos/Autocomplete/Overview/ReactJs/App.js b/apps/demos/Demos/Autocomplete/Overview/ReactJs/App.js index e2a7e0adc826..84dda8b1eb70 100644 --- a/apps/demos/Demos/Autocomplete/Overview/ReactJs/App.js +++ b/apps/demos/Demos/Autocomplete/Overview/ReactJs/App.js @@ -1,7 +1,6 @@ import React, { useCallback, useState } from 'react'; -import ODataStore from 'devextreme/data/odata/store'; +import { ODataStore, CustomStore } from 'devextreme-react/common/data'; import { Autocomplete } from 'devextreme-react/autocomplete'; -import CustomStore from 'devextreme/data/custom_store'; import 'whatwg-fetch'; import { names, surnames, positions } from './data.js'; diff --git a/apps/demos/Demos/Autocomplete/Overview/Vue/App.vue b/apps/demos/Demos/Autocomplete/Overview/Vue/App.vue index a306569f35a2..447b18d1c4cb 100644 --- a/apps/demos/Demos/Autocomplete/Overview/Vue/App.vue +++ b/apps/demos/Demos/Autocomplete/Overview/Vue/App.vue @@ -97,9 +97,8 @@