From 3cbb28eb238d65333d5cd455b24b7c847eb45c2e Mon Sep 17 00:00:00 2001
From: unknown <sajjadmrx@gmail.com>
Date: Mon, 6 Jul 2026 15:55:12 +0330
Subject: [PATCH] fix(habit): prevent clicking disabled calendar days

---
 .../components/habit-calendar-heatmap.tsx     | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/layouts/widgets/habit/components/habit-calendar-heatmap.tsx b/src/layouts/widgets/habit/components/habit-calendar-heatmap.tsx
index 0a87580e..98790db6 100644
--- a/src/layouts/widgets/habit/components/habit-calendar-heatmap.tsx
+++ b/src/layouts/widgets/habit/components/habit-calendar-heatmap.tsx
@@ -25,16 +25,6 @@ const isToday = (today: jalaliMoment.Moment, date: jalaliMoment.Moment) => {
 	)
 }
 
-const isPast = (todayGregorian: any, date: jalaliMoment.Moment) => {
-	const greg = toGregorian(date)
-	return greg <= todayGregorian
-}
-
-const toGregorian = (date: jalaliMoment.Moment): string => {
-	const d = date.toDate()
-	return moment(d).format('YYYY-MM-DD')
-}
-
 export function HabitCalendar({ habit, color }: HabitCalendarProps) {
 	const today = jalaliMoment()
 	const queryClient = useQueryClient()
@@ -50,8 +40,6 @@ export function HabitCalendar({ habit, color }: HabitCalendarProps) {
 		return moment(d).format('YYYY-MM-DD')
 	}
 
-	const todayGregorian = toGregorian(today)
-
 	const firstDayOfMonth = currentDate.clone().startOf('jMonth').day()
 	const daysInMonth = currentDate.clone().endOf('jMonth').jDate()
 	const emptyDays = (firstDayOfMonth + 1) % 7
@@ -146,18 +134,18 @@ export function HabitCalendar({ habit, color }: HabitCalendarProps) {
 		const habitData = getHabitData(gregorianDate)
 		const value = habitData.value
 		const isDayToday = isToday(today, cellDate)
-		const isDayPast = isPast(todayGregorian, cellDate)
-		const clickable = isDayPast && isCurrentMonth
 
 		const bgColor = value > 0 ? `${color}22` : ''
 		let Opacity = isCurrentMonth ? 'opacity-100' : ''
-
+		let clickable = true
 		if (cellDate.isAfter() && !value) {
 			Opacity = 'opacity-50'
+			clickable = false
 		}
 
 		if (cellDate.isBefore() && !isCurrentMonth && !value) {
 			Opacity = 'opacity-50'
+			clickable = false
 		}
 
 		let indicator = null
@@ -190,7 +178,11 @@ export function HabitCalendar({ habit, color }: HabitCalendarProps) {
 		return (
 			<div
 				key={`${isCurrentMonth ? 'c' : isPrevMonth ? 'p' : 'n'}-${day}`}
-				onClick={() => handleDateClick(day, isCurrentMonth, isPrevMonth)}
+				onClick={() =>
+					clickable
+						? handleDateClick(day, isCurrentMonth, isPrevMonth)
+						: undefined
+				}
 				className={`relative rounded-xl transition-all  h-10 w-10 mx-auto flex flex-col items-center justify-center ${Opacity} ${clickable ? 'hover:scale-110 cursor-pointer' : 'cursor-not-allowed'} ${isDayToday ? 'border-b scale-110 font-extrabold' : ''}`}
 				style={{
 					backgroundColor: bgColor,