@propriety/court-calendar 1.0.20 → 1.0.21

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@propriety/court-calendar",
     "private": false,
-    "version": "1.0.20",
+    "version": "1.0.21",
     "type": "module",
     "main": "dist/index.js",
     "module": "./dist/index.mjs",

package/src/_components/List/CalendarList.tsx

@@ -247,9 +247,7 @@ export default function CalendarList({
         .filter((date) => {
             if (!date.CourtDate) return false;
             const courtDate = new Date(date.CourtDate);
-            return (
-                courtDate.getMonth() === currentDate.getMonth() && courtDate.getFullYear() === currentDate.getFullYear()
-            );
+            return courtDate.getFullYear() === currentDate.getFullYear();
         })
         .map((date) => ({
             id: date.CourtDateID,

package/src/_components/Toolbar/Toolbar.tsx

@@ -24,6 +24,7 @@ export default function Toolbar({
     handleCreateClick,
     currentView,
     setCurrentView,
+    currentDate,
     setCurrentDate,
     activeUser,
     isFetchingCases,
@@ -46,34 +47,43 @@ export default function Toolbar({
     useEffect(() => {
         if (calendarApi) {
             const handleDatesSet = () => {
-                setCurrentTitle(calendarApi.getCurrentData().viewTitle);
+                if (currentView !== 'tableView') {
+                    setCurrentTitle(calendarApi.getCurrentData().viewTitle);
+                }
             };
             calendarApi.on('datesSet', handleDatesSet);
             return () => {
                 calendarApi.off('datesSet', handleDatesSet);
             };
         }
-    }, [calendarApi]);
+    }, [calendarApi, currentView]);
 
     useEffect(() => {
+        if (currentView === 'tableView') {
+            setCurrentTitle(currentDate.getFullYear().toString());
+            return;
+        }
         if (calendarApi) {
-            if (currentView === 'tableView') {
-                setCurrentTitle(calendarApi.getDate().toLocaleDateString('en-US', { month: 'long', year: 'numeric' }));
-                return;
-            }
             setCurrentTitle(calendarApi.getCurrentData().viewTitle);
         }
-    }, [calendarApi, currentView]);
+    }, [calendarApi, currentView, currentDate]);
 
     function goToToday() {
+        setCurrentDate(new Date());
+        if (currentView === 'tableView') return;
         if (calendarApi) {
             calendarApi.today();
-            setCurrentDate(new Date());
             setCurrentTitle(calendarApi.getCurrentData().viewTitle);
         }
     }
 
     function handleNext() {
+        if (currentView === 'tableView') {
+            const next = new Date(currentDate);
+            next.setFullYear(next.getFullYear() + 1);
+            setCurrentDate(next);
+            return;
+        }
         if (calendarApi) {
             calendarApi.next();
             setCurrentDate(calendarApi.getDate());
@@ -82,6 +92,12 @@ export default function Toolbar({
     }
 
     function handlePrev() {
+        if (currentView === 'tableView') {
+            const prev = new Date(currentDate);
+            prev.setFullYear(prev.getFullYear() - 1);
+            setCurrentDate(prev);
+            return;
+        }
         if (calendarApi) {
             calendarApi.prev();
             setCurrentDate(calendarApi.getDate());