Scheduler Demos: arrange imports (DevExpress#30244)

Author: mpreyskurantov

apps/demos/Demos/Scheduler/Toolbar/Angular/app/app.component.ts

@@ -1,13 +1,9 @@
 import { NgModule, Component, ViewChild, enableProdMode } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import {
-  DxSchedulerModule,
-  DxSchedulerComponent,
-  DxTemplateModule,
-  DxButtonModule,
-} from 'devextreme-angular';
-import type { DxButtonTypes } from 'devextreme-angular/ui/button';
+import { DxTemplateModule } from 'devextreme-angular';
+import { DxButtonModule, type DxButtonTypes } from 'devextreme-angular/ui/button';
+import { DxSchedulerModule, DxSchedulerComponent } from 'devextreme-angular/ui/scheduler';
 import { DxSelectBoxModule, type DxSelectBoxTypes } from 'devextreme-angular/ui/select-box';
 import { Service } from './app.service';
 
@@ -88,10 +84,10 @@ export class AppComponent {
 @NgModule({
   imports: [
     BrowserModule,
-    DxSchedulerModule,
     DxTemplateModule,
-    DxSelectBoxModule,
     DxButtonModule,
+    DxSchedulerModule,
+    DxSelectBoxModule,
   ],
   declarations: [AppComponent],
   bootstrap: [AppComponent],

apps/demos/Demos/Scheduler/Toolbar/React/App.tsx

@@ -1,8 +1,8 @@
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
-import type DataSource from 'devextreme/data/data_source';
-import Scheduler, { Toolbar, Item, Resource, type SchedulerTypes, type SchedulerRef } from 'devextreme-react/scheduler';
-import SelectBox, { type SelectBoxTypes } from 'devextreme-react/select-box';
+import { Scheduler, Resource, Toolbar, Item, type SchedulerRef, type SchedulerTypes } from 'devextreme-react/scheduler';
+import { SelectBox, type SelectBoxTypes } from 'devextreme-react/select-box';
+import { type DataSource } from 'devextreme-react/common/data';
 
 import { assignees, schedulerDataSource, currentDate } from './data.ts';
 

apps/demos/Demos/Scheduler/Toolbar/React/data.ts

@@ -1,5 +1,5 @@
-import type { SchedulerTypes } from 'devextreme-react/scheduler';
-import DataSource from 'devextreme/data/data_source';
+import { type SchedulerTypes } from 'devextreme-react/scheduler';
+import { DataSource } from 'devextreme-react/common/data';
 
 type Appointment = SchedulerTypes.Appointment & {
   assigneeId: number[];

apps/demos/Demos/Scheduler/Toolbar/ReactJs/App.js

@@ -1,8 +1,10 @@
 import React, {
   useCallback, useMemo, useRef, useState,
 } from 'react';
-import Scheduler, { Toolbar, Item, Resource } from 'devextreme-react/scheduler';
-import SelectBox from 'devextreme-react/select-box';
+import {
+  Scheduler, Resource, Toolbar, Item,
+} from 'devextreme-react/scheduler';
+import { SelectBox } from 'devextreme-react/select-box';
 import { assignees, schedulerDataSource, currentDate } from './data.js';
 
 const views = ['day', 'week', 'workWeek', 'month'];

apps/demos/Demos/Scheduler/Toolbar/ReactJs/data.js

@@ -1,4 +1,4 @@
-import DataSource from 'devextreme/data/data_source';
+import { DataSource } from 'devextreme-react/common/data';
 
 const ONE_MONTH_DAYS = 30;
 const addDays = (date, days) => new Date(new Date(date).setUTCDate(date.getUTCDate() + days));

apps/demos/Demos/Scheduler/Toolbar/Vue/App.vue

@@ -53,11 +53,11 @@
 </template>
 <script setup lang="ts">
 import { ref } from 'vue';
-import DxScheduler, {
-  DxResource, DxToolbar, DxItem, type DxSchedulerTypes,
+import { DxScheduler, DxResource,
+  DxToolbar, DxItem, type DxSchedulerTypes,
 } from 'devextreme-vue/scheduler';
 import { DxSelectBox, type DxSelectBoxTypes } from 'devextreme-vue/select-box';
-import type DataSource from 'devextreme/data/data_source';
+import { type DataSource } from 'devextreme-vue/common/data';
 import { assignees, currentDate, schedulerDataSource } from './data.ts';
 
 const MS_IN_HOUR = 60 * 1000;

apps/demos/Demos/Scheduler/Toolbar/Vue/data.ts

@@ -1,7 +1,7 @@
-import type { Appointment } from 'devextreme/ui/scheduler';
-import DataSource from 'devextreme/data/data_source';
+import { type SchedulerTypes } from 'devextreme-react/scheduler';
+import { DataSource } from 'devextreme-vue/common/data';
 
-type CustomAppointment = Appointment & {
+type CustomAppointment = SchedulerTypes.Appointment & {
   assigneeId: number[];
 };