From 48af00d2461ad42680982390aa8b056749d2e09f Mon Sep 17 00:00:00 2001 From: shams mosowi Date: Wed, 2 Oct 2019 13:56:06 +1000 Subject: [PATCH] updated styling --- src/components/Fields/Date.tsx | 13 +++++++++++-- src/components/Fields/DocSelect.tsx | 4 ++-- src/components/Fields/MultiSelect.tsx | 17 +++++------------ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/components/Fields/Date.tsx b/src/components/Fields/Date.tsx index 52263da7..fa6dac19 100644 --- a/src/components/Fields/Date.tsx +++ b/src/components/Fields/Date.tsx @@ -1,15 +1,21 @@ import React from "react"; import DateFnsUtils from "@date-io/date-fns"; +import { createStyles, makeStyles, Theme } from "@material-ui/core/styles"; import { FieldType } from "."; import { MuiPickersUtilsProvider, - // KeyboardTimePicker, - // KeyboardDatePicker, DatePicker, DateTimePicker, } from "@material-ui/pickers"; +const useStyles = makeStyles((theme: Theme) => + createStyles({ + field: { + width: "100%", + }, + }) +); // TODO: Create an interface for props interface Props { value: firebase.firestore.Timestamp | null; @@ -20,6 +26,8 @@ interface Props { } const Date = (props: Props) => { + const classes = useStyles(); + const { value, row, onSubmit, fieldType, isScrolling } = props; //if (isScrolling) return
; function handleDateChange(date: Date | null) { @@ -32,6 +40,7 @@ const Date = (props: Props) => { {fieldType === FieldType.date ? ( { return (
- + {value && value.map((doc: any, index: number) => ( diff --git a/src/components/Fields/MultiSelect.tsx b/src/components/Fields/MultiSelect.tsx index d9f27430..54e0885d 100644 --- a/src/components/Fields/MultiSelect.tsx +++ b/src/components/Fields/MultiSelect.tsx @@ -1,13 +1,7 @@ import React from "react"; -import EditIcon from "@material-ui/icons/Edit"; -import WarningIcon from "@material-ui/icons/Warning"; + import { Select } from "@material-ui/core"; -import { - createStyles, - makeStyles, - useTheme, - Theme, -} from "@material-ui/core/styles"; +import { createStyles, makeStyles, Theme } from "@material-ui/core/styles"; import Input from "@material-ui/core/Input"; import Grid from "@material-ui/core/Grid"; @@ -21,10 +15,8 @@ const useStyles = makeStyles((theme: Theme) => display: "flex", flexWrap: "wrap", }, - formControl: { - margin: theme.spacing(1), - minWidth: 120, - maxWidth: 300, + select: { + width: "100%", }, chips: { display: "flex", @@ -82,6 +74,7 @@ const MultiSelect = (props: Props) => { if (options && options.length !== 0) return (