Skip to content

Commit f214150

Browse files
DataGrid: fix ts issues in react demos (#31978)
1 parent 503e597 commit f214150

File tree

76 files changed

+350
-201
lines changed

Some content is hidden

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

76 files changed

+350
-201
lines changed

apps/demos/Demos/DataGrid/AIColumns/React/App.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
import React, { useCallback, useState } from 'react';
2+
23
import DataGrid, {
34
Column,
45
Paging,
56
Grouping,
67
AI,
78
} from 'devextreme-react/data-grid';
9+
import type { DataGridTypes } from 'devextreme-react/data-grid';
810
import Popup, { Position } from 'devextreme-react/popup';
11+
912
import { vehicles } from './data.ts';
1013
import { aiIntegration } from './service.ts';
11-
import Trademark from './Trademark.tsx';
1214
import Category from './Category.tsx';
1315
import LicenseInfo from './LicenseInfo.tsx';
14-
import { type Vehicle } from './types.ts';
16+
import Trademark from './Trademark.tsx';
17+
import type { Vehicle } from './types.ts';
1518

16-
const onAIColumnRequestCreating = (e) => {
17-
e.data = e.data.map((item) => ({
19+
const onAIColumnRequestCreating = (e: DataGridTypes.AIColumnRequestCreatingEvent) => {
20+
e.data = e.data.map((item: Vehicle) => ({
1821
ID: item.ID,
1922
TrademarkName: item.TrademarkName,
2023
Name: item.Name,
@@ -34,7 +37,7 @@ export default function App() {
3437
}, []);
3538

3639
return (
37-
<React.Fragment>
40+
<>
3841
<DataGrid
3942
dataSource={vehicles}
4043
showBorders={true}
@@ -117,6 +120,6 @@ export default function App() {
117120
collision="fit"
118121
/>
119122
</Popup>
120-
</React.Fragment>
123+
</>
121124
);
122125
}

apps/demos/Demos/DataGrid/AIColumns/React/service.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import { type AIMessage } from './types';
2-
import {
3-
AIIntegration,
4-
RequestParams,
5-
Response,
6-
} from 'devextreme-react/common/ai-integration';
2+
import { AIIntegration } from 'devextreme-react/common/ai-integration';
3+
import type { RequestParams, Response } from 'devextreme-react/common/ai-integration';
74
import { AzureOpenAI } from 'openai';
85
import notify from 'devextreme/ui/notify';
96

@@ -31,7 +28,7 @@ async function getAIResponse(messages: AIMessage[], signal: AbortSignal) {
3128
return result;
3229
}
3330

34-
async function getAIResponseRecursive(messages: AIMessage[], signal: AbortSignal) {
31+
async function getAIResponseRecursive(messages: AIMessage[], signal: AbortSignal): Promise<string | null | undefined> {
3532
return getAIResponse(messages, signal)
3633
.catch(async (error) => {
3734
if (!error.message.includes('Connection error')) {

apps/demos/Demos/DataGrid/AIColumns/ReactJs/App.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import DataGrid, {
55
import Popup, { Position } from 'devextreme-react/popup';
66
import { vehicles } from './data.js';
77
import { aiIntegration } from './service.js';
8-
import Trademark from './Trademark.js';
98
import Category from './Category.js';
109
import LicenseInfo from './LicenseInfo.js';
10+
import Trademark from './Trademark.js';
1111

1212
const onAIColumnRequestCreating = (e) => {
1313
e.data = e.data.map((item) => ({
@@ -26,7 +26,7 @@ export default function App() {
2626
setCurrentVehicle(null);
2727
}, []);
2828
return (
29-
<React.Fragment>
29+
<>
3030
<DataGrid
3131
dataSource={vehicles}
3232
showBorders={true}
@@ -107,6 +107,6 @@ export default function App() {
107107
collision="fit"
108108
/>
109109
</Popup>
110-
</React.Fragment>
110+
</>
111111
);
112112
}

apps/demos/Demos/DataGrid/AdvancedMasterDetailView/React/AddressTab.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
import React from 'react';
22
import { Form, Item } from 'devextreme-react/form';
3+
import type { TextBoxTypes } from 'devextreme-react/text-box';
34

45
const items = ['Address', 'City', 'Region', 'PostalCode', 'Country', 'Phone'];
56

6-
const renderFormItem = (item) => (
7+
interface FormItemRenderData {
8+
editorOptions: TextBoxTypes.Properties;
9+
}
10+
11+
const renderFormItem = (item: FormItemRenderData) => (
712
<span>{item.editorOptions.value}</span>
813
);
914

apps/demos/Demos/DataGrid/AdvancedMasterDetailView/React/MasterDetailView.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useCallback } from 'react';
2+
3+
import type { DataGridTypes } from 'devextreme-react/data-grid';
24
import { TabPanel, Item } from 'devextreme-react/tab-panel';
3-
import { type DataGridTypes } from 'devextreme-react/data-grid';
45

56
import AddressTab from './AddressTab.tsx';
67
import OrdersTab from './OrdersTab.tsx';

apps/demos/Demos/DataGrid/Appearance/React/App.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React, { useCallback, useState } from 'react';
2+
3+
import CheckBox from 'devextreme-react/check-box';
4+
import type { CheckBoxTypes } from 'devextreme-react/check-box';
25
import DataGrid, { Column } from 'devextreme-react/data-grid';
3-
import CheckBox, { type CheckBoxTypes } from 'devextreme-react/check-box';
46

57
import { employees } from './data.ts';
68

@@ -27,7 +29,7 @@ const App = () => {
2729
}, []);
2830

2931
return (
30-
<React.Fragment>
32+
<>
3133
<DataGrid
3234
dataSource={employees}
3335
keyExpr="ID"
@@ -79,7 +81,7 @@ const App = () => {
7981
/>
8082
</div>
8183
</div>
82-
</React.Fragment>
84+
</>
8385
);
8486
};
8587

apps/demos/Demos/DataGrid/Appearance/ReactJs/App.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useCallback, useState } from 'react';
2-
import DataGrid, { Column } from 'devextreme-react/data-grid';
32
import CheckBox from 'devextreme-react/check-box';
3+
import DataGrid, { Column } from 'devextreme-react/data-grid';
44
import { employees } from './data.js';
55

66
const App = () => {
@@ -21,7 +21,7 @@ const App = () => {
2121
setRowAlternationEnabled(e.value);
2222
}, []);
2323
return (
24-
<React.Fragment>
24+
<>
2525
<DataGrid
2626
dataSource={employees}
2727
keyExpr="ID"
@@ -88,7 +88,7 @@ const App = () => {
8888
/>
8989
</div>
9090
</div>
91-
</React.Fragment>
91+
</>
9292
);
9393
};
9494
export default App;

apps/demos/Demos/DataGrid/BatchEditing/React/App.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
import React, { useCallback, useState } from 'react';
2+
3+
import CheckBox from 'devextreme-react/check-box';
4+
import type { CheckBoxTypes } from 'devextreme-react/check-box';
25
import DataGrid, {
36
Column,
47
Editing,
58
Paging,
69
Lookup,
7-
type DataGridTypes,
810
} from 'devextreme-react/data-grid';
9-
import CheckBox, { type CheckBoxTypes } from 'devextreme-react/check-box';
10-
import SelectBox, { type SelectBoxTypes } from 'devextreme-react/select-box';
11+
import type { DataGridTypes } from 'devextreme-react/data-grid';
12+
import SelectBox from 'devextreme-react/select-box';
13+
import type { SelectBoxTypes } from 'devextreme-react/select-box';
14+
1115
import { employees, states } from './data.ts';
1216

1317
const startEditActions = ['click', 'dblClick'];

apps/demos/Demos/DataGrid/BatchEditing/ReactJs/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { useCallback, useState } from 'react';
2+
import CheckBox from 'devextreme-react/check-box';
23
import DataGrid, {
34
Column, Editing, Paging, Lookup,
45
} from 'devextreme-react/data-grid';
5-
import CheckBox from 'devextreme-react/check-box';
66
import SelectBox from 'devextreme-react/select-box';
77
import { employees, states } from './data.js';
88

apps/demos/Demos/DataGrid/BatchUpdateRequest/React/App.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from 'react';
2-
import DataGrid, { DataGridRef, Column, DataGridTypes, Editing, Pager } from 'devextreme-react/data-grid';
2+
import DataGrid, { Column, Editing, Pager } from 'devextreme-react/data-grid';
3+
import type { DataGridRef, DataGridTypes } from 'devextreme-react/data-grid';
34
import { createStore } from 'devextreme-aspnet-data-nojquery';
45
import 'whatwg-fetch';
56

0 commit comments

Comments
 (0)