From 388ccd1ae73e0dcc710e9b497e95c70a131c73cc Mon Sep 17 00:00:00 2001 From: eug-vs Date: Fri, 9 Oct 2020 00:21:58 +0300 Subject: feat: remove gap between header on mobile --- src/components/ModalScreen/ModalScreen.tsx | 4 +++- src/containers/PollCreation/PollCreation.tsx | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/ModalScreen/ModalScreen.tsx b/src/components/ModalScreen/ModalScreen.tsx index c6f0565..cf76272 100644 --- a/src/components/ModalScreen/ModalScreen.tsx +++ b/src/components/ModalScreen/ModalScreen.tsx @@ -27,7 +27,9 @@ const useStyles = makeStyles(theme => ({ backgroundColor: theme.palette.background.default }, content: { - padding: theme.spacing(6, 0) + [theme.breakpoints.up('md')]: { + padding: theme.spacing(4) + } }, toolbar: { display: 'flex', diff --git a/src/containers/PollCreation/PollCreation.tsx b/src/containers/PollCreation/PollCreation.tsx index 33d95bb..2e2bd06 100644 --- a/src/containers/PollCreation/PollCreation.tsx +++ b/src/containers/PollCreation/PollCreation.tsx @@ -1,4 +1,4 @@ -import React, { ChangeEvent, useState } from 'react'; +import React, { ChangeEvent, useState, useMemo } from 'react'; import Bluebird from 'bluebird'; import { makeStyles } from '@material-ui/core/styles'; import { Card, Container, LinearProgress, InputBase, Typography } from '@material-ui/core'; @@ -72,12 +72,14 @@ const PollCreation: React.FC = () => { } }; + const isSubmitting = useMemo(() => leftProgress + rightProgress > 0, [leftProgress, rightProgress]); + return ( } handleAction={handleSubmit} - isActionDisabled={!(left && right) || leftProgress + rightProgress > 0} + isActionDisabled={!(left && right) || isSubmitting} > @@ -89,6 +91,7 @@ const PollCreation: React.FC = () => { placeholder="Add description" onChange={handleDescriptionChange} className={classes.description} + readOnly={isSubmitting} />
@@ -96,7 +99,7 @@ const PollCreation: React.FC = () => {
- {(leftProgress + rightProgress > 0) && ( + {isSubmitting && ( <>