From 618f071ba51a6012335519c5a8f1966ae127e222 Mon Sep 17 00:00:00 2001 From: Camille Moussu <66134347+Eriikah@users.noreply.github.com> Date: Wed, 19 Nov 2025 15:12:21 +0100 Subject: [PATCH] [#246] removed navigation on month selection (#330) Co-authored-by: Camille Moussu --- src/components/Calendar/Calendar.tsx | 5 ++--- src/components/Calendar/MiniCalendar.tsx | 18 ++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/components/Calendar/Calendar.tsx b/src/components/Calendar/Calendar.tsx index 5af7a8c..29c0538 100644 --- a/src/components/Calendar/Calendar.tsx +++ b/src/components/Calendar/Calendar.tsx @@ -645,7 +645,6 @@ export default function CalendarApp({ }} datesSet={(arg) => { setCurrentView(arg.view.type); - // Get the current date from calendar API to ensure consistency const calendarCurrentDate = calendarRef.current?.getDate() || new Date(arg.start); @@ -656,8 +655,8 @@ export default function CalendarApp({ setSelectedDate(new Date(middle)); setSelectedMiniDate(calendarCurrentDate); } else { - setSelectedDate(new Date(arg.start)); - setSelectedMiniDate(new Date(arg.start)); + setSelectedDate(calendarCurrentDate); + setSelectedMiniDate(calendarCurrentDate); } // Always use the calendar's current date for consistency diff --git a/src/components/Calendar/MiniCalendar.tsx b/src/components/Calendar/MiniCalendar.tsx index a9164c9..666c7e4 100644 --- a/src/components/Calendar/MiniCalendar.tsx +++ b/src/components/Calendar/MiniCalendar.tsx @@ -1,7 +1,6 @@ import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider"; import { AdapterMoment } from "@mui/x-date-pickers/AdapterMoment"; -import { DateCalendar, PickersDay } from "@mui/x-date-pickers"; -import { DayCalendarSkeleton } from "@mui/x-date-pickers/DayCalendarSkeleton"; +import { DateCalendar } from "@mui/x-date-pickers"; import moment from "moment"; import { computeStartOfTheWeek, @@ -9,7 +8,6 @@ import { getCalendarRange, } from "../../utils/dateUtils"; import { useAppDispatch, useAppSelector } from "../../app/hooks"; -import { refreshCalendars } from "../Event/utils/eventUtils"; import { getCalendarDetailAsync } from "../../features/Calendars/CalendarSlice"; import { useEffect, useState } from "react"; import { useI18n } from "cozy-ui/transpiled/react/providers/I18n"; @@ -40,12 +38,13 @@ export function MiniCalendar({ > { + onChange={(dateMoment, selectionState) => { if (!dateMoment) return; const date = dateMoment.toDate(); - setSelectedDate(date); - setSelectedMiniDate(date); - calendarRef.current?.gotoDate(date); + if (selectionState === "finish") { + setSelectedMiniDate(date); + calendarRef.current?.gotoDate(date); + } }} showDaysOutsideCurrentMonth onMonthChange={(month) => { @@ -112,11 +111,6 @@ export function MiniCalendar({ selected: classNames.includes("selectedWeek"), outsideCurrentMonth: ownerState.isDayOutsideMonth, disableMargin: false, - onClick: () => { - setSelectedDate(date); - setSelectedMiniDate(date); - calendarRef.current?.gotoDate(date); - }, style: { backgroundColor: "transparent", position: "relative",