From 7d614fe23879af0f9d3b256a07fcdc4bee02b2d5 Mon Sep 17 00:00:00 2001 From: "hung.le" Date: Thu, 3 Nov 2022 13:47:52 +0700 Subject: [PATCH] fix disable button next month and style of month table --- src/lib/components/DatePicker/DialogContentDesktop.js | 8 +++----- .../components/DatePicker/SingleDatePicker.examples.md | 9 +++++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/lib/components/DatePicker/DialogContentDesktop.js b/src/lib/components/DatePicker/DialogContentDesktop.js index c0649c1..7cd2a46 100644 --- a/src/lib/components/DatePicker/DialogContentDesktop.js +++ b/src/lib/components/DatePicker/DialogContentDesktop.js @@ -71,8 +71,7 @@ const DialogContentDesktop = ({ } else { setDisablePrev(false); } - - if (maxDate && focusDate.isAfter(dayjs(maxDate).subtract(2, 'month'), 'month')) { + if (maxDate && focusDate.isAfter(dayjs(maxDate).subtract(1, 'month'), 'month')) { setDisableNext(true); } else { setDisableNext(false); @@ -112,7 +111,6 @@ const DialogContentDesktop = ({ function decreaseCurrentMonth(date) { if (disablePrev) return; - setTranslateAmount(wrapperWidth); setTimeout(() => { decreaseFocusDate(date); @@ -125,8 +123,8 @@ const DialogContentDesktop = ({ if (dayjs(dateChanged).isBefore(focusDate, 'month', true)) { decreaseCurrentMonth(dateChanged); } - if (dayjs(dateChanged).isAfter(focusDate.add(1, 'month'), 'month', true)) { - increaseCurrentMonth(dayjs(dateChanged).subtract(1, 'month')); + if (dayjs(dateChanged).isAfter(focusDate, 'month', true)) { + increaseCurrentMonth(dateChanged); } } }, [dateChanged]); diff --git a/src/lib/components/DatePicker/SingleDatePicker.examples.md b/src/lib/components/DatePicker/SingleDatePicker.examples.md index ea3a3c7..3c1e7fc 100644 --- a/src/lib/components/DatePicker/SingleDatePicker.examples.md +++ b/src/lib/components/DatePicker/SingleDatePicker.examples.md @@ -8,8 +8,13 @@ import { SingleDatePicker } from 'react-google-flight-datepicker';