From 5973221c79c2f65138619a2a12bfb751c71cf4ae Mon Sep 17 00:00:00 2001 From: bigfengyu Date: Sun, 29 Mar 2020 17:59:37 +0800 Subject: [PATCH] fix: Transition TS type bug --- src/components/common/Transition.tsx | 12 ++++++++++++ src/components/editor/DefaultValueModal.tsx | 9 ++------- src/components/editor/InterfaceForm.tsx | 10 +++------- src/components/editor/ModuleForm.tsx | 10 +++------- src/components/editor/RapperInstallerModal.tsx | 9 ++------- src/components/organization/OrganizationForm.tsx | 10 +++------- src/components/repository/ExportPostmanForm.tsx | 9 ++------- .../repository/ImportSwaggerRepositoryForm.tsx | 9 ++------- src/components/repository/RepositoryForm.tsx | 11 +++-------- 9 files changed, 32 insertions(+), 57 deletions(-) create mode 100644 src/components/common/Transition.tsx diff --git a/src/components/common/Transition.tsx b/src/components/common/Transition.tsx new file mode 100644 index 0000000..c442e02 --- /dev/null +++ b/src/components/common/Transition.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import { TransitionProps } from '@material-ui/core/transitions' +import Slide from '@material-ui/core/Slide' + +export const SlideUp = React.forwardRef( + ( + props: TransitionProps & { children?: React.ReactElement }, + ref: React.Ref, + ) => { + return + }, +) diff --git a/src/components/editor/DefaultValueModal.tsx b/src/components/editor/DefaultValueModal.tsx index df3d544..e370f58 100644 --- a/src/components/editor/DefaultValueModal.tsx +++ b/src/components/editor/DefaultValueModal.tsx @@ -7,9 +7,8 @@ import Toolbar from '@material-ui/core/Toolbar' import IconButton from '@material-ui/core/IconButton' import Typography from '@material-ui/core/Typography' import CloseIcon from '@material-ui/icons/Close' -import Slide from '@material-ui/core/Slide' import TextField from '@material-ui/core/TextField' -import { TransitionProps } from '@material-ui/core/transitions' +import { SlideUp } from 'components/common/Transition' import { Table, TableHead, TableRow, TableCell, TableBody, DialogContent } from '@material-ui/core' import Delete from '@material-ui/icons/Delete' import { useDispatch, useSelector } from 'react-redux' @@ -42,10 +41,6 @@ const useStyles = makeStyles(({ spacing }: Theme) => }) ) -const Transition = React.forwardRef((props, ref) => { - return -}) - function DefaultValueModal({ open, handleClose, repositoryId, enqueueSnackbar }: { open: boolean, handleClose: () => void, repositoryId: number } & WithSnackbarProps) { const classes = useStyles() @@ -95,7 +90,7 @@ function DefaultValueModal({ open, handleClose, repositoryId, enqueueSnackbar }: } return ( - + diff --git a/src/components/editor/InterfaceForm.tsx b/src/components/editor/InterfaceForm.tsx index 5a8ab76..1f09a2e 100644 --- a/src/components/editor/InterfaceForm.tsx +++ b/src/components/editor/InterfaceForm.tsx @@ -4,9 +4,9 @@ import { YUP_MSG } from '../../family/UIConst' import { Formik, Field, Form } from 'formik' import { TextField } from 'formik-material-ui' import * as Yup from 'yup' -import { Button, Theme, Dialog, Slide, DialogContent, DialogTitle, Select, MenuItem, InputLabel, FormControl } from '@material-ui/core' +import { Button, Theme, Dialog, DialogContent, DialogTitle, Select, MenuItem, InputLabel, FormControl } from '@material-ui/core' import { makeStyles } from '@material-ui/styles' -import { TransitionProps } from '@material-ui/core/transitions/transition' +import { SlideUp } from 'components/common/Transition' import { Interface, Repository, RootState, Module } from '../../actions/types' import { updateInterface, addInterface } from '../../actions/interface' import { refresh } from '../../actions/common' @@ -58,10 +58,6 @@ const FORM_STATE_INIT: Interface = { status: 200, } -const Transition = React.forwardRef((props, ref) => { - return -}) - interface Props { title?: string open: boolean @@ -81,7 +77,7 @@ function InterfaceForm(props: Props) { (reason !== 'backdropClick' && onClose())} - TransitionComponent={Transition} + TransitionComponent={SlideUp} > {title} diff --git a/src/components/editor/ModuleForm.tsx b/src/components/editor/ModuleForm.tsx index a2f58d6..8940e95 100644 --- a/src/components/editor/ModuleForm.tsx +++ b/src/components/editor/ModuleForm.tsx @@ -4,9 +4,9 @@ import { YUP_MSG } from '../../family/UIConst' import { Formik, Field, Form } from 'formik' import { TextField } from 'formik-material-ui' import * as Yup from 'yup' -import { Button, Theme, Dialog, Slide, DialogContent, DialogTitle } from '@material-ui/core' +import { Button, Theme, Dialog, DialogContent, DialogTitle } from '@material-ui/core' import { makeStyles } from '@material-ui/styles' -import { TransitionProps } from '@material-ui/core/transitions/transition' +import { SlideUp } from 'components/common/Transition' import { Module, Repository, RootState } from '../../actions/types' import { updateModule, addModule } from '../../actions/module' import { refresh } from '../../actions/common' @@ -52,10 +52,6 @@ const FORM_STATE_INIT: Module = { priority: 1, } -const Transition = React.forwardRef((props, ref) => { - return -}) - interface Props { title?: string open: boolean @@ -74,7 +70,7 @@ function ModuleForm(props: Props) { (reason !== 'backdropClick' && onClose())} - TransitionComponent={Transition} + TransitionComponent={SlideUp} > {title} diff --git a/src/components/editor/RapperInstallerModal.tsx b/src/components/editor/RapperInstallerModal.tsx index 4769869..37118c4 100644 --- a/src/components/editor/RapperInstallerModal.tsx +++ b/src/components/editor/RapperInstallerModal.tsx @@ -8,8 +8,7 @@ import Toolbar from '@material-ui/core/Toolbar' import IconButton from '@material-ui/core/IconButton' import Typography from '@material-ui/core/Typography' import CloseIcon from '@material-ui/icons/Close' -import Slide from '@material-ui/core/Slide' -import { TransitionProps } from '@material-ui/core/transitions' +import { SlideUp } from 'components/common/Transition' import { DialogContent } from '@material-ui/core' import Radio from '@material-ui/core/Radio' import RadioGroup from '@material-ui/core/RadioGroup' @@ -19,10 +18,6 @@ import { Repository } from 'actions/types' type RapperType = 'normal' | 'redux' -const Transition = React.forwardRef((props, ref) => { - return -}) - const codeTmpl = ({ projectId, token, rapperType, rapperPath }: { projectId: number token: string @@ -137,7 +132,7 @@ function RapperInstallerModal({ fullScreen={true} open={open} onClose={handleClose} - TransitionComponent={Transition} + TransitionComponent={SlideUp} > diff --git a/src/components/organization/OrganizationForm.tsx b/src/components/organization/OrganizationForm.tsx index aabcb9a..7a6fae3 100644 --- a/src/components/organization/OrganizationForm.tsx +++ b/src/components/organization/OrganizationForm.tsx @@ -5,9 +5,9 @@ import { FORM, YUP_MSG } from '../../family/UIConst' import { Formik, Field, Form } from 'formik' import { TextField } from 'formik-material-ui' import * as Yup from 'yup' -import { Button, Theme, Dialog, Slide, DialogContent, DialogTitle } from '@material-ui/core' +import { Button, Theme, Dialog, DialogContent, DialogTitle } from '@material-ui/core' import { makeStyles } from '@material-ui/styles' -import { TransitionProps } from '@material-ui/core/transitions/transition' +import { SlideUp } from 'components/common/Transition' import { Organization, RootState } from '../../actions/types' import UserList from '../common/UserList' import AccountService from '../../relatives/services/Account' @@ -57,10 +57,6 @@ const FORM_STATE_INIT: Organization = { visibility: false, } -const Transition = React.forwardRef((props, ref) => { - return -}) - interface Props { open: boolean onClose: (isOk?: boolean) => void @@ -77,7 +73,7 @@ function OrganizationForm(props: Props) { (reason !== 'backdropClick' && onClose())} - TransitionComponent={Transition} + TransitionComponent={SlideUp} > 新建团队 diff --git a/src/components/repository/ExportPostmanForm.tsx b/src/components/repository/ExportPostmanForm.tsx index 32a721d..7a49756 100644 --- a/src/components/repository/ExportPostmanForm.tsx +++ b/src/components/repository/ExportPostmanForm.tsx @@ -5,13 +5,8 @@ import { Dialog, DialogTitle, DialogContent, - Slide } from '@material-ui/core' -import { TransitionProps } from '@material-ui/core/transitions/transition' - -const Transition = React.forwardRef((props, ref) => { - return -}) +import { SlideUp } from 'components/common/Transition' export default function ExportPostmanForm(props: { repoId: number; @@ -28,7 +23,7 @@ export default function ExportPostmanForm(props: { onClose()} - TransitionComponent={Transition} + TransitionComponent={SlideUp} > {title} diff --git a/src/components/repository/ImportSwaggerRepositoryForm.tsx b/src/components/repository/ImportSwaggerRepositoryForm.tsx index 1377e32..91219c8 100644 --- a/src/components/repository/ImportSwaggerRepositoryForm.tsx +++ b/src/components/repository/ImportSwaggerRepositoryForm.tsx @@ -8,14 +8,13 @@ import { Button, Theme, Dialog, - Slide, DialogActions, DialogContentText, DialogContent, DialogTitle, } from '@material-ui/core' import { makeStyles } from '@material-ui/styles' -import { TransitionProps } from '@material-ui/core/transitions/transition' +import { SlideUp } from 'components/common/Transition' import { ImportSwagger } from '../../actions/types' import RepositoryService from '../../relatives/services/Repository' import './ImportSwaggerRepositoryForm.css' @@ -56,10 +55,6 @@ const FORM_STATE_INIT: ImportSwagger = { repositoryId: 0, } -const Transition = React.forwardRef((props, ref) => { - return -}) - interface Props { open: boolean onClose: (isOk?: boolean) => void @@ -79,7 +74,7 @@ function ImportSwaggerRepositoryForm(props: Props) { reason !== 'backdropClick' && onClose()} - TransitionComponent={Transition} + TransitionComponent={SlideUp} > 导入 Swagger 仓库 diff --git a/src/components/repository/RepositoryForm.tsx b/src/components/repository/RepositoryForm.tsx index cc32642..85e6fff 100644 --- a/src/components/repository/RepositoryForm.tsx +++ b/src/components/repository/RepositoryForm.tsx @@ -4,9 +4,9 @@ import { YUP_MSG } from '../../family/UIConst' import { Formik, Field, Form } from 'formik' import { TextField } from 'formik-material-ui' import * as Yup from 'yup' -import { Button, Theme, Dialog, Slide, DialogContent, DialogTitle } from '@material-ui/core' +import { Button, Theme, Dialog, DialogContent, DialogTitle } from '@material-ui/core' import { makeStyles } from '@material-ui/styles' -import { TransitionProps } from '@material-ui/core/transitions/transition' +import { SlideUp } from 'components/common/Transition' import { RepositoryFormData, RootState, Repository } from '../../actions/types' import UserList from '../common/UserList' import Select from '../common/Select' @@ -60,11 +60,6 @@ const FORM_STATE_INIT: RepositoryFormData = { collaborators: [], collaboratorIdstring: '', } - -const Transition = React.forwardRef((props, ref) => { - return -}) - interface Props { title?: string open: boolean @@ -113,7 +108,7 @@ function RepositoryForm(props: Props) { reason !== 'backdropClick' && onClose()} - TransitionComponent={Transition} + TransitionComponent={SlideUp} > {title}