From ee64c16943ae03b106c6497dca3124e2ddcc4248 Mon Sep 17 00:00:00 2001 From: syam babu Date: Fri, 17 Nov 2023 14:31:23 +0530 Subject: [PATCH] fix: fixed timepicker dropdown closeing without saving data upon blur. closes #culturecreates/tech-support-tickets/issues/9 --- src/components/RecurringEvents/RecurringEvents.jsx | 12 ++++++++++++ src/pages/Dashboard/AddEvent/AddEvent.jsx | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/components/RecurringEvents/RecurringEvents.jsx b/src/components/RecurringEvents/RecurringEvents.jsx index c18014a4..d0601fe1 100644 --- a/src/components/RecurringEvents/RecurringEvents.jsx +++ b/src/components/RecurringEvents/RecurringEvents.jsx @@ -35,6 +35,8 @@ const RecurringEvents = function ({ const [subEventCount, setSubEventCount] = useState(0); const startDateRecur = Form.useWatch('startDateRecur', form); const { t } = useTranslation(); + Form.useWatch('endTimeRecur', form); + Form.useWatch('startTimeRecur', form); useEffect(() => { if (eventDetails) { @@ -454,6 +456,11 @@ const RecurringEvents = function ({ use12Hours={i18n?.language === 'en' ? true : false} format={i18n?.language === 'en' ? 'h:mm a' : 'HH:mm'} data-cy="multiple-start-time" + onSelect={(value) => { + form.setFieldsValue({ + startTimeRecur: value, + }); + }} /> @@ -470,6 +477,11 @@ const RecurringEvents = function ({ disabledHours={disabledHours} disabledMinutes={disabledMinutes} data-cy="multiple-end-time" + onSelect={(value) => { + form.setFieldsValue({ + endTimeRecur: value, + }); + }} /> diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx index dc3c572f..55bb024d 100644 --- a/src/pages/Dashboard/AddEvent/AddEvent.jsx +++ b/src/pages/Dashboard/AddEvent/AddEvent.jsx @@ -90,6 +90,8 @@ function AddEvent() { const navigate = useNavigate(); const location = useLocation(); const [form] = Form.useForm(); + Form.useWatch('startTime', form); + Form.useWatch('endTime', form); const timestampRef = useRef(Date.now()).current; const { calendarId, eventId } = useParams(); let [searchParams] = useSearchParams(); @@ -1603,6 +1605,11 @@ function AddEvent() { placeholder={t('dashboard.events.addEditEvent.dates.timeFormatPlaceholder')} use12Hours={i18n?.language === 'en' ? true : false} format={i18n?.language === 'en' ? 'h:mm a' : 'HH:mm'} + onSelect={(value) => { + form.setFieldsValue({ + startTime: value, + }); + }} data-cy="single-date-start-time" /> @@ -1621,6 +1628,11 @@ function AddEvent() { placeholder={t('dashboard.events.addEditEvent.dates.timeFormatPlaceholder')} use12Hours={i18n?.language === 'en' ? true : false} format={i18n?.language === 'en' ? 'h:mm a' : 'HH:mm'} + onSelect={(value) => { + form.setFieldsValue({ + endTime: value, + }); + }} data-cy="single-date-end-time" />