fix: month count with year

kitayoshi · Jul 6, 2024 · 8d2bfb8 · 8d2bfb8
1 parent 00aa569
commit 8d2bfb8
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/components/MonthLogTable/MonthLogTable.tsx b/src/components/MonthLogTable/MonthLogTable.tsx
@@ -184,9 +184,11 @@ function MonthLogTable(props: MonthLogTableProps) {
   const { className, year, activityList, onSelect } = props
 
   const getMonthDistanceText = useCallback(
-    (month: number) => {
+    (year: number, month: number) => {
       const monthActivityList = activityList.filter((a) => {
-        return getMonth(parseISO(a.startDate)) === month
+        const yearMatch = getYear(parseISO(a.startDate)) === year
+        const monthMatch = getMonth(parseISO(a.startDate)) === month
+        return yearMatch && monthMatch
       })
       const distance = monthActivityList.reduce(
         (acc, cur) => acc + cur.distance,
@@ -254,7 +256,7 @@ function MonthLogTable(props: MonthLogTableProps) {
                         {format(new Date(year, month), 'MMM')}
                       </div>
                       <div className={styles.monthCount}>
-                        {getMonthDistanceText(month)}
+                        {getMonthDistanceText(year, month)}
                       </div>
                     </div>
                     <div className={styles.weekListContainer}>