github-forks
/
rap2-dolores
mirror of https://github.com/thx/rap2-dolores.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Transition TS type bug

Browse Source
pull/103/head
bigfengyu 5 years ago
parent 63268260f4
commit 5973221c79
9 changed files with 32 additions and 57 deletions
Show Stats Download Patch File Download Diff File

12
src/components/common/Transition.tsx
Unescape Escape View File

@ -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<any, any> },
ref: React.Ref<unknown>,
) => {
return <Slide direction="up" ref={ref} {...props} />
},
)

9
src/components/editor/DefaultValueModal.tsx
Unescape Escape View File

@ -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<unknown, TransitionProps>((props, ref) => {
return <Slide direction="up" ref={ref} {...props} />
})
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 (
<Dialog fullScreen={true} open={open} onClose={handleClose} TransitionComponent={Transition}>
<Dialog fullScreen={true} open={open} onClose={handleClose} TransitionComponent={SlideUp}>
<AppBar className={classes.appBar}>
<Toolbar>
<IconButton edge="start" color="inherit" onClick={handleClose} aria-label="close">

10
src/components/editor/InterfaceForm.tsx
Unescape Escape View File

@ -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<unknown, TransitionProps>((props, ref) => {
return <Slide direction="up" ref={ref} {...props} />
})
interface Props {
title?: string
open: boolean
@ -81,7 +77,7 @@ function InterfaceForm(props: Props) {
<Dialog
open={open}
onClose={(_event, reason) => (reason !== 'backdropClick' && onClose())}
TransitionComponent={Transition}
TransitionComponent={SlideUp}
>
<DialogTitle>{title}</DialogTitle>
<DialogContent dividers={true}>

10
src/components/editor/ModuleForm.tsx
Unescape Escape View File

@ -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<unknown, TransitionProps>((props, ref) => {
return <Slide direction="up" ref={ref} {...props} />
})
interface Props {
title?: string
open: boolean
@ -74,7 +70,7 @@ function ModuleForm(props: Props) {
<Dialog
open={open}
onClose={(_event, reason) => (reason !== 'backdropClick' && onClose())}
TransitionComponent={Transition}
TransitionComponent={SlideUp}
>
<DialogTitle>{title}</DialogTitle>
<DialogContent dividers={true}>

9
src/components/editor/RapperInstallerModal.tsx
Unescape Escape View File

@ -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<unknown, TransitionProps>((props, ref) => {
return <Slide direction="up" ref={ref} {...props} />
})
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}
>
<AppBar className={classes.appBar}>
<Toolbar>

10
src/components/organization/OrganizationForm.tsx
Unescape Escape View File

@ -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<unknown, TransitionProps>((props, ref) => {
return <Slide direction="up" ref={ref} {...props} />
})
interface Props {
open: boolean
onClose: (isOk?: boolean) => void
@ -77,7 +73,7 @@ function OrganizationForm(props: Props) {
<Dialog
open={open}
onClose={(_event, reason) => (reason !== 'backdropClick' && onClose())}
TransitionComponent={Transition}
TransitionComponent={SlideUp}
>
<DialogTitle>新建团队</DialogTitle>
<DialogContent dividers={true}>

9
src/components/repository/ExportPostmanForm.tsx
Unescape Escape View File

@ -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<unknown, TransitionProps>((props, ref) => {
return <Slide direction="up" ref={ref} {...props} />
})
import { SlideUp } from 'components/common/Transition'
export default function ExportPostmanForm(props: {
repoId: number;
@ -28,7 +23,7 @@ export default function ExportPostmanForm(props: {
<Dialog
open={open}
onClose={() => onClose()}
TransitionComponent={Transition}
TransitionComponent={SlideUp}
>
<DialogTitle>{title}</DialogTitle>
<DialogContent dividers={true}>

9
src/components/repository/ImportSwaggerRepositoryForm.tsx
Unescape Escape View File

@ -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<unknown, TransitionProps>((props, ref) => {
return <Slide direction="up" ref={ref} {...props} />
})
interface Props {
open: boolean
onClose: (isOk?: boolean) => void
@ -79,7 +74,7 @@ function ImportSwaggerRepositoryForm(props: Props) {
<Dialog
open={open}
onClose={(_event, reason) => reason !== 'backdropClick' && onClose()}
TransitionComponent={Transition}
TransitionComponent={SlideUp}
>
<DialogTitle>导入 Swagger 仓库</DialogTitle>
<DialogContent dividers={true}>

11
src/components/repository/RepositoryForm.tsx
Unescape Escape View File

@ -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<unknown, TransitionProps>((props, ref) => {
return <Slide direction="up" ref={ref} {...props} />
})
interface Props {
title?: string
open: boolean
@ -113,7 +108,7 @@ function RepositoryForm(props: Props) {
<Dialog
open={open}
onClose={(_event, reason) => reason !== 'backdropClick' && onClose()}
TransitionComponent={Transition}
TransitionComponent={SlideUp}
>
<DialogTitle>{title}</DialogTitle>
<DialogContent dividers={true}>

Write Preview
Loading…
Cancel
Save