Skip to content

Commit 657b8c2

Browse files
committed
Navigation: fix ts issues in demos
1 parent 224b6fb commit 657b8c2

File tree

54 files changed

+379
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+379
-271
lines changed

apps/demos/Demos/Box/Overview/React/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import Box, { Item } from 'devextreme-react/box';
33

44
const App = () => (
5-
<React.Fragment>
5+
<>
66
<Box direction="row" width="100%" height={75}>
77
<Item ratio={1}>
88
<div className="rect demo-dark">ratio = 1</div>
@@ -65,7 +65,7 @@ const App = () => (
6565
<div className="rect demo-dark footer">Footer</div>
6666
</Item>
6767
</Box>
68-
</React.Fragment>
68+
</>
6969
);
7070

7171
export default App;

apps/demos/Demos/Box/Overview/React/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React from 'react';
22
import ReactDOM from 'react-dom';
33

44
import themes from 'devextreme/ui/themes';
5+
56
import App from './App.tsx';
67

78
themes.initialized(() => {

apps/demos/Demos/Box/Overview/ReactJs/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import Box, { Item } from 'devextreme-react/box';
33

44
const App = () => (
5-
<React.Fragment>
5+
<>
66
<Box
77
direction="row"
88
width="100%"
@@ -99,6 +99,6 @@ const App = () => (
9999
<div className="rect demo-dark footer">Footer</div>
100100
</Item>
101101
</Box>
102-
</React.Fragment>
102+
</>
103103
);
104104
export default App;

apps/demos/Demos/Common/CustomTextEditorButtons/ReactJs/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function App() {
8787
[setCurrencyValue],
8888
);
8989
return (
90-
<React.Fragment>
90+
<>
9191
<div className="dx-fieldset">
9292
<div className="dx-field">
9393
<div className="dx-field-label">Password TextBox</div>
@@ -157,7 +157,7 @@ function App() {
157157
</div>
158158
</div>
159159
</div>
160-
</React.Fragment>
160+
</>
161161
);
162162
}
163163
export default App;

apps/demos/Demos/Common/EditorAppearanceVariants/ReactJs/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export default function App() {
5050
[setLabelMode],
5151
);
5252
return (
53-
<React.Fragment>
53+
<>
5454
<div className="options">
5555
<div className="caption">Options</div>
5656
<div className="editors-modes">
@@ -183,6 +183,6 @@ export default function App() {
183183
type="default"
184184
id="validate"
185185
/>
186-
</React.Fragment>
186+
</>
187187
);
188188
}

apps/demos/Demos/Common/EditorsOverview/ReactJs/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function App() {
5959
setBorder(e.value);
6060
}, []);
6161
return (
62-
<React.Fragment>
62+
<>
6363
<div className="settings">
6464
<div className="column">
6565
<div className="field">
@@ -152,7 +152,7 @@ function App() {
152152
transform={transform}
153153
border={border}
154154
/>
155-
</React.Fragment>
155+
</>
156156
);
157157
}
158158
export default App;

apps/demos/Demos/Common/FormsOverview/React/App.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import React from 'react';
2+
23
import {
3-
Form, SimpleItem, GroupItem, Label,
4+
Form, GroupItem, Label, SimpleItem,
45
} from 'devextreme-react/form';
5-
import { employee, positions, states } from './data.ts';
66
import 'devextreme-react/text-area';
77

8+
import { employee, positions, states } from './data.ts';
9+
810
const birthDateOptions = { width: '100%' };
911
const positionOptions = {
1012
items: positions,

apps/demos/Demos/Common/FormsOverview/ReactJs/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React from 'react';
22
import {
3-
Form, SimpleItem, GroupItem, Label,
3+
Form, GroupItem, Label, SimpleItem,
44
} from 'devextreme-react/form';
5-
import { employee, positions, states } from './data.js';
65
import 'devextreme-react/text-area';
6+
import { employee, positions, states } from './data.js';
77

88
const birthDateOptions = { width: '100%' };
99
const positionOptions = {

apps/demos/Demos/Common/ListsOverview/React/App.tsx

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,27 @@
11
import React, { useCallback, useState } from 'react';
2+
23
import { ArrayStore } from 'devextreme-react/common/data';
3-
import List, { type ListTypes } from 'devextreme-react/list';
4+
import List from 'devextreme-react/list';
5+
import type { ListTypes } from 'devextreme-react/list';
46
import TileView from 'devextreme-react/tile-view';
7+
58
import { data } from './data.ts';
69

10+
interface Hotel {
11+
Id: number;
12+
Hotel_Name: string;
13+
Address: string;
14+
Postal_Code: string;
15+
City: string;
16+
Hotel_Class: string;
17+
Price: number;
18+
Images: { FileName: string }[];
19+
}
20+
21+
interface GroupInfo {
22+
key: string;
23+
}
24+
725
const dataSourceOptions = {
826
store: new ArrayStore({
927
data,
@@ -24,9 +42,9 @@ const formatCurrency = new Intl.NumberFormat(
2442
},
2543
).format;
2644

27-
const renderListGroup = (group) => <div className="city">{group.key}</div>;
45+
const renderListGroup = (group: GroupInfo) => <div className="city">{group.key}</div>;
2846

29-
const renderListItem = (item) => (
47+
const renderListItem = (item: Hotel) => (
3048
<div>
3149
<div className="hotel">
3250
<div className="name">{item.Hotel_Name}</div>
@@ -57,10 +75,10 @@ const App = () => {
5775
const hotel = e.addedItems[0];
5876
setCurrentHotel(hotel);
5977
setSelectedItemKeys([hotel.Id]);
60-
}, [setCurrentHotel, setSelectedItemKeys]);
78+
}, []);
6179

6280
return (
63-
<React.Fragment>
81+
<>
6482
<div className="left">
6583
<List
6684
selectionMode="single"
@@ -102,7 +120,7 @@ const App = () => {
102120
<div className="address">{currentHotel.Postal_Code}, {currentHotel.Address}</div>
103121
<div className="description">{currentHotel.Description}</div>
104122
</div>
105-
</React.Fragment>
123+
</>
106124
);
107125
};
108126

apps/demos/Demos/Common/ListsOverview/ReactJs/App.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,13 @@ const renderTile = (item) => (
4949
const App = () => {
5050
const [currentHotel, setCurrentHotel] = useState(data[0]);
5151
const [selectedItemKeys, setSelectedItemKeys] = useState([data[0].Id]);
52-
const handleListSelectionChange = useCallback(
53-
(e) => {
54-
const hotel = e.addedItems[0];
55-
setCurrentHotel(hotel);
56-
setSelectedItemKeys([hotel.Id]);
57-
},
58-
[setCurrentHotel, setSelectedItemKeys],
59-
);
52+
const handleListSelectionChange = useCallback((e) => {
53+
const hotel = e.addedItems[0];
54+
setCurrentHotel(hotel);
55+
setSelectedItemKeys([hotel.Id]);
56+
}, []);
6057
return (
61-
<React.Fragment>
58+
<>
6259
<div className="left">
6360
<List
6461
selectionMode="single"
@@ -106,7 +103,7 @@ const App = () => {
106103
</div>
107104
<div className="description">{currentHotel.Description}</div>
108105
</div>
109-
</React.Fragment>
106+
</>
110107
);
111108
};
112109
export default App;

0 commit comments

Comments
 (0)