Skip to content

Commit f279cae

Browse files
Stepper Demos: arrange imports (DevExpress#30247)
Co-authored-by: EugeniyKiyashko <[email protected]>
1 parent 385724f commit f279cae

File tree

23 files changed

+71
-75
lines changed

23 files changed

+71
-75
lines changed

apps/demos/Demos/Stepper/FormIntegration/Angular/app/additional-form/additional-form.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, Input } from '@angular/core';
2-
import { DxFormTypes } from 'devextreme-angular/ui/form';
3-
import { DxTextAreaTypes } from 'devextreme-angular/ui/text-area';
2+
import { type DxFormTypes } from 'devextreme-angular/ui/form';
3+
import { type DxTextAreaTypes } from 'devextreme-angular/ui/text-area';
44
import type { BookingFormData } from '../app.types';
55

66
let modulePrefix = '';

apps/demos/Demos/Stepper/FormIntegration/Angular/app/app.component.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@ import { NgModule, Component, enableProdMode } from '@angular/core';
22
import { BrowserModule } from '@angular/platform-browser';
33
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
44
import {
5-
DxStepperModule,
65
DxButtonModule,
7-
DxMultiViewModule,
8-
DxFormModule,
96
DxDateRangeBoxModule,
7+
DxFormModule,
8+
DxMultiViewModule,
109
DxNumberBoxModule,
1110
DxSelectBoxModule,
1211
DxTextAreaModule,
1312
} from 'devextreme-angular';
14-
import type { Item, SelectionChangingEvent } from 'devextreme/ui/stepper';
15-
import validationEngine from 'devextreme/ui/validation_engine';
13+
import { DxStepperModule, type DxStepperTypes } from 'devextreme-angular/ui/stepper';
1614
import { AppService } from './app.service';
1715
import { BookingFormData } from './app.types';
1816
import { DatesFormComponent } from "./dates-form/dates-form.component";
@@ -21,6 +19,8 @@ import { RoomMealPlanFormComponent } from "./room-meal-plan-form/room-meal-plan-
2119
import { AdditionalFormComponent } from "./additional-form/additional-form.component";
2220
import { ConfirmationComponent } from "./confirmation/confirmation.component";
2321

22+
import validationEngine from 'devextreme/ui/validation_engine';
23+
2424
if (!/localhost/.test(document.location.host)) {
2525
enableProdMode();
2626
}
@@ -37,7 +37,7 @@ if (window && window.config?.packageConfigPaths) {
3737
styleUrls: [`.${modulePrefix}/app.component.css`],
3838
})
3939
export class AppComponent {
40-
steps: Item[];
40+
steps: DxStepperTypes.Item[];
4141

4242
formData: BookingFormData;
4343

@@ -69,12 +69,12 @@ export class AppComponent {
6969
this.steps[index].isValid = isValid;
7070
}
7171

72-
onSelectionChanging(e: SelectionChangingEvent) {
72+
onSelectionChanging(e: DxStepperTypes.SelectionChangingEvent) {
7373
const { component, addedItems, removedItems } = e;
7474
const { items = [] } = component.option();
7575

76-
const addedIndex = items.findIndex((item: Item) => item === addedItems[0]);
77-
const removedIndex = items.findIndex((item: Item) => item === removedItems[0]);
76+
const addedIndex = items.findIndex((item: DxStepperTypes.Item) => item === addedItems[0]);
77+
const removedIndex = items.findIndex((item: DxStepperTypes.Item) => item === removedItems[0]);
7878
const isMoveForward = removedIndex > -1 && addedIndex > removedIndex;
7979

8080
if (isMoveForward) {
@@ -138,13 +138,13 @@ export class AppComponent {
138138
@NgModule({
139139
imports: [
140140
BrowserModule,
141-
DxStepperModule,
142141
DxButtonModule,
143-
DxMultiViewModule,
144-
DxFormModule,
145142
DxDateRangeBoxModule,
143+
DxFormModule,
144+
DxMultiViewModule,
146145
DxNumberBoxModule,
147146
DxSelectBoxModule,
147+
DxStepperModule,
148148
DxTextAreaModule,
149149
],
150150
declarations: [

apps/demos/Demos/Stepper/FormIntegration/Angular/app/app.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Injectable } from '@angular/core';
2-
import { Item } from 'devextreme/ui/stepper';
2+
import { type DxStepperTypes } from 'devextreme-angular/ui/stepper';
33
import { BookingFormData } from "./app.types";
44

55
@Injectable({
66
providedIn: 'root',
77
})
88
export class AppService {
9-
initialSteps: Item[];
9+
initialSteps: DxStepperTypes.Item[];
1010

1111
initialFormData: BookingFormData;
1212

@@ -44,7 +44,7 @@ export class AppService {
4444
};
4545
}
4646

47-
getInitialSteps(): Item[] {
47+
getInitialSteps(): DxStepperTypes.Item[] {
4848
return this.initialSteps.map((item) => ({ ...item }));
4949
}
5050

apps/demos/Demos/Stepper/FormIntegration/Angular/app/dates-form/dates-form.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, Input, SimpleChanges, ViewChild } from '@angular/core';
2-
import { DxFormTypes, DxFormComponent } from 'devextreme-angular/ui/form';
3-
import { DxDateRangeBoxTypes } from 'devextreme-angular/ui/date-range-box';
2+
import { DxFormComponent, type DxFormTypes } from 'devextreme-angular/ui/form';
3+
import { type DxDateRangeBoxTypes } from 'devextreme-angular/ui/date-range-box';
44
import type { BookingFormData } from '../app.types';
55

66
let modulePrefix = '';

apps/demos/Demos/Stepper/FormIntegration/Angular/app/guests-form/guests-form.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, Input, SimpleChanges, ViewChild } from "@angular/core";
2-
import { DxFormTypes, DxFormComponent } from 'devextreme-angular/ui/form';
3-
import { DxNumberBoxTypes } from 'devextreme-angular/ui/number-box';
2+
import { DxFormComponent, type DxFormTypes } from 'devextreme-angular/ui/form';
3+
import { type DxNumberBoxTypes } from 'devextreme-angular/ui/number-box';
44
import type { BookingFormData } from '../app.types';
55

66
let modulePrefix = '';

apps/demos/Demos/Stepper/FormIntegration/Angular/app/room-meal-plan-form/room-meal-plan-form.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, Input, SimpleChanges, ViewChild } from "@angular/core";
2-
import { DxFormTypes, DxFormComponent } from 'devextreme-angular/ui/form';
3-
import { DxSelectBoxTypes } from 'devextreme-angular/ui/select-box';
2+
import { DxFormComponent, type DxFormTypes } from 'devextreme-angular/ui/form';
3+
import { type DxSelectBoxTypes } from 'devextreme-angular/ui/select-box';
44
import type { BookingFormData } from '../app.types';
55

66
let modulePrefix = '';

apps/demos/Demos/Stepper/FormIntegration/React/App.tsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import React, { useState, useCallback, useMemo } from 'react';
2-
import { Stepper, Item } from 'devextreme-react/stepper'
3-
import type { IItemProps } from 'devextreme-react/stepper'
4-
import Button from 'devextreme-react/button';
2+
import { Stepper, Item, type StepperTypes } from 'devextreme-react/stepper'
3+
import { Button } from 'devextreme-react/button';
54
import { MultiView } from 'devextreme-react/multi-view';
6-
import type { SelectionChangedEvent, SelectionChangingEvent } from 'devextreme/ui/stepper';
75
import validationEngine from 'devextreme/ui/validation_engine';
86

97
import DatesForm from './DatesForm.tsx';
@@ -19,7 +17,7 @@ const validationGroups = ['dates', 'guests', 'roomAndMealPlan'];
1917

2018
export default function App () {
2119
const [selectedIndex, setSelectedIndex] = useState(0);
22-
const [steps, setSteps] = useState<IItemProps[]>(initialSteps);
20+
const [steps, setSteps] = useState<StepperTypes.Item[]>(initialSteps);
2321
const [formData, setFormData] = useState<BookingFormData>(getInitialFormData);
2422
const [isConfirmed, setIsConfirmed] = useState(false);
2523
const [isStepperReadonly, setIsStepperReadonly] = useState(false);
@@ -95,12 +93,12 @@ export default function App () {
9593
return 'Confirm';
9694
}, [selectedIndex, isConfirmed, steps.length]);
9795

98-
const onSelectionChanging = useCallback((args: SelectionChangingEvent) => {
96+
const onSelectionChanging = useCallback((args: StepperTypes.SelectionChangingEvent) => {
9997
const { component, addedItems, removedItems } = args;
10098
const { items = [] } = component.option();
10199

102-
const addedIndex = items.findIndex((item: IItemProps) => item === addedItems[0]);
103-
const removedIndex = items.findIndex((item: IItemProps) => item === removedItems[0]);
100+
const addedIndex = items.findIndex((item: StepperTypes.Item) => item === addedItems[0]);
101+
const removedIndex = items.findIndex((item: StepperTypes.Item) => item === removedItems[0]);
104102
const isMoveForward = addedIndex > removedIndex;
105103

106104
if (isMoveForward) {
@@ -114,7 +112,7 @@ export default function App () {
114112
}
115113
}, [setStepValidationResult, getValidationResult]);
116114

117-
const onSelectionChanged = useCallback(({ component }: SelectionChangedEvent) => {
115+
const onSelectionChanged = useCallback(({ component }: StepperTypes.SelectionChangedEvent) => {
118116
setSelectedIndex(component.option('selectedIndex') ?? 0);
119117
}, []);
120118

apps/demos/Demos/Stepper/FormIntegration/React/data.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import type { IItemProps } from 'devextreme-react/stepper'
1+
import { type StepperTypes } from 'devextreme-react/stepper'
22
import type { BookingFormData } from './types';
33

4-
export const initialSteps: IItemProps[] = [
4+
export const initialSteps: StepperTypes.Item[] = [
55
{
66
label: 'Dates', hint: 'Dates', icon: 'daterangepicker',
77
},

apps/demos/Demos/Stepper/FormIntegration/ReactJs/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState, useCallback, useMemo } from 'react';
22
import { Stepper, Item } from 'devextreme-react/stepper';
3-
import Button from 'devextreme-react/button';
3+
import { Button } from 'devextreme-react/button';
44
import { MultiView } from 'devextreme-react/multi-view';
55
import validationEngine from 'devextreme/ui/validation_engine';
66
import DatesForm from './DatesForm.js';

apps/demos/Demos/Stepper/FormIntegration/Vue/AdditionalTemplate.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</template>
1414

1515
<script setup lang="ts">
16-
import DxForm, { DxSimpleItem } from 'devextreme-vue/form';
17-
import 'devextreme/ui/text_area';
16+
import { DxForm, DxSimpleItem } from 'devextreme-vue/form';
17+
import 'devextreme-vue/text-area';
1818
import type { BookingFormData } from './types.ts';
1919
import { initialFormData } from './data.ts';
2020

0 commit comments

Comments
 (0)