improve reload when new review submitted; see pathname

Author: jaepang

apps/conch/app/(app)/(home)/hooks.ts

@@ -1,18 +1,23 @@
-import { useState, useEffect, useMemo, useCallback } from 'react'
+import { useState, useEffect, useMemo, useCallback, useRef } from 'react'
 import { consts, getToday, inquiryMonth, list } from '@conch/utils'
 import { useRefresh } from '@conch/hooks/useRefresh'
-import { useIsFocused, useNavigation } from '@react-navigation/native'
+import { usePathname } from 'expo-router'
 import type { ReviewForCalendar, MonthlyReviews, MonthlyReviewKey, ReviewForList } from './types'
 
-// Safe wrapper for useIsFocused to handle cases outside NavigationContainer
-function useSafeIsFocused(): boolean {
-  try {
-    const navigation = useNavigation()
-    const isFocused = useIsFocused()
-    return isFocused
-  } catch {
-    return true // Default to true if navigation context is not available
-  }
+// Custom hook to detect when user returns to home screen
+function useHomeReturn(callback: () => void) {
+  const pathname = usePathname()
+  const prevPathname = useRef(pathname)
+
+  useEffect(() => {
+    const isReturningHome = prevPathname.current !== pathname && (pathname === '/' || pathname.includes('(home)'))
+    
+    if (isReturningHome) {
+      callback()
+    }
+    
+    prevPathname.current = pathname
+  }, [pathname, callback])
 }
 
 type CalendarCell = {
@@ -64,26 +69,24 @@ export function useCalendar({ reviews: _reviews, year, month }: { reviews: Revie
 export function useReviewDataAtMonth({ year, month }: { year: number; month: number }): { reviews: ReviewForCalendar[] } {
   const [reviews, setReviews] = useState<MonthlyReviews>({})
   const [date, setDate] = useState<number>(new Date().getDate())
-  const isFocused = useSafeIsFocused()
 
   const fetchAndSetReviewData = useCallback(
-    async ({ year, month }: { year: number; month: number }) => {
+    async ({ year: targetYear, month: targetMonth }: { year: number; month: number }) => {
       const { year: thisYear, month: thisMonth } = getToday()
-      const isThisMonth = year === thisYear && month === thisMonth
-      const isFuture = !(year < thisYear || (year === thisYear && month <= thisMonth))
+      const isThisMonth = targetYear === thisYear && targetMonth === thisMonth
+      const isFuture = !(targetYear < thisYear || (targetYear === thisYear && targetMonth <= thisMonth))
 
-      const yearAndMonth: MonthlyReviewKey = `${year}-${month + 1}`
+      const yearAndMonth: MonthlyReviewKey = `${targetYear}-${targetMonth + 1}`
 
       if (!isThisMonth && !!reviews[yearAndMonth]) return
       if (isFuture) return
 
-      const _reviewsData = await inquiryMonth({ year, month: month + 1 })
+      const _reviewsData = await inquiryMonth({ year: targetYear, month: targetMonth + 1 })
       const reviewsData = _reviewsData?.map((review) => ({
-        month: month + 1,
+        month: targetMonth + 1,
         ...review,
       })) || []
 
-      if (isThisMonth && reviewsData?.length === reviews[yearAndMonth]?.length) return
       setReviews((prev) => ({
         ...prev,
         [yearAndMonth]: reviewsData,
@@ -93,8 +96,18 @@ export function useReviewDataAtMonth({ year, month }: { year: number; month: num
   )
 
   useEffect(() => {
-    if (isFocused) fetchAndSetReviewData({ year, month })
-  }, [year, month, fetchAndSetReviewData, isFocused])
+    fetchAndSetReviewData({ year, month })
+  }, [year, month, fetchAndSetReviewData])
+
+  // (home)으로 돌아올 때 현재월 데이터 refetch
+  useHomeReturn(useCallback(() => {
+    const { year: thisYear, month: thisMonth } = getToday()
+    const isThisMonth = year === thisYear && month === thisMonth
+    
+    if (isThisMonth) {
+      fetchAndSetReviewData({ year, month })
+    }
+  }, [year, month, fetchAndSetReviewData]))
 
   const refreshWhenDateChanged = useCallback(() => {
     const { date: todayDate } = getToday()
@@ -106,12 +119,10 @@ export function useReviewDataAtMonth({ year, month }: { year: number; month: num
 
   useRefresh(() => refreshWhenDateChanged())
 
-  const yearAndMonth = useMemo<MonthlyReviewKey>(() => `${year}-${month + 1}`, [year, month])
-
   return { reviews: Object.values(reviews).flat() || [] }
 }
 
-export function useTodayReviewWritten({ reviews, year, month, date }: { reviews: ReviewForCalendar[]; year: number; month: number; date: number }): boolean {
+export function useTodayReviewWritten({ reviews, date }: { reviews: ReviewForCalendar[]; year: number; month: number; date: number }): boolean {
   return reviews?.some((review) => review.day === date) || false
 }
 
@@ -120,7 +131,6 @@ export function useReviewList() {
   const [nextCursor, setNextCursor] = useState<string | null>(null)
   const [isLoading, setIsLoading] = useState(false)
   const [isRefreshing, setIsRefreshing] = useState(false)
-  const isFocused = useSafeIsFocused()
 
   const fetchReviews = useCallback(async (cursor?: string) => {
     try {
@@ -143,7 +153,11 @@ export function useReviewList() {
 
       setNextCursor(response?.hasNext ? response.nextCursor || null : null)
     } catch (error) {
-      console.error('Failed to fetch reviews:', error)
+      // Failed to fetch reviews
+      if (__DEV__) {
+        // eslint-disable-next-line no-console
+        console.error('Failed to fetch reviews:', error)
+      }
     } finally {
       setIsLoading(false)
       setIsRefreshing(false)
@@ -162,10 +176,15 @@ export function useReviewList() {
   }, [fetchReviews])
 
   useEffect(() => {
-    if (isFocused && reviews.length === 0) {
+    if (reviews.length === 0) {
       fetchReviews()
     }
-  }, [isFocused, fetchReviews, reviews.length])
+  }, [fetchReviews, reviews.length])
+
+  // (home)으로 돌아올 때 리스트 데이터 refetch
+  useHomeReturn(useCallback(() => {
+    fetchReviews()
+  }, [fetchReviews]))
 
   useRefresh(() => refresh())