From a80207fc9a7f6c8bec0c8af1822909383096dec8 Mon Sep 17 00:00:00 2001
From: Hermes <hermes@buzzbee.dev>
Date: Sat, 1 Aug 2026 05:34:35 +0000
Subject: [PATCH] =?UTF-8?q?fix(calendar):=20day/week=20view=20toggle=20?=
 =?UTF-8?q?=E2=80=94=20controlled=20view=20prop=20+=20currentView=20in=20C?=
 =?UTF-8?q?ustomToolbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/apps/web/src/routes/_app/calendar.tsx b/apps/web/src/routes/_app/calendar.tsx
index c1b6bdb..c30fbd1 100644
--- a/apps/web/src/routes/_app/calendar.tsx
+++ b/apps/web/src/routes/_app/calendar.tsx
@@ -63,7 +63,7 @@ function EventComponent({ event }: { event: CalendarEvent }) {
 }
 
 // Custom toolbar
-function CustomToolbar({ date, onNavigate, onView, view, label }: any) {
+function CustomToolbar({ date, onNavigate, onView, currentView, label }: any) {
   const goToBack = () => onNavigate(Navigate.PREVIOUS);
   const goToNext = () => onNavigate(Navigate.NEXT);
   const goToToday = () => onNavigate(Navigate.TODAY);
@@ -88,7 +88,7 @@ function CustomToolbar({ date, onNavigate, onView, view, label }: any) {
         {viewNames.map((name) => (
           <Button
             key={name}
-            variant={view === name ? "default" : "outline"}
+            variant={currentView === name ? "default" : "outline"}
             size="sm"
             onClick={() => onView(name)}
             className="capitalize"
@@ -266,8 +266,8 @@ function CalendarPage() {
           events={calendarEvents}
           startAccessor="start"
           endAccessor="end"
-          date={date}
           view={view}
+          defaultView={Views.MONTH}
           onNavigate={handleNavigate}
           onView={handleViewChange}
           onSelectEvent={handleSelectEvent}
@@ -280,9 +280,8 @@ function CalendarPage() {
           showMultiDayTimes
           components={{
             event: EventComponent,
-            toolbar: CustomToolbar,
+            toolbar: (props: any) => <CustomToolbar {...props} currentView={view} />,
           }}
-          defaultView={Views.MONTH}
           views={["month", "week", "work_week", "day", "agenda"]}
           step={30}
           timeslots={2}