Skip to content

Commit c6f52b2

Browse files
update react next (#36)
* update react next * (BA) lint design-sytem-mui --------- Co-authored-by: Alexandre Anicio <[email protected]>
1 parent ef3f253 commit c6f52b2

File tree

15 files changed

+486
-492
lines changed

15 files changed

+486
-492
lines changed

packages/core/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @baseapp-frontend/core
22

3+
## 2.6.0
4+
5+
### Minor Changes
6+
7+
- Update Next React vesions
8+
39
## 2.5.3
410

511
### Patch Changes

packages/core/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@baseapp-frontend/core",
3-
"version": "2.5.3",
3+
"version": "2.6.0",
44
"description": "Core utilities.",
55
"main": "./src/index.tsx",
66
"scripts": {
@@ -27,9 +27,9 @@
2727
"yup": "^0.32.11"
2828
},
2929
"peerDependencies": {
30-
"next": "12.0.7",
31-
"react": "^17.0.2",
32-
"react-dom": "^17.0.2"
30+
"next": "^12.3.4",
31+
"react": "^18.2.0",
32+
"react-dom": "^18.2.0"
3333
},
3434
"devDependencies": {
3535
"@babel/core": "^7.16.12",
@@ -42,17 +42,17 @@
4242
"@types/js-cookie": "^3.0.1",
4343
"@types/node": "^17.0.8",
4444
"@types/qs": "^6.9.7",
45-
"@types/react": "^17.0.38",
46-
"@types/react-dom": "^17.0.11",
45+
"@types/react": "^18.0.28",
46+
"@types/react-dom": "^18.0.11",
4747
"babel-jest": "^27.4.6",
4848
"jest": "^27.4.7",
49-
"next": "^12.2.4",
50-
"prettier": "^2.5.1",
49+
"next": "12.3.4",
50+
"prettier": "^2.8.4",
5151
"react": "^18.2.0",
5252
"react-dom": "^18.2.0",
5353
"react-test-renderer": "^18.2.0",
5454
"ts-jest": "^27.1.3",
55-
"typescript": "^4.5.4"
55+
"typescript": "^4.9.5"
5656
},
5757
"license": "MIT",
5858
"repository": {

packages/core/src/auth/provider.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useState } from 'react'
1+
import { ReactNode, useState } from 'react'
22

33
import { Hydrate, QueryCache, QueryClient, QueryClientProvider } from 'react-query'
44
import type { QueryFunction } from 'react-query'
@@ -40,7 +40,7 @@ export const BaseAppProvider = ({
4040
queryClientOptions,
4141
}: {
4242
pageProps?: any
43-
children: React.ReactNode
43+
children: ReactNode
4444
queryClientOptions?: any
4545
}) => {
4646
const [queryClient] = useState(() => buildQueryClient(queryClientOptions))

packages/core/src/permissions/withPermissions.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import { FC } from 'react'
2+
3+
import { IProps, PermissionOptions, UserWithPermissions } from './types'
14
import { checkPermissions } from './utils'
2-
import { UserWithPermissions, PermissionOptions, IProps } from './types'
35

4-
export const withPermissions = (Component: React.FC<any>, options: PermissionOptions = {}) => {
6+
export const withPermissions = (Component: FC<any>, options: PermissionOptions = {}) => {
57
const { all, any, PermissionDeniedComponent, hide } = options
68

79
return (props: IProps) => {

packages/design-system-mui/components/ButtonWithLoading/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ function ButtonWithLoading({
1010
form,
1111
...props
1212
}: IButtonWitthLoadingProps) {
13-
const _isLoading = loading || form?.formState.isSubmitting
13+
const isLoading = loading || form?.formState.isSubmitting
1414
return (
15-
<Button disabled={_isLoading} {...props}>
15+
<Button disabled={isLoading} {...props}>
1616
{children}
17-
{_isLoading && loadingChildren}
17+
{isLoading && loadingChildren}
1818
</Button>
1919
)
2020
}
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import { styled } from '@mui/material/styles'
2-
import { CircularProgress as MuiCircularProgress, CircularProgressProps } from '@mui/material'
31
import { FC } from 'react'
42

5-
export const CircularProgress = styled(MuiCircularProgress)(({ theme }) => ({
3+
import { CircularProgressProps, CircularProgress as MuiCircularProgress } from '@mui/material'
4+
import { styled } from '@mui/material/styles'
5+
6+
export const CircularProgress = styled(MuiCircularProgress)({
67
position: 'absolute',
78
top: '50%',
89
left: '50%',
910
marginTop: '-10px',
1011
marginLeft: '-10px',
11-
})) as unknown as FC<CircularProgressProps>
12+
}) as unknown as FC<CircularProgressProps>
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import { Button, ButtonProps } from '@mui/material'
1+
import { PropsWithChildren } from 'react'
2+
3+
import { ButtonProps } from '@mui/material'
24
import { UseFormReturn } from 'react-hook-form'
35

4-
export interface IButtonWitthLoadingProps extends ButtonProps {
5-
children?: React.FC<any> | React.Element | string
6+
export interface IButtonWitthLoadingProps extends ButtonProps, PropsWithChildren {
67
loading?: boolean
7-
loadingChildren?: React.FC<any> | React.Element
8+
loadingChildren?: any
89
form?: UseFormReturn
910
}

packages/design-system-mui/components/CheckboxField/index.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
import { withController } from '@baseapp-frontend/core'
2+
13
import Checkbox from '@mui/material/Checkbox'
2-
import FormControlLabel from '@mui/material/FormControlLabel'
34
import FormControl from '@mui/material/FormControl'
5+
import FormControlLabel from '@mui/material/FormControlLabel'
46
import FormHelperText from '@mui/material/FormHelperText'
5-
import { withController } from '@baseapp-frontend/core'
67

78
import { ICheckboxFieldProps, IControlledCheckBoxProps } from './types'
89

@@ -26,13 +27,13 @@ export default function CheckboxField({
2627
FormControlProps,
2728
}: ICheckboxFieldProps) {
2829
const formError = form?.formState?.errors?.[name]?.message
29-
const _showError = (formError && form?.formState?.touchedFields?.[name]) as boolean
30+
const innerShowError = (formError && form?.formState?.touchedFields?.[name]) as boolean
3031

3132
return (
3233
<FormControl
3334
component="fieldset"
3435
variant={variant}
35-
error={showError || _showError}
36+
error={showError || innerShowError}
3637
{...FormControlProps}
3738
>
3839
<FormControlLabel
@@ -42,11 +43,11 @@ export default function CheckboxField({
4243
checked={checked}
4344
handleChange={handleChange}
4445
{...CheckboxProps}
45-
></ControlledCheckBox>
46+
/>
4647
}
4748
label={label}
4849
/>
49-
{((showError && errorMessage) || _showError) && (
50+
{((showError && errorMessage) || innerShowError) && (
5051
<FormHelperText>{showError ? (formError as string) : errorMessage}</FormHelperText>
5152
)}
5253
{helperText && <FormHelperText>{helperText}</FormHelperText>}

packages/design-system-mui/components/CheckboxField/types.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import { UseFormReturn, ControllerRenderProps } from 'react-hook-form'
1+
import { ChangeEvent } from 'react'
2+
3+
import { ControllerRenderProps, UseFormReturn } from 'react-hook-form'
24

35
export interface ICheckboxFieldProps {
46
label?: string
@@ -10,7 +12,7 @@ export interface ICheckboxFieldProps {
1012
name: string
1113
showError?: boolean
1214
checked?: boolean
13-
handleChange?: (event: React.ChangeEvent<HTMLInputElement>) => void
15+
handleChange?: (event: ChangeEvent<HTMLInputElement>) => void
1416
CheckboxProps?: CheckboxProps
1517
FormControlProps?: FormControlProps
1618
}

packages/design-system-mui/components/ImageUploader/index.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { FormControl, FormHelperText } from '@mui/material'
21
import UploadFileOutlinedIcon from '@mui/icons-material/UploadFileOutlined'
2+
import { FormControl, FormHelperText } from '@mui/material'
33

4+
import { DeleteButton, Image, ImageGroup, ImageLabel, LabelGroup, UploaderButton } from './styled'
45
import type { IImageUploadInput, ImageFile } from './types'
5-
import { ImageGroup, Image, UploaderButton, LabelGroup, ImageLabel, DeleteButton } from './styled'
66

77
function ImageUploader({
88
images,
@@ -27,12 +27,11 @@ function ImageUploader({
2727
}
2828

2929
function onChange(e: any): void {
30-
//eslint-disable-line @typescript-eslint/no-explicit-any
31-
for (let i = 0; i < e.target?.files?.length; i++) {
30+
for (let i = 0; i < e.target?.files?.length; i += 1) {
3231
const file = e.target?.files[i]
3332
const fileReader = new FileReader()
3433
fileReader.onload = () => {
35-
setImages([{ file: file, imagePreviewUrl: fileReader.result }])
34+
setImages([{ file, imagePreviewUrl: fileReader.result }])
3635
}
3736
fileReader.readAsDataURL(file)
3837
}
@@ -42,7 +41,7 @@ function ImageUploader({
4241
<FormControl error={error} fullWidth>
4342
<UploaderButton
4443
component="label"
45-
htmlFor={'imageInput' + name}
44+
htmlFor={`imageInput${name}`}
4645
variant="outlined"
4746
color="primary"
4847
sx={{ display: images.length ? 'none' : 'auto' }}
@@ -53,7 +52,7 @@ function ImageUploader({
5352
</UploaderButton>
5453
<input
5554
name={name}
56-
id={'imageInput' + name}
55+
id={`imageInput${name}`}
5756
type="file"
5857
accept="image/*"
5958
onChange={onChange}
@@ -62,7 +61,7 @@ function ImageUploader({
6261
/>
6362
{error && <FormHelperText>{helperText}</FormHelperText>}
6463
{images?.map((img: ImageFile, index: number) => (
65-
<ImageGroup key={index}>
64+
<ImageGroup key={img.file.name}>
6665
<Image src={img.imagePreviewUrl as string} alt="preview" {...ImageProps} />
6766
<LabelGroup>
6867
<ImageLabel variant="caption" {...ImageLabelProps}>

0 commit comments

Comments
 (0)