From c7e5fcebe2b9ee3a15ec53d8ea99b17240b1e5bc Mon Sep 17 00:00:00 2001 From: krokodilka Date: Thu, 2 Jun 2022 13:39:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D1=84?= =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=B8=D0=BA=D0=B0=20+=20=D0=B4=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D0=B1=D0=BB=20=D1=87=D0=B5=D0=BA=D0=B1=D0=BE=D0=BA=D1=81?= =?UTF-8?q?=D0=B0=20=D0=BE=D0=B4=D0=BE=D0=B1=D1=80=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BF=D0=B0=D1=83=D0=B7=D1=8B=20=D0=BE=D1=82=20=D1=83=D1=81?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 14 ++++++++++++++ package.json | 1 + src/create.tsx | 23 ++++++++++++----------- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0a9349b3..b9dc7af5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "axios": "^0.27.2", "formik": "^2.2.9", "framer-motion": "^6.3.3", + "moment": "^2.29.3", "notistack": "^2.0.5", "react": "^18.1.0", "react-datepicker": "^4.8.0", @@ -13052,6 +13053,14 @@ "mkdirp": "bin/cmd.js" } }, + "node_modules/moment": { + "version": "2.29.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz", + "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==", + "engines": { + "node": "*" + } + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -27695,6 +27704,11 @@ "minimist": "^1.2.6" } }, + "moment": { + "version": "2.29.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz", + "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==" + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", diff --git a/package.json b/package.json index 44b09019..ad7b4ac9 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "axios": "^0.27.2", "formik": "^2.2.9", "framer-motion": "^6.3.3", + "moment": "^2.29.3", "notistack": "^2.0.5", "react": "^18.1.0", "react-datepicker": "^4.8.0", diff --git a/src/create.tsx b/src/create.tsx index 464a07d3..08936c82 100644 --- a/src/create.tsx +++ b/src/create.tsx @@ -1,16 +1,15 @@ import React from 'react'; +import moment from 'moment'; import {Input, Select, Stack, Checkbox, Box, Text, Divider, Button} from '@chakra-ui/react' import { Formik, Field, Form } from 'formik'; import DatePicker from "react-datepicker"; import "react-datepicker/dist/react-datepicker.css"; import TimePicker from 'react-time-picker'; - const statusValues: any = ['draft', 'template', 'stop', 'start'] export default () => { - const [startDate, setStartDate] = React.useState(null); - const [value, onChange] = React.useState(""); + return( { amPmAriaLabel={"am"} onChange={(e:any) => { if (e !== null) { - console.log("i used") - console.log(e) - console.log(typeof e) setFieldValue("time", e) + } else { + //При стирании значения пользователем затирается и последнее значение + setFieldValue("time", "") } }} - // onChange={(e:any) => onChange(e)} value={values.time} /> Разрешить ставить на паузу - + Дата проведения опроса { + console.log(e) + setFieldValue("date", e) + }} + minDate={new Date()} />