diff --git a/apps/demos/Demos/Chat/Customization/ReactJs/index.html b/apps/demos/Demos/Chat/Customization/ReactJs/index.html
index c9ee055d50a5..db31b0fd60c6 100644
--- a/apps/demos/Demos/Chat/Customization/ReactJs/index.html
+++ b/apps/demos/Demos/Chat/Customization/ReactJs/index.html
@@ -37,7 +37,7 @@
-
+
diff --git a/apps/demos/Demos/DataGrid/FixedAndStickyColumns/description.md b/apps/demos/Demos/DataGrid/FixedAndStickyColumns/description.md
index 19b882579083..33e1bbc0b9f0 100644
--- a/apps/demos/Demos/DataGrid/FixedAndStickyColumns/description.md
+++ b/apps/demos/Demos/DataGrid/FixedAndStickyColumns/description.md
@@ -10,6 +10,6 @@ The column is fixed to the right edge of the grid.
- *'sticky'*
The column sticks to left and right edges when it reaches them.
-
-To fix or unfix a column, users should right-click the column's header and select the corresponding operation in the context menu. To prevent users from fixing or unfixing a column, set its [allowFixing](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/columns/#allowFixing) property to `false`.
\ No newline at end of file
+To fix or unfix a column, users should right-click the column's header and select the corresponding operation in the context menu. To prevent users from fixing or unfixing a column, set its [allowFixing](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/columns/#allowFixing) property to `false`.
+
\ No newline at end of file
diff --git a/apps/demos/Demos/Pagination/Overview/description.md b/apps/demos/Demos/Pagination/Overview/description.md
index ada1cc79830e..e334bd8d669b 100644
--- a/apps/demos/Demos/Pagination/Overview/description.md
+++ b/apps/demos/Demos/Pagination/Overview/description.md
@@ -1,4 +1,4 @@
-DevExpress Pagination UI component allows users to navigate between pages and adjust page size at runtime. The Pagination component in this demo allows users to browse employee cards.
+DevExpress Pagination UI component allows users to navigate between pages and adjust page size at runtime. In this demo, users can browse employee cards with the Pagination component.
To set up a Pagination component, specify the following options:
diff --git a/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css b/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css
index a4c619487f71..3c13932a2a05 100644
--- a/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css
+++ b/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css
@@ -3,6 +3,10 @@
position: relative;
}
+::ng-deep .dx-scheduler-group-header-content {
+ padding-left: 8px;
+}
+
::ng-deep .dx-color-scheme-light,
::ng-deep .dx-color-scheme-carmine,
::ng-deep .dx-color-scheme-softblue,
@@ -50,7 +54,8 @@
color: var(--text-color-1);
}
-::ng-deep .dx-scheduler-work-space-month .dx-scheduler-appointment {
+::ng-deep .dx-scheduler-work-space-month .dx-scheduler-appointment,
+::ng-deep .dx-scheduler-work-space-month .dx-scheduler-appointment.dx-state-focused {
color: var(--text-color-2);
line-height: 22px;
}
diff --git a/apps/demos/Demos/Scheduler/Overview/React/styles.css b/apps/demos/Demos/Scheduler/Overview/React/styles.css
index 1f104cd1c477..97f1dab526a7 100644
--- a/apps/demos/Demos/Scheduler/Overview/React/styles.css
+++ b/apps/demos/Demos/Scheduler/Overview/React/styles.css
@@ -3,6 +3,10 @@
position: relative;
}
+.dx-scheduler-group-header-content {
+ padding-left: 8px;
+}
+
.dx-color-scheme-light,
.dx-color-scheme-carmine,
.dx-color-scheme-softblue,
@@ -50,7 +54,8 @@
color: var(--text-color-1);
}
-.dx-scheduler-work-space-month .dx-scheduler-appointment {
+.dx-scheduler-work-space-month .dx-scheduler-appointment,
+.dx-scheduler-work-space-month .dx-scheduler-appointment.dx-state-focused {
color: var(--text-color-2);
line-height: 22px;
}
diff --git a/apps/demos/Demos/Scheduler/Overview/ReactJs/styles.css b/apps/demos/Demos/Scheduler/Overview/ReactJs/styles.css
index 1f104cd1c477..97f1dab526a7 100644
--- a/apps/demos/Demos/Scheduler/Overview/ReactJs/styles.css
+++ b/apps/demos/Demos/Scheduler/Overview/ReactJs/styles.css
@@ -3,6 +3,10 @@
position: relative;
}
+.dx-scheduler-group-header-content {
+ padding-left: 8px;
+}
+
.dx-color-scheme-light,
.dx-color-scheme-carmine,
.dx-color-scheme-softblue,
@@ -50,7 +54,8 @@
color: var(--text-color-1);
}
-.dx-scheduler-work-space-month .dx-scheduler-appointment {
+.dx-scheduler-work-space-month .dx-scheduler-appointment,
+.dx-scheduler-work-space-month .dx-scheduler-appointment.dx-state-focused {
color: var(--text-color-2);
line-height: 22px;
}
diff --git a/apps/demos/Demos/Scheduler/Overview/Vue/App.vue b/apps/demos/Demos/Scheduler/Overview/Vue/App.vue
index 2bcfe477aed7..226fce3440e2 100644
--- a/apps/demos/Demos/Scheduler/Overview/Vue/App.vue
+++ b/apps/demos/Demos/Scheduler/Overview/Vue/App.vue
@@ -51,6 +51,10 @@ const dataSource = data;
position: relative;
}
+.dx-scheduler-group-header-content {
+ padding-left: 8px;
+}
+
.dx-color-scheme-light,
.dx-color-scheme-carmine,
.dx-color-scheme-softblue,
@@ -98,7 +102,8 @@ const dataSource = data;
color: var(--text-color-1);
}
-.dx-scheduler-work-space-month .dx-scheduler-appointment {
+.dx-scheduler-work-space-month .dx-scheduler-appointment,
+.dx-scheduler-work-space-month .dx-scheduler-appointment.dx-state-focused {
color: var(--text-color-2);
line-height: 22px;
}
diff --git a/apps/demos/Demos/Scheduler/Overview/jQuery/styles.css b/apps/demos/Demos/Scheduler/Overview/jQuery/styles.css
index 1f104cd1c477..97f1dab526a7 100644
--- a/apps/demos/Demos/Scheduler/Overview/jQuery/styles.css
+++ b/apps/demos/Demos/Scheduler/Overview/jQuery/styles.css
@@ -3,6 +3,10 @@
position: relative;
}
+.dx-scheduler-group-header-content {
+ padding-left: 8px;
+}
+
.dx-color-scheme-light,
.dx-color-scheme-carmine,
.dx-color-scheme-softblue,
@@ -50,7 +54,8 @@
color: var(--text-color-1);
}
-.dx-scheduler-work-space-month .dx-scheduler-appointment {
+.dx-scheduler-work-space-month .dx-scheduler-appointment,
+.dx-scheduler-work-space-month .dx-scheduler-appointment.dx-state-focused {
color: var(--text-color-2);
line-height: 22px;
}
diff --git a/apps/demos/Demos/SelectBox/GroupedItems/Angular/app/app.component.css b/apps/demos/Demos/SelectBox/GroupedItems/Angular/app/app.component.css
index 61138f2a6bf1..7038173143d2 100644
--- a/apps/demos/Demos/SelectBox/GroupedItems/Angular/app/app.component.css
+++ b/apps/demos/Demos/SelectBox/GroupedItems/Angular/app/app.component.css
@@ -1,5 +1,9 @@
::ng-deep .custom-icon .icon {
- font-size: 17px;
color: #f05b41;
- margin-right: 2px;
+}
+
+::ng-deep .custom-icon {
+ display: flex;
+ align-items: center;
+ gap: 4px;
}
diff --git a/apps/demos/Demos/SelectBox/GroupedItems/React/styles.css b/apps/demos/Demos/SelectBox/GroupedItems/React/styles.css
index 437d26328ad2..63ce2320c355 100644
--- a/apps/demos/Demos/SelectBox/GroupedItems/React/styles.css
+++ b/apps/demos/Demos/SelectBox/GroupedItems/React/styles.css
@@ -1,5 +1,9 @@
.custom-icon .icon {
- font-size: 17px;
color: #f05b41;
- margin-right: 2px;
+}
+
+.custom-icon {
+ display: flex;
+ align-items: center;
+ gap: 4px;
}
diff --git a/apps/demos/Demos/SelectBox/GroupedItems/ReactJs/styles.css b/apps/demos/Demos/SelectBox/GroupedItems/ReactJs/styles.css
index 437d26328ad2..63ce2320c355 100644
--- a/apps/demos/Demos/SelectBox/GroupedItems/ReactJs/styles.css
+++ b/apps/demos/Demos/SelectBox/GroupedItems/ReactJs/styles.css
@@ -1,5 +1,9 @@
.custom-icon .icon {
- font-size: 17px;
color: #f05b41;
- margin-right: 2px;
+}
+
+.custom-icon {
+ display: flex;
+ align-items: center;
+ gap: 4px;
}
diff --git a/apps/demos/Demos/SelectBox/GroupedItems/Vue/Group.vue b/apps/demos/Demos/SelectBox/GroupedItems/Vue/Group.vue
index 66496ebe1912..bd738f14b7e1 100644
--- a/apps/demos/Demos/SelectBox/GroupedItems/Vue/Group.vue
+++ b/apps/demos/Demos/SelectBox/GroupedItems/Vue/Group.vue
@@ -13,8 +13,12 @@ withDefaults(defineProps<{
diff --git a/apps/demos/Demos/SelectBox/GroupedItems/jQuery/styles.css b/apps/demos/Demos/SelectBox/GroupedItems/jQuery/styles.css
index 437d26328ad2..63ce2320c355 100644
--- a/apps/demos/Demos/SelectBox/GroupedItems/jQuery/styles.css
+++ b/apps/demos/Demos/SelectBox/GroupedItems/jQuery/styles.css
@@ -1,5 +1,9 @@
.custom-icon .icon {
- font-size: 17px;
color: #f05b41;
- margin-right: 2px;
+}
+
+.custom-icon {
+ display: flex;
+ align-items: center;
+ gap: 4px;
}
diff --git a/apps/demos/Demos/TagBox/GroupedItems/Angular/app/app.component.css b/apps/demos/Demos/TagBox/GroupedItems/Angular/app/app.component.css
index 035fc75aaef9..01e5b0b3bd12 100644
--- a/apps/demos/Demos/TagBox/GroupedItems/Angular/app/app.component.css
+++ b/apps/demos/Demos/TagBox/GroupedItems/Angular/app/app.component.css
@@ -1,7 +1,11 @@
::ng-deep .custom-icon .icon {
- font-size: 17px;
color: #f05b41;
- margin-right: 2px;
+}
+
+::ng-deep .custom-icon {
+ display: flex;
+ align-items: center;
+ gap: 4px;
}
::ng-deep .dx-field {
diff --git a/apps/demos/Demos/TagBox/GroupedItems/React/styles.css b/apps/demos/Demos/TagBox/GroupedItems/React/styles.css
index 37568462f9fb..f997c92f251f 100644
--- a/apps/demos/Demos/TagBox/GroupedItems/React/styles.css
+++ b/apps/demos/Demos/TagBox/GroupedItems/React/styles.css
@@ -1,7 +1,11 @@
.custom-icon .icon {
- font-size: 17px;
color: #f05b41;
- margin-right: 2px;
+}
+
+.custom-icon {
+ display: flex;
+ align-items: center;
+ gap: 4px;
}
.dx-field {
diff --git a/apps/demos/Demos/TagBox/GroupedItems/ReactJs/styles.css b/apps/demos/Demos/TagBox/GroupedItems/ReactJs/styles.css
index 37568462f9fb..f997c92f251f 100644
--- a/apps/demos/Demos/TagBox/GroupedItems/ReactJs/styles.css
+++ b/apps/demos/Demos/TagBox/GroupedItems/ReactJs/styles.css
@@ -1,7 +1,11 @@
.custom-icon .icon {
- font-size: 17px;
color: #f05b41;
- margin-right: 2px;
+}
+
+.custom-icon {
+ display: flex;
+ align-items: center;
+ gap: 4px;
}
.dx-field {
diff --git a/apps/demos/Demos/TagBox/GroupedItems/Vue/Group.vue b/apps/demos/Demos/TagBox/GroupedItems/Vue/Group.vue
index 66496ebe1912..bd738f14b7e1 100644
--- a/apps/demos/Demos/TagBox/GroupedItems/Vue/Group.vue
+++ b/apps/demos/Demos/TagBox/GroupedItems/Vue/Group.vue
@@ -13,8 +13,12 @@ withDefaults(defineProps<{
diff --git a/apps/demos/Demos/TagBox/GroupedItems/jQuery/styles.css b/apps/demos/Demos/TagBox/GroupedItems/jQuery/styles.css
index 37568462f9fb..f997c92f251f 100644
--- a/apps/demos/Demos/TagBox/GroupedItems/jQuery/styles.css
+++ b/apps/demos/Demos/TagBox/GroupedItems/jQuery/styles.css
@@ -1,7 +1,11 @@
.custom-icon .icon {
- font-size: 17px;
color: #f05b41;
- margin-right: 2px;
+}
+
+.custom-icon {
+ display: flex;
+ align-items: center;
+ gap: 4px;
}
.dx-field {
diff --git a/apps/demos/Demos/TreeList/ColumnFixing/description.md b/apps/demos/Demos/TreeList/ColumnFixing/description.md
index 11b58966bb5d..d8d8917ac35d 100644
--- a/apps/demos/Demos/TreeList/ColumnFixing/description.md
+++ b/apps/demos/Demos/TreeList/ColumnFixing/description.md
@@ -10,6 +10,6 @@ The column is fixed to the right edge of the grid.
- *'sticky'*
The column sticks to left and right edges when it reaches them.
-
-To fix or unfix a column, users should right-click the column's header and select the corresponding operation in the context menu. To prevent users from fixing or unfixing a column, set its [allowFixing](/Documentation/ApiReference/UI_Components/dxTreeList/Configuration/columns/#allowFixing) property to `false`.
\ No newline at end of file
+To fix or unfix a column, users should right-click the column's header and select the corresponding operation in the context menu. To prevent users from fixing or unfixing a column, set its [allowFixing](/Documentation/ApiReference/UI_Components/dxTreeList/Configuration/columns/#allowFixing) property to `false`.
+
\ No newline at end of file
diff --git a/apps/demos/configs/Angular/config.bundle.js b/apps/demos/configs/Angular/config.bundle.js
index 460e4aa1af56..57d089649471 100644
--- a/apps/demos/configs/Angular/config.bundle.js
+++ b/apps/demos/configs/Angular/config.bundle.js
@@ -2,8 +2,9 @@ const bundleConfig = {
bundles: {
'devextreme.angular.systemjs.js': [
'devextreme/*',
+ 'devextreme/data/*',
+ 'devextreme/data/odata/*',
'devextreme/animation/*',
- 'devextreme/common/*',
'devextreme/core/*',
'devextreme/core/utils/*',
'devextreme/data/*',
@@ -23,8 +24,21 @@ const bundleConfig = {
'devextreme/ui/toast/*',
'devextreme/viz/*',
'devextreme/viz/vector_map/*',
+ 'devextreme/common/*',
+ 'devextreme/common/data/*',
+ 'devextreme/common/data/odata/*',
+ 'devextreme/common/export/*',
+ 'devextreme/common/core/*',
+ 'devextreme/common/core/animation/*',
+ 'devextreme/common/core/environment/*',
+ 'devextreme/common/core/events/*',
+ 'devextreme/common/core/localization/*',
'devextreme-angular',
'devextreme-angular/*',
+ 'devextreme-angular/core/*',
+ 'devextreme-angular/common/*',
+ 'devextreme-angular/common/core/*',
+ 'devextreme-angular/common/export/*',
'devexpress-gantt',
'devexpress-diagram',
'rxjs/*',
diff --git a/apps/demos/configs/React/config.bundle.js b/apps/demos/configs/React/config.bundle.js
index b00bed0cee17..b603c1619458 100644
--- a/apps/demos/configs/React/config.bundle.js
+++ b/apps/demos/configs/React/config.bundle.js
@@ -2,8 +2,9 @@ const bundleConfig = {
bundles: {
'devextreme.react.systemjs.js': [
'devextreme/*',
+ 'devextreme/data/*',
+ 'devextreme/data/odata/*',
'devextreme/animation/*',
- 'devextreme/common/*',
'devextreme/core/*',
'devextreme/core/utils/*',
'devextreme/data/*',
@@ -23,8 +24,21 @@ const bundleConfig = {
'devextreme/ui/toast/*',
'devextreme/viz/*',
'devextreme/viz/vector_map/*',
+ 'devextreme/common/*',
+ 'devextreme/common/data/*',
+ 'devextreme/common/data/odata/*',
+ 'devextreme/common/export/*',
+ 'devextreme/common/core/*',
+ 'devextreme/common/core/animation/*',
+ 'devextreme/common/core/environment/*',
+ 'devextreme/common/core/events/*',
+ 'devextreme/common/core/localization/*',
+ 'devextreme/common/core/localization/globalize/*',
'devextreme-react/*',
'devextreme-react/core/*',
+ 'devextreme-react/common/*',
+ 'devextreme-react/common/core/*',
+ 'devextreme-react/common/export/*',
'devexpress-gantt',
'devexpress-diagram',
'react/*',
diff --git a/apps/demos/configs/ReactJs/config.bundle.js b/apps/demos/configs/ReactJs/config.bundle.js
index 754c39a693d0..698ffa4e391c 100644
--- a/apps/demos/configs/ReactJs/config.bundle.js
+++ b/apps/demos/configs/ReactJs/config.bundle.js
@@ -2,6 +2,8 @@ const bundleConfig = {
bundles: {
'devextreme.react.systemjs.js': [
'devextreme/*',
+ 'devextreme/data/*',
+ 'devextreme/data/odata/*',
'devextreme/animation/*',
'devextreme/core/*',
'devextreme/core/utils/*',
@@ -17,7 +19,21 @@ const bundleConfig = {
'devextreme/ui/pivot_grid/*',
'devextreme/viz/*',
'devextreme/viz/vector_map/*',
+ 'devextreme/common/*',
+ 'devextreme/common/data/*',
+ 'devextreme/common/data/odata/*',
+ 'devextreme/common/export/*',
+ 'devextreme/common/core/*',
+ 'devextreme/common/core/animation/*',
+ 'devextreme/common/core/environment/*',
+ 'devextreme/common/core/events/*',
+ 'devextreme/common/core/localization/*',
+ 'devextreme/common/core/localization/globalize/*',
'devextreme-react/*',
+ 'devextreme-react/core/*',
+ 'devextreme-react/common/*',
+ 'devextreme-react/common/core/*',
+ 'devextreme-react/common/export/*',
'devexpress-gantt',
'devexpress-diagram',
'react/*',
diff --git a/apps/demos/configs/Vue/config.bundle.js b/apps/demos/configs/Vue/config.bundle.js
index 6123fa5a4b09..fe075b6666a3 100644
--- a/apps/demos/configs/Vue/config.bundle.js
+++ b/apps/demos/configs/Vue/config.bundle.js
@@ -2,8 +2,9 @@ const bundleConfig = {
bundles: {
'devextreme.vue.systemjs.js': [
'devextreme/*',
+ 'devextreme/data/*',
+ 'devextreme/data/odata/*',
'devextreme/animation/*',
- 'devextreme/common/*',
'devextreme/core/*',
'devextreme/core/utils/*',
'devextreme/data/*',
@@ -23,7 +24,20 @@ const bundleConfig = {
'devextreme/ui/toast/*',
'devextreme/viz/*',
'devextreme/viz/vector_map/*',
+ 'devextreme/common/*',
+ 'devextreme/common/data/*',
+ 'devextreme/common/data/odata/*',
+ 'devextreme/common/export/*',
+ 'devextreme/common/core/*',
+ 'devextreme/common/core/animation/*',
+ 'devextreme/common/core/environment/*',
+ 'devextreme/common/core/events/*',
+ 'devextreme/common/core/localization/*',
'devextreme-vue/*',
+ 'devextreme-vue/core/*',
+ 'devextreme-vue/common/*',
+ 'devextreme-vue/common/core/*',
+ 'devextreme-vue/common/export/*',
'devexpress-gantt',
'devexpress-diagram',
],
diff --git a/apps/demos/menuMeta.json b/apps/demos/menuMeta.json
index 656d9ffd7ad0..2893f7cf8b59 100644
--- a/apps/demos/menuMeta.json
+++ b/apps/demos/menuMeta.json
@@ -2086,7 +2086,13 @@
"Name": "Customization",
"DocUrl": "Guide/UI_Components/Chat/Customization/",
"Widget": "Chat",
- "DemoType": "Web"
+ "DemoType": "Web",
+ "MvcAdditionalFiles": [
+ "/Models/SampleData/ChatData.cs",
+ "/Models/Chat/User.cs",
+ "/Models/Chat/Message.cs",
+ "/ViewModels/ChatViewModel.cs"
+ ]
}
]
},
@@ -2098,6 +2104,7 @@
"Title": "AI and Chatbot Integration",
"Name": "AIAndChatbotIntegration",
"Widget": "Chat",
+ "Modules": "html-react-parser",
"DemoType": "Web"
}
]
diff --git a/apps/demos/package.json b/apps/demos/package.json
index 44b6bdcd5046..16c3505adf78 100644
--- a/apps/demos/package.json
+++ b/apps/demos/package.json
@@ -111,7 +111,7 @@
"eslint-plugin-deprecation": "2.0.0",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-react-perf": "3.3.2",
- "express": "4.20.0",
+ "express": "4.21.1",
"glob": "10.4.5",
"gulp": "4.0.2",
"gulp-clean": "0.4.0",
@@ -128,7 +128,7 @@
"prettier": "2.8.8",
"rollup": "4.22.4",
"serve-index": "1.9.1",
- "serve-static": "1.16.0",
+ "serve-static": "1.16.2",
"stylelint": "16.5.0",
"stylelint-config-recommended-vue": "1.5.0",
"stylelint-config-standard": "35.0.0",
diff --git a/apps/demos/rollup.devextreme-angular.umd.config.mjs b/apps/demos/rollup.devextreme-angular.umd.config.mjs
index f15ea55bbc80..7c78bf2f10cb 100644
--- a/apps/demos/rollup.devextreme-angular.umd.config.mjs
+++ b/apps/demos/rollup.devextreme-angular.umd.config.mjs
@@ -4,16 +4,19 @@ import babel from '@rollup/plugin-babel';
import fs from 'fs-extra';
const baseDir = './node_modules/devextreme-angular/fesm2022/';
-const componentNames = fs.readdirSync(baseDir)
+const fileNames = fs.readdirSync(baseDir)
.filter((fileName) => fileName.indexOf('mjs.map') !== -1)
- .filter((fileName) => fileName.indexOf('devextreme-angular-ui') === 0)
+ .filter((fileName) =>
+ fileName.indexOf('devextreme-angular-ui') === 0
+ || fileName.indexOf('devextreme-angular-common') === 0
+ )
.map((fileName) => fileName.replace('.mjs.map', ''));
const inputs = {
'devextreme-angular': `${baseDir}devextreme-angular.mjs`,
'devextreme-angular-core': `${baseDir}devextreme-angular-core.mjs`,
'devextreme-angular-http': `${baseDir}devextreme-angular-http.mjs`,
- ...componentNames.reduce((acc, name) => {
+ ...fileNames.reduce((acc, name) => {
acc[name] = `${baseDir}${name}.mjs`;
return acc;
diff --git a/apps/demos/testing/etalons/Scheduler-Overview.png b/apps/demos/testing/etalons/Scheduler-Overview.png
index e0d9643cd098..bfcf62ce8298 100644
Binary files a/apps/demos/testing/etalons/Scheduler-Overview.png and b/apps/demos/testing/etalons/Scheduler-Overview.png differ
diff --git a/apps/demos/testing/widgets/scheduler/etalons/scheduler_overview_selection.png b/apps/demos/testing/widgets/scheduler/etalons/scheduler_overview_selection.png
index a136bce0faa7..5793b8a02466 100644
Binary files a/apps/demos/testing/widgets/scheduler/etalons/scheduler_overview_selection.png and b/apps/demos/testing/widgets/scheduler/etalons/scheduler_overview_selection.png differ
diff --git a/apps/demos/testing/widgets/selectbox/GroupedItems.test.js b/apps/demos/testing/widgets/selectbox/GroupedItems.test.js
new file mode 100644
index 000000000000..a8f2fc26beda
--- /dev/null
+++ b/apps/demos/testing/widgets/selectbox/GroupedItems.test.js
@@ -0,0 +1,47 @@
+import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
+import { Selector as $ } from 'testcafe';
+import { runManualTest } from '../../../utils/visual-tests/matrix-test-helper';
+import { testScreenshot } from '../../../utils/visual-tests/helpers/theme-utils';
+
+fixture('SelectBox.GroupedItems')
+ .page('http://localhost:8080/')
+ .before(async (ctx) => {
+ ctx.initialWindowSize = [900, 600];
+ });
+
+runManualTest('SelectBox', 'GroupedItems', ['jQuery', 'React', 'Vue', 'Angular'], (test) => {
+ test('GroupedItems', async (t) => {
+ const SELECT_BOX_CLASS = 'dx-selectbox';
+ const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+
+ await t
+ .click($(`.${SELECT_BOX_CLASS}`).nth(0))
+ .wait(200);
+
+ await testScreenshot(t, takeScreenshot, 'selectbox_groupeditems_first_opened.png');
+
+ await t
+ .click($(`.${SELECT_BOX_CLASS}`).nth(0))
+ .wait(200);
+
+ await t
+ .click($(`.${SELECT_BOX_CLASS}`).nth(1))
+ .wait(200);
+
+ await testScreenshot(t, takeScreenshot, 'selectbox_groupeditems_second_opened.png');
+
+ await t
+ .click($(`.${SELECT_BOX_CLASS}`).nth(1))
+ .wait(200);
+
+ await t
+ .click($(`.${SELECT_BOX_CLASS}`).nth(2))
+ .wait(200);
+
+ await testScreenshot(t, takeScreenshot, 'selectbox_groupeditems_third_opened.png');
+
+ await t
+ .expect(compareResults.isValid())
+ .ok(compareResults.errorMessages());
+ });
+});
diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (fluent.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (fluent.blue.light).png
new file mode 100644
index 000000000000..2744d9ef4c4b
Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (fluent.blue.light).png differ
diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (material.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (material.blue.light).png
new file mode 100644
index 000000000000..3dc3ec5ef727
Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (material.blue.light).png differ
diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened.png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened.png
new file mode 100644
index 000000000000..2795e515cfd6
Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened.png differ
diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (fluent.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (fluent.blue.light).png
new file mode 100644
index 000000000000..fc86112f8270
Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (fluent.blue.light).png differ
diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (material.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (material.blue.light).png
new file mode 100644
index 000000000000..2af7b026eb5e
Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (material.blue.light).png differ
diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened.png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened.png
new file mode 100644
index 000000000000..485dffc0fda7
Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened.png differ
diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (fluent.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (fluent.blue.light).png
new file mode 100644
index 000000000000..a164d2a9b3ae
Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (fluent.blue.light).png differ
diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (material.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (material.blue.light).png
new file mode 100644
index 000000000000..c19fd5d976f9
Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (material.blue.light).png differ
diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened.png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened.png
new file mode 100644
index 000000000000..207ebdac4531
Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened.png differ
diff --git a/apps/demos/testing/widgets/tagbox/GroupedItems.test.js b/apps/demos/testing/widgets/tagbox/GroupedItems.test.js
new file mode 100644
index 000000000000..d7d2f288a577
--- /dev/null
+++ b/apps/demos/testing/widgets/tagbox/GroupedItems.test.js
@@ -0,0 +1,43 @@
+import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
+import { runManualTest } from '../../../utils/visual-tests/matrix-test-helper';
+import { testScreenshot } from '../../../utils/visual-tests/helpers/theme-utils';
+
+fixture('TagBox.GroupedItems')
+ .page('http://localhost:8080/')
+ .before(async (ctx) => {
+ ctx.initialWindowSize = [900, 600];
+ });
+
+runManualTest('TagBox', 'GroupedItems', ['jQuery', 'React', 'Vue', 'Angular'], (test) => {
+ test('GroupedItems', async (t) => {
+ const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+
+ await t
+ .pressKey('tab')
+ .pressKey('alt+down');
+
+ await testScreenshot(t, takeScreenshot, 'tagbox_groupeditems_first_opened.png');
+
+ await t
+ .pressKey('esc');
+
+ await t
+ .pressKey('tab')
+ .pressKey('alt+down');
+
+ await testScreenshot(t, takeScreenshot, 'tagbox_groupeditems_second_opened.png');
+
+ await t
+ .pressKey('esc');
+
+ await t
+ .pressKey('tab')
+ .pressKey('alt+down');
+
+ await testScreenshot(t, takeScreenshot, 'tagbox_groupeditems_third_opened.png');
+
+ await t
+ .expect(compareResults.isValid())
+ .ok(compareResults.errorMessages());
+ });
+});
diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (fluent.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (fluent.blue.light).png
new file mode 100644
index 000000000000..e2f8c00ebfb6
Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (fluent.blue.light).png differ
diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (material.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (material.blue.light).png
new file mode 100644
index 000000000000..45c22f3680d4
Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (material.blue.light).png differ
diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened.png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened.png
new file mode 100644
index 000000000000..470a876c8d81
Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened.png differ
diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (fluent.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (fluent.blue.light).png
new file mode 100644
index 000000000000..5de81bbb86cc
Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (fluent.blue.light).png differ
diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (material.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (material.blue.light).png
new file mode 100644
index 000000000000..686a775fdcdd
Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (material.blue.light).png differ
diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened.png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened.png
new file mode 100644
index 000000000000..5d70be663736
Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened.png differ
diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (fluent.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (fluent.blue.light).png
new file mode 100644
index 000000000000..3865ae3e51ec
Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (fluent.blue.light).png differ
diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (material.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (material.blue.light).png
new file mode 100644
index 000000000000..130534e91cda
Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (material.blue.light).png differ
diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened.png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened.png
new file mode 100644
index 000000000000..dc11796e37e0
Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened.png differ
diff --git a/apps/demos/utils/bundle/index.js b/apps/demos/utils/bundle/index.js
index beef028630e9..de1daa887370 100644
--- a/apps/demos/utils/bundle/index.js
+++ b/apps/demos/utils/bundle/index.js
@@ -5,6 +5,7 @@ const Builder = require('systemjs-builder');
const babel = require('@babel/core');
const url = require('url');
+const GRID_COMMON_STAR_IMPORT = 'exports.Grids = __importStar(require("./grids"));';
// https://stackoverflow.com/questions/42412965/how-to-load-named-exports-with-systemjs/47108328
const prepareModulesToNamedImport = () => {
@@ -133,6 +134,7 @@ const prepareConfigs = (framework)=> {
prepareDevextremexAngularFiles();
const bundlesRoot = 'node_modules/devextreme-angular/bundles';
+
const componentNames = fs.readdirSync(bundlesRoot)
.filter((fileName) => fileName.indexOf('umd.js') !== -1)
.filter((fileName) => fileName.indexOf('devextreme-angular-ui') === 0)
@@ -215,6 +217,14 @@ const prepareConfigs = (framework)=> {
]
};
+ // This auto-generated runtime import is useless because grid.js exports only types,
+ // but System.js transpiles this import into code that crashes when triggered in a Demo.
+ const removeImportTranspiledToCrashingCode = (result) => {
+ if(result.code.includes(GRID_COMMON_STAR_IMPORT)) {
+ result.code = result.code.replace(GRID_COMMON_STAR_IMPORT, '');
+ }
+ }
+
const result = new Promise((resolve) => {
// systemjs-builder uses babel 6, so we use babel 7 here for transpiling ES2020
babel.transformFile(url.fileURLToPath(load.name), babelOptions, (err, result) => {
@@ -222,6 +232,7 @@ const prepareConfigs = (framework)=> {
fetch(load).then(r => resolve(r));
console.log('Unexpected transipling error (babel 7): ' + err);
} else {
+ removeImportTranspiledToCrashingCode(result);
resolve(result.code);
}
});
diff --git a/e2e/compilation-cases/data/data_source.ts b/e2e/compilation-cases/data/data_source.ts
index 833d4350e6fc..093405f6ec13 100644
--- a/e2e/compilation-cases/data/data_source.ts
+++ b/e2e/compilation-cases/data/data_source.ts
@@ -1,6 +1,20 @@
/* 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,
+} from 'devextreme/common/data';
+
+import {
+ DataSourceOptionsStub,
+ DataSourceLike,
+} from 'devextreme/data/data_source';
+
import {
AnotherType,
ANY,
@@ -11,16 +25,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({
diff --git a/package.json b/package.json
index 054fd5899a65..7d155ee56adb 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"axe-core": "4.10.2",
"cheerio": "1.0.0-rc.10",
"codelyzer": "6.0.2",
- "devextreme-internal-tools": "16.0.0-beta.18",
+ "devextreme-internal-tools": "16.0.0",
"http-server": "14.1.1",
"husky": "8.0.3",
"jest": "29.7.0",
diff --git a/packages/devextreme-angular/build.config.js b/packages/devextreme-angular/build.config.js
index d338e587bd20..0a8123bcb4ee 100644
--- a/packages/devextreme-angular/build.config.js
+++ b/packages/devextreme-angular/build.config.js
@@ -55,7 +55,7 @@ module.exports = {
outputFileName: 'tests/src/server/component-names.ts'
},
commonReexportsGenerator: {
- metadataPath: './metadata/NGMetaData.json',
+ imdMetadataFilePath: './metadata/integration-data.json',
outputPath: './src/'
},
},
diff --git a/packages/devextreme-angular/gulpfile.js b/packages/devextreme-angular/gulpfile.js
index 856bb6fe25b4..07885794ed44 100644
--- a/packages/devextreme-angular/gulpfile.js
+++ b/packages/devextreme-angular/gulpfile.js
@@ -84,14 +84,28 @@ gulp.task('before-generate.preserve-component-files', (done) => {
gulp.task('generate.facades', gulp.series('generate.moduleFacades', (done) => {
const facadeGenerator = new AngularFacadeGenerator();
- facadeGenerator.generate(buildConfig.tools.facadeGenerator);
+ facadeGenerator.generate({
+ ...buildConfig.tools.facadeGenerator,
+ templatingOptions: {
+ quotes: 'single',
+ excplicitIndexInImports: true,
+ },
+ });
+
done();
}));
gulp.task('generate.common-reexports', (done) => {
- const commonReexportsGenerator = new AngularCommonReexportsGenerator();
-
- commonReexportsGenerator.generate(buildConfig.tools.commonReexportsGenerator);
+ const { outputPath, imdMetadataFilePath } = buildConfig.tools.commonReexportsGenerator;
+
+ AngularCommonReexportsGenerator.generate({
+ outputPath,
+ metadata: JSON.parse(fs.readFileSync(imdMetadataFilePath).toString()),
+ templatingOptions: {
+ quotes: 'single',
+ excplicitIndexInImports: true,
+ },
+ });
done();
});
diff --git a/packages/devextreme-angular/package.json b/packages/devextreme-angular/package.json
index b8cfc6ea1b43..1697cc345318 100644
--- a/packages/devextreme-angular/package.json
+++ b/packages/devextreme-angular/package.json
@@ -24,7 +24,7 @@
"devextreme": "workspace:~"
},
"devDependencies": {
- "@angular-devkit/architect": "0.1703.11",
+ "@angular-devkit/architect": "0.1900.2",
"@angular-devkit/schematics": "17.3.11",
"@angular/animations": "17.3.12",
"@angular/cli": "17.3.11",
@@ -73,7 +73,7 @@
"devexpress"
],
"dependencies": {
- "@angular-devkit/schematics": "17.3.8",
+ "@angular-devkit/schematics": "17.3.11",
"devextreme-schematics": "*",
"inferno-server": "7.4.11"
},
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..19ae8891d1ea
--- /dev/null
+++ b/packages/devextreme-angular/src/common/core/environment/index.ts
@@ -0,0 +1,7 @@
+export {
+ Device,
+ getTimeZones,
+ hideTopOverlay,
+ initMobileViewport,
+ SchedulerTimeZone,
+} 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..23f9af001715
--- /dev/null
+++ b/packages/devextreme-angular/src/common/core/events/index.ts
@@ -0,0 +1,14 @@
+export {
+ AsyncCancelable,
+ Cancelable,
+ ChangedOptionInfo,
+ EventInfo,
+ EventObject,
+ InitializedEventInfo,
+ ItemInfo,
+ NativeEventInfo,
+ off,
+ on,
+ one,
+ trigger,
+} from 'devextreme/common/core/events';
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/index.ts b/packages/devextreme-angular/src/common/core/index.ts
new file mode 100644
index 000000000000..3e8c304c3d8b
--- /dev/null
+++ b/packages/devextreme-angular/src/common/core/index.ts
@@ -0,0 +1,4 @@
+export * as Animation from './animation';
+export * as Environment from './environment';
+export * as Events from './events';
+export * as Localization from './localization';
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/core/ng-package.json b/packages/devextreme-angular/src/common/core/ng-package.json
new file mode 100644
index 000000000000..3360c83b3395
--- /dev/null
+++ b/packages/devextreme-angular/src/common/core/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..25c15fd09554
--- /dev/null
+++ b/packages/devextreme-angular/src/common/data/index.ts
@@ -0,0 +1,43 @@
+export {
+ applyChanges,
+ ArrayStore,
+ ArrayStoreOptions,
+ base64_encode,
+ compileGetter,
+ compileSetter,
+ CustomStore,
+ CustomStoreOptions,
+ DataSource,
+ 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,
+ StoreOptions,
+ 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..22ad01b8501d
--- /dev/null
+++ b/packages/devextreme-angular/src/common/export/excel/index.ts
@@ -0,0 +1,8 @@
+export {
+ DataGridCell,
+ DataGridExportOptions,
+ exportDataGrid,
+ exportPivotGrid,
+ PivotGridCell,
+ PivotGridExportOptions,
+} 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..ef73ffadf731
--- /dev/null
+++ b/packages/devextreme-angular/src/common/export/index.ts
@@ -0,0 +1,2 @@
+export * as Excel from './excel';
+export * as Pdf from './pdf';
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..e2deb669df82
--- /dev/null
+++ b/packages/devextreme-angular/src/common/export/pdf/index.ts
@@ -0,0 +1,9 @@
+export {
+ Cell,
+ DataGridCell,
+ DataGridExportOptions,
+ exportDataGrid,
+ exportGantt,
+ GanttExportFont,
+ GanttExportOptions,
+} 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/index.ts b/packages/devextreme-angular/src/common/index.ts
index ccdb9057c493..2b0c97f54bd0 100644
--- a/packages/devextreme-angular/src/common/index.ts
+++ b/packages/devextreme-angular/src/common/index.ts
@@ -5,9 +5,11 @@ export {
ButtonType,
CompareRule,
ComparisonOperator,
+ config,
CustomRule,
DataStructure,
DataType,
+ DefaultOptionsRule,
Direction,
DisplayMode,
DragDirection,
@@ -18,8 +20,10 @@ export {
ExportFormat,
FieldChooserLayout,
FirstDayOfWeek,
+ FloatingActionButtonDirection,
Format,
GlobalConfig,
+ Guid,
HorizontalAlignment,
HorizontalEdge,
LabelMode,
@@ -29,7 +33,6 @@ export {
Orientation,
PageLoadMode,
PageOrientation,
- PagerBase,
PatternRule,
Position,
PositionAlignment,
@@ -41,6 +44,7 @@ export {
ScrollMode,
SearchMode,
SelectAllMode,
+ setTemplateEngine,
SimplifiedSearchMode,
SingleMultipleAllOrNone,
SingleMultipleOrNone,
@@ -54,6 +58,7 @@ export {
SubmenuShowMode,
TabsIconPosition,
TabsStyle,
+ template,
TextBoxPredefinedButton,
TextEditorButton,
TextEditorButtonLocation,
@@ -68,3 +73,9 @@ export {
VerticalAlignment,
VerticalEdge,
} from 'devextreme/common';
+
+export * as Charts from './charts';
+export * as Core from './core/index';
+export * as Data from './data';
+export * as Export from './export/index';
+export * as Grids from './grids';
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-angular/src/index.ts b/packages/devextreme-angular/src/index.ts
index 15285133dca8..2319f8a9b38d 100644
--- a/packages/devextreme-angular/src/index.ts
+++ b/packages/devextreme-angular/src/index.ts
@@ -84,3 +84,4 @@ export { DxValidationGroupComponent, DxValidationGroupModule } from 'devextreme-
export { DxValidationSummaryComponent, DxValidationSummaryModule } from 'devextreme-angular/ui/validation-summary';
export { DxValidatorComponent, DxValidatorModule } from 'devextreme-angular/ui/validator';
export { DxVectorMapComponent, DxVectorMapModule } from 'devextreme-angular/ui/vector-map';
+export * as Common from './common/index';
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/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..5156a47fb20a 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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/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..6d526b4650a0 100644
--- a/packages/devextreme-angular/src/ui/chart/index.ts
+++ b/packages/devextreme-angular/src/ui/chart/index.ts
@@ -27,7 +27,7 @@ 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 { ChartSeries } from 'devextreme/viz/common';
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..00d47f0e5160 100644
--- a/packages/devextreme-angular/src/ui/chat/index.ts
+++ b/packages/devextreme-angular/src/ui/chat/index.ts
@@ -26,7 +26,7 @@ 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 { 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..98c2ecf6d1f9 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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..e5e900a726ff 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/events/events.types';
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 { 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..6d60f8d17b7b 100644
--- a/packages/devextreme-angular/src/ui/data-grid/index.ts
+++ b/packages/devextreme-angular/src/ui/data-grid/index.ts
@@ -28,7 +28,7 @@ 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';
@@ -36,8 +36,8 @@ import { Store } from 'devextreme/data/store';
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/events/events.types';
+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..9cb8be81f4b7 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,7 +21,7 @@ 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';
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..6330206edd52 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,7 +14,7 @@ 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';
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..f2ccc16f1e2c 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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/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/popup.ts b/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts
index 0ebef132c2b3..9c4460ca91a9 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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..6a983762ff22 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/events/events.types';
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..f8b528cf8c18 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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..83d6b1c676db 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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..04d631d6906e 100644
--- a/packages/devextreme-angular/src/ui/defer-rendering/index.ts
+++ b/packages/devextreme-angular/src/ui/defer-rendering/index.ts
@@ -17,7 +17,7 @@ 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';
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/drawer/index.ts b/packages/devextreme-angular/src/ui/drawer/index.ts
index 053816ce6a0f..a2f08d33ed0e 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/events/events.types';
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/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..fdd881c15fae 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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/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..e1bdf04c2a90 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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/filter-builder/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts
index 5f78539ce8fd..ffb2e61c6519 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,7 +14,7 @@ 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';
diff --git a/packages/devextreme-angular/src/ui/funnel/index.ts b/packages/devextreme-angular/src/ui/funnel/index.ts
index 73880049619e..c691dba9fc12 100644
--- a/packages/devextreme-angular/src/ui/funnel/index.ts
+++ b/packages/devextreme-angular/src/ui/funnel/index.ts
@@ -26,7 +26,7 @@ import { DataSourceOptions } from 'devextreme/data/data_source';
import { Store } from 'devextreme/data/store';
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/gantt/nested/column-dxi.ts b/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts
index a918dd31e800..177604efadfb 100644
--- a/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts
+++ b/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts
@@ -16,7 +16,7 @@ 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';
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/load-panel/index.ts b/packages/devextreme-angular/src/ui/load-panel/index.ts
index 022b1a9ccabe..95fb08fa0afc 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/events/events.types';
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/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..558010270f05 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/events/events.types';
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..cd91855cf623 100644
--- a/packages/devextreme-angular/src/ui/menu/index.ts
+++ b/packages/devextreme-angular/src/ui/menu/index.ts
@@ -24,7 +24,7 @@ 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';
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/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 0ce11e619bab..07eaf9b5941c 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';
@Component({
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..204333de521e 100644
--- a/packages/devextreme-angular/src/ui/pie-chart/index.ts
+++ b/packages/devextreme-angular/src/ui/pie-chart/index.ts
@@ -25,7 +25,7 @@ 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 { ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge, SingleOrMultiple } from 'devextreme/common';
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..4882b6ca7db3 100644
--- a/packages/devextreme-angular/src/ui/polar-chart/index.ts
+++ b/packages/devextreme-angular/src/ui/polar-chart/index.ts
@@ -26,7 +26,7 @@ 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 { ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge, SingleOrMultiple } from 'devextreme/common';
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..ecc68f7f6d96 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/events/events.types';
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..5605258d13af 100644
--- a/packages/devextreme-angular/src/ui/popup/component.ts
+++ b/packages/devextreme-angular/src/ui/popup/component.ts
@@ -22,10 +22,10 @@ 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 } from 'devextreme/events/events.types';
+import { 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/range-selector/index.ts b/packages/devextreme-angular/src/ui/range-selector/index.ts
index f9ac9cf94332..67a0615b7a5f 100644
--- a/packages/devextreme-angular/src/ui/range-selector/index.ts
+++ b/packages/devextreme-angular/src/ui/range-selector/index.ts
@@ -31,7 +31,7 @@ import { Palette, PaletteExtensionMode, ChartsDataType, Font, TimeInterval, Scal
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 { 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/sankey/index.ts b/packages/devextreme-angular/src/ui/sankey/index.ts
index 5a0fa72c86f1..84c56ba43dfb 100644
--- a/packages/devextreme-angular/src/ui/sankey/index.ts
+++ b/packages/devextreme-angular/src/ui/sankey/index.ts
@@ -26,7 +26,7 @@ import { DataSourceOptions } from 'devextreme/data/data_source';
import { Store } from 'devextreme/data/store';
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..b1ceeb417a34 100644
--- a/packages/devextreme-angular/src/ui/scheduler/index.ts
+++ b/packages/devextreme-angular/src/ui/scheduler/index.ts
@@ -27,7 +27,7 @@ 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/events/events.types';
import { DataSourceOptions } from 'devextreme/data/data_source';
import { Store } from 'devextreme/data/store';
import { FirstDayOfWeek, Orientation } from 'devextreme/common';
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..9e7f49a34adf 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/events/events.types';
import {
NestedOptionHost,
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..38ac6e8f873f 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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..daa6feffe5a6 100644
--- a/packages/devextreme-angular/src/ui/sparkline/index.ts
+++ b/packages/devextreme-angular/src/ui/sparkline/index.ts
@@ -25,7 +25,7 @@ import { DataSourceOptions } from 'devextreme/data/data_source';
import { Store } from 'devextreme/data/store';
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/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..79c00e738c4a 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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/toast/index.ts b/packages/devextreme-angular/src/ui/toast/index.ts
index 237eee0a03d4..161fd1e18d51 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/events/events.types';
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/tooltip/index.ts b/packages/devextreme-angular/src/ui/tooltip/index.ts
index 11a57be8f40b..eac27fa9a018 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/events/events.types';
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..c86e64430245 100644
--- a/packages/devextreme-angular/src/ui/tree-list/index.ts
+++ b/packages/devextreme-angular/src/ui/tree-list/index.ts
@@ -28,7 +28,7 @@ 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';
@@ -36,7 +36,7 @@ import { Store } from 'devextreme/data/store';
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/events/events.types';
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..baeca5d53a37 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/events/events.types';
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..970abd8f1770 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,7 +21,7 @@ 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';
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..97d502327ad1 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,7 +14,7 @@ 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';
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..3fb56eaa79af 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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/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/popup.ts b/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts
index 329bd9500597..ddd81446603a 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,11 @@ 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 } from 'devextreme/events/events.types';
+import { 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..52f4fe10b497 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/events/events.types';
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..265d37a315e2 100644
--- a/packages/devextreme-angular/src/ui/tree-map/index.ts
+++ b/packages/devextreme-angular/src/ui/tree-map/index.ts
@@ -26,7 +26,7 @@ import { TreeMapColorizerType, TreeMapLayoutAlgorithm, TreeMapLayoutDirection, C
import { DataSourceOptions } from 'devextreme/data/data_source';
import { Store } from 'devextreme/data/store';
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/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-react/gulpfile.js b/packages/devextreme-react/gulpfile.js
index 56a059f18672..20cfb76606ed 100644
--- a/packages/devextreme-react/gulpfile.js
+++ b/packages/devextreme-react/gulpfile.js
@@ -43,6 +43,10 @@ gulp.task(GEN_RUN, (done) => {
generateReexports: true,
generateCustomTypes: true,
},
+ templatingOptions: {
+ quotes: 'double',
+ excplicitIndexInImports: true,
+ },
});
done();
@@ -96,7 +100,9 @@ gulp.task(NPM_PREPARE_MODULES, (done) => {
const packParamsForFolders = [
['common'],
['core', ['template', 'config', 'nested-option', 'component', 'extension-component']],
+ ['common/core'],
['common/data'],
+ ['common/export'],
];
const modulesImportsFromIndex = fs.readFileSync(
config.npm.dist + 'esm/index.js',
@@ -110,7 +116,7 @@ gulp.task(NPM_PREPARE_MODULES, (done) => {
return ['', [moduleFileName], moduleFilePath];
});
- [...packParamsForFolders, ...packParamsForModules].forEach(
+ [ ...packParamsForModules, ...packParamsForFolders].forEach(
([folder, moduleFileNames, moduleFilePath]) =>
makeModule(folder, moduleFileNames, moduleFilePath)
);
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..57d227f2a8b0 100644
--- a/packages/devextreme-react/src/autocomplete.ts
+++ b/packages/devextreme-react/src/autocomplete.ts
@@ -10,11 +10,10 @@ 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 } from "devextreme/events/events.types";
+import type { 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..340029dc2111 100644
--- a/packages/devextreme-react/src/color-box.ts
+++ b/packages/devextreme-react/src/color-box.ts
@@ -10,11 +10,10 @@ 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 } from "devextreme/events/events.types";
+import type { 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..8830f31c4290
--- /dev/null
+++ b/packages/devextreme-react/src/common/core/environment.ts
@@ -0,0 +1,7 @@
+export {
+ Device,
+ getTimeZones,
+ hideTopOverlay,
+ initMobileViewport,
+ SchedulerTimeZone,
+} 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..f7b89308f060
--- /dev/null
+++ b/packages/devextreme-react/src/common/core/events.ts
@@ -0,0 +1,14 @@
+export {
+ AsyncCancelable,
+ Cancelable,
+ ChangedOptionInfo,
+ EventInfo,
+ EventObject,
+ InitializedEventInfo,
+ ItemInfo,
+ NativeEventInfo,
+ off,
+ on,
+ one,
+ trigger,
+} from "devextreme/common/core/events";
diff --git a/packages/devextreme-react/src/common/core/index.ts b/packages/devextreme-react/src/common/core/index.ts
new file mode 100644
index 000000000000..2f48cae6d949
--- /dev/null
+++ b/packages/devextreme-react/src/common/core/index.ts
@@ -0,0 +1,4 @@
+export * as Animation from "./animation";
+export * as Environment from "./environment";
+export * as Events from "./events";
+export * as Localization from "./localization";
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..16a77b01921d
--- /dev/null
+++ b/packages/devextreme-react/src/common/data.ts
@@ -0,0 +1,43 @@
+export {
+ applyChanges,
+ ArrayStore,
+ ArrayStoreOptions,
+ base64_encode,
+ compileGetter,
+ compileSetter,
+ CustomStore,
+ CustomStoreOptions,
+ DataSource,
+ 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,
+ StoreOptions,
+ SummaryDescriptor,
+} from "devextreme/common/data";
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..62583b766d91
--- /dev/null
+++ b/packages/devextreme-react/src/common/export/excel.ts
@@ -0,0 +1,8 @@
+export {
+ DataGridCell,
+ DataGridExportOptions,
+ exportDataGrid,
+ exportPivotGrid,
+ PivotGridCell,
+ PivotGridExportOptions,
+} from "devextreme/common/export/excel";
diff --git a/packages/devextreme-react/src/common/export/index.ts b/packages/devextreme-react/src/common/export/index.ts
new file mode 100644
index 000000000000..ece2a724b2db
--- /dev/null
+++ b/packages/devextreme-react/src/common/export/index.ts
@@ -0,0 +1,2 @@
+export * as Excel from "./excel";
+export * as Pdf from "./pdf";
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..2b95e14b2487
--- /dev/null
+++ b/packages/devextreme-react/src/common/export/pdf.ts
@@ -0,0 +1,9 @@
+export {
+ Cell,
+ DataGridCell,
+ DataGridExportOptions,
+ exportDataGrid,
+ exportGantt,
+ GanttExportFont,
+ GanttExportOptions,
+} from "devextreme/common/export/pdf";
diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts
index 4cddfd8869c9..c9e79d048002 100644
--- a/packages/devextreme-react/src/common/index.ts
+++ b/packages/devextreme-react/src/common/index.ts
@@ -5,9 +5,11 @@ export {
ButtonType,
CompareRule,
ComparisonOperator,
+ config,
CustomRule,
DataStructure,
DataType,
+ DefaultOptionsRule,
Direction,
DisplayMode,
DragDirection,
@@ -18,8 +20,10 @@ export {
ExportFormat,
FieldChooserLayout,
FirstDayOfWeek,
+ FloatingActionButtonDirection,
Format,
GlobalConfig,
+ Guid,
HorizontalAlignment,
HorizontalEdge,
LabelMode,
@@ -29,7 +33,6 @@ export {
Orientation,
PageLoadMode,
PageOrientation,
- PagerBase,
PatternRule,
Position,
PositionAlignment,
@@ -41,6 +44,7 @@ export {
ScrollMode,
SearchMode,
SelectAllMode,
+ setTemplateEngine,
SimplifiedSearchMode,
SingleMultipleAllOrNone,
SingleMultipleOrNone,
@@ -54,6 +58,7 @@ export {
SubmenuShowMode,
TabsIconPosition,
TabsStyle,
+ template,
TextBoxPredefinedButton,
TextEditorButton,
TextEditorButtonLocation,
@@ -68,3 +73,9 @@ export {
VerticalAlignment,
VerticalEdge,
} from "devextreme/common";
+
+export * as Charts from "./charts";
+export * as Core from "./core/index";
+export * as Data from "./data";
+export * as Export from "./export/index";
+export * as Grids from "./grids";
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..fcc218aea737 100644
--- a/packages/devextreme-react/src/data-grid.ts
+++ b/packages/devextreme-react/src/data-grid.ts
@@ -11,17 +11,16 @@ 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 { dxPopupOptions, dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup";
-import type { event, EventInfo } from "devextreme/events/index";
+import type { event } from "devextreme/events/events.types";
+import type { 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..976a4b16a7c4 100644
--- a/packages/devextreme-react/src/date-box.ts
+++ b/packages/devextreme-react/src/date-box.ts
@@ -11,11 +11,10 @@ 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 } from "devextreme/events/events.types";
+import type { 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..5ce467df5291 100644
--- a/packages/devextreme-react/src/date-range-box.ts
+++ b/packages/devextreme-react/src/date-range-box.ts
@@ -11,11 +11,10 @@ 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 } from "devextreme/events/events.types";
+import type { 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..44b8bd2c1031 100644
--- a/packages/devextreme-react/src/diagram.ts
+++ b/packages/devextreme-react/src/diagram.ts
@@ -9,9 +9,8 @@ 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";
diff --git a/packages/devextreme-react/src/drop-down-box.ts b/packages/devextreme-react/src/drop-down-box.ts
index c79e93cf6e0c..315e56332bb4 100644
--- a/packages/devextreme-react/src/drop-down-box.ts
+++ b/packages/devextreme-react/src/drop-down-box.ts
@@ -10,11 +10,10 @@ 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 } from "devextreme/events/events.types";
+import type { 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..f34fe455cf04 100644
--- a/packages/devextreme-react/src/drop-down-button.ts
+++ b/packages/devextreme-react/src/drop-down-button.ts
@@ -9,11 +9,10 @@ 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 } from "devextreme/events/events.types";
+import type { 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..2a7c73c85b43 100644
--- a/packages/devextreme-react/src/filter-builder.ts
+++ b/packages/devextreme-react/src/filter-builder.ts
@@ -9,9 +9,8 @@ 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";
diff --git a/packages/devextreme-react/src/form.ts b/packages/devextreme-react/src/form.ts
index df4b103107cf..40474ca2cf63 100644
--- a/packages/devextreme-react/src/form.ts
+++ b/packages/devextreme-react/src/form.ts
@@ -11,8 +11,7 @@ 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";
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..2b7f4ed136ea 100644
--- a/packages/devextreme-react/src/gantt.ts
+++ b/packages/devextreme-react/src/gantt.ts
@@ -9,11 +9,10 @@ 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 { dxContextMenuItem } from "devextreme/ui/context_menu";
diff --git a/packages/devextreme-react/src/html-editor.ts b/packages/devextreme-react/src/html-editor.ts
index d1971a16c4a4..05b8d1ae8972 100644
--- a/packages/devextreme-react/src/html-editor.ts
+++ b/packages/devextreme-react/src/html-editor.ts
@@ -10,9 +10,8 @@ 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 { 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";
diff --git a/packages/devextreme-react/src/index.ts b/packages/devextreme-react/src/index.ts
index 7854d6a05322..2cb6dbbb4d50 100644
--- a/packages/devextreme-react/src/index.ts
+++ b/packages/devextreme-react/src/index.ts
@@ -80,3 +80,5 @@ export { ValidationGroup } from "./validation-group";
export { ValidationSummary } from "./validation-summary";
export { Validator } from "./validator";
export { VectorMap } from "./vector-map";
+
+export * as Common from "./common/index";
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..0378331475b4 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/events/events.types";
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..5941feacfd13 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/events/events.types";
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 { 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..0416561ca8f7 100644
--- a/packages/devextreme-react/src/select-box.ts
+++ b/packages/devextreme-react/src/select-box.ts
@@ -10,11 +10,10 @@ 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 } from "devextreme/events/events.types";
+import type { 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..20f2c86b9888 100644
--- a/packages/devextreme-react/src/tag-box.ts
+++ b/packages/devextreme-react/src/tag-box.ts
@@ -10,11 +10,10 @@ 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 } from "devextreme/events/events.types";
+import type { 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..10b572bb4787 100644
--- a/packages/devextreme-react/src/tree-list.ts
+++ b/packages/devextreme-react/src/tree-list.ts
@@ -13,15 +13,14 @@ 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 } from "devextreme/events/events.types";
+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 { dxPopupOptions, dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup";
+import type { 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/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..a8c3e8e20bc3 100644
--- a/packages/devextreme-react/src/vector-map.ts
+++ b/packages/devextreme-react/src/vector-map.ts
@@ -10,8 +10,7 @@ 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";
diff --git a/packages/devextreme-themebuilder/package.json b/packages/devextreme-themebuilder/package.json
index 3e1e41ce19ba..fa5b749ced5f 100644
--- a/packages/devextreme-themebuilder/package.json
+++ b/packages/devextreme-themebuilder/package.json
@@ -39,7 +39,7 @@
"eslint-config-airbnb-base": "15.0.0",
"eslint-config-airbnb-typescript": "17.1.0",
"eslint-config-devextreme": "1.1.5",
- "express": "4.20.0",
+ "express": "4.21.1",
"filing-cabinet": "4.1.6",
"fs-extra": "11.2.0",
"immutable": "4.3.5",
diff --git a/packages/devextreme-vue/gulpfile.js b/packages/devextreme-vue/gulpfile.js
index e0a1f8ce05eb..640075b42fcf 100644
--- a/packages/devextreme-vue/gulpfile.js
+++ b/packages/devextreme-vue/gulpfile.js
@@ -44,7 +44,11 @@ gulp.task(GENERATE,
},
config.widgetsPackage,
VUE_VERSION,
- true
+ true,
+ {
+ quotes: 'double',
+ excplicitIndexInImports: true,
+ }
);
done();
@@ -117,7 +121,7 @@ gulp.task(NPM_PREPARE_MODULES, (done) => {
return ['', [moduleFileName], moduleFilePath];
});
- [...packParamsForFolders, ...packParamsForModules].forEach(
+ [ ...packParamsForModules, ...packParamsForFolders].forEach(
([folder, moduleFileNames, moduleFilePath]) =>
makeModule(folder, moduleFileNames, moduleFilePath)
);
diff --git a/packages/devextreme-vue/src/accordion.ts b/packages/devextreme-vue/src/accordion.ts
index 3fc2789d558f..d85be8b2f15f 100644
--- a/packages/devextreme-vue/src/accordion.ts
+++ b/packages/devextreme-vue/src/accordion.ts
@@ -19,7 +19,7 @@ import {
} from "devextreme/ui/accordion";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -76,7 +76,7 @@ const componentConfig = {
activeStateEnabled: Boolean,
animationDuration: Number,
collapsible: Boolean,
- dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
deferRendering: Boolean,
disabled: Boolean,
elementAttr: Object as PropType>,
diff --git a/packages/devextreme-vue/src/action-sheet.ts b/packages/devextreme-vue/src/action-sheet.ts
index 04792e583d60..cef00037f9fc 100644
--- a/packages/devextreme-vue/src/action-sheet.ts
+++ b/packages/devextreme-vue/src/action-sheet.ts
@@ -18,13 +18,13 @@ import {
} from "devextreme/ui/action_sheet";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
import {
NativeEventInfo,
-} from "devextreme/events/index";
+} from "devextreme/common/core/events";
import {
ButtonStyle,
ButtonType,
@@ -68,7 +68,7 @@ interface DxActionSheet extends AccessibleOptions {
const componentConfig = {
props: {
cancelText: String,
- dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
elementAttr: Object as PropType>,
height: [Function, Number, String] as PropType<((() => number | string)) | number | string>,
diff --git a/packages/devextreme-vue/src/autocomplete.ts b/packages/devextreme-vue/src/autocomplete.ts
index fb680a5dde2c..07857a865727 100644
--- a/packages/devextreme-vue/src/autocomplete.ts
+++ b/packages/devextreme-vue/src/autocomplete.ts
@@ -33,7 +33,7 @@ import {
} from "devextreme/ui/collection/ui.collection_widget.base";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -65,9 +65,12 @@ import {
} from "devextreme/ui/autocomplete";
import {
AnimationConfig,
+ CollisionResolution,
+ PositionConfig,
AnimationState,
AnimationType,
-} from "devextreme/animation/fx";
+ CollisionResolutionCombination,
+} from "devextreme/common/core/animation";
import {
dxButtonOptions,
ClickEvent,
@@ -76,15 +79,12 @@ import {
InitializedEvent as ButtonInitializedEvent,
OptionChangedEvent as ButtonOptionChangedEvent,
} from "devextreme/ui/button";
-import {
- CollisionResolution,
- PositionConfig,
- CollisionResolutionCombination,
-} from "devextreme/animation/position";
import {
event,
+} from "devextreme/events/events.types";
+import {
EventInfo,
-} from "devextreme/events/index";
+} from "devextreme/common/core/events";
import {
Component,
} from "devextreme/core/component";
@@ -179,7 +179,7 @@ const componentConfig = {
accessKey: String,
activeStateEnabled: Boolean,
buttons: Array as PropType>,
- dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
deferRendering: Boolean,
disabled: Boolean,
displayValue: String,
diff --git a/packages/devextreme-vue/src/bar-gauge.ts b/packages/devextreme-vue/src/bar-gauge.ts
index 28007a51b561..55960c741ffb 100644
--- a/packages/devextreme-vue/src/bar-gauge.ts
+++ b/packages/devextreme-vue/src/bar-gauge.ts
@@ -37,7 +37,7 @@ import {
} from "devextreme/common";
import {
Format as LocalizationFormat,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick,
crossAlign: String as PropType,
- dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
direction: String as PropType,
disabled: Boolean,
elementAttr: Object as PropType>,
diff --git a/packages/devextreme-vue/src/bullet.ts b/packages/devextreme-vue/src/bullet.ts
index 8c1b11e0c400..9e715de1178f 100644
--- a/packages/devextreme-vue/src/bullet.ts
+++ b/packages/devextreme-vue/src/bullet.ts
@@ -24,7 +24,7 @@ import {
} from "devextreme/common";
import {
Format as LocalizationFormat,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick SeriesLabel)>,
customizePoint: Function as PropType<((pointInfo: any) => SeriesPoint)>,
dataPrepareSettings: Object as PropType>,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
defaultPane: String,
disabled: Boolean,
elementAttr: Object as PropType>,
diff --git a/packages/devextreme-vue/src/chat.ts b/packages/devextreme-vue/src/chat.ts
index d7da98cb6f99..957ef24b90cb 100644
--- a/packages/devextreme-vue/src/chat.ts
+++ b/packages/devextreme-vue/src/chat.ts
@@ -16,13 +16,13 @@ import {
} from "devextreme/ui/chat";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
import {
Format,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import {
Format as CommonFormat,
} from "devextreme/common";
@@ -70,7 +70,7 @@ const componentConfig = {
accessKey: String,
activeStateEnabled: Boolean,
alerts: Array as PropType>,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
dayHeaderFormat: [Object, String, Function] as PropType string)) | Record | string>,
disabled: Boolean,
elementAttr: Object as PropType>,
diff --git a/packages/devextreme-vue/src/circular-gauge.ts b/packages/devextreme-vue/src/circular-gauge.ts
index 57e9b96f1ddc..99012c4abbb2 100644
--- a/packages/devextreme-vue/src/circular-gauge.ts
+++ b/packages/devextreme-vue/src/circular-gauge.ts
@@ -40,7 +40,7 @@ import {
} from "devextreme/common";
import {
Format as LocalizationFormat,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick>,
closeOnOutsideClick: [Boolean, Function] as PropType boolean))>,
cssClass: String,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
disabledExpr: [Function, String] as PropType<((() => void)) | string>,
displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>,
diff --git a/packages/devextreme-vue/src/core/__tests__/textbox.test.ts b/packages/devextreme-vue/src/core/__tests__/textbox.test.ts
index 29a3885f9b56..bb60c478f8ac 100644
--- a/packages/devextreme-vue/src/core/__tests__/textbox.test.ts
+++ b/packages/devextreme-vue/src/core/__tests__/textbox.test.ts
@@ -82,4 +82,28 @@ describe('two-way binding', () => {
expect(component.element.classList.toString()).toBe('custom2 dx-show-invalid-badge dx-textbox dx-texteditor dx-editor-outlined dx-texteditor-empty dx-widget');
});
});
+
+ it('dxClass should be set when class attr is undefined', async () => {
+ expect.assertions(1);
+ const vm = defineComponent({
+ template:
+ `
+ `,
+ components: {
+ DxTextBox,
+ },
+ props: {
+ customClass: {
+ type: String,
+ default: true,
+ },
+ },
+ });
+ const wrapper = mount(vm);
+ const component = wrapper.getComponent('#component');
+ await wrapper.setProps({ customClass: false });
+ await nextTick(() => {
+ expect(component.element.classList.toString()).toBe(' dx-show-invalid-badge dx-textbox dx-texteditor dx-editor-outlined dx-texteditor-empty dx-widget');
+ });
+ });
});
diff --git a/packages/devextreme-vue/src/core/component.ts b/packages/devextreme-vue/src/core/component.ts
index de579a29874a..f09aec6d430b 100644
--- a/packages/devextreme-vue/src/core/component.ts
+++ b/packages/devextreme-vue/src/core/component.ts
@@ -54,7 +54,7 @@ function getAttrs(attrs, dxClasses: string[]) {
const attributes = {};
includeAttrs.forEach((attr) => {
const attrValue = attrs[attr];
- if (attrValue) {
+ if (attrValue !== undefined && attrValue !== null) {
attributes[attr] = attr === 'class' && dxClasses.length ? `${attrValue} ${dxClasses.join(' ')}` : attrValue;
}
});
diff --git a/packages/devextreme-vue/src/data-grid.ts b/packages/devextreme-vue/src/data-grid.ts
index 9e1801683f11..b5cf5b8faeb0 100644
--- a/packages/devextreme-vue/src/data-grid.ts
+++ b/packages/devextreme-vue/src/data-grid.ts
@@ -97,7 +97,6 @@ import {
} from "devextreme/ui/data_grid";
import {
Mode,
- PagerBase,
ValidationRuleType,
HorizontalAlignment,
VerticalAlignment,
@@ -119,7 +118,7 @@ import {
} from "devextreme/common";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -143,18 +142,19 @@ import {
ToolbarLocation,
} from "devextreme/ui/popup";
import {
- AnimationConfig,
- AnimationState,
- AnimationType,
-} from "devextreme/animation/fx";
+ PagerBase,
+} from "devextreme/ui/pagination";
import {
+ AnimationConfig,
CollisionResolution,
PositionConfig,
+ AnimationState,
+ AnimationType,
CollisionResolutionCombination,
-} from "devextreme/animation/position";
+} from "devextreme/common/core/animation";
import {
Format,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import {
dxFormSimpleItem,
dxFormOptions,
@@ -175,8 +175,10 @@ import {
} from "devextreme/ui/form";
import {
event,
+} from "devextreme/events/events.types";
+import {
EventInfo,
-} from "devextreme/events/index";
+} from "devextreme/common/core/events";
import {
Component,
} from "devextreme/core/component";
@@ -329,7 +331,7 @@ const componentConfig = {
columnWidth: [String, Number] as PropType,
customizeColumns: Function as PropType<((columns: Array) => void)>,
dataRowTemplate: {},
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
dateSerializationFormat: String,
disabled: Boolean,
editing: Object as PropType>,
@@ -1104,7 +1106,7 @@ const DxColumnHeaderFilterConfig = {
props: {
allowSearch: Boolean,
allowSelectAll: Boolean,
- dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store>,
+ dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record>,
groupInterval: [String, Number] as PropType,
height: [Number, String],
search: Object as PropType>,
@@ -1161,7 +1163,7 @@ const DxColumnLookupConfig = {
props: {
allowClearing: Boolean,
calculateCellValue: Function as PropType<((rowData: any) => any)>,
- dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store>,
+ dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store | Record>,
displayExpr: [Function, String] as PropType<(((data: any) => string)) | string>,
valueExpr: String
}
@@ -1612,7 +1614,7 @@ const DxFieldLookupConfig = {
},
props: {
allowClearing: Boolean,
- dataSource: [Array, Object] as PropType | DataSourceOptions | Store>,
+ dataSource: [Array, Object] as PropType | DataSourceOptions | Store | Record>,
displayExpr: [Function, String] as PropType<(((data: any) => string)) | string>,
valueExpr: [Function, String] as PropType<(((data: any) => string | number | boolean)) | string>
}
@@ -2308,7 +2310,7 @@ const DxHeaderFilterConfig = {
props: {
allowSearch: Boolean,
allowSelectAll: Boolean,
- dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store>,
+ dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record>,
groupInterval: [String, Number] as PropType,
height: [Number, String],
search: Object as PropType>,
@@ -2533,7 +2535,7 @@ const DxLookupConfig = {
props: {
allowClearing: Boolean,
calculateCellValue: Function as PropType<((rowData: any) => any)>,
- dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store>,
+ dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store | Record>,
displayExpr: [Function, String] as PropType<(((data: any) => string)) | string>,
valueExpr: [String, Function] as PropType string | number | boolean))>
}
diff --git a/packages/devextreme-vue/src/date-box.ts b/packages/devextreme-vue/src/date-box.ts
index 7f8a3ac49ac3..6d80105498aa 100644
--- a/packages/devextreme-vue/src/date-box.ts
+++ b/packages/devextreme-vue/src/date-box.ts
@@ -43,7 +43,7 @@ import {
} from "devextreme/ui/calendar";
import {
Format,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import {
dxPopupOptions,
dxPopupToolbarItem,
@@ -72,9 +72,12 @@ import {
} from "devextreme/ui/date_box";
import {
AnimationConfig,
+ CollisionResolution,
+ PositionConfig,
AnimationState,
AnimationType,
-} from "devextreme/animation/fx";
+ CollisionResolutionCombination,
+} from "devextreme/common/core/animation";
import {
dxButtonOptions,
ClickEvent,
@@ -83,15 +86,12 @@ import {
InitializedEvent as ButtonInitializedEvent,
OptionChangedEvent as ButtonOptionChangedEvent,
} from "devextreme/ui/button";
-import {
- CollisionResolution,
- PositionConfig,
- CollisionResolutionCombination,
-} from "devextreme/animation/position";
import {
event,
+} from "devextreme/events/events.types";
+import {
EventInfo,
-} from "devextreme/events/index";
+} from "devextreme/common/core/events";
import {
Component,
} from "devextreme/core/component";
diff --git a/packages/devextreme-vue/src/date-range-box.ts b/packages/devextreme-vue/src/date-range-box.ts
index 9f9f039c1e3e..0f4caf1e2465 100644
--- a/packages/devextreme-vue/src/date-range-box.ts
+++ b/packages/devextreme-vue/src/date-range-box.ts
@@ -42,7 +42,7 @@ import {
} from "devextreme/ui/calendar";
import {
Format,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import {
dxPopupOptions,
dxPopupToolbarItem,
@@ -69,9 +69,12 @@ import {
} from "devextreme/ui/date_range_box";
import {
AnimationConfig,
+ CollisionResolution,
+ PositionConfig,
AnimationState,
AnimationType,
-} from "devextreme/animation/fx";
+ CollisionResolutionCombination,
+} from "devextreme/common/core/animation";
import {
dxButtonOptions,
ClickEvent,
@@ -80,15 +83,12 @@ import {
InitializedEvent as ButtonInitializedEvent,
OptionChangedEvent as ButtonOptionChangedEvent,
} from "devextreme/ui/button";
-import {
- CollisionResolution,
- PositionConfig,
- CollisionResolutionCombination,
-} from "devextreme/animation/position";
import {
event,
+} from "devextreme/events/events.types";
+import {
EventInfo,
-} from "devextreme/events/index";
+} from "devextreme/common/core/events";
import {
Component,
} from "devextreme/core/component";
diff --git a/packages/devextreme-vue/src/defer-rendering.ts b/packages/devextreme-vue/src/defer-rendering.ts
index 0e961b630dfe..8764bcff1d56 100644
--- a/packages/devextreme-vue/src/defer-rendering.ts
+++ b/packages/devextreme-vue/src/defer-rendering.ts
@@ -6,7 +6,10 @@ import {
AnimationConfig,
AnimationState,
AnimationType,
-} from "devextreme/animation/fx";
+ CollisionResolution,
+ PositionConfig,
+ CollisionResolutionCombination,
+} from "devextreme/common/core/animation";
import {
ContentReadyEvent,
DisposingEvent,
@@ -21,11 +24,6 @@ import {
VerticalAlignment,
PositionAlignment,
} from "devextreme/common";
-import {
- CollisionResolution,
- PositionConfig,
- CollisionResolutionCombination,
-} from "devextreme/animation/position";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick any)) | string>,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
fromExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>,
fromLineEndExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>,
fromPointIndexExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>,
@@ -745,7 +745,7 @@ const DxNodesConfig = {
containerChildrenExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>,
containerKeyExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>,
customDataExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
heightExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>,
imageUrlExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>,
itemsExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>,
diff --git a/packages/devextreme-vue/src/drawer.ts b/packages/devextreme-vue/src/drawer.ts
index 3ef1cab47451..7726fdafbcff 100644
--- a/packages/devextreme-vue/src/drawer.ts
+++ b/packages/devextreme-vue/src/drawer.ts
@@ -4,7 +4,7 @@ import { prepareComponentConfig } from "./core/index";
import Drawer, { Properties } from "devextreme/ui/drawer";
import {
event,
-} from "devextreme/events/index";
+} from "devextreme/events/events.types";
import {
DisposingEvent,
InitializedEvent,
diff --git a/packages/devextreme-vue/src/drop-down-box.ts b/packages/devextreme-vue/src/drop-down-box.ts
index 1cbc58a4d2c8..3dfa84f00f07 100644
--- a/packages/devextreme-vue/src/drop-down-box.ts
+++ b/packages/devextreme-vue/src/drop-down-box.ts
@@ -29,7 +29,7 @@ import {
} from "devextreme/common";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -58,9 +58,12 @@ import {
} from "devextreme/ui/drop_down_box";
import {
AnimationConfig,
+ CollisionResolution,
+ PositionConfig,
AnimationState,
AnimationType,
-} from "devextreme/animation/fx";
+ CollisionResolutionCombination,
+} from "devextreme/common/core/animation";
import {
dxButtonOptions,
ClickEvent,
@@ -69,15 +72,12 @@ import {
InitializedEvent as ButtonInitializedEvent,
OptionChangedEvent as ButtonOptionChangedEvent,
} from "devextreme/ui/button";
-import {
- CollisionResolution,
- PositionConfig,
- CollisionResolutionCombination,
-} from "devextreme/animation/position";
import {
event,
+} from "devextreme/events/events.types";
+import {
EventInfo,
-} from "devextreme/events/index";
+} from "devextreme/common/core/events";
import {
Component,
} from "devextreme/core/component";
@@ -163,7 +163,7 @@ const componentConfig = {
activeStateEnabled: Boolean,
buttons: Array as PropType>,
contentTemplate: {},
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
deferRendering: Boolean,
disabled: Boolean,
displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>,
diff --git a/packages/devextreme-vue/src/drop-down-button.ts b/packages/devextreme-vue/src/drop-down-button.ts
index c4c7fb7f3e99..dd082cc2423c 100644
--- a/packages/devextreme-vue/src/drop-down-button.ts
+++ b/packages/devextreme-vue/src/drop-down-button.ts
@@ -18,7 +18,7 @@ import {
} from "devextreme/ui/drop_down_button";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -39,18 +39,18 @@ import {
} from "devextreme/common";
import {
AnimationConfig,
- AnimationState,
- AnimationType,
-} from "devextreme/animation/fx";
-import {
CollisionResolution,
PositionConfig,
+ AnimationState,
+ AnimationType,
CollisionResolutionCombination,
-} from "devextreme/animation/position";
+} from "devextreme/common/core/animation";
import {
event,
+} from "devextreme/events/events.types";
+import {
EventInfo,
-} from "devextreme/events/index";
+} from "devextreme/common/core/events";
import {
Component,
} from "devextreme/core/component";
@@ -112,7 +112,7 @@ const componentConfig = {
props: {
accessKey: String,
activeStateEnabled: Boolean,
- dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
deferRendering: Boolean,
disabled: Boolean,
displayExpr: [Function, String] as PropType<(((itemData: any) => string)) | string>,
diff --git a/packages/devextreme-vue/src/filter-builder.ts b/packages/devextreme-vue/src/filter-builder.ts
index 4d5f6be6e0a9..35d76cf8ad04 100644
--- a/packages/devextreme-vue/src/filter-builder.ts
+++ b/packages/devextreme-vue/src/filter-builder.ts
@@ -21,10 +21,10 @@ import {
} from "devextreme/common";
import {
Format,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -327,7 +327,7 @@ const DxLookupConfig = {
},
props: {
allowClearing: Boolean,
- dataSource: [Array, Object] as PropType | DataSourceOptions | Store>,
+ dataSource: [Array, Object] as PropType | DataSourceOptions | Store | Record>,
displayExpr: [Function, String] as PropType<(((data: any) => string)) | string>,
valueExpr: [Function, String] as PropType<(((data: any) => string | number | boolean)) | string>
}
diff --git a/packages/devextreme-vue/src/form.ts b/packages/devextreme-vue/src/form.ts
index 7e04351738da..95f468f87af5 100644
--- a/packages/devextreme-vue/src/form.ts
+++ b/packages/devextreme-vue/src/form.ts
@@ -59,7 +59,7 @@ import {
} from "devextreme/ui/tab_panel";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -1000,7 +1000,7 @@ const DxTabPanelOptionsConfig = {
activeStateEnabled: Boolean,
animationEnabled: Boolean,
bindingOptions: Object as PropType>,
- dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
deferRendering: Boolean,
disabled: Boolean,
elementAttr: Object as PropType>,
diff --git a/packages/devextreme-vue/src/funnel.ts b/packages/devextreme-vue/src/funnel.ts
index 455f4b198833..b02723eab9e5 100644
--- a/packages/devextreme-vue/src/funnel.ts
+++ b/packages/devextreme-vue/src/funnel.ts
@@ -22,7 +22,7 @@ import {
} from "devextreme/viz/funnel";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -50,7 +50,7 @@ import {
} from "devextreme/common";
import {
Format as LocalizationFormat,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick,
argumentField: String,
colorField: String,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
elementAttr: Object as PropType>,
export: Object as PropType>,
diff --git a/packages/devextreme-vue/src/gallery.ts b/packages/devextreme-vue/src/gallery.ts
index d5430067f7b2..31149912175e 100644
--- a/packages/devextreme-vue/src/gallery.ts
+++ b/packages/devextreme-vue/src/gallery.ts
@@ -18,7 +18,7 @@ import {
} from "devextreme/ui/gallery";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -74,7 +74,7 @@ const componentConfig = {
accessKey: String,
animationDuration: Number,
animationEnabled: Boolean,
- dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
elementAttr: Object as PropType>,
focusStateEnabled: Boolean,
diff --git a/packages/devextreme-vue/src/gantt.ts b/packages/devextreme-vue/src/gantt.ts
index 9be6cc9e97a9..0d9d928a6ab8 100644
--- a/packages/devextreme-vue/src/gantt.ts
+++ b/packages/devextreme-vue/src/gantt.ts
@@ -72,10 +72,10 @@ import {
} from "devextreme/common/grids";
import {
Format,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -452,7 +452,7 @@ const DxColumnHeaderFilterConfig = {
props: {
allowSearch: Boolean,
allowSelectAll: Boolean,
- dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store>,
+ dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record>,
groupInterval: [String, Number] as PropType,
height: [Number, String],
search: Object as PropType>,
@@ -568,7 +568,7 @@ const DxDependenciesConfig = {
"update:typeExpr": null,
},
props: {
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
keyExpr: [Function, String] as PropType<((() => void)) | string>,
predecessorIdExpr: [Function, String] as PropType<((() => void)) | string>,
successorIdExpr: [Function, String] as PropType<((() => void)) | string>,
@@ -754,7 +754,7 @@ const DxHeaderFilterConfig = {
props: {
allowSearch: Boolean,
allowSelectAll: Boolean,
- dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store>,
+ dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record>,
groupInterval: [String, Number] as PropType,
height: [Number, String],
search: Object as PropType>,
@@ -878,7 +878,7 @@ const DxResourceAssignmentsConfig = {
"update:taskIdExpr": null,
},
props: {
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
keyExpr: [Function, String] as PropType<((() => void)) | string>,
resourceIdExpr: [Function, String] as PropType<((() => void)) | string>,
taskIdExpr: [Function, String] as PropType<((() => void)) | string>
@@ -902,7 +902,7 @@ const DxResourcesConfig = {
},
props: {
colorExpr: [Function, String] as PropType<((() => void)) | string>,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
keyExpr: [Function, String] as PropType<((() => void)) | string>,
textExpr: [Function, String] as PropType<((() => void)) | string>
}
@@ -1022,7 +1022,7 @@ const DxTasksConfig = {
},
props: {
colorExpr: [Function, String] as PropType<((() => void)) | string>,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
endExpr: [Function, String] as PropType<((() => void)) | string>,
keyExpr: [Function, String] as PropType<((() => void)) | string>,
parentIdExpr: [Function, String] as PropType<((() => void)) | string>,
diff --git a/packages/devextreme-vue/src/html-editor.ts b/packages/devextreme-vue/src/html-editor.ts
index ddff5eba478a..5d8a8a17a38f 100644
--- a/packages/devextreme-vue/src/html-editor.ts
+++ b/packages/devextreme-vue/src/html-editor.ts
@@ -61,7 +61,7 @@ import {
} from "devextreme/ui/toolbar";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -518,7 +518,7 @@ const DxMentionConfig = {
"update:valueExpr": null,
},
props: {
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>,
itemTemplate: {},
marker: String,
@@ -718,7 +718,7 @@ const DxVariablesConfig = {
"update:escapeChar": null,
},
props: {
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
escapeChar: [Array, String] as PropType | string>
}
};
diff --git a/packages/devextreme-vue/src/index.ts b/packages/devextreme-vue/src/index.ts
index ab1ec1f3428a..198b4adbe672 100644
--- a/packages/devextreme-vue/src/index.ts
+++ b/packages/devextreme-vue/src/index.ts
@@ -79,3 +79,5 @@ export { DxValidationGroup } from "./validation-group";
export { DxValidationSummary } from "./validation-summary";
export { DxValidator } from "./validator";
export { DxVectorMap } from "./vector-map";
+
+export * as Common from "./common/index";
diff --git a/packages/devextreme-vue/src/linear-gauge.ts b/packages/devextreme-vue/src/linear-gauge.ts
index 2f0cbed6bd49..60bfe321fba6 100644
--- a/packages/devextreme-vue/src/linear-gauge.ts
+++ b/packages/devextreme-vue/src/linear-gauge.ts
@@ -40,7 +40,7 @@ import {
} from "devextreme/common";
import {
Format as LocalizationFormat,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>,
elementAttr: Object as PropType>,
diff --git a/packages/devextreme-vue/src/load-panel.ts b/packages/devextreme-vue/src/load-panel.ts
index 81ab0fece3d9..9398bd096e1c 100644
--- a/packages/devextreme-vue/src/load-panel.ts
+++ b/packages/devextreme-vue/src/load-panel.ts
@@ -4,7 +4,7 @@ import { prepareComponentConfig } from "./core/index";
import LoadPanel, { Properties } from "devextreme/ui/load_panel";
import {
event,
-} from "devextreme/events/index";
+} from "devextreme/events/events.types";
import {
ContentReadyEvent,
DisposingEvent,
@@ -23,14 +23,12 @@ import {
} from "devextreme/common";
import {
PositionConfig,
- CollisionResolution,
- CollisionResolutionCombination,
-} from "devextreme/animation/position";
-import {
AnimationConfig,
+ CollisionResolution,
AnimationState,
AnimationType,
-} from "devextreme/animation/fx";
+ CollisionResolutionCombination,
+} from "devextreme/common/core/animation";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
deferRendering: Boolean,
disabled: Boolean,
displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>,
diff --git a/packages/devextreme-vue/src/menu.ts b/packages/devextreme-vue/src/menu.ts
index ebd0e464128d..a71b0dbacf2b 100644
--- a/packages/devextreme-vue/src/menu.ts
+++ b/packages/devextreme-vue/src/menu.ts
@@ -22,7 +22,7 @@ import {
} from "devextreme/ui/menu";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -37,14 +37,12 @@ import {
} from "devextreme/common";
import {
AnimationConfig,
- AnimationState,
- AnimationType,
-} from "devextreme/animation/fx";
-import {
CollisionResolution,
PositionConfig,
+ AnimationState,
+ AnimationType,
CollisionResolutionCombination,
-} from "devextreme/animation/position";
+} from "devextreme/common/core/animation";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick>,
cssClass: String,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
disabledExpr: [Function, String] as PropType<((() => void)) | string>,
displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>,
diff --git a/packages/devextreme-vue/src/multi-view.ts b/packages/devextreme-vue/src/multi-view.ts
index 579dcf15025d..e11636d960c8 100644
--- a/packages/devextreme-vue/src/multi-view.ts
+++ b/packages/devextreme-vue/src/multi-view.ts
@@ -18,7 +18,7 @@ import {
} from "devextreme/ui/multi_view";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -68,7 +68,7 @@ const componentConfig = {
accessKey: String,
activeStateEnabled: Boolean,
animationEnabled: Boolean,
- dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
deferRendering: Boolean,
disabled: Boolean,
elementAttr: Object as PropType>,
diff --git a/packages/devextreme-vue/src/number-box.ts b/packages/devextreme-vue/src/number-box.ts
index bbc411e9fa62..0758b41ecfac 100644
--- a/packages/devextreme-vue/src/number-box.ts
+++ b/packages/devextreme-vue/src/number-box.ts
@@ -35,7 +35,7 @@ import {
} from "devextreme/common";
import {
Format,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import {
dxButtonOptions,
ClickEvent,
diff --git a/packages/devextreme-vue/src/pagination.ts b/packages/devextreme-vue/src/pagination.ts
index 59b18008c71a..dbaf168edbc3 100644
--- a/packages/devextreme-vue/src/pagination.ts
+++ b/packages/devextreme-vue/src/pagination.ts
@@ -8,7 +8,7 @@ import {
} from "devextreme/common";
import {
EventInfo,
-} from "devextreme/events/index";
+} from "devextreme/common/core/events";
import {
Component,
} from "devextreme/core/component";
diff --git a/packages/devextreme-vue/src/pie-chart.ts b/packages/devextreme-vue/src/pie-chart.ts
index 118a1afda2a4..585db5aa0143 100644
--- a/packages/devextreme-vue/src/pie-chart.ts
+++ b/packages/devextreme-vue/src/pie-chart.ts
@@ -50,7 +50,7 @@ import {
} from "devextreme/common/charts";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -65,7 +65,7 @@ import {
} from "devextreme/common";
import {
Format as LocalizationFormat,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick dxPieChartAnnotationConfig)>,
customizeLabel: Function as PropType<((pointInfo: any) => SeriesLabel)>,
customizePoint: Function as PropType<((pointInfo: any) => SeriesPoint)>,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
diameter: Number,
disabled: Boolean,
elementAttr: Object as PropType>,
diff --git a/packages/devextreme-vue/src/polar-chart.ts b/packages/devextreme-vue/src/polar-chart.ts
index 0100ea41ef08..ec3d53acebe3 100644
--- a/packages/devextreme-vue/src/polar-chart.ts
+++ b/packages/devextreme-vue/src/polar-chart.ts
@@ -63,7 +63,7 @@ import {
} from "devextreme/common/charts";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -78,7 +78,7 @@ import {
} from "devextreme/common";
import {
Format as LocalizationFormat,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import * as CommonChartTypes from "devextreme/common/charts";
import { prepareConfigurationComponentConfig } from "./core/index";
@@ -164,7 +164,7 @@ const componentConfig = {
customizeLabel: Function as PropType<((pointInfo: any) => SeriesLabel)>,
customizePoint: Function as PropType<((pointInfo: any) => SeriesPoint)>,
dataPrepareSettings: Object as PropType>,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
elementAttr: Object as PropType>,
export: Object as PropType>,
diff --git a/packages/devextreme-vue/src/popover.ts b/packages/devextreme-vue/src/popover.ts
index 1f07651bd22c..acf2a4dee774 100644
--- a/packages/devextreme-vue/src/popover.ts
+++ b/packages/devextreme-vue/src/popover.ts
@@ -4,7 +4,7 @@ import { prepareComponentConfig } from "./core/index";
import Popover, { Properties } from "devextreme/ui/popover";
import {
event,
-} from "devextreme/events/index";
+} from "devextreme/events/events.types";
import {
ContentReadyEvent,
DisposingEvent,
@@ -27,18 +27,16 @@ import {
} from "devextreme/common";
import {
PositionConfig,
+ AnimationConfig,
CollisionResolution,
+ AnimationState,
+ AnimationType,
CollisionResolutionCombination,
-} from "devextreme/animation/position";
+} from "devextreme/common/core/animation";
import {
dxPopupToolbarItem,
ToolbarLocation,
} from "devextreme/ui/popup";
-import {
- AnimationConfig,
- AnimationState,
- AnimationType,
-} from "devextreme/animation/fx";
import {
LocateInMenuMode,
ShowTextMode,
diff --git a/packages/devextreme-vue/src/popup.ts b/packages/devextreme-vue/src/popup.ts
index d19d09498aff..edba5edad721 100644
--- a/packages/devextreme-vue/src/popup.ts
+++ b/packages/devextreme-vue/src/popup.ts
@@ -7,8 +7,10 @@ import DOMComponent from "devextreme/core/dom_component";
import dxPopup from "devextreme/ui/popup";
import {
event,
+} from "devextreme/events/events.types";
+import {
EventInfo,
-} from "devextreme/events/index";
+} from "devextreme/common/core/events";
import {
Component,
} from "devextreme/core/component";
@@ -22,18 +24,16 @@ import {
} from "devextreme/common";
import {
PositionConfig,
+ AnimationConfig,
CollisionResolution,
+ AnimationState,
+ AnimationType,
CollisionResolutionCombination,
-} from "devextreme/animation/position";
+} from "devextreme/common/core/animation";
import {
dxPopupToolbarItem,
ToolbarLocation,
} from "devextreme/ui/popup";
-import {
- AnimationConfig,
- AnimationState,
- AnimationType,
-} from "devextreme/animation/fx";
import {
LocateInMenuMode,
ShowTextMode,
diff --git a/packages/devextreme-vue/src/radio-group.ts b/packages/devextreme-vue/src/radio-group.ts
index e3f20973fec7..aeb17a95db3c 100644
--- a/packages/devextreme-vue/src/radio-group.ts
+++ b/packages/devextreme-vue/src/radio-group.ts
@@ -8,7 +8,7 @@ import {
} from "devextreme/ui/collection/ui.collection_widget.base";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -71,7 +71,7 @@ const componentConfig = {
props: {
accessKey: String,
activeStateEnabled: Boolean,
- dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>,
elementAttr: Object as PropType>,
diff --git a/packages/devextreme-vue/src/range-selector.ts b/packages/devextreme-vue/src/range-selector.ts
index 3cf6c28ce018..4954b8a9845b 100644
--- a/packages/devextreme-vue/src/range-selector.ts
+++ b/packages/devextreme-vue/src/range-selector.ts
@@ -5,7 +5,7 @@ import RangeSelector, { Properties } from "devextreme/viz/range_selector";
import DataSource from "devextreme/data/data_source";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -69,7 +69,7 @@ import {
} from "devextreme/viz/common";
import {
Format as LocalizationFormat,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import * as CommonChartTypes from "devextreme/common/charts";
import { prepareConfigurationComponentConfig } from "./core/index";
@@ -120,7 +120,7 @@ const componentConfig = {
behavior: Object as PropType>,
chart: Object as PropType>,
containerBackgroundColor: String,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
dataSourceField: String,
disabled: Boolean,
elementAttr: Object as PropType>,
diff --git a/packages/devextreme-vue/src/range-slider.ts b/packages/devextreme-vue/src/range-slider.ts
index 05b79a2bca06..0e5831933e14 100644
--- a/packages/devextreme-vue/src/range-slider.ts
+++ b/packages/devextreme-vue/src/range-slider.ts
@@ -20,7 +20,7 @@ import {
} from "devextreme/common";
import {
Format as LocalizationFormat,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick>>,
- dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
elementAttr: Object as PropType>,
height: [Function, Number, String] as PropType<((() => number | string)) | number | string>,
diff --git a/packages/devextreme-vue/src/sankey.ts b/packages/devextreme-vue/src/sankey.ts
index beb90f8edb49..ca0b4b261547 100644
--- a/packages/devextreme-vue/src/sankey.ts
+++ b/packages/devextreme-vue/src/sankey.ts
@@ -12,7 +12,7 @@ import {
} from "devextreme/common";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -44,7 +44,7 @@ import {
} from "devextreme/common/charts";
import {
Format as LocalizationFormat,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick>,
alignment: [Array, String] as PropType | VerticalAlignment>,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
elementAttr: Object as PropType>,
export: Object as PropType>,
diff --git a/packages/devextreme-vue/src/scheduler.ts b/packages/devextreme-vue/src/scheduler.ts
index 48e4dca6beee..3f82f7ff64d7 100644
--- a/packages/devextreme-vue/src/scheduler.ts
+++ b/packages/devextreme-vue/src/scheduler.ts
@@ -34,7 +34,7 @@ import {
} from "devextreme/ui/scheduler";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -45,7 +45,7 @@ import {
} from "devextreme/common";
import {
event,
-} from "devextreme/events/index";
+} from "devextreme/events/events.types";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick,
customizeDateNavigatorText: Function as PropType<((info: { endDate: Date, startDate: Date, text: string }) => string)>,
dataCellTemplate: {},
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
dateCellTemplate: {},
dateSerializationFormat: String,
descriptionExpr: String,
@@ -397,7 +397,7 @@ const DxResourceConfig = {
props: {
allowMultiple: Boolean,
colorExpr: String,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
displayExpr: [Function, String] as PropType<(((resource: any) => string)) | string>,
fieldExpr: String,
label: String,
diff --git a/packages/devextreme-vue/src/select-box.ts b/packages/devextreme-vue/src/select-box.ts
index ef9f164df19f..fbfbdcda589e 100644
--- a/packages/devextreme-vue/src/select-box.ts
+++ b/packages/devextreme-vue/src/select-box.ts
@@ -33,7 +33,7 @@ import {
} from "devextreme/ui/collection/ui.collection_widget.base";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -66,9 +66,12 @@ import {
} from "devextreme/ui/select_box";
import {
AnimationConfig,
+ CollisionResolution,
+ PositionConfig,
AnimationState,
AnimationType,
-} from "devextreme/animation/fx";
+ CollisionResolutionCombination,
+} from "devextreme/common/core/animation";
import {
dxButtonOptions,
ClickEvent,
@@ -77,15 +80,12 @@ import {
InitializedEvent as ButtonInitializedEvent,
OptionChangedEvent as ButtonOptionChangedEvent,
} from "devextreme/ui/button";
-import {
- CollisionResolution,
- PositionConfig,
- CollisionResolutionCombination,
-} from "devextreme/animation/position";
import {
event,
+} from "devextreme/events/events.types";
+import {
EventInfo,
-} from "devextreme/events/index";
+} from "devextreme/common/core/events";
import {
Component,
} from "devextreme/core/component";
@@ -190,7 +190,7 @@ const componentConfig = {
activeStateEnabled: Boolean,
buttons: Array as PropType>,
customItemCreateEvent: String,
- dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>,
deferRendering: Boolean,
disabled: Boolean,
displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>,
diff --git a/packages/devextreme-vue/src/slider.ts b/packages/devextreme-vue/src/slider.ts
index 649b05e7e9f4..a58af3f34560 100644
--- a/packages/devextreme-vue/src/slider.ts
+++ b/packages/devextreme-vue/src/slider.ts
@@ -20,7 +20,7 @@ import {
} from "devextreme/common";
import {
Format as LocalizationFormat,
-} from "devextreme/localization";
+} from "devextreme/common/core/localization";
import { prepareConfigurationComponentConfig } from "./core/index";
type AccessibleOptions = Pick | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
elementAttr: Object as PropType>,
firstLastColor: String,
diff --git a/packages/devextreme-vue/src/splitter.ts b/packages/devextreme-vue/src/splitter.ts
index c29ee3ea9476..809a36e2b3b4 100644
--- a/packages/devextreme-vue/src/splitter.ts
+++ b/packages/devextreme-vue/src/splitter.ts
@@ -22,7 +22,7 @@ import {
} from "devextreme/ui/splitter";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -66,7 +66,7 @@ interface DxSplitter extends AccessibleOptions {
const componentConfig = {
props: {
allowKeyboardNavigation: Boolean,
- dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>,
+ dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>,
disabled: Boolean,
elementAttr: Object as PropType>,
height: [Function, Number, String] as PropType<((() => number | string)) | number | string>,
diff --git a/packages/devextreme-vue/src/tab-panel.ts b/packages/devextreme-vue/src/tab-panel.ts
index a27846f63cc4..4d9d15e37988 100644
--- a/packages/devextreme-vue/src/tab-panel.ts
+++ b/packages/devextreme-vue/src/tab-panel.ts
@@ -22,7 +22,7 @@ import {
} from "devextreme/ui/tab_panel";
import {
DataSourceOptions,
-} from "devextreme/data/data_source";
+} from "devextreme/common/data";
import {
Store,
} from "devextreme/data/store";
@@ -89,7 +89,7 @@ const componentConfig = {
accessKey: String,
activeStateEnabled: Boolean,
animationEnabled: Boolean,
- dataSource: [Array, Object, String] as PropType<(Array