Skip to content

Commit 8c27dfb

Browse files
fix types in react for lint check
1 parent d3430be commit 8c27dfb

File tree

7 files changed

+32
-19
lines changed

7 files changed

+32
-19
lines changed

packages/devextreme-cli/src/templates/react/application/src/components/change-password-form/ChangePasswordForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useState, useRef, useCallback } from 'react';
1+
import <%=#isTypeScript%>React, <%=/isTypeScript%>{ useState, useRef, useCallback } from 'react';
22
import { useNavigate, useParams } from 'react-router-dom';
33
import Form, {
44
Item,
@@ -19,7 +19,7 @@ export default function ChangePasswordForm() {
1919
const formData = useRef({ password: '' });
2020
const { recoveryCode } = useParams();
2121

22-
const onSubmit = useCallback(async (e<%=#isTypeScript%>: any<%=/isTypeScript%>) => {
22+
const onSubmit = useCallback(async (e<%=#isTypeScript%>: React.FormEvent<HTMLFormElement><%=/isTypeScript%>) => {
2323
e.preventDefault();
2424
const { password } = formData.current;
2525
setLoading(true);

packages/devextreme-cli/src/templates/react/application/src/components/create-account-form/CreateAccountForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useState, useRef, useCallback } from 'react';
1+
import <%=#isTypeScript%>React, <%=/isTypeScript%>{ useState, useRef, useCallback } from 'react';
22
import { Link, useNavigate } from 'react-router-dom';
33
import Form, {
44
Item,
@@ -20,7 +20,7 @@ export default function CreateAccountForm() {
2020
const [loading, setLoading] = useState(false);
2121
const formData = useRef({ email: '', password: '' });
2222

23-
const onSubmit = useCallback(async (e<%=#isTypeScript%>: any<%=/isTypeScript%>) => {
23+
const onSubmit = useCallback(async (e<%=#isTypeScript%>: React.FormEvent<HTMLFormElement><%=/isTypeScript%>) => {
2424
e.preventDefault();
2525
const { email, password } = formData.current;
2626
setLoading(true);

packages/devextreme-cli/src/templates/react/application/src/components/login-form/LoginForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useState, useRef, useCallback } from 'react';
1+
import <%=#isTypeScript%>React, <%=/isTypeScript%>{ useState, useRef, useCallback } from 'react';
22
import { Link, useNavigate } from 'react-router-dom';
33
import Form, {
44
Item,
@@ -21,7 +21,7 @@ export default function LoginForm() {
2121
const [loading, setLoading] = useState(false);
2222
const formData = useRef({ email: '', password: '' });
2323

24-
const onSubmit = useCallback(async (e<%=#isTypeScript%>: any<%=/isTypeScript%>) => {
24+
const onSubmit = useCallback(async (e<%=#isTypeScript%>: React.FormEvent<HTMLFormElement><%=/isTypeScript%>) => {
2525
e.preventDefault();
2626
const { email, password } = formData.current;
2727
setLoading(true);

packages/devextreme-cli/src/templates/react/application/src/components/reset-password-form/ResetPasswordForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useState, useRef, useCallback } from 'react';
1+
import <%=#isTypeScript%>React, <%=/isTypeScript%>{ useState, useRef, useCallback } from 'react';
22
import { Link, useNavigate } from "react-router-dom";
33
import Form, {
44
Item,
@@ -20,7 +20,7 @@ export default function ResetPasswordForm() {
2020
const [loading, setLoading] = useState(false);
2121
const formData = useRef({ email: '', password: '' });
2222

23-
const onSubmit = useCallback(async (e<%=#isTypeScript%>: any<%=/isTypeScript%>) => {
23+
const onSubmit = useCallback(async (e<%=#isTypeScript%>: React.FormEvent<HTMLFormElement><%=/isTypeScript%>) => {
2424
e.preventDefault();
2525
const { email } = formData.current;
2626
setLoading(true);

packages/devextreme-cli/src/templates/react/application/src/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,19 @@ export default function SideNavInnerToolbar({ title, children }<%=#isTypeScript%
8484
/>
8585
<ScrollView ref={scrollViewRef} className={'layout-body with-footer'}>
8686
<div className={'content'}>
87-
{React.Children.map(children, (item<%=#isTypeScript%>: any<%=/isTypeScript%>) => {
88-
return item.type !== Footer && item;
87+
{React.Children.map(children, (item) => {
88+
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type !== Footer) {
89+
return item;
90+
}
91+
return null;
8992
})}
9093
</div>
9194
<div className={'content-block'}>
92-
{React.Children.map(children, (item<%=#isTypeScript%>: any<%=/isTypeScript%>) => {
93-
return item.type === Footer && item;
95+
{React.Children.map(children, (item) => {
96+
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type === Footer) {
97+
return item;
98+
}
99+
return null;
94100
})}
95101
</div>
96102
</ScrollView>

packages/devextreme-cli/src/templates/react/application/src/layouts/side-nav-outer-toolbar/side-nav-outer-toolbar.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,19 @@ export default function SideNavOuterToolbar({ title, children }<%=#isTypeScript%
8383
<div className={'container'}>
8484
<ScrollView ref={scrollViewRef} className={'with-footer'}>
8585
<div className={'content'}>
86-
{React.Children.map(children, (item<%=#isTypeScript%>: any<%=/isTypeScript%>) => {
87-
return item.type !== Footer && item;
86+
{React.Children.map(children, (item) => {
87+
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type !== Footer) {
88+
return item;
89+
}
90+
return null;
8891
})}
8992
</div>
9093
<div className={'content-block'}>
91-
{React.Children.map(children, (item<%=#isTypeScript%>: any<%=/isTypeScript%>) => {
92-
return item.type === Footer && item;
94+
{React.Children.map(children, (item) => {
95+
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type === Footer) {
96+
return item;
97+
}
98+
return null;
9399
})}
94100
</div>
95101
</ScrollView>

packages/devextreme-cli/src/templates/react/sample-pages/tasks/tasks.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from 'react';
22
import 'devextreme/data/odata/store';
3+
import DataSource from 'devextreme/data/data_source';
34
import DataGrid, {
45
Column,
56
Pager,
@@ -16,7 +17,7 @@ export default function Task() {
1617

1718
<DataGrid
1819
className={'dx-card content-block'}
19-
dataSource={dataSource<%=#isTypeScript%> as any<%=/isTypeScript%>}
20+
dataSource={dataSource}
2021
showBorders={false}
2122
focusedRowEnabled={true}
2223
defaultFocusedRowIndex={0}
@@ -83,7 +84,7 @@ export default function Task() {
8384
</React.Fragment>
8485
)}
8586

86-
const dataSource = {
87+
const dataSource = new DataSource({
8788
store: {
8889
version: 2,
8990
type: 'odata',
@@ -101,7 +102,7 @@ const dataSource = {
101102
'Task_Completion',
102103
'ResponsibleEmployee/Employee_Full_Name'
103104
]
104-
};
105+
});
105106

106107
const priorities = [
107108
{ name: 'High', value: 4 },

0 commit comments

Comments
 (0)