From b9cce1e452ed9a42303475093dfabf8c593e047d Mon Sep 17 00:00:00 2001
From: Hermes <hermes@buzzbee.dev>
Date: Sat, 1 Aug 2026 12:33:39 +0000
Subject: [PATCH] fix: calendar day view - toolbar onView directly sets page
 state, Calendar remounts via key

---
 apps/web/src/routes/_app/calendar.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/routes/_app/calendar.tsx b/apps/web/src/routes/_app/calendar.tsx
index 8aaab41..9d817cd 100644
--- a/apps/web/src/routes/_app/calendar.tsx
+++ b/apps/web/src/routes/_app/calendar.tsx
@@ -266,7 +266,6 @@ function CalendarPage() {
           view={view}
           defaultView={isMobile ? Views.AGENDA : Views.MONTH}
           onNavigate={handleNavigate}
-          onView={handleViewChange}
           onSelectEvent={handleSelectEvent}
           onSelectSlot={handleSelectSlot}
           onEventDrop={handleEventDrop}
@@ -277,7 +276,13 @@ function CalendarPage() {
           showMultiDayTimes
           components={{
             event: EventComponent,
-            toolbar: (props: any) => <CustomToolbar {...props} currentView={view} />,
+            toolbar: (props: any) => (
+              <CustomToolbar
+                {...props}
+                currentView={view}
+                onView={(newView: string) => setView(newView)}
+              />
+            ),
           }}
           views={["month", "week", "work_week", "day", "agenda"]}
           step={30}