From 6dfe43b566a2718ea3d11b003aa9d3eba3606654 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Thu, 14 May 2026 13:47:22 +0900
Subject: [PATCH 01/23] =?UTF-8?q?feat:=20=EC=B9=9C=EA=B5=AC=20=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=20API=20=EC=97=B0=EB=8F=99=20=EB=B0=8F=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=20=EC=95=84=EC=9D=B4=EB=94=94=20=EA=B4=80=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Calendar/hooks/useCalendarApiEvents.ts    |   1 +
 .../utils/helpers/calendarPageHelpers.ts      |   1 +
 src/shared/api/friend/api.ts                  |  15 +++
 src/shared/api/friend/queryKeys.ts            |  10 ++
 src/shared/api/queryKeys/index.ts             |   1 +
 .../hooks/form/useScheduleFormFields.ts       |   2 +
 src/shared/hooks/query/useFriendQueries.ts    |   7 ++
 src/shared/schemas/schedule.ts                |   1 +
 src/shared/types/calendar/types.ts            |   1 +
 src/shared/types/friend/types.ts              |   5 +
 .../ScheduleEditor/ShareSchedulePanel.tsx     |  31 ++++-
 .../SearchFriend/SearchFriend.tsx             | 117 ++++++++++--------
 12 files changed, 137 insertions(+), 55 deletions(-)
 create mode 100644 src/shared/api/friend/api.ts
 create mode 100644 src/shared/api/friend/queryKeys.ts
 create mode 100644 src/shared/hooks/query/useFriendQueries.ts
 create mode 100644 src/shared/types/friend/types.ts

diff --git a/src/features/Calendar/hooks/useCalendarApiEvents.ts b/src/features/Calendar/hooks/useCalendarApiEvents.ts
index 78b2e62..6b2c375 100644
--- a/src/features/Calendar/hooks/useCalendarApiEvents.ts
+++ b/src/features/Calendar/hooks/useCalendarApiEvents.ts
@@ -48,6 +48,7 @@ const toTodoEvent = (todo: TodoType): CalendarEvent => {
     isAllDay: todo.isAllDay,
     color: todo.color ?? 'GRAY',
     recurrenceGroup: null,
+    friendIds: [],
     type: 'todo',
     isDone: todo.isCompleted,
     isRecurring: todo.isRecurring,
diff --git a/src/features/Calendar/utils/helpers/calendarPageHelpers.ts b/src/features/Calendar/utils/helpers/calendarPageHelpers.ts
index f96a282..7ca43ed 100644
--- a/src/features/Calendar/utils/helpers/calendarPageHelpers.ts
+++ b/src/features/Calendar/utils/helpers/calendarPageHelpers.ts
@@ -32,6 +32,7 @@ export const createEvent = (date: Date, index: number, allDay = false): Calendar
     isAllDay: allDay,
     color: 'GRAY',
     recurrenceGroup: null,
+    friendIds: [],
     type: 'schedule',
   }
 }
diff --git a/src/shared/api/friend/api.ts b/src/shared/api/friend/api.ts
new file mode 100644
index 0000000..7b3546a
--- /dev/null
+++ b/src/shared/api/friend/api.ts
@@ -0,0 +1,15 @@
+import type { TCommonResponse } from '@/shared/types/common/common'
+import type { FriendDetail } from '@/shared/types/friend/types'
+
+import axiosInstance from '../axios'
+
+export const getFriendSearch = async (
+  keyword: string,
+): Promise<TCommonResponse<{ friendDetailList: FriendDetail[] }>> => {
+  const { data } = await axiosInstance.get('/friends/search', {
+    params: {
+      keyword,
+    },
+  })
+  return data
+}
diff --git a/src/shared/api/friend/queryKeys.ts b/src/shared/api/friend/queryKeys.ts
new file mode 100644
index 0000000..e0d1d1d
--- /dev/null
+++ b/src/shared/api/friend/queryKeys.ts
@@ -0,0 +1,10 @@
+import { createQueryKeys } from '@lukemorales/query-key-factory'
+
+import { getFriendSearch } from './api'
+
+export const friendKeys = createQueryKeys('friend', {
+  search: (keyword: string) => ({
+    queryKey: [{ keyword }],
+    queryFn: () => getFriendSearch(keyword),
+  }),
+})
diff --git a/src/shared/api/queryKeys/index.ts b/src/shared/api/queryKeys/index.ts
index fa1198c..e244ad3 100644
--- a/src/shared/api/queryKeys/index.ts
+++ b/src/shared/api/queryKeys/index.ts
@@ -1,2 +1,3 @@
 export * from '../calendar/queryKeys'
+export * from '../friend/queryKeys'
 export * from '../todo/queryKeys'
diff --git a/src/shared/hooks/form/useScheduleFormFields.ts b/src/shared/hooks/form/useScheduleFormFields.ts
index be0903f..cd0b831 100644
--- a/src/shared/hooks/form/useScheduleFormFields.ts
+++ b/src/shared/hooks/form/useScheduleFormFields.ts
@@ -96,6 +96,7 @@ const buildScheduleDefaultValues = ({
     isAllday: draftValues?.isAllday ?? initialIsAllDay,
     eventColor: draftValues?.eventColor ?? initialColor,
     repeatConfig: draftValues?.repeatConfig ?? initialRepeatConfig,
+    friendIds: initialEvent?.friendIds ?? [],
   }
 }
 
@@ -140,6 +141,7 @@ export const useScheduleFormFields = ({
     register('isAllday')
     register('repeatConfig')
     register('eventColor')
+    register('friendIds')
   }, [register])
 
   useEffect(() => {
diff --git a/src/shared/hooks/query/useFriendQueries.ts b/src/shared/hooks/query/useFriendQueries.ts
new file mode 100644
index 0000000..3fa0399
--- /dev/null
+++ b/src/shared/hooks/query/useFriendQueries.ts
@@ -0,0 +1,7 @@
+import { friendKeys } from '@/shared/api/queryKeys'
+import { useCustomQuery } from '@/shared/hooks/common/customQuery'
+
+export function useFriendSearchQuery(keyword: string, enabled = true) {
+  const query = friendKeys.search(keyword)
+  return useCustomQuery(query.queryKey, query.queryFn, { enabled })
+}
diff --git a/src/shared/schemas/schedule.ts b/src/shared/schemas/schedule.ts
index 11ff267..2885df4 100644
--- a/src/shared/schemas/schedule.ts
+++ b/src/shared/schemas/schedule.ts
@@ -57,4 +57,5 @@ export const addScheduleSchema = yup.object().shape({
   isAllday,
   eventColor,
   repeatConfig: repeatConfigSchema,
+  friendIds: yup.array().of(yup.number().required()).default([]).defined(),
 })
diff --git a/src/shared/types/calendar/types.ts b/src/shared/types/calendar/types.ts
index 72242ee..d53fd04 100644
--- a/src/shared/types/calendar/types.ts
+++ b/src/shared/types/calendar/types.ts
@@ -15,6 +15,7 @@ export type Event = {
   color: EventColorType
   recurrenceGroup: RecurrenceGroup | null
   isShared?: boolean
+  friendIds: number[]
 }
 
 export type CalendarEvent = Omit<Event, 'start' | 'end'> & {
diff --git a/src/shared/types/friend/types.ts b/src/shared/types/friend/types.ts
new file mode 100644
index 0000000..53f8dbd
--- /dev/null
+++ b/src/shared/types/friend/types.ts
@@ -0,0 +1,5 @@
+export type FriendDetail = {
+  id: number
+  opponentName: string
+  opponentEmail: string
+}
diff --git a/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx b/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
index 24ec701..de45440 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
@@ -1,7 +1,9 @@
 import { useEffect, useState } from 'react'
+import { useFormContext, useWatch } from 'react-hook-form'
 
 import Arrow from '@/shared/assets/icons/chevron.svg?react'
 import Close from '@/shared/assets/icons/close.svg?react'
+import type { ScheduleEditorFormValues } from '@/shared/types/event/event'
 import type { ScheduleShareFriend } from '@/shared/types/schedule/shareFriend'
 import SearchFriend from '@/shared/ui/scheduleTodo/SearchFriend/SearchFriend'
 
@@ -12,17 +14,28 @@ type ShareSchedulePanelProps = {
 }
 
 const ShareSchedulePanel = ({ onSharedChange }: ShareSchedulePanelProps) => {
+  const { control, setValue } = useFormContext<ScheduleEditorFormValues>()
   const [isOpen, setIsOpen] = useState(false)
   const [selectedFriends, setSelectedFriends] = useState<ScheduleShareFriend[]>([])
+  const selectedFriendIds = useWatch({ control, name: 'friendIds' }) ?? []
 
   useEffect(() => {
-    onSharedChange?.(selectedFriends.length > 0)
-  }, [onSharedChange, selectedFriends.length])
+    onSharedChange?.(selectedFriendIds.length > 0)
+  }, [onSharedChange, selectedFriendIds.length])
 
   const handleToggleFriend = (friend: ScheduleShareFriend) => {
-    setSelectedFriends((previous) => {
-      const isSelected = previous.some((selectedFriend) => selectedFriend.userId === friend.userId)
+    const friendId = Number(friend.userId)
+    const isSelected = selectedFriendIds.includes(friendId)
+
+    setValue(
+      'friendIds',
+      isSelected
+        ? selectedFriendIds.filter((selectedFriendId) => selectedFriendId !== friendId)
+        : [...selectedFriendIds, friendId],
+      { shouldDirty: true, shouldValidate: true },
+    )
 
+    setSelectedFriends((previous) => {
       if (isSelected) {
         return previous.filter((selectedFriend) => selectedFriend.userId !== friend.userId)
       }
@@ -32,6 +45,12 @@ const ShareSchedulePanel = ({ onSharedChange }: ShareSchedulePanelProps) => {
   }
 
   const handleRemoveFriend = (friendId: ScheduleShareFriend['userId']) => {
+    const numericFriendId = Number(friendId)
+    setValue(
+      'friendIds',
+      selectedFriendIds.filter((selectedFriendId) => selectedFriendId !== numericFriendId),
+      { shouldDirty: true, shouldValidate: true },
+    )
     setSelectedFriends((previous) => previous.filter((friend) => friend.userId !== friendId))
   }
 
@@ -41,7 +60,7 @@ const ShareSchedulePanel = ({ onSharedChange }: ShareSchedulePanelProps) => {
         type="button"
         onClick={() => setIsOpen(!isOpen)}
         isOpen={isOpen}
-        isShared={selectedFriends.length > 0}
+        isShared={selectedFriendIds.length > 0}
       >
         <div className="section-title">
           <div className="dot" />
@@ -51,7 +70,7 @@ const ShareSchedulePanel = ({ onSharedChange }: ShareSchedulePanelProps) => {
       </S.FriendSectionOpenButton>
       {isOpen && (
         <S.FriendSection>
-          <SearchFriend selectedFriends={selectedFriends} onToggleFriend={handleToggleFriend} />
+          <SearchFriend selectedFriendIds={selectedFriendIds} onToggleFriend={handleToggleFriend} />
 
           <div className="added-friend-list">
             {selectedFriends.map((friend) => (
diff --git a/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx b/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx
index cf69d2c..c26207a 100644
--- a/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx
+++ b/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx
@@ -4,36 +4,47 @@ import { createPortal } from 'react-dom'
 import Close from '@/shared/assets/icons/close.svg?react'
 import Plus from '@/shared/assets/icons/plus.svg?react'
 import Search from '@/shared/assets/icons/search.svg?react'
-import { MOCK_SCHEDULE_SHARE_FRIENDS } from '@/shared/constants/scheduleShareFriend'
+import { useThrottledValue } from '@/shared/hooks/common/useThrottledValue'
+import { useFriendSearchQuery } from '@/shared/hooks/query/useFriendQueries'
 import { theme } from '@/shared/styles'
 import type { ScheduleShareFriend } from '@/shared/types/schedule/shareFriend'
 import { isElementVisible } from '@/shared/utils/domVisibility'
-import { filterScheduleShareFriends } from '@/shared/utils/scheduleShareFriend'
 
 import * as S from './SearchFriend.style'
 
 type SearchFriendProps = {
-  selectedFriends: ScheduleShareFriend[]
+  selectedFriendIds: number[]
   onToggleFriend: (friend: ScheduleShareFriend) => void
 }
 
-const SearchFriend = ({ selectedFriends, onToggleFriend }: SearchFriendProps) => {
+const SearchFriend = ({ selectedFriendIds, onToggleFriend }: SearchFriendProps) => {
   const [keyword, setKeyword] = useState('')
   const [isOpen, setIsOpen] = useState(false)
   const [resultPosition, setResultPosition] = useState({ left: 0, top: 0, width: 0 })
   const inputWrapperRef = useRef<HTMLDivElement>(null)
   const resultRef = useRef<HTMLDivElement>(null)
-  const selectedFriendIds = useMemo(
-    () => new Set(selectedFriends.map((friend) => friend.userId)),
-    [selectedFriends],
-  )
-  const trimmedKeyword = keyword.trim().toLowerCase()
-  const filteredFriends = useMemo(
-    () => filterScheduleShareFriends(MOCK_SCHEDULE_SHARE_FRIENDS, trimmedKeyword),
-    [trimmedKeyword],
+  const selectedFriendIdSet = useMemo(() => new Set(selectedFriendIds), [selectedFriendIds])
+  const trimmedKeyword = keyword.trim()
+  const throttledKeyword = useThrottledValue(trimmedKeyword, 300)
+  const {
+    data: friendSearchData,
+    isError,
+    isFetching,
+  } = useFriendSearchQuery(throttledKeyword, Boolean(throttledKeyword))
+  const searchedFriends = useMemo(
+    () =>
+      (friendSearchData?.result.friendDetailList ?? []).map(
+        (friend): ScheduleShareFriend => ({
+          userId: String(friend.id),
+          userName: friend.opponentName,
+          email: friend.opponentEmail,
+        }),
+      ),
+    [friendSearchData?.result.friendDetailList],
   )
 
-  const shouldShowResult = isOpen && Boolean(trimmedKeyword) && filteredFriends.length > 0
+  const shouldShowResult = isOpen && Boolean(trimmedKeyword)
+  const isWaitingForThrottledSearch = trimmedKeyword !== throttledKeyword || isFetching
 
   const updateResultPosition = () => {
     const inputWrapper = inputWrapperRef.current
@@ -58,41 +69,49 @@ const SearchFriend = ({ selectedFriends, onToggleFriend }: SearchFriendProps) =>
 
     return createPortal(
       <S.SearchResult ref={resultRef} position={resultPosition}>
-        {filteredFriends.map((friend) => {
-          const isSelected = selectedFriendIds.has(friend.userId)
-
-          return (
-            <S.SearchResultItem
-              key={friend.userId}
-              type="button"
-              isAdded={isSelected}
-              onClick={() => onToggleFriend(friend)}
-            >
-              <S.Name isAdded={isSelected}>{friend.userName}</S.Name>
-              <div className="divider" />
-              <S.Email>{friend.email}</S.Email>
-              {isSelected ? (
-                <Close
-                  aria-hidden="true"
-                  focusable="false"
-                  height={18}
-                  width={18}
-                  color={theme.colors.textColor3}
-                  className="close"
-                />
-              ) : (
-                <Plus
-                  aria-hidden="true"
-                  focusable="false"
-                  height={20}
-                  width={20}
-                  color="#594FCA"
-                  className="plus"
-                />
-              )}
-            </S.SearchResultItem>
-          )
-        })}
+        {isWaitingForThrottledSearch ? (
+          <S.EmptySearchResult>검색 중...</S.EmptySearchResult>
+        ) : isError ? (
+          <S.EmptySearchResult>친구 검색에 실패했어요</S.EmptySearchResult>
+        ) : searchedFriends.length === 0 ? (
+          <S.EmptySearchResult>검색 결과가 없어요</S.EmptySearchResult>
+        ) : (
+          searchedFriends.map((friend) => {
+            const isSelected = selectedFriendIdSet.has(Number(friend.userId))
+
+            return (
+              <S.SearchResultItem
+                key={friend.userId}
+                type="button"
+                isAdded={isSelected}
+                onClick={() => onToggleFriend(friend)}
+              >
+                <S.Name isAdded={isSelected}>{friend.userName}</S.Name>
+                <div className="divider" />
+                <S.Email>{friend.email}</S.Email>
+                {isSelected ? (
+                  <Close
+                    aria-hidden="true"
+                    focusable="false"
+                    height={18}
+                    width={18}
+                    color={theme.colors.textColor3}
+                    className="close"
+                  />
+                ) : (
+                  <Plus
+                    aria-hidden="true"
+                    focusable="false"
+                    height={20}
+                    width={20}
+                    color="#594FCA"
+                    className="plus"
+                  />
+                )}
+              </S.SearchResultItem>
+            )
+          })
+        )}
       </S.SearchResult>,
       document.body,
     )
@@ -111,7 +130,7 @@ const SearchFriend = ({ selectedFriends, onToggleFriend }: SearchFriendProps) =>
       window.removeEventListener('resize', updateResultPosition)
       window.removeEventListener('scroll', updateResultPosition, true)
     }
-  }, [selectedFriends.length, shouldShowResult])
+  }, [selectedFriendIds.length, shouldShowResult])
 
   useEffect(() => {
     if (!isOpen) return undefined

From 24f1d4abd21425a96b47b6edd588ca69236b12d0 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Thu, 14 May 2026 13:47:36 +0900
Subject: [PATCH 02/23] =?UTF-8?q?feat:=20=EC=9D=BC=EC=A0=95=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=20=EC=9A=94=EC=B2=AD=EC=97=90=20=EA=B3=B5=EC=9C=A0=20?=
 =?UTF-8?q?=EC=B9=9C=EA=B5=AC=20=EC=95=84=EC=9D=B4=EB=94=94=20=ED=8F=AC?=
 =?UTF-8?q?=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shared/api/calendar/api.ts                        |  2 ++
 src/shared/hooks/addSchedule/useSchedulePatch.ts      | 11 +++++++++++
 .../hooks/addSchedule/useSchedulePatchController.ts   |  1 +
 3 files changed, 14 insertions(+)

diff --git a/src/shared/api/calendar/api.ts b/src/shared/api/calendar/api.ts
index f681136..4b611c2 100644
--- a/src/shared/api/calendar/api.ts
+++ b/src/shared/api/calendar/api.ts
@@ -38,6 +38,7 @@ export const postEvents = async (eventData: {
   color?: EventColorType
   isAllDay?: boolean
   recurrenceGroup?: RecurrenceGroup
+  friendIds?: number[]
 }) => {
   const { data } = await axiosInstance.post('/events', eventData)
   return data
@@ -55,6 +56,7 @@ export const patchEvent = async (
     color?: EventColorType
     isAllDay?: boolean
     recurrenceGroup?: RecurrenceGroup | null
+    friendIds?: number[]
   },
   params: {
     occurrenceDate: string
diff --git a/src/shared/hooks/addSchedule/useSchedulePatch.ts b/src/shared/hooks/addSchedule/useSchedulePatch.ts
index 7190b28..b296f16 100644
--- a/src/shared/hooks/addSchedule/useSchedulePatch.ts
+++ b/src/shared/hooks/addSchedule/useSchedulePatch.ts
@@ -46,9 +46,17 @@ type PatchEventMutate = (params: {
     color?: Event['color']
     isAllDay?: boolean
     recurrenceGroup?: Event['recurrenceGroup'] | null
+    friendIds?: Event['friendIds']
   }
 }) => Promise<unknown>
 
+const areSameFriendIds = (left: number[] = [], right: number[] = []) => {
+  if (left.length !== right.length) return false
+  const leftSorted = [...left].sort((a, b) => a - b)
+  const rightSorted = [...right].sort((a, b) => a - b)
+  return leftSorted.every((friendId, index) => friendId === rightSorted[index])
+}
+
 type UseSchedulePatchArgs = {
   eventId: number | null
   date: string
@@ -107,6 +115,7 @@ export const useSchedulePatch = ({
       const initialAddress = initialEvent?.address ?? null
       const initialColor = initialEvent?.color
       const initialIsAllday = initialEvent?.isAllDay ?? false
+      const initialFriendIds = initialEvent?.friendIds ?? []
       const initialStart =
         initialEvent?.start != null ? formatDateTime(new Date(initialEvent.start)) : undefined
       const initialEnd =
@@ -118,6 +127,7 @@ export const useSchedulePatch = ({
       const nextAddress = values.address?.trim() || null
       const nextStart = formatDateTime(start)
       const nextEnd = formatDateTime(end)
+      const nextFriendIds = values.friendIds ?? []
       const hasStartDateChanged =
         initialEvent?.start != null && !isSameYmd(new Date(initialEvent.start), start)
       const shouldSendMonthlySinglePattern =
@@ -151,6 +161,7 @@ export const useSchedulePatch = ({
         ...(initialEnd && nextEnd !== initialEnd ? { endTime: nextEnd } : {}),
         ...(initialColor && values.eventColor !== initialColor ? { color: values.eventColor } : {}),
         ...(values.isAllday !== initialIsAllday ? { isAllDay: values.isAllday } : {}),
+        ...(!areSameFriendIds(nextFriendIds, initialFriendIds) ? { friendIds: nextFriendIds } : {}),
         ...(recurrenceGroupPayload !== undefined
           ? {
               recurrenceGroup: recurrenceGroupPayload,
diff --git a/src/shared/hooks/addSchedule/useSchedulePatchController.ts b/src/shared/hooks/addSchedule/useSchedulePatchController.ts
index 3b3f2a2..4a13ffb 100644
--- a/src/shared/hooks/addSchedule/useSchedulePatchController.ts
+++ b/src/shared/hooks/addSchedule/useSchedulePatchController.ts
@@ -96,6 +96,7 @@ export const useSchedulePatchController = ({
         isAllDay: values.isAllday,
         color: values.eventColor,
         recurrenceGroup,
+        friendIds: values.friendIds ?? [],
       })
     },
     [buildDateTime, date, formatDateTime, postEventMutation],

From eb425e8815748d8f5f77a0d71e53fdb37cf60724 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sat, 16 May 2026 17:10:53 +0900
Subject: [PATCH 03/23] =?UTF-8?q?refactor:=20=EB=B0=98=EB=B3=B5=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B2=94=EC=9C=84=20=EC=83=81=EC=88=98=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomCalendar/CustomCalendarDialogs.tsx  |  4 ++--
 .../Calendar/hooks/useCalendarDragDrop.ts     |  3 ++-
 .../Calendar/hooks/useCalendarKeyDelete.ts    | 10 +++++++--
 src/shared/api/calendar/api.ts                |  5 +++--
 src/shared/constants/recurrenceScope.ts       | 18 +++++++++++++++
 .../hooks/addSchedule/useScheduleFooter.tsx   |  6 ++++-
 .../hooks/addSchedule/useSchedulePatch.ts     |  9 ++++----
 .../addSchedule/useScheduleSubmitFlow.ts      |  6 ++++-
 src/shared/hooks/addTodo/useTodoFooter.tsx    |  3 ++-
 src/shared/hooks/addTodo/useTodoSubmitFlow.ts |  6 ++++-
 src/shared/hooks/form/useTodoEditorForm.ts    |  3 ++-
 src/shared/hooks/query/useCalendarMutation.ts |  4 ++--
 src/shared/types/recurrence/recurrence.ts     |  4 +---
 .../DeleteConfirmModal/DeleteConfirmModal.tsx | 22 ++++++++++++-------
 .../ScheduleEditor/ScheduleEditorContent.tsx  |  3 ++-
 15 files changed, 76 insertions(+), 30 deletions(-)
 create mode 100644 src/shared/constants/recurrenceScope.ts

diff --git a/src/features/Calendar/components/CustomCalendar/CustomCalendarDialogs.tsx b/src/features/Calendar/components/CustomCalendar/CustomCalendarDialogs.tsx
index 37f5cfd..1aa0f58 100644
--- a/src/features/Calendar/components/CustomCalendar/CustomCalendarDialogs.tsx
+++ b/src/features/Calendar/components/CustomCalendar/CustomCalendarDialogs.tsx
@@ -1,15 +1,15 @@
 import type { UseMutateFunction } from '@tanstack/react-query'
 import type { EventInteractionArgs } from 'react-big-calendar/lib/addons/dragAndDrop'
 
+import type { RecurrenceEventSeriesScope } from '@/shared/constants/recurrenceScope'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
-import type { RecurrenceEventScope } from '@/shared/types/recurrence/recurrence'
 import { EditConfirmModal, type EditConfirmOption } from '@/shared/ui/Modals'
 import DeleteConfirmModal from '@/shared/ui/Modals/DeleteConfirmModal/DeleteConfirmModal'
 
 type EventDeleteVariables = {
   eventId: number
   params: {
-    scope?: RecurrenceEventScope
+    scope?: RecurrenceEventSeriesScope
     occurrenceDate: string
   }
 }
diff --git a/src/features/Calendar/hooks/useCalendarDragDrop.ts b/src/features/Calendar/hooks/useCalendarDragDrop.ts
index 954957b..94cf352 100644
--- a/src/features/Calendar/hooks/useCalendarDragDrop.ts
+++ b/src/features/Calendar/hooks/useCalendarDragDrop.ts
@@ -5,6 +5,7 @@ import { Views } from 'react-big-calendar'
 import type { EventInteractionArgs } from 'react-big-calendar/lib/addons/dragAndDrop'
 
 import { resolveOccurrenceDateTime } from '@/features/Calendar/utils/helpers/dayViewHelpers'
+import { RECURRENCE_EVENT_SCOPE } from '@/shared/constants/recurrenceScope'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
 import type {
   RecurrenceEventScope,
@@ -132,7 +133,7 @@ export const useCalendarDragDrop = ({
           startTime: nextStart,
           endTime: nextEnd,
           isAllDay: event.isAllDay ?? false,
-          ...(options?.eventScope === 'THIS_AND_FOLLOWING_EVENTS'
+          ...(options?.eventScope === RECURRENCE_EVENT_SCOPE.THIS_AND_FOLLOWING_EVENTS
             ? {
                 recurrenceGroup: buildRecurringGroupForFutureDrop(
                   event.recurrenceGroup,
diff --git a/src/features/Calendar/hooks/useCalendarKeyDelete.ts b/src/features/Calendar/hooks/useCalendarKeyDelete.ts
index 657b7ff..56fbf7b 100644
--- a/src/features/Calendar/hooks/useCalendarKeyDelete.ts
+++ b/src/features/Calendar/hooks/useCalendarKeyDelete.ts
@@ -6,7 +6,9 @@ import {
   getEventOccurrenceKey,
   resolveOccurrenceDateTime,
 } from '@/features/Calendar/utils/helpers/dayViewHelpers'
+import { RECURRENCE_TODO_SCOPE } from '@/shared/constants/recurrenceScope'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
+import type { RecurrenceTodoScope } from '@/shared/types/recurrence/recurrence'
 
 type UseCalendarKeyDeleteArgs = {
   isModalOpen: boolean
@@ -26,7 +28,11 @@ type UseCalendarKeyDeleteArgs = {
     occurrenceDate: string,
     isRecurring: boolean,
   ) => void
-  onDeleteTodo: (payload: { todoId: number; occurrenceDate: string; scope?: 'THIS_TODO' }) => void
+  onDeleteTodo: (payload: {
+    todoId: number
+    occurrenceDate: string
+    scope?: RecurrenceTodoScope
+  }) => void
 }
 
 // input, textarea, contenteditable 요소에서는 백스페이스로 이벤트 삭제 안되도록 막기
@@ -81,7 +87,7 @@ export const useCalendarKeyDelete = ({
         onDeleteTodo({
           todoId: selectedEvent.id,
           occurrenceDate: selectedEvent.occurrenceDate ?? moment(baseDate).format('YYYY-MM-DD'),
-          scope: isRecurringEvent ? 'THIS_TODO' : undefined,
+          scope: isRecurringEvent ? RECURRENCE_TODO_SCOPE.THIS_TODO : undefined,
         })
         onClearSelection()
         return
diff --git a/src/shared/api/calendar/api.ts b/src/shared/api/calendar/api.ts
index 4b611c2..b8971db 100644
--- a/src/shared/api/calendar/api.ts
+++ b/src/shared/api/calendar/api.ts
@@ -1,4 +1,5 @@
 import axiosInstance from '@/shared/api/axios'
+import type { RecurrenceEventSeriesScope } from '@/shared/constants/recurrenceScope'
 import type { GetEventDetailResponseDTO, GetEventsResponseDTO } from '@/shared/types/calendar/types'
 import type { TCommonResponse, TitleHistoryResponseDTO } from '@/shared/types/common/common'
 import type { EventColorType } from '@/shared/types/event/event'
@@ -60,7 +61,7 @@ export const patchEvent = async (
   },
   params: {
     occurrenceDate: string
-    scope?: Extract<RecurrenceEventScope, 'THIS_EVENT' | 'THIS_AND_FOLLOWING_EVENTS'>
+    scope?: RecurrenceEventScope
   },
 ) => {
   const { data } = await axiosInstance.patch(`/events/${eventId}`, eventData, { params })
@@ -71,7 +72,7 @@ export const deleteEvent = async (
   eventId: number,
   params: {
     occurrenceDate: string
-    scope?: Extract<RecurrenceEventScope, 'THIS_EVENT' | 'THIS_AND_FOLLOWING_EVENTS'>
+    scope?: RecurrenceEventSeriesScope
   },
 ) => {
   const { data } = await axiosInstance.delete(`/events/${eventId}`, { params })
diff --git a/src/shared/constants/recurrenceScope.ts b/src/shared/constants/recurrenceScope.ts
new file mode 100644
index 0000000..efe3d69
--- /dev/null
+++ b/src/shared/constants/recurrenceScope.ts
@@ -0,0 +1,18 @@
+export const RECURRENCE_EVENT_SCOPE = {
+  THIS_EVENT: 'THIS_EVENT',
+  THIS_AND_FOLLOWING_EVENTS: 'THIS_AND_FOLLOWING_EVENTS',
+  THIS_AND_FOLLOWING: 'THIS_AND_FOLLOWING',
+} as const
+
+export const RECURRENCE_TODO_SCOPE = {
+  THIS_TODO: 'THIS_TODO',
+  THIS_AND_FOLLOWING: 'THIS_AND_FOLLOWING',
+} as const
+
+export type RecurrenceEventScope =
+  (typeof RECURRENCE_EVENT_SCOPE)[keyof typeof RECURRENCE_EVENT_SCOPE]
+export type RecurrenceEventSeriesScope =
+  | typeof RECURRENCE_EVENT_SCOPE.THIS_EVENT
+  | typeof RECURRENCE_EVENT_SCOPE.THIS_AND_FOLLOWING_EVENTS
+
+export type RecurrenceTodoScope = (typeof RECURRENCE_TODO_SCOPE)[keyof typeof RECURRENCE_TODO_SCOPE]
diff --git a/src/shared/hooks/addSchedule/useScheduleFooter.tsx b/src/shared/hooks/addSchedule/useScheduleFooter.tsx
index ba48d71..0ade81b 100644
--- a/src/shared/hooks/addSchedule/useScheduleFooter.tsx
+++ b/src/shared/hooks/addSchedule/useScheduleFooter.tsx
@@ -3,6 +3,7 @@ import type { ReactNode } from 'react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { type UseFormGetValues } from 'react-hook-form'
 
+import { RECURRENCE_EVENT_SCOPE } from '@/shared/constants/recurrenceScope'
 import { useCalendarMutation } from '@/shared/hooks/query/useCalendarMutation'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
 import type { EventColorType, ScheduleEditorFormValues } from '@/shared/types/event/event'
@@ -115,7 +116,10 @@ export const useScheduleFooter = ({
       const nextValues = { ...getValues(), eventColor: value }
       void (async () => {
         try {
-          await patchSchedule(nextValues, isExistingRecurring ? 'THIS_EVENT' : undefined)
+          await patchSchedule(
+            nextValues,
+            isExistingRecurring ? RECURRENCE_EVENT_SCOPE.THIS_EVENT : undefined,
+          )
         } catch (error) {
           setEventColor(previousColor)
           if (eventId != null && eventId !== 0) {
diff --git a/src/shared/hooks/addSchedule/useSchedulePatch.ts b/src/shared/hooks/addSchedule/useSchedulePatch.ts
index b296f16..591ef9e 100644
--- a/src/shared/hooks/addSchedule/useSchedulePatch.ts
+++ b/src/shared/hooks/addSchedule/useSchedulePatch.ts
@@ -1,6 +1,7 @@
 // 일정 수정 payload를 생성하고 patch 요청을 보내는 훅
 import { useCallback } from 'react'
 
+import { RECURRENCE_EVENT_SCOPE } from '@/shared/constants/recurrenceScope'
 import type { CalendarEvent, Event } from '@/shared/types/calendar/types'
 import type { RepeatConfigSchema, ScheduleEditorFormValues } from '@/shared/types/event/event'
 import type { RecurrenceEventScope, RecurrenceGroup } from '@/shared/types/recurrence/recurrence'
@@ -34,7 +35,7 @@ type PatchEventMutate = (params: {
   eventId: number
   params: {
     occurrenceDate: string
-    scope?: Extract<RecurrenceEventScope, 'THIS_EVENT' | 'THIS_AND_FOLLOWING_EVENTS'>
+    scope?: RecurrenceEventScope
   }
   eventData: {
     title?: string
@@ -104,9 +105,9 @@ export const useSchedulePatch = ({
         JSON.stringify(nextRecurrenceGroupPayload ?? null) !==
         JSON.stringify(initialRecurrenceGroupPayload ?? null)
       const patchScope = shouldSendRecurrenceGroup
-        ? 'THIS_AND_FOLLOWING_EVENTS'
+        ? RECURRENCE_EVENT_SCOPE.THIS_AND_FOLLOWING_EVENTS
         : isRecurring
-          ? (scope ?? 'THIS_EVENT')
+          ? (scope ?? RECURRENCE_EVENT_SCOPE.THIS_EVENT)
           : undefined
 
       const initialTitle = initialEvent?.title ?? ''
@@ -131,7 +132,7 @@ export const useSchedulePatch = ({
       const hasStartDateChanged =
         initialEvent?.start != null && !isSameYmd(new Date(initialEvent.start), start)
       const shouldSendMonthlySinglePattern =
-        patchScope === 'THIS_AND_FOLLOWING_EVENTS' &&
+        patchScope === RECURRENCE_EVENT_SCOPE.THIS_AND_FOLLOWING_EVENTS &&
         !shouldSendRecurrenceGroup &&
         hasStartDateChanged &&
         isMonthlyPatternWithFlexibleWeekdayRule(initialRecurrenceGroupPayload)
diff --git a/src/shared/hooks/addSchedule/useScheduleSubmitFlow.ts b/src/shared/hooks/addSchedule/useScheduleSubmitFlow.ts
index d81801b..63ce585 100644
--- a/src/shared/hooks/addSchedule/useScheduleSubmitFlow.ts
+++ b/src/shared/hooks/addSchedule/useScheduleSubmitFlow.ts
@@ -1,6 +1,7 @@
 import { useCallback, useState } from 'react'
 import type { UseFormHandleSubmit, UseFormSetValue } from 'react-hook-form'
 
+import { RECURRENCE_EVENT_SCOPE } from '@/shared/constants/recurrenceScope'
 import { useRepeatChangeGuard } from '@/shared/hooks/repeat/useRepeatChangeGuard'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
 import type { ScheduleEditorFormValues } from '@/shared/types/event/event'
@@ -173,7 +174,10 @@ export const useScheduleSubmitFlow = ({
       const occurrenceDate = initialEvent?.occurrenceDate
         ? formatDateTime(new Date(initialEvent.occurrenceDate))
         : fallbackOccurrenceDate
-      const scope = option === 'future' ? 'THIS_AND_FOLLOWING_EVENTS' : 'THIS_EVENT'
+      const scope =
+        option === 'future'
+          ? RECURRENCE_EVENT_SCOPE.THIS_AND_FOLLOWING_EVENTS
+          : RECURRENCE_EVENT_SCOPE.THIS_EVENT
       await submitScheduleValues(pendingScheduleValues, {
         mode: 'patch',
         scope,
diff --git a/src/shared/hooks/addTodo/useTodoFooter.tsx b/src/shared/hooks/addTodo/useTodoFooter.tsx
index dab52ff..6140ff0 100644
--- a/src/shared/hooks/addTodo/useTodoFooter.tsx
+++ b/src/shared/hooks/addTodo/useTodoFooter.tsx
@@ -1,6 +1,7 @@
 import type { ReactNode } from 'react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
+import { RECURRENCE_TODO_SCOPE } from '@/shared/constants/recurrenceScope'
 import { useTodoMutations } from '@/shared/hooks/query/useTodoMutations'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
 import type { EventColorType } from '@/shared/types/event/event'
@@ -105,7 +106,7 @@ export const useTodoFooter = ({
       {
         todoId: eventIdRef.current,
         occurrenceDate: occurrenceDateRef.current,
-        ...(hasExistingRecurrenceRef.current ? { scope: 'THIS_TODO' as const } : {}),
+        ...(hasExistingRecurrenceRef.current ? { scope: RECURRENCE_TODO_SCOPE.THIS_TODO } : {}),
         requestBody: {
           color: value,
         },
diff --git a/src/shared/hooks/addTodo/useTodoSubmitFlow.ts b/src/shared/hooks/addTodo/useTodoSubmitFlow.ts
index 0613e04..d8a1369 100644
--- a/src/shared/hooks/addTodo/useTodoSubmitFlow.ts
+++ b/src/shared/hooks/addTodo/useTodoSubmitFlow.ts
@@ -1,6 +1,7 @@
 import { useCallback, useState } from 'react'
 import type { UseFormHandleSubmit, UseFormSetValue } from 'react-hook-form'
 
+import { RECURRENCE_TODO_SCOPE } from '@/shared/constants/recurrenceScope'
 import { useRepeatChangeGuard } from '@/shared/hooks/repeat/useRepeatChangeGuard'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
 import type { TodoEditorFormValues } from '@/shared/types/event/event'
@@ -150,7 +151,10 @@ export const useTodoSubmitFlow = ({
   const handleConfirmedSubmit = useCallback(
     async (option: EditConfirmOption) => {
       if (!pendingTodoValues) return
-      const scope: RecurrenceTodoScope = option === 'future' ? 'THIS_AND_FOLLOWING' : 'THIS_TODO'
+      const scope: RecurrenceTodoScope =
+        option === 'future'
+          ? RECURRENCE_TODO_SCOPE.THIS_AND_FOLLOWING
+          : RECURRENCE_TODO_SCOPE.THIS_TODO
       await submitTodoValues(pendingTodoValues, {
         scope,
         shouldConfirmChange: isEditConfirmOpen,
diff --git a/src/shared/hooks/form/useTodoEditorForm.ts b/src/shared/hooks/form/useTodoEditorForm.ts
index 1cbab63..03d3490 100644
--- a/src/shared/hooks/form/useTodoEditorForm.ts
+++ b/src/shared/hooks/form/useTodoEditorForm.ts
@@ -1,6 +1,7 @@
 import { useCallback } from 'react'
 import { type Control, type UseFormReturn } from 'react-hook-form'
 
+import { RECURRENCE_TODO_SCOPE } from '@/shared/constants/recurrenceScope'
 import { useTodoMutations } from '@/shared/hooks/query/useTodoMutations'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
 import type {
@@ -143,7 +144,7 @@ export const useTodoEditorForm = ({
     const currentDate = values.todoDate ? new Date(values.todoDate) : null
     const targetOccurrenceDate = parseYmd(options?.occurrenceDate)
     const shouldAdjustFutureMonthlyPattern =
-      options?.scope === 'THIS_AND_FOLLOWING' &&
+      options?.scope === RECURRENCE_TODO_SCOPE.THIS_AND_FOLLOWING &&
       mappedRecurrenceGroup?.frequency === 'MONTHLY' &&
       mappedRecurrenceGroup?.monthlyType === 'DAY_OF_WEEK' &&
       mappedRecurrenceGroup?.weekdayRule != null &&
diff --git a/src/shared/hooks/query/useCalendarMutation.ts b/src/shared/hooks/query/useCalendarMutation.ts
index 1e87855..6616625 100644
--- a/src/shared/hooks/query/useCalendarMutation.ts
+++ b/src/shared/hooks/query/useCalendarMutation.ts
@@ -1,7 +1,7 @@
 import { useQueryClient } from '@tanstack/react-query'
 
 import { deleteEvent, patchEvent, postEvents } from '@/shared/api/calendar/api'
-import type { RecurrenceEventScope } from '@/shared/types/recurrence/recurrence'
+import type { RecurrenceEventSeriesScope } from '@/shared/constants/recurrenceScope'
 import { getErrorMessage, markErrorToastHandled } from '@/shared/utils'
 import { useToastStore } from '@/store/useToastStore'
 
@@ -72,7 +72,7 @@ export function useCalendarMutation() {
       }: {
         eventId: number
         params: {
-          scope?: RecurrenceEventScope
+          scope?: RecurrenceEventSeriesScope
           occurrenceDate: string
         }
       }) => deleteEvent(eventId, params),
diff --git a/src/shared/types/recurrence/recurrence.ts b/src/shared/types/recurrence/recurrence.ts
index 3845e91..e4d5d97 100644
--- a/src/shared/types/recurrence/recurrence.ts
+++ b/src/shared/types/recurrence/recurrence.ts
@@ -1,4 +1,5 @@
 import type { Week } from '../event/event'
+export type { RecurrenceEventScope, RecurrenceTodoScope } from '@/shared/constants/recurrenceScope'
 
 export type MonthlyWeekDayRule = 'SINGLE' | 'WEEKDAY' | 'WEEKEND' | 'ALL_DAYS'
 
@@ -16,6 +17,3 @@ export interface RecurrenceGroup {
   dayOfWeekInMonth?: Week | null
   monthOfYear?: number
 }
-
-export type RecurrenceEventScope = 'THIS_EVENT' | 'THIS_AND_FOLLOWING_EVENTS'
-export type RecurrenceTodoScope = 'THIS_TODO' | 'THIS_AND_FOLLOWING'
diff --git a/src/shared/ui/Modals/DeleteConfirmModal/DeleteConfirmModal.tsx b/src/shared/ui/Modals/DeleteConfirmModal/DeleteConfirmModal.tsx
index e398782..0e297df 100644
--- a/src/shared/ui/Modals/DeleteConfirmModal/DeleteConfirmModal.tsx
+++ b/src/shared/ui/Modals/DeleteConfirmModal/DeleteConfirmModal.tsx
@@ -2,10 +2,12 @@ import type { UseMutateFunction } from '@tanstack/react-query'
 import { useId, useState } from 'react'
 import { createPortal } from 'react-dom'
 
-import type {
-  RecurrenceEventScope,
-  RecurrenceTodoScope,
-} from '@/shared/types/recurrence/recurrence'
+import {
+  RECURRENCE_EVENT_SCOPE,
+  RECURRENCE_TODO_SCOPE,
+  type RecurrenceEventSeriesScope,
+  type RecurrenceTodoScope,
+} from '@/shared/constants/recurrenceScope'
 
 import Modal from '../../common/Modal/Modal'
 import * as S from './DeleteConfirmModal.style'
@@ -13,7 +15,7 @@ import * as S from './DeleteConfirmModal.style'
 type EventDeleteVariables = {
   eventId: number
   params: {
-    scope?: RecurrenceEventScope
+    scope?: RecurrenceEventSeriesScope
     occurrenceDate: string
   }
 }
@@ -67,8 +69,10 @@ const DeleteConfirmModal = (props: DeleteConfirmModalProps) => {
 
   const handleDelete = () => {
     if (isEventDeleteProps(props)) {
-      const scope: RecurrenceEventScope =
-        selectedOption === 'single' ? 'THIS_EVENT' : 'THIS_AND_FOLLOWING_EVENTS'
+      const scope: RecurrenceEventSeriesScope =
+        selectedOption === 'single'
+          ? RECURRENCE_EVENT_SCOPE.THIS_EVENT
+          : RECURRENCE_EVENT_SCOPE.THIS_AND_FOLLOWING_EVENTS
       const params = { scope, occurrenceDate: props.target.occurrenceDate }
       props.mutate(
         { eventId: props.target.id, params },
@@ -81,7 +85,9 @@ const DeleteConfirmModal = (props: DeleteConfirmModalProps) => {
       return
     }
     const scope: RecurrenceTodoScope =
-      selectedOption === 'single' ? 'THIS_TODO' : 'THIS_AND_FOLLOWING'
+      selectedOption === 'single'
+        ? RECURRENCE_TODO_SCOPE.THIS_TODO
+        : RECURRENCE_TODO_SCOPE.THIS_AND_FOLLOWING
     props.mutate(
       { todoId: props.target.id, occurrenceDate: props.target.occurrenceDate, scope },
       {
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
index a080d93..9b85368 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
@@ -2,6 +2,7 @@
 import { useCallback, useEffect, useRef } from 'react'
 import { useFormContext } from 'react-hook-form'
 
+import { RECURRENCE_EVENT_SCOPE } from '@/shared/constants/recurrenceScope'
 import {
   useScheduleEventSync,
   useScheduleFooter,
@@ -106,7 +107,7 @@ const ScheduleEditorContent = ({
           isAllday: nextIsAllDay,
           ...(nextIsAllDay ? { eventStartTime: undefined, eventEndTime: undefined } : {}),
         },
-        isExistingRecurring ? 'THIS_EVENT' : undefined,
+        isExistingRecurring ? RECURRENCE_EVENT_SCOPE.THIS_EVENT : undefined,
       )
     }
   }, [getValues, initialEvent?.recurrenceGroup, isAllday, isEditing, patchSchedule, setValue])

From 3fc996dee5d5347c95cb82f03167b7cb3e1658e2 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sat, 16 May 2026 17:11:07 +0900
Subject: [PATCH 04/23] =?UTF-8?q?refactor:=20=EC=BA=98=EB=A6=B0=EB=8D=94?=
 =?UTF-8?q?=20=EC=8B=9C=EA=B0=84=20=EB=B3=80=EA=B2=BD=20=EB=A1=9C=EC=A7=81?=
 =?UTF-8?q?=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomCalendar/CustomCalendar.tsx         | 149 +++---------------
 src/features/Calendar/hooks/index.ts          |   2 +
 .../hooks/useCalendarDayViewTiming.ts         |  88 +++++++++++
 .../hooks/useCalendarTodoTimingPatch.ts       |  95 +++++++++++
 .../utils/helpers/calendarRecurrenceScope.ts  |  25 +++
 5 files changed, 228 insertions(+), 131 deletions(-)
 create mode 100644 src/features/Calendar/hooks/useCalendarDayViewTiming.ts
 create mode 100644 src/features/Calendar/hooks/useCalendarTodoTimingPatch.ts
 create mode 100644 src/features/Calendar/utils/helpers/calendarRecurrenceScope.ts

diff --git a/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx b/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx
index 8f17620..a34adb4 100644
--- a/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx
+++ b/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx
@@ -3,15 +3,7 @@ import 'moment/locale/ko'
 import 'react-big-calendar/lib/css/react-big-calendar.css'
 
 import moment from 'moment'
-import {
-  cloneElement,
-  type MouseEvent,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from 'react'
+import { cloneElement, type MouseEvent, useCallback, useEffect, useMemo, useState } from 'react'
 import { Calendar, type DateCellWrapperProps, momentLocalizer } from 'react-big-calendar'
 import type { EventInteractionArgs } from 'react-big-calendar/lib/addons/dragAndDrop'
 import withDragAndDrop from 'react-big-calendar/lib/addons/dragAndDrop'
@@ -20,6 +12,7 @@ import {
   useCalendarApiEvents,
   useCalendarCreateHandlers,
   useCalendarDateRange,
+  useCalendarDayViewTiming,
   useCalendarDraftEvent,
   useCalendarDragDrop,
   useCalendarKeyDelete,
@@ -28,23 +21,20 @@ import {
   useCalendarRbcProps,
   useCalendarResponsive,
   useCalendarSelection,
+  useCalendarTodoTimingPatch,
   useDayViewHandlers,
   useStoredCalendarView,
 } from '@/features/Calendar/hooks'
-import { buildRecurringGroupForFutureDrop } from '@/features/Calendar/hooks/useCalendarDragDrop'
 import { useCalendarEvents } from '@/features/Calendar/hooks/useCalendarEvents'
 import {
-  getEventOccurrenceKey,
-  resolveOccurrenceDateTime,
-} from '@/features/Calendar/utils/helpers/dayViewHelpers'
-import { getDetailTodo } from '@/shared/api/todo/api'
+  getEventOccurrenceScope,
+  getEventScopeFromEditOption,
+  getTodoScopeFromEditOption,
+} from '@/features/Calendar/utils/helpers/calendarRecurrenceScope'
+import { getEventOccurrenceKey } from '@/features/Calendar/utils/helpers/dayViewHelpers'
 import { useCalendarMutation } from '@/shared/hooks/query/useCalendarMutation'
 import { useTodoMutations } from '@/shared/hooks/query/useTodoMutations'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
-import type {
-  RecurrenceEventScope,
-  RecurrenceTodoScope,
-} from '@/shared/types/recurrence/recurrence'
 import type { EditConfirmOption } from '@/shared/ui/Modals'
 
 import CalendarModals from './CalendarModals'
@@ -77,7 +67,7 @@ const CustomCalendar = ({ onSelectedDateChange }: CustomCalendarProps) => {
   const { mutate: patchCompleteTodoMutate } = usePatchCompleteTodo()
   const { mutate: patchTodoMutate } = usePatchTodo()
   const { mutate: deleteTodoMutate } = useDeleteTodo()
-  const recurringTodoPatchSeqRef = useRef<Map<string, number>>(new Map())
+  const { patchTodoTiming } = useCalendarTodoTimingPatch({ patchTodoMutate })
   const [deleteConfirm, setDeleteConfirm] = useState<{
     isOpen: boolean
     eventId: CalendarEvent['id'] | null
@@ -126,68 +116,6 @@ const CustomCalendar = ({ onSelectedDateChange }: CustomCalendarProps) => {
     [events, patchCompleteTodoMutate, toggleEventDone],
   )
 
-  const resolveFutureTodoRecurrenceGroup = useCallback(
-    async (todoId: number, occurrenceDate: string, nextStart: Date) => {
-      try {
-        // "이후 일정만 변경"일 때는 현재 occurrence 기준의 상세 recurrence를 받아
-        // 드롭한 날짜(nextStart)에 맞는 recurrenceGroup으로 재계산해 patch에 포함합니다.
-        const { result } = await getDetailTodo(todoId, occurrenceDate)
-        return buildRecurringGroupForFutureDrop(result?.recurrenceGroup ?? null, nextStart)
-      } catch (error) {
-        console.error('[CustomCalendar] failed to resolve todo recurrenceGroup', error)
-        return undefined
-      }
-    },
-    [],
-  )
-
-  // Todo 일정 이동 시 시간 패치
-  const patchTodoTiming = useCallback(
-    (
-      todoEvent: CalendarEvent,
-      start: Date,
-      options?: { scope?: RecurrenceTodoScope; occurrenceDate?: string },
-    ) => {
-      const startDate = moment(start).format('YYYY-MM-DD')
-      const occurrenceDate =
-        options?.occurrenceDate ??
-        moment(todoEvent.occurrenceDate ?? todoEvent.start).format('YYYY-MM-DD')
-      const patchScope = options?.scope ?? (todoEvent.isRecurring ? 'THIS_TODO' : undefined)
-      const dueTime = todoEvent.isAllDay ? undefined : moment(start).format('HH:mm')
-      const submitPatch = (recurrenceGroup?: CalendarEvent['recurrenceGroup']) => {
-        patchTodoMutate({
-          todoId: todoEvent.id,
-          occurrenceDate,
-          ...(patchScope ? { scope: patchScope } : {}),
-          requestBody: {
-            startDate,
-            dueTime,
-            isAllDay: todoEvent.isAllDay,
-            ...(recurrenceGroup ? { recurrenceGroup } : {}),
-          },
-        })
-      }
-
-      if (patchScope === 'THIS_AND_FOLLOWING') {
-        const requestKey = `${todoEvent.id}-${occurrenceDate}`
-        const nextSequence = (recurringTodoPatchSeqRef.current.get(requestKey) ?? 0) + 1
-        recurringTodoPatchSeqRef.current.set(requestKey, nextSequence)
-        // 반복 할 일을 "이후 항목" 범위로 이동한 경우 recurrenceGroup 보정이 필요합니다.
-        void resolveFutureTodoRecurrenceGroup(todoEvent.id, occurrenceDate, start).then(
-          (recurrenceGroup) => {
-            // 가장 마지막 드롭 요청만 반영해, 비동기 응답 역전으로 인한 역패치를 방지합니다.
-            const latestSequence = recurringTodoPatchSeqRef.current.get(requestKey)
-            if (latestSequence !== nextSequence) return
-            submitPatch(recurrenceGroup)
-          },
-        )
-        return
-      }
-      submitPatch()
-    },
-    [patchTodoMutate, resolveFutureTodoRecurrenceGroup],
-  )
-
   // 반응형 레이아웃 판단
   const isDesktop = useCalendarResponsive()
   const isInlineMode = isDesktop
@@ -195,7 +123,7 @@ const CustomCalendar = ({ onSelectedDateChange }: CustomCalendarProps) => {
   const handleRemoveEvent = useCallback(
     (eventId: CalendarEvent['id'], occurrenceDate: string, isRecurring: boolean) => {
       const params = {
-        ...(isRecurring ? { scope: 'THIS_EVENT' as const } : {}),
+        ...(isRecurring ? { scope: getEventOccurrenceScope(isRecurring) } : {}),
         occurrenceDate: moment(occurrenceDate).format('YYYY-MM-DDTHH:mm:ss'),
       }
       deleteEventMutate(
@@ -274,49 +202,12 @@ const CustomCalendar = ({ onSelectedDateChange }: CustomCalendarProps) => {
     setDeleteConfirm({ isOpen: false, eventId: null, title: '', occurrenceDate: '' })
   }, [])
 
-  // 일간 뷰에서 시간 변경 확정 처리
-  const handleDayViewEventTimeChange = useCallback(
-    (eventId: CalendarEvent['id'], start: Date, end: Date, type?: CalendarEvent['type']) => {
-      updateLocalEventTime(eventId, start, end, type)
-      if (type === 'todo') {
-        const todoEvent = events.find(
-          (eventItem) => eventItem.id === eventId && eventItem.type === 'todo',
-        )
-        if (todoEvent) {
-          patchTodoTiming(todoEvent, start)
-        }
-        return
-      }
-      const nextEnd = moment(end).format('YYYY-MM-DDTHH:mm:ss')
-      const targetEvent = events.find((eventItem) => eventItem.id === eventId)
-      const occurrenceDate = resolveOccurrenceDateTime(
-        targetEvent?.occurrenceDate,
-        targetEvent?.start ?? start,
-      )
-      const patchScope = targetEvent?.recurrenceGroup != null ? ('THIS_EVENT' as const) : undefined
-      patchEventMutate({
-        eventId,
-        params: {
-          occurrenceDate,
-          ...(patchScope ? { scope: patchScope } : {}),
-        },
-        eventData: {
-          startTime: moment(start).format('YYYY-MM-DDTHH:mm:ss'),
-          endTime: nextEnd,
-          isAllDay: false,
-        },
-      })
-    },
-    [events, patchEventMutate, patchTodoTiming, updateLocalEventTime],
-  )
-
-  // 일간 뷰에서 시간 변경 미리보기
-  const handleDayViewEventTimePreview = useCallback(
-    (eventId: CalendarEvent['id'], start: Date, end: Date, type?: CalendarEvent['type']) => {
-      updateLocalEventTime(eventId, start, end, type)
-    },
-    [updateLocalEventTime],
-  )
+  const { handleDayViewEventTimeChange, handleDayViewEventTimePreview } = useCalendarDayViewTiming({
+    events,
+    patchEventMutate,
+    patchTodoTiming,
+    updateLocalEventTime,
+  })
 
   // 키보드 삭제(Backspace) 처리
   useCalendarKeyDelete({
@@ -431,15 +322,11 @@ const CustomCalendar = ({ onSelectedDateChange }: CustomCalendarProps) => {
     (option: EditConfirmOption) => {
       if (!recurringDropConfirm.args) return
       if (recurringDropConfirm.target === 'todo') {
-        const todoScope: RecurrenceTodoScope =
-          option === 'future' ? 'THIS_AND_FOLLOWING' : 'THIS_TODO'
-        applyEventDrop(recurringDropConfirm.args, { todoScope })
+        applyEventDrop(recurringDropConfirm.args, { todoScope: getTodoScopeFromEditOption(option) })
         handleCloseRecurringDropConfirm()
         return
       }
-      const eventScope: RecurrenceEventScope =
-        option === 'future' ? 'THIS_AND_FOLLOWING_EVENTS' : 'THIS_EVENT'
-      applyEventDrop(recurringDropConfirm.args, { eventScope })
+      applyEventDrop(recurringDropConfirm.args, { eventScope: getEventScopeFromEditOption(option) })
       handleCloseRecurringDropConfirm()
     },
     [
diff --git a/src/features/Calendar/hooks/index.ts b/src/features/Calendar/hooks/index.ts
index f2a85fd..bc91c91 100644
--- a/src/features/Calendar/hooks/index.ts
+++ b/src/features/Calendar/hooks/index.ts
@@ -2,6 +2,7 @@ export { useCalendarApiEvents } from './useCalendarApiEvents'
 export { useCalendarCreateEvent } from './useCalendarCreateEvent'
 export { useCalendarCreateHandlers } from './useCalendarCreateHandlers'
 export { useCalendarDateRange } from './useCalendarDateRange'
+export { useCalendarDayViewTiming } from './useCalendarDayViewTiming'
 export { useCalendarDraftEvent } from './useCalendarDraftEvent'
 export { useCalendarDragDrop } from './useCalendarDragDrop'
 export { useCalendarEvents } from './useCalendarEvents'
@@ -12,5 +13,6 @@ export { useCalendarPortals } from './useCalendarPortals'
 export { useCalendarRbcProps } from './useCalendarRbcProps'
 export { useCalendarResponsive } from './useCalendarResponsive'
 export { useCalendarSelection } from './useCalendarSelection'
+export { useCalendarTodoTimingPatch } from './useCalendarTodoTimingPatch'
 export { useDayViewHandlers } from './useDayViewHandlers'
 export { useStoredCalendarView } from './useStoredCalendarView'
diff --git a/src/features/Calendar/hooks/useCalendarDayViewTiming.ts b/src/features/Calendar/hooks/useCalendarDayViewTiming.ts
new file mode 100644
index 0000000..7b1c3a0
--- /dev/null
+++ b/src/features/Calendar/hooks/useCalendarDayViewTiming.ts
@@ -0,0 +1,88 @@
+import moment from 'moment'
+import { useCallback } from 'react'
+
+import { getEventOccurrenceScope } from '@/features/Calendar/utils/helpers/calendarRecurrenceScope'
+import { resolveOccurrenceDateTime } from '@/features/Calendar/utils/helpers/dayViewHelpers'
+import type { RecurrenceEventSeriesScope } from '@/shared/constants/recurrenceScope'
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+
+import type { PatchTodoTiming } from './useCalendarTodoTimingPatch'
+
+type PatchEventPayload = {
+  eventId: number
+  params: {
+    occurrenceDate: string
+    scope?: RecurrenceEventSeriesScope
+  }
+  eventData: {
+    startTime: string
+    endTime: string
+    isAllDay: boolean
+  }
+}
+
+type UseCalendarDayViewTimingArgs = {
+  events: CalendarEvent[]
+  patchEventMutate: (payload: PatchEventPayload) => void
+  patchTodoTiming: PatchTodoTiming
+  updateLocalEventTime: (
+    eventId: CalendarEvent['id'],
+    start: Date,
+    end: Date,
+    type?: CalendarEvent['type'],
+  ) => void
+}
+
+export const useCalendarDayViewTiming = ({
+  events,
+  patchEventMutate,
+  patchTodoTiming,
+  updateLocalEventTime,
+}: UseCalendarDayViewTimingArgs) => {
+  const handleDayViewEventTimeChange = useCallback(
+    (eventId: CalendarEvent['id'], start: Date, end: Date, type?: CalendarEvent['type']) => {
+      updateLocalEventTime(eventId, start, end, type)
+      if (type === 'todo') {
+        const todoEvent = events.find(
+          (eventItem) => eventItem.id === eventId && eventItem.type === 'todo',
+        )
+        if (todoEvent) {
+          patchTodoTiming(todoEvent, start)
+        }
+        return
+      }
+
+      const targetEvent = events.find((eventItem) => eventItem.id === eventId)
+      const occurrenceDate = resolveOccurrenceDateTime(
+        targetEvent?.occurrenceDate,
+        targetEvent?.start ?? start,
+      )
+      const patchScope = getEventOccurrenceScope(targetEvent?.recurrenceGroup != null)
+      patchEventMutate({
+        eventId,
+        params: {
+          occurrenceDate,
+          ...(patchScope ? { scope: patchScope } : {}),
+        },
+        eventData: {
+          startTime: moment(start).format('YYYY-MM-DDTHH:mm:ss'),
+          endTime: moment(end).format('YYYY-MM-DDTHH:mm:ss'),
+          isAllDay: false,
+        },
+      })
+    },
+    [events, patchEventMutate, patchTodoTiming, updateLocalEventTime],
+  )
+
+  const handleDayViewEventTimePreview = useCallback(
+    (eventId: CalendarEvent['id'], start: Date, end: Date, type?: CalendarEvent['type']) => {
+      updateLocalEventTime(eventId, start, end, type)
+    },
+    [updateLocalEventTime],
+  )
+
+  return {
+    handleDayViewEventTimeChange,
+    handleDayViewEventTimePreview,
+  }
+}
diff --git a/src/features/Calendar/hooks/useCalendarTodoTimingPatch.ts b/src/features/Calendar/hooks/useCalendarTodoTimingPatch.ts
new file mode 100644
index 0000000..008d689
--- /dev/null
+++ b/src/features/Calendar/hooks/useCalendarTodoTimingPatch.ts
@@ -0,0 +1,95 @@
+import moment from 'moment'
+import { useCallback, useRef } from 'react'
+
+import { buildRecurringGroupForFutureDrop } from '@/features/Calendar/hooks/useCalendarDragDrop'
+import {
+  getTodoOccurrenceScope,
+  isTodoFollowingScope,
+} from '@/features/Calendar/utils/helpers/calendarRecurrenceScope'
+import { getDetailTodo } from '@/shared/api/todo/api'
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+import type { RecurrenceGroup, RecurrenceTodoScope } from '@/shared/types/recurrence/recurrence'
+import type { PatchTodoRequestDTO } from '@/shared/types/todo/types'
+
+type PatchTodoPayload = {
+  todoId: number
+  requestBody: PatchTodoRequestDTO
+  occurrenceDate?: string
+  scope?: RecurrenceTodoScope
+}
+
+export type PatchTodoTiming = (
+  todoEvent: CalendarEvent,
+  start: Date,
+  options?: { scope?: RecurrenceTodoScope; occurrenceDate?: string },
+) => void
+
+type UseCalendarTodoTimingPatchArgs = {
+  patchTodoMutate: (payload: PatchTodoPayload) => void
+}
+
+export const useCalendarTodoTimingPatch = ({ patchTodoMutate }: UseCalendarTodoTimingPatchArgs) => {
+  const recurringTodoPatchSeqRef = useRef<Map<string, number>>(new Map())
+
+  const resolveFutureTodoRecurrenceGroup = useCallback(
+    async (todoId: number, occurrenceDate: string, nextStart: Date) => {
+      try {
+        const { result } = await getDetailTodo(todoId, occurrenceDate)
+        return buildRecurringGroupForFutureDrop(result?.recurrenceGroup ?? null, nextStart)
+      } catch (error) {
+        console.error('[useCalendarTodoTimingPatch] failed to resolve todo recurrenceGroup', error)
+        return undefined
+      }
+    },
+    [],
+  )
+
+  const patchTodoTiming = useCallback(
+    (
+      todoEvent: CalendarEvent,
+      start: Date,
+      options?: { scope?: RecurrenceTodoScope; occurrenceDate?: string },
+    ) => {
+      const startDate = moment(start).format('YYYY-MM-DD')
+      const occurrenceDate =
+        options?.occurrenceDate ??
+        moment(todoEvent.occurrenceDate ?? todoEvent.start).format('YYYY-MM-DD')
+      const patchScope = options?.scope ?? getTodoOccurrenceScope(Boolean(todoEvent.isRecurring))
+      const dueTime = todoEvent.isAllDay ? undefined : moment(start).format('HH:mm')
+
+      const submitPatch = (recurrenceGroup?: RecurrenceGroup) => {
+        patchTodoMutate({
+          todoId: todoEvent.id,
+          occurrenceDate,
+          ...(patchScope ? { scope: patchScope } : {}),
+          requestBody: {
+            startDate,
+            dueTime,
+            isAllDay: todoEvent.isAllDay,
+            ...(recurrenceGroup ? { recurrenceGroup } : {}),
+          },
+        })
+      }
+
+      if (isTodoFollowingScope(patchScope)) {
+        const requestKey = `${todoEvent.id}-${occurrenceDate}`
+        const nextSequence = (recurringTodoPatchSeqRef.current.get(requestKey) ?? 0) + 1
+        recurringTodoPatchSeqRef.current.set(requestKey, nextSequence)
+
+        void resolveFutureTodoRecurrenceGroup(todoEvent.id, occurrenceDate, start).then(
+          (recurrenceGroup) => {
+            const latestSequence = recurringTodoPatchSeqRef.current.get(requestKey)
+            if (latestSequence !== nextSequence) return
+            submitPatch(recurrenceGroup)
+          },
+        )
+        return
+      }
+
+      submitPatch()
+    },
+    [patchTodoMutate, resolveFutureTodoRecurrenceGroup],
+  )
+
+  return { patchTodoTiming }
+}
diff --git a/src/features/Calendar/utils/helpers/calendarRecurrenceScope.ts b/src/features/Calendar/utils/helpers/calendarRecurrenceScope.ts
new file mode 100644
index 0000000..74e7cb9
--- /dev/null
+++ b/src/features/Calendar/utils/helpers/calendarRecurrenceScope.ts
@@ -0,0 +1,25 @@
+import type { RecurrenceEventSeriesScope } from '@/shared/constants/recurrenceScope'
+import { RECURRENCE_EVENT_SCOPE, RECURRENCE_TODO_SCOPE } from '@/shared/constants/recurrenceScope'
+import type { RecurrenceTodoScope } from '@/shared/types/recurrence/recurrence'
+import type { EditConfirmOption } from '@/shared/ui/Modals'
+
+export const getEventOccurrenceScope = (
+  isRecurring: boolean,
+): RecurrenceEventSeriesScope | undefined =>
+  isRecurring ? RECURRENCE_EVENT_SCOPE.THIS_EVENT : undefined
+
+export const getTodoOccurrenceScope = (isRecurring: boolean): RecurrenceTodoScope | undefined =>
+  isRecurring ? RECURRENCE_TODO_SCOPE.THIS_TODO : undefined
+
+export const getEventScopeFromEditOption = (
+  option: EditConfirmOption,
+): RecurrenceEventSeriesScope =>
+  option === 'future'
+    ? RECURRENCE_EVENT_SCOPE.THIS_AND_FOLLOWING_EVENTS
+    : RECURRENCE_EVENT_SCOPE.THIS_EVENT
+
+export const getTodoScopeFromEditOption = (option: EditConfirmOption): RecurrenceTodoScope =>
+  option === 'future' ? RECURRENCE_TODO_SCOPE.THIS_AND_FOLLOWING : RECURRENCE_TODO_SCOPE.THIS_TODO
+
+export const isTodoFollowingScope = (scope?: RecurrenceTodoScope): boolean =>
+  scope === RECURRENCE_TODO_SCOPE.THIS_AND_FOLLOWING

From 4fd5f267751be9a399ab306645b998819b0f7abc Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sat, 16 May 2026 17:11:19 +0900
Subject: [PATCH 05/23] =?UTF-8?q?fix:=20=EC=9D=BC=EC=A0=95=20=EC=A0=9C?=
 =?UTF-8?q?=EB=AA=A9=20=EA=B2=80=EC=83=89=20=ED=98=B8=EC=B6=9C=20=EA=B0=84?=
 =?UTF-8?q?=EA=B2=A9=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx
index 06c54c4..d8b105f 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx
@@ -8,6 +8,8 @@ import { theme } from '@/shared/styles/theme'
 import type { ScheduleEditorFormValues } from '@/shared/types/event/event'
 import TitleSuggestionInput from '@/shared/ui/scheduleTodo/TitleSuggestionInput/TitleSuggestionInput'
 
+const TITLE_SEARCH_THROTTLE_MS = 300
+
 type ScheduleTitleFieldProps = {
   portalTarget?: HTMLElement | null
   autoFocus?: boolean
@@ -23,7 +25,7 @@ const ScheduleTitleField = ({
 }: ScheduleTitleFieldProps) => {
   const { control } = useFormContext<ScheduleEditorFormValues>()
   const eventTitleKeyword = (useWatch({ control, name: 'eventTitle' }) ?? '').trim()
-  const throttledEventTitleKeyword = useThrottledValue(eventTitleKeyword, 150)
+  const throttledEventTitleKeyword = useThrottledValue(eventTitleKeyword, TITLE_SEARCH_THROTTLE_MS)
   const { data: eventTitleHistoryData } = useEventTitleHistoryQuery(
     throttledEventTitleKeyword,
     Boolean(throttledEventTitleKeyword),

From 4aa1fc9de485645bd429cfc88fa5f49d339d9ffa Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sat, 16 May 2026 17:11:24 +0900
Subject: [PATCH 06/23] =?UTF-8?q?fix:=20=EC=9D=BC=EC=A0=95=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B3=B8=20=EC=8B=9C=EA=B0=84=20=EB=B2=94=EC=9C=84=20=EB=B3=B4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hooks/form/useScheduleFormFields.ts       | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/shared/hooks/form/useScheduleFormFields.ts b/src/shared/hooks/form/useScheduleFormFields.ts
index cd0b831..f50575a 100644
--- a/src/shared/hooks/form/useScheduleFormFields.ts
+++ b/src/shared/hooks/form/useScheduleFormFields.ts
@@ -40,6 +40,35 @@ const pad2 = (value: number) => String(value).padStart(2, '0')
 
 const formatTimeFromDate = (value: Date) => `${pad2(value.getHours())}:${pad2(value.getMinutes())}`
 
+const toMinutes = (value?: string) => {
+  if (!value) return null
+  const [hour, minute] = value.split(':').map((item) => Number.parseInt(item, 10))
+  if (Number.isNaN(hour) || Number.isNaN(minute)) return null
+  return hour * 60 + minute
+}
+
+const formatTimeFromMinutes = (value: number) => {
+  const normalizedValue = Math.max(0, Math.min(value, 23 * 60 + 59))
+  const hour = Math.floor(normalizedValue / 60)
+  const minute = normalizedValue % 60
+  return `${pad2(hour)}:${pad2(minute)}`
+}
+
+const normalizeScheduleTimeRange = (startTime: string, endTime: string) => {
+  const startMinutes = toMinutes(startTime)
+  const endMinutes = toMinutes(endTime)
+
+  if (startMinutes == null || endMinutes == null || startMinutes !== endMinutes) {
+    return { startTime, endTime }
+  }
+
+  if (endMinutes >= 60) {
+    return { startTime: formatTimeFromMinutes(endMinutes - 60), endTime }
+  }
+
+  return { startTime, endTime: formatTimeFromMinutes(startMinutes + 60) }
+}
+
 const toDate = (value: string | Date) => new Date(value)
 
 const isSameDateTime = (left: string | Date, right: string | Date) =>
@@ -75,6 +104,9 @@ const buildScheduleDefaultValues = ({
   const initialAddress = initialEvent?.address ?? null
   const initialColor = initialEvent?.color ?? 'BLUE'
   const initialIsAllDay = initialEvent?.isAllDay ?? false
+  const defaultStartTime = draftValues?.startTime ?? formatTimeFromDate(defaultStart)
+  const defaultEndTime = draftValues?.endTime ?? formatTimeFromDate(defaultEnd)
+  const { startTime, endTime } = normalizeScheduleTimeRange(defaultStartTime, defaultEndTime)
   const mappedRepeatConfig = mapRecurrenceGroupToRepeatConfig(initialEvent?.recurrenceGroup)
   const initialRepeatConfig: RepeatConfigSchema = {
     ...defaultRepeatConfig,
@@ -91,8 +123,8 @@ const buildScheduleDefaultValues = ({
     address: draftValues?.address ?? initialAddress,
     eventStartDate: draftValues?.startDate ?? defaultStart,
     eventEndDate: draftValues?.endDate ?? defaultEnd,
-    eventStartTime: draftValues?.startTime ?? formatTimeFromDate(defaultStart),
-    eventEndTime: draftValues?.endTime ?? formatTimeFromDate(defaultEnd),
+    eventStartTime: startTime,
+    eventEndTime: endTime,
     isAllday: draftValues?.isAllday ?? initialIsAllDay,
     eventColor: draftValues?.eventColor ?? initialColor,
     repeatConfig: draftValues?.repeatConfig ?? initialRepeatConfig,

From 99d2e9b756f0469613806e3687b361f82e76b327 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sun, 17 May 2026 14:21:28 +0900
Subject: [PATCH 07/23] =?UTF-8?q?fix:=20=EA=B3=B5=EC=9C=A0=20=EC=9D=BC?=
 =?UTF-8?q?=EC=A0=95=20=EC=B4=88=EB=8C=80=EC=9E=90=20=EC=83=81=ED=83=9C=20?=
 =?UTF-8?q?=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hooks/addSchedule/useSchedulePatch.ts     |  5 +-
 .../hooks/form/useScheduleFormFields.ts       |  6 +-
 src/shared/types/calendar/types.ts            |  7 +-
 src/shared/types/modal/scheduleEditor.ts      |  3 +-
 .../ScheduleEditor/ScheduleEditorContent.tsx  |  2 +
 .../ScheduleEditor/ScheduleEditorFields.tsx   | 14 ++-
 .../ScheduleEditor/ShareSchedulePanel.tsx     | 90 +++++++++++--------
 7 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/src/shared/hooks/addSchedule/useSchedulePatch.ts b/src/shared/hooks/addSchedule/useSchedulePatch.ts
index 591ef9e..77ba351 100644
--- a/src/shared/hooks/addSchedule/useSchedulePatch.ts
+++ b/src/shared/hooks/addSchedule/useSchedulePatch.ts
@@ -116,7 +116,10 @@ export const useSchedulePatch = ({
       const initialAddress = initialEvent?.address ?? null
       const initialColor = initialEvent?.color
       const initialIsAllday = initialEvent?.isAllDay ?? false
-      const initialFriendIds = initialEvent?.friendIds ?? []
+      const initialFriendIds =
+        initialEvent?.friendIds ??
+        initialEvent?.eventParticipantInfo?.map((participant) => participant.eventParticipantId) ??
+        []
       const initialStart =
         initialEvent?.start != null ? formatDateTime(new Date(initialEvent.start)) : undefined
       const initialEnd =
diff --git a/src/shared/hooks/form/useScheduleFormFields.ts b/src/shared/hooks/form/useScheduleFormFields.ts
index f50575a..a75184c 100644
--- a/src/shared/hooks/form/useScheduleFormFields.ts
+++ b/src/shared/hooks/form/useScheduleFormFields.ts
@@ -108,6 +108,10 @@ const buildScheduleDefaultValues = ({
   const defaultEndTime = draftValues?.endTime ?? formatTimeFromDate(defaultEnd)
   const { startTime, endTime } = normalizeScheduleTimeRange(defaultStartTime, defaultEndTime)
   const mappedRepeatConfig = mapRecurrenceGroupToRepeatConfig(initialEvent?.recurrenceGroup)
+  const initialFriendIds =
+    initialEvent?.friendIds ??
+    initialEvent?.eventParticipantInfo?.map((participant) => participant.eventParticipantId) ??
+    []
   const initialRepeatConfig: RepeatConfigSchema = {
     ...defaultRepeatConfig,
     ...mappedRepeatConfig,
@@ -128,7 +132,7 @@ const buildScheduleDefaultValues = ({
     isAllday: draftValues?.isAllday ?? initialIsAllDay,
     eventColor: draftValues?.eventColor ?? initialColor,
     repeatConfig: draftValues?.repeatConfig ?? initialRepeatConfig,
-    friendIds: initialEvent?.friendIds ?? [],
+    friendIds: initialFriendIds,
   }
 }
 
diff --git a/src/shared/types/calendar/types.ts b/src/shared/types/calendar/types.ts
index d53fd04..28117b4 100644
--- a/src/shared/types/calendar/types.ts
+++ b/src/shared/types/calendar/types.ts
@@ -15,7 +15,12 @@ export type Event = {
   color: EventColorType
   recurrenceGroup: RecurrenceGroup | null
   isShared?: boolean
-  friendIds: number[]
+  friendIds?: number[]
+  eventParticipantInfo?: Array<{
+    eventParticipantId: number
+    email: string
+    name: string
+  }>
 }
 
 export type CalendarEvent = Omit<Event, 'start' | 'end'> & {
diff --git a/src/shared/types/modal/scheduleEditor.ts b/src/shared/types/modal/scheduleEditor.ts
index a1ae774..f47d0a8 100644
--- a/src/shared/types/modal/scheduleEditor.ts
+++ b/src/shared/types/modal/scheduleEditor.ts
@@ -14,9 +14,10 @@ export type ScheduleEditorFormProps = {
   eventId: CalendarEvent['id']
   onClose: () => void
   isEditing?: boolean
-  isShared?: boolean
+  isShared: boolean
   headerTitlePortalTarget?: HTMLElement | null
   initialEvent?: CalendarEvent | null
+  invitedParticipants?: CalendarEvent['eventParticipantInfo']
   onEventColorChange?: (eventId: CalendarEvent['id'], color: EventColorType) => void
   onEventTitleConfirm?: (eventId: CalendarEvent['id'], title: string) => void
   onSharedChange?: (isShared: boolean) => void
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
index 9b85368..0c24e5c 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
@@ -34,6 +34,7 @@ const ScheduleEditorContent = ({
   headerTitlePortalTarget,
   modalWrapperElement,
   initialEvent,
+  invitedParticipants,
   eventId,
   onEventColorChange,
   onEventTitleConfirm,
@@ -185,6 +186,7 @@ const ScheduleEditorContent = ({
           isShared={isShared}
           modalWrapperElement={modalWrapperElement}
           mode={mode}
+          invitedParticipants={invitedParticipants ?? initialEvent?.eventParticipantInfo}
           handleAllDayToggle={handleAllDayToggle}
           updateConfig={updateConfig}
           handleRepeatType={handleRepeatType}
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx
index a77ebe5..413a3a5 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx
@@ -11,7 +11,12 @@ import ShareSchedulePanel from './ShareSchedulePanel'
 
 type ScheduleEditorFieldsProps = Pick<
   ScheduleEditorFormProps,
-  'headerTitlePortalTarget' | 'isEditing' | 'isShared' | 'modalWrapperElement' | 'mode'
+  | 'headerTitlePortalTarget'
+  | 'isEditing'
+  | 'isShared'
+  | 'invitedParticipants'
+  | 'modalWrapperElement'
+  | 'mode'
 > & {
   updateConfig: (changes: Partial<RepeatConfig>) => void
   handleRepeatType: (value: RepeatType) => void
@@ -24,6 +29,7 @@ const ScheduleEditorFields = ({
   headerTitlePortalTarget,
   isEditing = false,
   isShared = false,
+  invitedParticipants,
   modalWrapperElement,
   mode = 'modal',
   updateConfig,
@@ -45,7 +51,11 @@ const ScheduleEditorFields = ({
         <ScheduleDetailsSection mode={mode} modalWrapperElement={modalWrapperElement} />
       </S.FormContent>
       <ScheduleRepeatSection updateConfig={updateConfig} handleRepeatType={handleRepeatType} />
-      <ShareSchedulePanel onSharedChange={onSharedChange} />
+      <ShareSchedulePanel
+        isShared={isShared}
+        invitedParticipants={invitedParticipants}
+        onSharedChange={onSharedChange}
+      />
     </>
   )
 }
diff --git a/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx b/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
index de45440..25c3b2f 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
@@ -1,8 +1,9 @@
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
 import { useFormContext, useWatch } from 'react-hook-form'
 
 import Arrow from '@/shared/assets/icons/chevron.svg?react'
 import Close from '@/shared/assets/icons/close.svg?react'
+import type { CalendarEvent } from '@/shared/types/calendar/types'
 import type { ScheduleEditorFormValues } from '@/shared/types/event/event'
 import type { ScheduleShareFriend } from '@/shared/types/schedule/shareFriend'
 import SearchFriend from '@/shared/ui/scheduleTodo/SearchFriend/SearchFriend'
@@ -10,30 +11,43 @@ import SearchFriend from '@/shared/ui/scheduleTodo/SearchFriend/SearchFriend'
 import * as S from './index.style'
 
 type ShareSchedulePanelProps = {
+  isShared?: boolean
+  invitedParticipants?: CalendarEvent['eventParticipantInfo']
   onSharedChange?: (isShared: boolean) => void
 }
 
-const ShareSchedulePanel = ({ onSharedChange }: ShareSchedulePanelProps) => {
+const ShareSchedulePanel = ({
+  isShared = false,
+  invitedParticipants = [],
+  onSharedChange,
+}: ShareSchedulePanelProps) => {
   const { control, setValue } = useFormContext<ScheduleEditorFormValues>()
   const [isOpen, setIsOpen] = useState(false)
   const [selectedFriends, setSelectedFriends] = useState<ScheduleShareFriend[]>([])
   const selectedFriendIds = useWatch({ control, name: 'friendIds' }) ?? []
-
-  useEffect(() => {
-    onSharedChange?.(selectedFriendIds.length > 0)
-  }, [onSharedChange, selectedFriendIds.length])
+  const visibleInvitedParticipants = invitedParticipants.filter((participant) =>
+    selectedFriendIds.includes(participant.eventParticipantId),
+  )
+  const displayedFriends = [
+    ...visibleInvitedParticipants.map((participant) => ({
+      id: String(participant.eventParticipantId),
+      name: participant.name,
+    })),
+    ...selectedFriends.map((friend) => ({
+      id: friend.userId,
+      name: friend.userName,
+    })),
+  ]
 
   const handleToggleFriend = (friend: ScheduleShareFriend) => {
     const friendId = Number(friend.userId)
     const isSelected = selectedFriendIds.includes(friendId)
+    const nextFriendIds = isSelected
+      ? selectedFriendIds.filter((selectedFriendId) => selectedFriendId !== friendId)
+      : [...selectedFriendIds, friendId]
 
-    setValue(
-      'friendIds',
-      isSelected
-        ? selectedFriendIds.filter((selectedFriendId) => selectedFriendId !== friendId)
-        : [...selectedFriendIds, friendId],
-      { shouldDirty: true, shouldValidate: true },
-    )
+    setValue('friendIds', nextFriendIds, { shouldDirty: true, shouldValidate: true })
+    onSharedChange?.(nextFriendIds.length > 0)
 
     setSelectedFriends((previous) => {
       if (isSelected) {
@@ -46,11 +60,11 @@ const ShareSchedulePanel = ({ onSharedChange }: ShareSchedulePanelProps) => {
 
   const handleRemoveFriend = (friendId: ScheduleShareFriend['userId']) => {
     const numericFriendId = Number(friendId)
-    setValue(
-      'friendIds',
-      selectedFriendIds.filter((selectedFriendId) => selectedFriendId !== numericFriendId),
-      { shouldDirty: true, shouldValidate: true },
+    const nextFriendIds = selectedFriendIds.filter(
+      (selectedFriendId) => selectedFriendId !== numericFriendId,
     )
+    setValue('friendIds', nextFriendIds, { shouldDirty: true, shouldValidate: true })
+    onSharedChange?.(nextFriendIds.length > 0)
     setSelectedFriends((previous) => previous.filter((friend) => friend.userId !== friendId))
   }
 
@@ -60,7 +74,7 @@ const ShareSchedulePanel = ({ onSharedChange }: ShareSchedulePanelProps) => {
         type="button"
         onClick={() => setIsOpen(!isOpen)}
         isOpen={isOpen}
-        isShared={selectedFriendIds.length > 0}
+        isShared={isShared || selectedFriendIds.length > 0}
       >
         <div className="section-title">
           <div className="dot" />
@@ -72,25 +86,27 @@ const ShareSchedulePanel = ({ onSharedChange }: ShareSchedulePanelProps) => {
         <S.FriendSection>
           <SearchFriend selectedFriendIds={selectedFriendIds} onToggleFriend={handleToggleFriend} />
 
-          <div className="added-friend-list">
-            {selectedFriends.map((friend) => (
-              <div key={friend.userId} className="added-friend">
-                {friend.userName}
-                <button
-                  type="button"
-                  className="remove-friend-button"
-                  onClick={(event) => {
-                    event.stopPropagation()
-                    handleRemoveFriend(friend.userId)
-                  }}
-                  aria-label={`${friend.userName} 삭제`}
-                  title={`${friend.userName} 삭제`}
-                >
-                  <Close width={14} height={14} />
-                </button>
-              </div>
-            ))}
-          </div>
+          {displayedFriends.length > 0 && (
+            <div className="added-friend-list">
+              {displayedFriends.map((friend) => (
+                <div key={friend.id} className="added-friend">
+                  {friend.name}
+                  <button
+                    type="button"
+                    className="remove-friend-button"
+                    onClick={(event) => {
+                      event.stopPropagation()
+                      handleRemoveFriend(friend.id)
+                    }}
+                    aria-label={`${friend.name} 삭제`}
+                    title={`${friend.name} 삭제`}
+                  >
+                    <Close width={14} height={14} />
+                  </button>
+                </div>
+              ))}
+            </div>
+          )}
         </S.FriendSection>
       )}
     </S.FriendWrapper>

From 8e81e91838d7d42a31c2b061f6546f8e2f5d8582 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sun, 17 May 2026 14:21:42 +0900
Subject: [PATCH 08/23] =?UTF-8?q?style:=20=EC=B4=88=EB=8C=80=EB=90=9C=20?=
 =?UTF-8?q?=EC=B9=9C=EA=B5=AC=20=EA=B2=80=EC=83=89=20=EA=B2=B0=EA=B3=BC=20?=
 =?UTF-8?q?=EA=B0=95=EC=A1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/scheduleTodo/SearchFriend/SearchFriend.style.ts   | 9 +++++----
 src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.style.ts b/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.style.ts
index ba72700..9f53d30 100644
--- a/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.style.ts
+++ b/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.style.ts
@@ -90,11 +90,12 @@ export const SearchResultItem = styled.button<{ isAdded: boolean }>`
     background-color 0.2s ease,
     color 0.2s ease;
   background-color: ${(props) => (props.isAdded ? theme.colors.share.base : '#f1f1f1')};
+  border: 1px solid ${(props) => (props.isAdded ? theme.colors.share.point : 'transparent')};
 
   .divider {
     width: 1px;
     height: 16px;
-    background-color: #d2d3d2;
+    background-color: ${(props) => (props.isAdded ? theme.colors.share.point : '#d2d3d2')};
     margin: 0 8px;
   }
   .plus {
@@ -117,10 +118,10 @@ export const EmptySearchResult = styled.div`
 `
 
 export const Name = styled.div<{ isAdded: boolean }>`
-  color: ${(props) => (props.isAdded ? '#484569' : '#655446')};
+  color: ${(props) => (props.isAdded ? theme.colors.share.point : '#655446')};
 `
 
-export const Email = styled.div`
-  color: ${theme.colors.textColor2};
+export const Email = styled.div<{ isAdded?: boolean }>`
+  color: ${(props) => (props.isAdded ? theme.colors.share.point : theme.colors.textColor2)};
   font-weight: 400;
 `
diff --git a/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx b/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx
index c26207a..ee731b8 100644
--- a/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx
+++ b/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx
@@ -88,14 +88,14 @@ const SearchFriend = ({ selectedFriendIds, onToggleFriend }: SearchFriendProps)
               >
                 <S.Name isAdded={isSelected}>{friend.userName}</S.Name>
                 <div className="divider" />
-                <S.Email>{friend.email}</S.Email>
+                <S.Email isAdded={isSelected}>{friend.email}</S.Email>
                 {isSelected ? (
                   <Close
                     aria-hidden="true"
                     focusable="false"
                     height={18}
                     width={18}
-                    color={theme.colors.textColor3}
+                    color={theme.colors.share.point}
                     className="close"
                   />
                 ) : (

From dba1c25e811862cfde398d95f001505bedeb2b3a Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sun, 17 May 2026 14:22:05 +0900
Subject: [PATCH 09/23] =?UTF-8?q?fix:=20=EC=BA=98=EB=A6=B0=EB=8D=94=20?=
 =?UTF-8?q?=EC=9D=BC=EC=A0=95=20=ED=91=9C=EC=8B=9C=20=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Calendar/components/CustomEvent/CustomEvent.style.ts       | 2 +-
 src/features/Calendar/hooks/useCalendarApiEvents.ts            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/features/Calendar/components/CustomEvent/CustomEvent.style.ts b/src/features/Calendar/components/CustomEvent/CustomEvent.style.ts
index d067623..caf9ff2 100644
--- a/src/features/Calendar/components/CustomEvent/CustomEvent.style.ts
+++ b/src/features/Calendar/components/CustomEvent/CustomEvent.style.ts
@@ -98,7 +98,7 @@ export const WeekEventContainer = styled.div<{
 export const EventTitle = styled.div`
   font-weight: 400;
   font-size: 12px;
-  width: 75px;
+  width: 55px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/src/features/Calendar/hooks/useCalendarApiEvents.ts b/src/features/Calendar/hooks/useCalendarApiEvents.ts
index 6b2c375..ffed916 100644
--- a/src/features/Calendar/hooks/useCalendarApiEvents.ts
+++ b/src/features/Calendar/hooks/useCalendarApiEvents.ts
@@ -47,8 +47,9 @@ const toTodoEvent = (todo: TodoType): CalendarEvent => {
     location: null,
     isAllDay: todo.isAllDay,
     color: todo.color ?? 'GRAY',
+
     recurrenceGroup: null,
-    friendIds: [],
+    eventParticipantInfo: [],
     type: 'todo',
     isDone: todo.isCompleted,
     isRecurring: todo.isRecurring,

From 59bd10007487b6fd700a7e14d8f842caf79d534d Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sun, 17 May 2026 14:22:14 +0900
Subject: [PATCH 10/23] =?UTF-8?q?fix:=20=EB=B0=98=EB=B3=B5=20=EC=98=B5?=
 =?UTF-8?q?=EC=85=98=20=EC=84=A0=ED=83=9D=20=EC=8B=9C=20=EC=83=81=EC=84=B8?=
 =?UTF-8?q?=20=ED=8C=A8=EB=84=90=20=EC=97=B4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx | 2 ++
 src/shared/ui/Modals/TodoEditor/TodoRepeatSection.tsx         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx
index af8cdf7..87b5177 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx
@@ -30,7 +30,9 @@ const ScheduleRepeatSection = ({ updateConfig, handleRepeatType }: ScheduleRepea
     handleRepeatType(value)
     if (willClearRepeatType || willClearCustomRepeat) {
       setIsRepeatDetailOpen(false)
+      return
     }
+    setIsRepeatDetailOpen(true)
   }
 
   return (
diff --git a/src/shared/ui/Modals/TodoEditor/TodoRepeatSection.tsx b/src/shared/ui/Modals/TodoEditor/TodoRepeatSection.tsx
index f9c11fe..a7b53c6 100644
--- a/src/shared/ui/Modals/TodoEditor/TodoRepeatSection.tsx
+++ b/src/shared/ui/Modals/TodoEditor/TodoRepeatSection.tsx
@@ -30,7 +30,9 @@ const TodoRepeatSection = ({ updateConfig, handleRepeatType }: TodoRepeatSection
     handleRepeatType(value)
     if (willClearRepeatType || willClearCustomRepeat) {
       setIsRepeatDetailOpen(false)
+      return
     }
+    setIsRepeatDetailOpen(true)
   }
 
   const repeatEndDate = todoDate ? new Date(todoDate) : null

From 152faa60ceabb8d7c2f57fd0a7d3af216a99e607 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sun, 17 May 2026 20:32:54 +0900
Subject: [PATCH 11/23] =?UTF-8?q?refactor:=20=EC=BA=98=EB=A6=B0=EB=8D=94?=
 =?UTF-8?q?=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=ED=9B=85=20=EB=B6=84?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomCalendar/CalendarModals.tsx         |  18 +-
 .../CustomCalendar/CustomCalendar.tsx         | 385 +-----------------
 .../CustomCalendar/CustomCalendar.types.ts    |  32 ++
 .../CustomCalendar/CustomCalendarDialogs.tsx  |  17 +-
 src/features/Calendar/hooks/index.ts          |   2 +-
 .../hooks/useCalendarDateCellWrapper.tsx      |  31 ++
 .../hooks/useCalendarDeleteConfirm.ts         |  90 ++++
 .../Calendar/hooks/useCalendarPortals.ts      |   9 -
 .../hooks/useCalendarRecurringDropConfirm.ts  |  68 ++++
 .../hooks/useCalendarSelectionBridge.ts       |  34 ++
 .../Calendar/hooks/useCalendarTodoActions.ts  |  40 ++
 .../hooks/useCalendarViewCreationHandlers.ts  | 100 +++++
 .../hooks/useCustomCalendarController.tsx     | 251 ++++++++++++
 .../hooks/useCustomCalendarMutations.ts       |  24 ++
 .../utils/helpers/calendarModalEvent.ts       |  26 ++
 15 files changed, 722 insertions(+), 405 deletions(-)
 create mode 100644 src/features/Calendar/components/CustomCalendar/CustomCalendar.types.ts
 create mode 100644 src/features/Calendar/hooks/useCalendarDateCellWrapper.tsx
 create mode 100644 src/features/Calendar/hooks/useCalendarDeleteConfirm.ts
 delete mode 100644 src/features/Calendar/hooks/useCalendarPortals.ts
 create mode 100644 src/features/Calendar/hooks/useCalendarRecurringDropConfirm.ts
 create mode 100644 src/features/Calendar/hooks/useCalendarSelectionBridge.ts
 create mode 100644 src/features/Calendar/hooks/useCalendarTodoActions.ts
 create mode 100644 src/features/Calendar/hooks/useCalendarViewCreationHandlers.ts
 create mode 100644 src/features/Calendar/hooks/useCustomCalendarController.tsx
 create mode 100644 src/features/Calendar/hooks/useCustomCalendarMutations.ts
 create mode 100644 src/features/Calendar/utils/helpers/calendarModalEvent.ts

diff --git a/src/features/Calendar/components/CustomCalendar/CalendarModals.tsx b/src/features/Calendar/components/CustomCalendar/CalendarModals.tsx
index 3bf41dc..f17d8b5 100644
--- a/src/features/Calendar/components/CustomCalendar/CalendarModals.tsx
+++ b/src/features/Calendar/components/CustomCalendar/CalendarModals.tsx
@@ -8,6 +8,8 @@ import ScheduleEditorModal from '@/shared/ui/Modals/ScheduleEditor'
 import TodoEditorModal from '@/shared/ui/Modals/TodoEditor'
 import { buildDefaultItemEditorDraft } from '@/shared/utils'
 
+import type { CalendarEventActions } from './CustomCalendar.types'
+
 type CalendarModalsProps = {
   modalDate: string
   modalEventId: CalendarEvent['id'] | null
@@ -15,19 +17,7 @@ type CalendarModalsProps = {
   isModalEditing: boolean
   modalMode: 'modal' | 'inline'
   onCloseModal: () => void
-  eventActions: {
-    onEventColorChange: (eventId: CalendarEvent['id'], color: CalendarEvent['color']) => void
-    onEventTitleConfirm: (eventId: CalendarEvent['id'], title: CalendarEvent['title']) => void
-    onEventSharedChange: (eventId: CalendarEvent['id'], isShared: boolean) => void
-    onEventTypeChange: (eventId: CalendarEvent['id'], type: 'todo' | 'schedule') => void
-    onEventTimingChange: (
-      eventId: CalendarEvent['id'],
-      start: Date,
-      end: Date,
-      allDay: boolean,
-      occurrenceDate?: CalendarEvent['occurrenceDate'],
-    ) => void
-  }
+  eventActions: CalendarEventActions
 }
 
 type DraftBackedModalProps = {
@@ -38,7 +28,7 @@ type DraftBackedModalProps = {
   isModalEditing: boolean
   modalMode: 'modal' | 'inline'
   onCloseModal: () => void
-  eventActions: CalendarModalsProps['eventActions']
+  eventActions: CalendarEventActions
 }
 
 const DraftBackedModal = ({
diff --git a/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx b/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx
index a34adb4..8b57592 100644
--- a/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx
+++ b/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx
@@ -3,39 +3,11 @@ import 'moment/locale/ko'
 import 'react-big-calendar/lib/css/react-big-calendar.css'
 
 import moment from 'moment'
-import { cloneElement, type MouseEvent, useCallback, useEffect, useMemo, useState } from 'react'
-import { Calendar, type DateCellWrapperProps, momentLocalizer } from 'react-big-calendar'
-import type { EventInteractionArgs } from 'react-big-calendar/lib/addons/dragAndDrop'
+import { Calendar, momentLocalizer } from 'react-big-calendar'
 import withDragAndDrop from 'react-big-calendar/lib/addons/dragAndDrop'
 
-import {
-  useCalendarApiEvents,
-  useCalendarCreateHandlers,
-  useCalendarDateRange,
-  useCalendarDayViewTiming,
-  useCalendarDraftEvent,
-  useCalendarDragDrop,
-  useCalendarKeyDelete,
-  useCalendarModal,
-  useCalendarNavigation,
-  useCalendarRbcProps,
-  useCalendarResponsive,
-  useCalendarSelection,
-  useCalendarTodoTimingPatch,
-  useDayViewHandlers,
-  useStoredCalendarView,
-} from '@/features/Calendar/hooks'
-import { useCalendarEvents } from '@/features/Calendar/hooks/useCalendarEvents'
-import {
-  getEventOccurrenceScope,
-  getEventScopeFromEditOption,
-  getTodoScopeFromEditOption,
-} from '@/features/Calendar/utils/helpers/calendarRecurrenceScope'
-import { getEventOccurrenceKey } from '@/features/Calendar/utils/helpers/dayViewHelpers'
-import { useCalendarMutation } from '@/shared/hooks/query/useCalendarMutation'
-import { useTodoMutations } from '@/shared/hooks/query/useTodoMutations'
+import { useCustomCalendarController } from '@/features/Calendar/hooks/useCustomCalendarController'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
-import type { EditConfirmOption } from '@/shared/ui/Modals'
 
 import CalendarModals from './CalendarModals'
 import * as S from './CustomCalendar.style'
@@ -45,352 +17,33 @@ import CustomCalendarMobileActions from './CustomCalendarMobileActions'
 moment.locale('ko')
 const localizer = momentLocalizer(moment)
 const DragAndDropCalendar = withDragAndDrop<CalendarEvent, object>(Calendar)
-export type SelectDateSource = 'date-cell' | 'slot' | 'header' | 'date-header'
+export type { SelectDateSource } from './CustomCalendar.types'
 
 type CustomCalendarProps = {
   onSelectedDateChange?: (selectedDate: Date) => void
 }
 
 const CustomCalendar = ({ onSelectedDateChange }: CustomCalendarProps) => {
-  // 사용자 뷰 상태(월/주/일) 저장
-  const { view, setView } = useStoredCalendarView()
-  const [date, setDate] = useState<Date>(new Date())
-  // 현재 뷰 기준으로 서버 조회 범위 계산
-  const { startDate, endDate } = useCalendarDateRange(view, date)
-  // 서버 일정 목록 조회
-  const { events: apiEvents, refetch: refetchEvents } = useCalendarApiEvents(startDate, endDate)
-
-  const { usePatchEvent, useDeleteEvent } = useCalendarMutation()
-  const { mutate: patchEventMutate } = usePatchEvent()
-  const { mutate: deleteEventMutate } = useDeleteEvent()
-  const { usePatchCompleteTodo, usePatchTodo, useDeleteTodo } = useTodoMutations()
-  const { mutate: patchCompleteTodoMutate } = usePatchCompleteTodo()
-  const { mutate: patchTodoMutate } = usePatchTodo()
-  const { mutate: deleteTodoMutate } = useDeleteTodo()
-  const { patchTodoTiming } = useCalendarTodoTimingPatch({ patchTodoMutate })
-  const [deleteConfirm, setDeleteConfirm] = useState<{
-    isOpen: boolean
-    eventId: CalendarEvent['id'] | null
-    title: string
-    occurrenceDate: string
-  }>({ isOpen: false, eventId: null, title: '', occurrenceDate: '' })
-  const [recurringDropConfirm, setRecurringDropConfirm] = useState<{
-    isOpen: boolean
-    target: 'event' | 'todo'
-    args: EventInteractionArgs<CalendarEvent> | null
-  }>({ isOpen: false, target: 'event', args: null })
-  // 로컬 캘린더 이벤트 상태 및 동작
   const {
-    events,
-    addEvent: enqueueEvent,
-    moveEvent,
-    resizeEvent,
-    updateEventTime: updateLocalEventTime,
-    updateEventColor,
-    updateEventTiming,
-    updateEventType,
-    updateEventTitle,
-    updateEventShared,
-    toggleEventDone,
-    removeEvent,
-  } = useCalendarEvents({ initialEvents: apiEvents })
-
-  // Todo 완료 토글
-  const handleToggleTodo = useCallback(
-    (eventId: CalendarEvent['id']) => {
-      const target = events.find(
-        (eventItem) => eventItem.id === eventId && eventItem.type === 'todo',
-      )
-      if (!target || target.type !== 'todo') {
-        return
-      }
-      const nextCompleted = !target.isDone
-      toggleEventDone(eventId, 'todo')
-      const occurrenceDate = moment(target.start).format('YYYY-MM-DD')
-      patchCompleteTodoMutate({
-        todoId: eventId,
-        occurrenceDate,
-        isCompleted: nextCompleted,
-      })
-    },
-    [events, patchCompleteTodoMutate, toggleEventDone],
-  )
-
-  // 반응형 레이아웃 판단
-  const isDesktop = useCalendarResponsive()
-  const isInlineMode = isDesktop
-  // 일정 삭제(반복 여부 포함)
-  const handleRemoveEvent = useCallback(
-    (eventId: CalendarEvent['id'], occurrenceDate: string, isRecurring: boolean) => {
-      const params = {
-        ...(isRecurring ? { scope: getEventOccurrenceScope(isRecurring) } : {}),
-        occurrenceDate: moment(occurrenceDate).format('YYYY-MM-DDTHH:mm:ss'),
-      }
-      deleteEventMutate(
-        {
-          eventId,
-          params,
-        },
-        {
-          onSuccess: () => {
-            refetchEvents()
-          },
-        },
-      )
-    },
-    [deleteEventMutate, refetchEvents],
-  )
-
-  // 반복 일정/할 일 판정
-  const isRecurring = useCallback(
-    (eventId: CalendarEvent['id']) => {
-      const target = events.find((eventItem) => eventItem.id === eventId)
-      if (!target) return false
-      if (target.type === 'todo') {
-        return Boolean(target.isRecurring)
-      }
-      return target.recurrenceGroup != null
-    },
-    [events],
-  )
-
-  // 모달 상태/핸들러
-  const { modal, modalDate, isModalEditing, handleAddEvent, handleEventClick, handleCloseModal } =
-    useCalendarModal({
-      currentDate: date,
-      removeEvent: handleRemoveEvent,
-      isRecurring,
-    })
-
-  const handleOpenEventFromCalendar = useCallback(
-    (event: CalendarEvent) => {
-      if (!isModalEditing && modal.isOpen && modal.eventId != null) {
-        removeEvent(modal.eventId)
-      }
-      handleEventClick(event)
-    },
-    [handleEventClick, isModalEditing, modal.eventId, modal.isOpen, removeEvent],
-  )
-
-  // 선택 상태 관리
-  const {
-    selectedDate,
-    setSelectedDate,
-    selectedEventId,
-    setSelectedEventId,
-    selectedEventKey,
-    setSelectedEventKey,
-    clearSelection,
-    selectEvent,
-    selectEventOnly,
-  } = useCalendarSelection({
-    onOpenEvent: handleOpenEventFromCalendar,
-  })
-
-  const { handleCloseModalWithCleanup, enqueueDraftEvent } = useCalendarDraftEvent({
-    events,
-    isModalEditing,
-    modal,
-    removeEvent,
-    handleCloseModal,
-    enqueueEvent,
-    updateEventTiming,
-  })
-
-  // 반복 삭제 확인 모달 닫기
-  const handleCloseDeleteConfirm = useCallback(() => {
-    setDeleteConfirm({ isOpen: false, eventId: null, title: '', occurrenceDate: '' })
-  }, [])
-
-  const { handleDayViewEventTimeChange, handleDayViewEventTimePreview } = useCalendarDayViewTiming({
-    events,
-    patchEventMutate,
-    patchTodoTiming,
-    updateLocalEventTime,
-  })
-
-  // 키보드 삭제(Backspace) 처리
-  useCalendarKeyDelete({
-    isModalOpen: modal.isOpen,
-    date,
-    events,
-    selectedEventId,
-    selectedEventKey,
-    selectedDate,
-    onClearSelection: clearSelection,
-    onOpenRecurringConfirm: ({ eventId, title, occurrenceDate }) =>
-      setDeleteConfirm({
-        isOpen: true,
-        eventId,
-        title,
-        occurrenceDate,
-      }),
-    onRemoveEvent: handleRemoveEvent,
-    onDeleteTodo: deleteTodoMutate,
-  })
-
-  // 뷰/날짜 이동 처리
-  const { onView, onNavigate, onSelectDate } = useCalendarNavigation({
     view,
     date,
-    isDesktop,
-    setView,
-    setDate,
-    setSelectedDate,
-    setSelectedEventId,
-    setSelectedEventKey,
-  })
-
-  // 슬롯 선택 및 일간 뷰 생성 처리
-  const { handleDayViewCreateEvent, handleSelectSlotWrapper } = useCalendarCreateHandlers({
-    view,
-    enqueueEvent: enqueueDraftEvent,
-    onAddEvent: handleAddEvent,
-    setSelectedDate,
-    setSelectedEventId,
-    setSelectedEventKey,
-  })
-  const handleWeekViewCreateEvent = useCallback(
-    (slotDate: Date) => {
-      const start = moment(slotDate).startOf('day').set({ hour: 9, minute: 0, second: 0 }).toDate()
-      const createdId = enqueueDraftEvent(start, false)
-      if (createdId != null) {
-        handleAddEvent(start, createdId)
-      }
-    },
-    [enqueueDraftEvent, handleAddEvent],
-  )
-  const handleWeekViewSelectDate = useCallback(
-    (nextDate: Date) => {
-      setSelectedDate(nextDate)
-      setSelectedEventId(null)
-      setSelectedEventKey(null)
-    },
-    [setSelectedDate, setSelectedEventId, setSelectedEventKey],
-  )
-
-  // 일간뷰 전용 핸들러 주입
-  const dayViewWithHandlers = useDayViewHandlers({
-    clearSelectedDate: () => setSelectedDate(null),
-    clearSelectedEvent: () => {
-      setSelectedEventId(null)
-      setSelectedEventKey(null)
-    },
-    enqueueEvent,
+    calendarProps,
+    modalDate,
+    modalEventId,
+    modalEvent,
+    isModalEditing,
+    modalMode,
+    eventActions,
+    deleteConfirm,
+    recurringDropConfirm,
+    deleteEventMutate,
     handleAddEvent,
-    updateEventTime: handleDayViewEventTimeChange,
-    updateEventTimePreview: handleDayViewEventTimePreview,
-    onCreateEvent: handleDayViewCreateEvent,
-    onToggleTodo: handleToggleTodo,
-    selectedEventKey,
-    onEventSelect: selectEventOnly,
-    onEventClick: undefined,
-    onEventDoubleClick: selectEvent,
-  })
-
-  // 날짜 셀 클릭 시 날짜 이동(기본 이벤트 전파 제어)
-  const DateCellWrapper = useCallback(
-    ({ value, children }: DateCellWrapperProps) =>
-      cloneElement(children, {
-        onClick: (event: MouseEvent<HTMLElement>) => {
-          event.stopPropagation()
-          setSelectedEventId(null)
-          setSelectedEventKey(null)
-          setDate(value)
-          if (typeof children.props.onClick === 'function') {
-            children.props.onClick(event)
-          }
-        },
-      }),
-    [setDate, setSelectedEventId, setSelectedEventKey],
-  )
-
-  // drag & drop 처리
-  const { handleEventDrop, applyEventDrop } = useCalendarDragDrop({
-    view,
-    moveEvent,
-    patchEventMutate,
-    patchTodoTiming,
-    onRequireRecurringDropConfirm: (args, target) => {
-      setRecurringDropConfirm({ isOpen: true, target, args })
-    },
-  })
-  const handleCloseRecurringDropConfirm = useCallback(() => {
-    setRecurringDropConfirm({ isOpen: false, target: 'event', args: null })
-  }, [])
-  const handleConfirmRecurringDrop = useCallback(
-    (option: EditConfirmOption) => {
-      if (!recurringDropConfirm.args) return
-      if (recurringDropConfirm.target === 'todo') {
-        applyEventDrop(recurringDropConfirm.args, { todoScope: getTodoScopeFromEditOption(option) })
-        handleCloseRecurringDropConfirm()
-        return
-      }
-      applyEventDrop(recurringDropConfirm.args, { eventScope: getEventScopeFromEditOption(option) })
-      handleCloseRecurringDropConfirm()
-    },
-    [
-      applyEventDrop,
-      handleCloseRecurringDropConfirm,
-      recurringDropConfirm.args,
-      recurringDropConfirm.target,
-    ],
-  )
-
-  // react-big-calendar props 구성
-  const { calendarProps } = useCalendarRbcProps({
-    view,
-    date,
-    events,
-    selectedEventKey,
-    effectiveSelectedDate: selectedDate,
+    handleCloseModalWithCleanup,
+    handleCloseDeleteConfirm,
+    handleCloseRecurringDropConfirm,
+    handleConfirmRecurringDrop,
     onView,
-    onNavigate,
-    onSelectDate,
-    onSelectEvent: selectEvent,
-    onSelectEventOnly: selectEventOnly,
-    onDoubleClickEvent: selectEvent,
-    onDoubleClickDate: handleWeekViewCreateEvent,
-    onSelectWeekDate: handleWeekViewSelectDate,
-    onToggleTodo: handleToggleTodo,
-    onSelectSlot: handleSelectSlotWrapper,
-    onEventDrop: handleEventDrop,
-    onEventResize: resizeEvent,
-    dateCellWrapper: DateCellWrapper,
-    dayViewComponent: dayViewWithHandlers,
-    localizer,
-  })
-
-  // 모달에 넘길 이벤트 조회
-  const modalEvent = useMemo(() => {
-    if (modal.eventId == null) return null
-
-    const selectedOccurrenceEvent =
-      selectedEventKey != null
-        ? (events.find((item) => getEventOccurrenceKey(item) === selectedEventKey) ?? null)
-        : null
-
-    if (selectedOccurrenceEvent && selectedOccurrenceEvent.id === modal.eventId) {
-      return selectedOccurrenceEvent
-    }
-
-    return events.find((item) => item.id === modal.eventId) ?? null
-  }, [events, modal.eventId, selectedEventKey])
-  const modalMode: 'modal' | 'inline' = isInlineMode ? 'inline' : 'modal'
-  // 이벤트 수정 핸들러 묶음
-  const eventActions = useMemo(
-    () => ({
-      onEventColorChange: updateEventColor,
-      onEventTitleConfirm: updateEventTitle,
-      onEventSharedChange: updateEventShared,
-      onEventTypeChange: updateEventType,
-      onEventTimingChange: updateEventTiming,
-    }),
-    [updateEventColor, updateEventShared, updateEventTitle, updateEventType, updateEventTiming],
-  )
-  useEffect(() => {
-    onSelectedDateChange?.(selectedDate ?? date)
-  }, [date, onSelectedDateChange, selectedDate])
+  } = useCustomCalendarController({ localizer, onSelectedDateChange })
 
   return (
     <div css={{ position: 'relative', height: 'fit-content', width: '100%' }}>
@@ -405,7 +58,7 @@ const CustomCalendar = ({ onSelectedDateChange }: CustomCalendarProps) => {
       </S.CalendarWrapper>
       <CalendarModals
         modalDate={modalDate}
-        modalEventId={modal.eventId}
+        modalEventId={modalEventId}
         modalEvent={modalEvent}
         isModalEditing={isModalEditing}
         modalMode={modalMode}
diff --git a/src/features/Calendar/components/CustomCalendar/CustomCalendar.types.ts b/src/features/Calendar/components/CustomCalendar/CustomCalendar.types.ts
new file mode 100644
index 0000000..b00df01
--- /dev/null
+++ b/src/features/Calendar/components/CustomCalendar/CustomCalendar.types.ts
@@ -0,0 +1,32 @@
+import type { EventInteractionArgs } from 'react-big-calendar/lib/addons/dragAndDrop'
+
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+
+export type SelectDateSource = 'date-cell' | 'slot' | 'header' | 'date-header'
+
+export type CalendarEventActions = {
+  onEventColorChange: (eventId: CalendarEvent['id'], color: CalendarEvent['color']) => void
+  onEventTitleConfirm: (eventId: CalendarEvent['id'], title: CalendarEvent['title']) => void
+  onEventSharedChange: (eventId: CalendarEvent['id'], isShared: boolean) => void
+  onEventTypeChange: (eventId: CalendarEvent['id'], type: 'todo' | 'schedule') => void
+  onEventTimingChange: (
+    eventId: CalendarEvent['id'],
+    start: Date,
+    end: Date,
+    allDay: boolean,
+    occurrenceDate?: CalendarEvent['occurrenceDate'],
+  ) => void
+}
+
+export type DeleteConfirmState = {
+  isOpen: boolean
+  eventId: CalendarEvent['id'] | null
+  title: string
+  occurrenceDate: string
+}
+
+export type RecurringDropConfirmState = {
+  isOpen: boolean
+  target: 'event' | 'todo'
+  args: EventInteractionArgs<CalendarEvent> | null
+}
diff --git a/src/features/Calendar/components/CustomCalendar/CustomCalendarDialogs.tsx b/src/features/Calendar/components/CustomCalendar/CustomCalendarDialogs.tsx
index 1aa0f58..45c403b 100644
--- a/src/features/Calendar/components/CustomCalendar/CustomCalendarDialogs.tsx
+++ b/src/features/Calendar/components/CustomCalendar/CustomCalendarDialogs.tsx
@@ -1,11 +1,11 @@
 import type { UseMutateFunction } from '@tanstack/react-query'
-import type { EventInteractionArgs } from 'react-big-calendar/lib/addons/dragAndDrop'
 
 import type { RecurrenceEventSeriesScope } from '@/shared/constants/recurrenceScope'
-import type { CalendarEvent } from '@/shared/types/calendar/types'
 import { EditConfirmModal, type EditConfirmOption } from '@/shared/ui/Modals'
 import DeleteConfirmModal from '@/shared/ui/Modals/DeleteConfirmModal/DeleteConfirmModal'
 
+import type { DeleteConfirmState, RecurringDropConfirmState } from './CustomCalendar.types'
+
 type EventDeleteVariables = {
   eventId: number
   params: {
@@ -14,19 +14,6 @@ type EventDeleteVariables = {
   }
 }
 
-type DeleteConfirmState = {
-  isOpen: boolean
-  eventId: CalendarEvent['id'] | null
-  title: string
-  occurrenceDate: string
-}
-
-type RecurringDropConfirmState = {
-  isOpen: boolean
-  target: 'event' | 'todo'
-  args: EventInteractionArgs<CalendarEvent> | null
-}
-
 type CustomCalendarDialogsProps = {
   deleteConfirm: DeleteConfirmState
   onCloseDeleteConfirm: () => void
diff --git a/src/features/Calendar/hooks/index.ts b/src/features/Calendar/hooks/index.ts
index bc91c91..7ace55a 100644
--- a/src/features/Calendar/hooks/index.ts
+++ b/src/features/Calendar/hooks/index.ts
@@ -9,10 +9,10 @@ export { useCalendarEvents } from './useCalendarEvents'
 export { useCalendarKeyDelete } from './useCalendarKeyDelete'
 export { useCalendarModal } from './useCalendarModal'
 export { useCalendarNavigation } from './useCalendarNavigation'
-export { useCalendarPortals } from './useCalendarPortals'
 export { useCalendarRbcProps } from './useCalendarRbcProps'
 export { useCalendarResponsive } from './useCalendarResponsive'
 export { useCalendarSelection } from './useCalendarSelection'
 export { useCalendarTodoTimingPatch } from './useCalendarTodoTimingPatch'
+export { useCustomCalendarController } from './useCustomCalendarController'
 export { useDayViewHandlers } from './useDayViewHandlers'
 export { useStoredCalendarView } from './useStoredCalendarView'
diff --git a/src/features/Calendar/hooks/useCalendarDateCellWrapper.tsx b/src/features/Calendar/hooks/useCalendarDateCellWrapper.tsx
new file mode 100644
index 0000000..0070fc2
--- /dev/null
+++ b/src/features/Calendar/hooks/useCalendarDateCellWrapper.tsx
@@ -0,0 +1,31 @@
+import { cloneElement, type MouseEvent, useCallback } from 'react'
+import type { DateCellWrapperProps } from 'react-big-calendar'
+
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+
+type UseCalendarDateCellWrapperArgs = {
+  setDate: (date: Date) => void
+  setSelectedEventId: (eventId: CalendarEvent['id'] | null) => void
+  setSelectedEventKey: (eventKey: string | null) => void
+}
+
+export const useCalendarDateCellWrapper = ({
+  setDate,
+  setSelectedEventId,
+  setSelectedEventKey,
+}: UseCalendarDateCellWrapperArgs) =>
+  useCallback(
+    ({ value, children }: DateCellWrapperProps) =>
+      cloneElement(children, {
+        onClick: (event: MouseEvent<HTMLElement>) => {
+          event.stopPropagation()
+          setSelectedEventId(null)
+          setSelectedEventKey(null)
+          setDate(value)
+          if (typeof children.props.onClick === 'function') {
+            children.props.onClick(event)
+          }
+        },
+      }),
+    [setDate, setSelectedEventId, setSelectedEventKey],
+  )
diff --git a/src/features/Calendar/hooks/useCalendarDeleteConfirm.ts b/src/features/Calendar/hooks/useCalendarDeleteConfirm.ts
new file mode 100644
index 0000000..a4dd48e
--- /dev/null
+++ b/src/features/Calendar/hooks/useCalendarDeleteConfirm.ts
@@ -0,0 +1,90 @@
+import moment from 'moment'
+import { useCallback, useState } from 'react'
+
+import type { DeleteConfirmState } from '@/features/Calendar/components/CustomCalendar/CustomCalendar.types'
+import { getEventOccurrenceScope } from '@/features/Calendar/utils/helpers/calendarRecurrenceScope'
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+
+type UseCalendarDeleteConfirmArgs = {
+  events: CalendarEvent[]
+  deleteEventMutate: (
+    variables: {
+      eventId: number
+      params: {
+        scope?: ReturnType<typeof getEventOccurrenceScope>
+        occurrenceDate: string
+      }
+    },
+    options?: {
+      onSuccess?: () => void
+    },
+  ) => void
+  refetchEvents: () => void
+}
+
+export const useCalendarDeleteConfirm = ({
+  events,
+  deleteEventMutate,
+  refetchEvents,
+}: UseCalendarDeleteConfirmArgs) => {
+  const [deleteConfirm, setDeleteConfirm] = useState<DeleteConfirmState>({
+    isOpen: false,
+    eventId: null,
+    title: '',
+    occurrenceDate: '',
+  })
+
+  const handleCloseDeleteConfirm = useCallback(() => {
+    setDeleteConfirm({ isOpen: false, eventId: null, title: '', occurrenceDate: '' })
+  }, [])
+
+  const openDeleteConfirm = useCallback(
+    ({ eventId, title, occurrenceDate }: Omit<DeleteConfirmState, 'isOpen'>) => {
+      setDeleteConfirm({
+        isOpen: true,
+        eventId,
+        title,
+        occurrenceDate,
+      })
+    },
+    [],
+  )
+
+  const isRecurring = useCallback(
+    (eventId: CalendarEvent['id']) => {
+      const target = events.find((eventItem) => eventItem.id === eventId)
+      if (!target) return false
+      if (target.type === 'todo') return Boolean(target.isRecurring)
+      return target.recurrenceGroup != null
+    },
+    [events],
+  )
+
+  const handleRemoveEvent = useCallback(
+    (eventId: CalendarEvent['id'], occurrenceDate: string, isRecurringEvent: boolean) => {
+      deleteEventMutate(
+        {
+          eventId,
+          params: {
+            ...(isRecurringEvent ? { scope: getEventOccurrenceScope(isRecurringEvent) } : {}),
+            occurrenceDate: moment(occurrenceDate).format('YYYY-MM-DDTHH:mm:ss'),
+          },
+        },
+        {
+          onSuccess: () => {
+            refetchEvents()
+          },
+        },
+      )
+    },
+    [deleteEventMutate, refetchEvents],
+  )
+
+  return {
+    deleteConfirm,
+    isRecurring,
+    handleRemoveEvent,
+    openDeleteConfirm,
+    handleCloseDeleteConfirm,
+  }
+}
diff --git a/src/features/Calendar/hooks/useCalendarPortals.ts b/src/features/Calendar/hooks/useCalendarPortals.ts
deleted file mode 100644
index daa65e7..0000000
--- a/src/features/Calendar/hooks/useCalendarPortals.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// 캘린더 모달/카드 포털 DOM을 제공하는 훅
-export const useCalendarPortals = () => {
-  const modalPortalRoot =
-    typeof document === 'undefined' ? null : document.getElementById('modal-root')
-  const cardPortalRoot =
-    typeof document === 'undefined' ? null : document.getElementById('desktop-card-area')
-
-  return { modalPortalRoot, cardPortalRoot }
-}
diff --git a/src/features/Calendar/hooks/useCalendarRecurringDropConfirm.ts b/src/features/Calendar/hooks/useCalendarRecurringDropConfirm.ts
new file mode 100644
index 0000000..d8ecc9d
--- /dev/null
+++ b/src/features/Calendar/hooks/useCalendarRecurringDropConfirm.ts
@@ -0,0 +1,68 @@
+import { useCallback, useState } from 'react'
+
+import type { RecurringDropConfirmState } from '@/features/Calendar/components/CustomCalendar/CustomCalendar.types'
+import {
+  getEventScopeFromEditOption,
+  getTodoScopeFromEditOption,
+} from '@/features/Calendar/utils/helpers/calendarRecurrenceScope'
+import type { EditConfirmOption } from '@/shared/ui/Modals'
+
+import { useCalendarDragDrop } from './useCalendarDragDrop'
+
+type UseCalendarRecurringDropConfirmArgs = Omit<
+  Parameters<typeof useCalendarDragDrop>[0],
+  'onRequireRecurringDropConfirm'
+>
+
+export const useCalendarRecurringDropConfirm = ({
+  view,
+  moveEvent,
+  patchEventMutate,
+  patchTodoTiming,
+}: UseCalendarRecurringDropConfirmArgs) => {
+  const [recurringDropConfirm, setRecurringDropConfirm] = useState<RecurringDropConfirmState>({
+    isOpen: false,
+    target: 'event',
+    args: null,
+  })
+
+  const { handleEventDrop, applyEventDrop } = useCalendarDragDrop({
+    view,
+    moveEvent,
+    patchEventMutate,
+    patchTodoTiming,
+    onRequireRecurringDropConfirm: (args, target) => {
+      setRecurringDropConfirm({ isOpen: true, target, args })
+    },
+  })
+
+  const handleCloseRecurringDropConfirm = useCallback(() => {
+    setRecurringDropConfirm({ isOpen: false, target: 'event', args: null })
+  }, [])
+
+  const handleConfirmRecurringDrop = useCallback(
+    (option: EditConfirmOption) => {
+      if (!recurringDropConfirm.args) return
+      if (recurringDropConfirm.target === 'todo') {
+        applyEventDrop(recurringDropConfirm.args, { todoScope: getTodoScopeFromEditOption(option) })
+        handleCloseRecurringDropConfirm()
+        return
+      }
+      applyEventDrop(recurringDropConfirm.args, { eventScope: getEventScopeFromEditOption(option) })
+      handleCloseRecurringDropConfirm()
+    },
+    [
+      applyEventDrop,
+      handleCloseRecurringDropConfirm,
+      recurringDropConfirm.args,
+      recurringDropConfirm.target,
+    ],
+  )
+
+  return {
+    recurringDropConfirm,
+    handleEventDrop,
+    handleCloseRecurringDropConfirm,
+    handleConfirmRecurringDrop,
+  }
+}
diff --git a/src/features/Calendar/hooks/useCalendarSelectionBridge.ts b/src/features/Calendar/hooks/useCalendarSelectionBridge.ts
new file mode 100644
index 0000000..a27cac0
--- /dev/null
+++ b/src/features/Calendar/hooks/useCalendarSelectionBridge.ts
@@ -0,0 +1,34 @@
+import { useCallback } from 'react'
+
+import { useCalendarSelection } from '@/features/Calendar/hooks/useCalendarSelection'
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+
+type UseCalendarSelectionBridgeArgs = {
+  isModalEditing: boolean
+  isModalOpen: boolean
+  modalEventId: CalendarEvent['id'] | null
+  removeEvent: (eventId: CalendarEvent['id']) => void
+  handleEventClick: (event: CalendarEvent) => void
+}
+
+export const useCalendarSelectionBridge = ({
+  isModalEditing,
+  isModalOpen,
+  modalEventId,
+  removeEvent,
+  handleEventClick,
+}: UseCalendarSelectionBridgeArgs) => {
+  const handleOpenEventFromCalendar = useCallback(
+    (event: CalendarEvent) => {
+      if (!isModalEditing && isModalOpen && modalEventId != null) {
+        removeEvent(modalEventId)
+      }
+      handleEventClick(event)
+    },
+    [handleEventClick, isModalEditing, isModalOpen, modalEventId, removeEvent],
+  )
+
+  return useCalendarSelection({
+    onOpenEvent: handleOpenEventFromCalendar,
+  })
+}
diff --git a/src/features/Calendar/hooks/useCalendarTodoActions.ts b/src/features/Calendar/hooks/useCalendarTodoActions.ts
new file mode 100644
index 0000000..a0c37c8
--- /dev/null
+++ b/src/features/Calendar/hooks/useCalendarTodoActions.ts
@@ -0,0 +1,40 @@
+import moment from 'moment'
+import { useCallback } from 'react'
+
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+
+type UseCalendarTodoActionsArgs = {
+  events: CalendarEvent[]
+  toggleEventDone: (eventId: CalendarEvent['id'], type: 'todo') => void
+  patchCompleteTodoMutate: (variables: {
+    todoId: CalendarEvent['id']
+    occurrenceDate: string
+    isCompleted: boolean
+  }) => void
+}
+
+export const useCalendarTodoActions = ({
+  events,
+  toggleEventDone,
+  patchCompleteTodoMutate,
+}: UseCalendarTodoActionsArgs) => {
+  const handleToggleTodo = useCallback(
+    (eventId: CalendarEvent['id']) => {
+      const target = events.find(
+        (eventItem) => eventItem.id === eventId && eventItem.type === 'todo',
+      )
+      if (!target || target.type !== 'todo') return
+
+      const nextCompleted = !target.isDone
+      toggleEventDone(eventId, 'todo')
+      patchCompleteTodoMutate({
+        todoId: eventId,
+        occurrenceDate: moment(target.start).format('YYYY-MM-DD'),
+        isCompleted: nextCompleted,
+      })
+    },
+    [events, patchCompleteTodoMutate, toggleEventDone],
+  )
+
+  return { handleToggleTodo }
+}
diff --git a/src/features/Calendar/hooks/useCalendarViewCreationHandlers.ts b/src/features/Calendar/hooks/useCalendarViewCreationHandlers.ts
new file mode 100644
index 0000000..aecc88d
--- /dev/null
+++ b/src/features/Calendar/hooks/useCalendarViewCreationHandlers.ts
@@ -0,0 +1,100 @@
+import moment from 'moment'
+import { useCallback } from 'react'
+
+import { useCalendarCreateHandlers } from '@/features/Calendar/hooks/useCalendarCreateHandlers'
+import { useDayViewHandlers } from '@/features/Calendar/hooks/useDayViewHandlers'
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+
+type UseCalendarViewCreationHandlersArgs = {
+  view: Parameters<typeof useCalendarCreateHandlers>[0]['view']
+  enqueueEvent: (date: Date, allDay: boolean) => CalendarEvent['id'] | null
+  handleAddEvent: (referenceDate?: Date | string, eventId?: CalendarEvent['id'] | null) => void
+  setSelectedDate: (date: Date | null) => void
+  setSelectedEventId: (eventId: CalendarEvent['id'] | null) => void
+  setSelectedEventKey: (eventKey: string | null) => void
+  updateEventTime: (
+    eventId: CalendarEvent['id'],
+    start: Date,
+    end: Date,
+    type?: CalendarEvent['type'],
+  ) => void
+  updateEventTimePreview: (
+    eventId: CalendarEvent['id'],
+    start: Date,
+    end: Date,
+    type?: CalendarEvent['type'],
+  ) => void
+  onToggleTodo: (eventId: CalendarEvent['id']) => void
+  selectedEventKey: string | null
+  selectEventOnly: (event: CalendarEvent) => void
+  selectEvent: (event: CalendarEvent) => void
+}
+
+export const useCalendarViewCreationHandlers = ({
+  view,
+  enqueueEvent,
+  handleAddEvent,
+  setSelectedDate,
+  setSelectedEventId,
+  setSelectedEventKey,
+  updateEventTime,
+  updateEventTimePreview,
+  onToggleTodo,
+  selectedEventKey,
+  selectEventOnly,
+  selectEvent,
+}: UseCalendarViewCreationHandlersArgs) => {
+  const { handleDayViewCreateEvent, handleSelectSlotWrapper } = useCalendarCreateHandlers({
+    view,
+    enqueueEvent,
+    onAddEvent: handleAddEvent,
+    setSelectedDate,
+    setSelectedEventId,
+    setSelectedEventKey,
+  })
+
+  const handleWeekViewCreateEvent = useCallback(
+    (slotDate: Date) => {
+      const start = moment(slotDate).startOf('day').set({ hour: 9, minute: 0, second: 0 }).toDate()
+      const createdId = enqueueEvent(start, false)
+      if (createdId != null) {
+        handleAddEvent(start, createdId)
+      }
+    },
+    [enqueueEvent, handleAddEvent],
+  )
+
+  const handleWeekViewSelectDate = useCallback(
+    (nextDate: Date) => {
+      setSelectedDate(nextDate)
+      setSelectedEventId(null)
+      setSelectedEventKey(null)
+    },
+    [setSelectedDate, setSelectedEventId, setSelectedEventKey],
+  )
+
+  const dayViewWithHandlers = useDayViewHandlers({
+    clearSelectedDate: () => setSelectedDate(null),
+    clearSelectedEvent: () => {
+      setSelectedEventId(null)
+      setSelectedEventKey(null)
+    },
+    enqueueEvent,
+    handleAddEvent,
+    updateEventTime,
+    updateEventTimePreview,
+    onCreateEvent: handleDayViewCreateEvent,
+    onToggleTodo,
+    selectedEventKey,
+    onEventSelect: selectEventOnly,
+    onEventClick: undefined,
+    onEventDoubleClick: selectEvent,
+  })
+
+  return {
+    dayViewWithHandlers,
+    handleSelectSlotWrapper,
+    handleWeekViewCreateEvent,
+    handleWeekViewSelectDate,
+  }
+}
diff --git a/src/features/Calendar/hooks/useCustomCalendarController.tsx b/src/features/Calendar/hooks/useCustomCalendarController.tsx
new file mode 100644
index 0000000..e24b68b
--- /dev/null
+++ b/src/features/Calendar/hooks/useCustomCalendarController.tsx
@@ -0,0 +1,251 @@
+import { useEffect, useMemo, useState } from 'react'
+import type { DateLocalizer } from 'react-big-calendar'
+
+import type { CalendarEventActions } from '@/features/Calendar/components/CustomCalendar/CustomCalendar.types'
+import { useCalendarApiEvents } from '@/features/Calendar/hooks/useCalendarApiEvents'
+import { useCalendarDateCellWrapper } from '@/features/Calendar/hooks/useCalendarDateCellWrapper'
+import { useCalendarDateRange } from '@/features/Calendar/hooks/useCalendarDateRange'
+import { useCalendarDayViewTiming } from '@/features/Calendar/hooks/useCalendarDayViewTiming'
+import { useCalendarDeleteConfirm } from '@/features/Calendar/hooks/useCalendarDeleteConfirm'
+import { useCalendarDraftEvent } from '@/features/Calendar/hooks/useCalendarDraftEvent'
+import { useCalendarEvents } from '@/features/Calendar/hooks/useCalendarEvents'
+import { useCalendarKeyDelete } from '@/features/Calendar/hooks/useCalendarKeyDelete'
+import { useCalendarModal } from '@/features/Calendar/hooks/useCalendarModal'
+import { useCalendarNavigation } from '@/features/Calendar/hooks/useCalendarNavigation'
+import { useCalendarRbcProps } from '@/features/Calendar/hooks/useCalendarRbcProps'
+import { useCalendarRecurringDropConfirm } from '@/features/Calendar/hooks/useCalendarRecurringDropConfirm'
+import { useCalendarResponsive } from '@/features/Calendar/hooks/useCalendarResponsive'
+import { useCalendarSelectionBridge } from '@/features/Calendar/hooks/useCalendarSelectionBridge'
+import { useCalendarTodoActions } from '@/features/Calendar/hooks/useCalendarTodoActions'
+import { useCalendarViewCreationHandlers } from '@/features/Calendar/hooks/useCalendarViewCreationHandlers'
+import { useCustomCalendarMutations } from '@/features/Calendar/hooks/useCustomCalendarMutations'
+import { useStoredCalendarView } from '@/features/Calendar/hooks/useStoredCalendarView'
+import { getCalendarModalEvent } from '@/features/Calendar/utils/helpers/calendarModalEvent'
+
+type UseCustomCalendarControllerArgs = {
+  localizer: DateLocalizer
+  onSelectedDateChange?: (selectedDate: Date) => void
+}
+
+export const useCustomCalendarController = ({
+  localizer,
+  onSelectedDateChange,
+}: UseCustomCalendarControllerArgs) => {
+  const { view, setView } = useStoredCalendarView()
+  const [date, setDate] = useState<Date>(new Date())
+  const { startDate, endDate } = useCalendarDateRange(view, date)
+  const { events: apiEvents, refetch: refetchEvents } = useCalendarApiEvents(startDate, endDate)
+  const {
+    patchEventMutate,
+    deleteEventMutate,
+    patchCompleteTodoMutate,
+    patchTodoTiming,
+    deleteTodoMutate,
+  } = useCustomCalendarMutations()
+
+  const {
+    events,
+    addEvent: enqueueEvent,
+    moveEvent,
+    resizeEvent,
+    updateEventTime: updateLocalEventTime,
+    updateEventColor,
+    updateEventTiming,
+    updateEventType,
+    updateEventTitle,
+    updateEventShared,
+    toggleEventDone,
+    removeEvent,
+  } = useCalendarEvents({ initialEvents: apiEvents })
+
+  const isDesktop = useCalendarResponsive()
+  const modalMode: 'modal' | 'inline' = isDesktop ? 'inline' : 'modal'
+  const { handleToggleTodo } = useCalendarTodoActions({
+    events,
+    toggleEventDone,
+    patchCompleteTodoMutate,
+  })
+  const {
+    deleteConfirm,
+    isRecurring,
+    handleRemoveEvent,
+    openDeleteConfirm,
+    handleCloseDeleteConfirm,
+  } = useCalendarDeleteConfirm({
+    events,
+    deleteEventMutate,
+    refetchEvents,
+  })
+
+  const { modal, modalDate, isModalEditing, handleAddEvent, handleEventClick, handleCloseModal } =
+    useCalendarModal({
+      currentDate: date,
+      removeEvent: handleRemoveEvent,
+      isRecurring,
+    })
+
+  const {
+    selectedDate,
+    setSelectedDate,
+    selectedEventId,
+    setSelectedEventId,
+    selectedEventKey,
+    setSelectedEventKey,
+    clearSelection,
+    selectEvent,
+    selectEventOnly,
+  } = useCalendarSelectionBridge({
+    isModalEditing,
+    isModalOpen: modal.isOpen,
+    modalEventId: modal.eventId,
+    removeEvent,
+    handleEventClick,
+  })
+
+  const { handleCloseModalWithCleanup, enqueueDraftEvent } = useCalendarDraftEvent({
+    events,
+    isModalEditing,
+    modal,
+    removeEvent,
+    handleCloseModal,
+    enqueueEvent,
+    updateEventTiming,
+  })
+
+  const { handleDayViewEventTimeChange, handleDayViewEventTimePreview } = useCalendarDayViewTiming({
+    events,
+    patchEventMutate,
+    patchTodoTiming,
+    updateLocalEventTime,
+  })
+
+  useCalendarKeyDelete({
+    isModalOpen: modal.isOpen,
+    date,
+    events,
+    selectedEventId,
+    selectedEventKey,
+    selectedDate,
+    onClearSelection: clearSelection,
+    onOpenRecurringConfirm: openDeleteConfirm,
+    onRemoveEvent: handleRemoveEvent,
+    onDeleteTodo: deleteTodoMutate,
+  })
+
+  const { onView, onNavigate, onSelectDate } = useCalendarNavigation({
+    view,
+    date,
+    isDesktop,
+    setView,
+    setDate,
+    setSelectedDate,
+    setSelectedEventId,
+    setSelectedEventKey,
+  })
+
+  const {
+    dayViewWithHandlers,
+    handleSelectSlotWrapper,
+    handleWeekViewCreateEvent,
+    handleWeekViewSelectDate,
+  } = useCalendarViewCreationHandlers({
+    view,
+    enqueueEvent: enqueueDraftEvent,
+    handleAddEvent,
+    setSelectedDate,
+    setSelectedEventId,
+    setSelectedEventKey,
+    updateEventTime: handleDayViewEventTimeChange,
+    updateEventTimePreview: handleDayViewEventTimePreview,
+    onToggleTodo: handleToggleTodo,
+    selectedEventKey,
+    selectEventOnly,
+    selectEvent,
+  })
+
+  const DateCellWrapper = useCalendarDateCellWrapper({
+    setDate,
+    setSelectedEventId,
+    setSelectedEventKey,
+  })
+
+  const {
+    recurringDropConfirm,
+    handleEventDrop,
+    handleCloseRecurringDropConfirm,
+    handleConfirmRecurringDrop,
+  } = useCalendarRecurringDropConfirm({
+    view,
+    moveEvent,
+    patchEventMutate,
+    patchTodoTiming,
+  })
+
+  const { calendarProps } = useCalendarRbcProps({
+    view,
+    date,
+    events,
+    selectedEventKey,
+    effectiveSelectedDate: selectedDate,
+    onView,
+    onNavigate,
+    onSelectDate,
+    onSelectEvent: selectEvent,
+    onSelectEventOnly: selectEventOnly,
+    onDoubleClickEvent: selectEvent,
+    onDoubleClickDate: handleWeekViewCreateEvent,
+    onSelectWeekDate: handleWeekViewSelectDate,
+    onToggleTodo: handleToggleTodo,
+    onSelectSlot: handleSelectSlotWrapper,
+    onEventDrop: handleEventDrop,
+    onEventResize: resizeEvent,
+    dateCellWrapper: DateCellWrapper,
+    dayViewComponent: dayViewWithHandlers,
+    localizer,
+  })
+
+  const modalEvent = useMemo(
+    () =>
+      getCalendarModalEvent({
+        events,
+        modalEventId: modal.eventId,
+        selectedEventKey,
+      }),
+    [events, modal.eventId, selectedEventKey],
+  )
+  const eventActions = useMemo<CalendarEventActions>(
+    () => ({
+      onEventColorChange: updateEventColor,
+      onEventTitleConfirm: updateEventTitle,
+      onEventSharedChange: updateEventShared,
+      onEventTypeChange: updateEventType,
+      onEventTimingChange: updateEventTiming,
+    }),
+    [updateEventColor, updateEventShared, updateEventTitle, updateEventType, updateEventTiming],
+  )
+
+  useEffect(() => {
+    onSelectedDateChange?.(selectedDate ?? date)
+  }, [date, onSelectedDateChange, selectedDate])
+
+  return {
+    view,
+    date,
+    calendarProps,
+    modalDate,
+    modalEventId: modal.eventId,
+    modalEvent,
+    isModalEditing,
+    modalMode,
+    eventActions,
+    deleteConfirm,
+    recurringDropConfirm,
+    deleteEventMutate,
+    handleAddEvent,
+    handleCloseModalWithCleanup,
+    handleCloseDeleteConfirm,
+    handleCloseRecurringDropConfirm,
+    handleConfirmRecurringDrop,
+    onView,
+  }
+}
diff --git a/src/features/Calendar/hooks/useCustomCalendarMutations.ts b/src/features/Calendar/hooks/useCustomCalendarMutations.ts
new file mode 100644
index 0000000..3a7310d
--- /dev/null
+++ b/src/features/Calendar/hooks/useCustomCalendarMutations.ts
@@ -0,0 +1,24 @@
+import { useCalendarMutation } from '@/shared/hooks/query/useCalendarMutation'
+import { useTodoMutations } from '@/shared/hooks/query/useTodoMutations'
+
+import { useCalendarTodoTimingPatch } from './useCalendarTodoTimingPatch'
+
+export const useCustomCalendarMutations = () => {
+  const { usePatchEvent, useDeleteEvent } = useCalendarMutation()
+  const { mutate: patchEventMutate } = usePatchEvent()
+  const { mutate: deleteEventMutate } = useDeleteEvent()
+
+  const { usePatchCompleteTodo, usePatchTodo, useDeleteTodo } = useTodoMutations()
+  const { mutate: patchCompleteTodoMutate } = usePatchCompleteTodo()
+  const { mutate: patchTodoMutate } = usePatchTodo()
+  const { mutate: deleteTodoMutate } = useDeleteTodo()
+  const { patchTodoTiming } = useCalendarTodoTimingPatch({ patchTodoMutate })
+
+  return {
+    patchEventMutate,
+    deleteEventMutate,
+    patchCompleteTodoMutate,
+    patchTodoTiming,
+    deleteTodoMutate,
+  }
+}
diff --git a/src/features/Calendar/utils/helpers/calendarModalEvent.ts b/src/features/Calendar/utils/helpers/calendarModalEvent.ts
new file mode 100644
index 0000000..7c6e49d
--- /dev/null
+++ b/src/features/Calendar/utils/helpers/calendarModalEvent.ts
@@ -0,0 +1,26 @@
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+
+import { getEventOccurrenceKey } from './dayViewHelpers'
+
+export const getCalendarModalEvent = ({
+  events,
+  modalEventId,
+  selectedEventKey,
+}: {
+  events: CalendarEvent[]
+  modalEventId: CalendarEvent['id'] | null
+  selectedEventKey: string | null
+}) => {
+  if (modalEventId == null) return null
+
+  const selectedOccurrenceEvent =
+    selectedEventKey != null
+      ? (events.find((item) => getEventOccurrenceKey(item) === selectedEventKey) ?? null)
+      : null
+
+  if (selectedOccurrenceEvent && selectedOccurrenceEvent.id === modalEventId) {
+    return selectedOccurrenceEvent
+  }
+
+  return events.find((item) => item.id === modalEventId) ?? null
+}

From 6764842c5c8d4653aa919eddb8b3f77026e2fb7b Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sun, 17 May 2026 20:33:20 +0900
Subject: [PATCH 12/23] =?UTF-8?q?refactor:=20=EC=BA=98=EB=A6=B0=EB=8D=94?=
 =?UTF-8?q?=20=EB=B7=B0=20=EA=B3=84=EC=82=B0=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CustomView/CustomWeekView.tsx  | 118 ++++--------------
 .../CustomView/dayView/dragHandlers.ts        | 100 +++++----------
 .../components/CustomView/dayView/dragMath.ts | 100 +++++++++++++++
 .../CustomView/dayView/renderGeometry.ts      |  76 +++++++++++
 .../CustomView/dayView/renderers.tsx          |  65 +++-------
 src/features/Calendar/utils/weekViewLayout.ts | 118 ++++++++++++++++++
 6 files changed, 364 insertions(+), 213 deletions(-)
 create mode 100644 src/features/Calendar/components/CustomView/dayView/dragMath.ts
 create mode 100644 src/features/Calendar/components/CustomView/dayView/renderGeometry.ts
 create mode 100644 src/features/Calendar/utils/weekViewLayout.ts

diff --git a/src/features/Calendar/components/CustomView/CustomWeekView.tsx b/src/features/Calendar/components/CustomView/CustomWeekView.tsx
index 9d6c6da..f03cc8d 100644
--- a/src/features/Calendar/components/CustomView/CustomWeekView.tsx
+++ b/src/features/Calendar/components/CustomView/CustomWeekView.tsx
@@ -6,18 +6,24 @@ import type { EventInteractionArgs } from 'react-big-calendar/lib/addons/dragAnd
 import People from '@/assets/icons/people.svg?react'
 import { getColorPalette } from '@/features/Calendar/utils/colorPalette'
 import {
-  compareByStart,
-  eventCoversDate,
   getEventOccurrenceKey,
   isDateOnlyString,
 } from '@/features/Calendar/utils/helpers/dayViewHelpers'
+import {
+  buildAllDaySegments,
+  buildWeekDays,
+  buildWeekDropRange,
+  getAllDayLaneCount,
+  getDropDayIndex,
+  getTimedEventsForDate,
+  getWeeklyAllDayEvents,
+  KOREAN_WEEKDAYS,
+} from '@/features/Calendar/utils/weekViewLayout'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
 
 import { TodoCheckbox } from '../CustomEvent/CustomEvent.style'
 import * as S from './weekView'
 
-const KOREAN_WEEKDAYS = ['일', '월', '화', '수', '목', '금', '토'] as const
-
 type WeekProps = {
   date?: Date
   events?: CalendarEvent[]
@@ -31,14 +37,6 @@ type WeekProps = {
   selectedEventKey?: string | null
 }
 
-type AllDaySegment = {
-  event: CalendarEvent
-  key: string
-  startIndex: number
-  endIndex: number
-  lane: number
-}
-
 const formatTime = (event: CalendarEvent) => {
   if (event.isAllDay || isDateOnlyString(event.start)) {
     return '종일'
@@ -64,52 +62,19 @@ const CustomWeekView: React.ComponentType<WeekProps> & ViewStatic = (({
   onToggleTodo,
   selectedEventKey,
 }: WeekProps) => {
-  const weekStart = moment(date).startOf('week')
-  const weekDays = Array.from({ length: 7 }, (_, index) => weekStart.clone().add(index, 'day'))
+  const weekDays = React.useMemo(() => buildWeekDays(date), [date])
+  const weekDayDates = React.useMemo(
+    () => weekDays.map((dayMoment) => dayMoment.toDate()),
+    [weekDays],
+  )
   const allDaySectionRef = React.useRef<HTMLElement | null>(null)
   const today = moment()
-  const weeklyAllDayEvents = React.useMemo(
-    () =>
-      events
-        .filter((event) => event.isAllDay || isDateOnlyString(event.start))
-        .sort(compareByStart),
-    [events],
-  )
-  const allDaySegments = React.useMemo<AllDaySegment[]>(() => {
-    const laneLastEndIndexes: number[] = []
-    const segments: AllDaySegment[] = []
-
-    weeklyAllDayEvents.forEach((event) => {
-      const coveredIndexes = weekDays
-        .map((dayMoment, index) => (eventCoversDate(event, dayMoment.toDate()) ? index : -1))
-        .filter((index) => index >= 0)
-      if (coveredIndexes.length === 0) return
-
-      const startIndex = coveredIndexes[0]
-      const endIndex = coveredIndexes[coveredIndexes.length - 1]
-      let lane = laneLastEndIndexes.findIndex((lastEnd) => startIndex > lastEnd)
-      if (lane === -1) {
-        lane = laneLastEndIndexes.length
-        laneLastEndIndexes.push(endIndex)
-      } else {
-        laneLastEndIndexes[lane] = endIndex
-      }
-
-      segments.push({
-        event,
-        key: getEventOccurrenceKey(event),
-        startIndex,
-        endIndex,
-        lane,
-      })
-    })
-
-    return segments
-  }, [weekDays, weeklyAllDayEvents])
-  const allDayLaneCount = React.useMemo(
-    () => allDaySegments.reduce((maxLane, segment) => Math.max(maxLane, segment.lane), -1) + 1,
-    [allDaySegments],
+  const weeklyAllDayEvents = React.useMemo(() => getWeeklyAllDayEvents(events), [events])
+  const allDaySegments = React.useMemo(
+    () => buildAllDaySegments(weeklyAllDayEvents, weekDayDates),
+    [weekDayDates, weeklyAllDayEvents],
   )
+  const allDayLaneCount = React.useMemo(() => getAllDayLaneCount(allDaySegments), [allDaySegments])
   const eventsByOccurrenceKey = React.useMemo(
     () => new Map(events.map((event) => [getEventOccurrenceKey(event), event])),
     [events],
@@ -125,39 +90,13 @@ const CustomWeekView: React.ComponentType<WeekProps> & ViewStatic = (({
       setDraggingEventKey(null)
       if (!draggingEvent) return
 
-      const originalStart = moment(draggingEvent.start)
-      const originalEnd = moment(draggingEvent.end)
-      const originalStartDay = originalStart.clone().startOf('day')
-      const originalEndDay = originalEnd.clone().startOf('day')
-      const originalAllDay = draggingEvent.isAllDay || isDateOnlyString(draggingEvent.start)
-      const durationMs = Math.max(originalEnd.diff(originalStart), 0)
-      const useAllDayTime = dropAsAllDay || originalAllDay
-
-      const nextStart = useAllDayTime
-        ? moment(targetDate).startOf('day')
-        : moment(targetDate).set({
-            hour: originalStart.hour(),
-            minute: originalStart.minute(),
-            second: originalStart.second(),
-            millisecond: originalStart.millisecond(),
-          })
-      const nextEnd = useAllDayTime
-        ? (() => {
-            const spanDays = Math.max(originalEndDay.diff(originalStartDay, 'days') + 1, 1)
-            return nextStart
-              .clone()
-              .add(spanDays - 1, 'days')
-              .endOf('day')
-          })()
-        : durationMs > 0
-          ? nextStart.clone().add(durationMs, 'milliseconds')
-          : nextStart.clone().add(1, 'hour')
+      const nextRange = buildWeekDropRange(draggingEvent, targetDate, dropAsAllDay)
 
       onEventDrop({
         event: draggingEvent,
-        start: nextStart.toDate(),
-        end: nextEnd.toDate(),
-        allDay: useAllDayTime,
+        start: nextRange.start,
+        end: nextRange.end,
+        allDay: nextRange.allDay,
       } as EventInteractionArgs<CalendarEvent>)
     },
     [draggingEventKey, eventsByOccurrenceKey, onEventDrop],
@@ -166,9 +105,7 @@ const CustomWeekView: React.ComponentType<WeekProps> & ViewStatic = (({
     (clientX: number) => {
       const sectionRect = allDaySectionRef.current?.getBoundingClientRect()
       if (!sectionRect || sectionRect.width <= 0) return
-      const relativeX = Math.max(0, Math.min(clientX - sectionRect.left, sectionRect.width - 1))
-      const dayWidth = sectionRect.width / 7
-      const dayIndex = Math.max(0, Math.min(6, Math.floor(relativeX / dayWidth)))
+      const dayIndex = getDropDayIndex(clientX, sectionRect, weekDays.length)
       handleDropToDate(weekDays[dayIndex].toDate(), true)
     },
     [handleDropToDate, weekDays],
@@ -309,10 +246,7 @@ const CustomWeekView: React.ComponentType<WeekProps> & ViewStatic = (({
         {weekDays.map((dayMoment) => {
           const dayDate = dayMoment.toDate()
           const isSelectedDay = selectedDate ? dayMoment.isSame(selectedDate, 'day') : false
-          const timedEvents = events
-            .filter((event) => eventCoversDate(event, dayDate))
-            .filter((event) => !event.isAllDay && !isDateOnlyString(event.start))
-            .sort(compareByStart)
+          const timedEvents = getTimedEventsForDate(events, dayDate)
 
           const renderEventCard = (event: CalendarEvent) => {
             const palette = getColorPalette(event.color)
diff --git a/src/features/Calendar/components/CustomView/dayView/dragHandlers.ts b/src/features/Calendar/components/CustomView/dayView/dragHandlers.ts
index deb0b23..9873526 100644
--- a/src/features/Calendar/components/CustomView/dayView/dragHandlers.ts
+++ b/src/features/Calendar/components/CustomView/dayView/dragHandlers.ts
@@ -1,47 +1,15 @@
 import { type PointerEvent as ReactPointerEvent, useCallback, useRef, useState } from 'react'
 
 import type { CalendarEvent } from '../../../../../shared/types/calendar/types'
-import { MIN_EVENT_DURATION_MINUTES } from './constants'
 import {
-  buildMoveRange,
-  buildResizeRange,
-  buildResizeStartRange,
-  getMinutesPerPixel,
-  shiftMinutesBy,
-  snapDateToMinutes,
-} from './timeHelpers'
-
-const SNAP_MINUTES = 30
-const snapMinutes = (value: number) => Math.round(value / SNAP_MINUTES) * SNAP_MINUTES
-
-const snapMoveRange = (range: { nextStart: Date; nextEnd: Date }) => {
-  const snappedStart = snapDateToMinutes(range.nextStart, SNAP_MINUTES)
-  const snappedEnd = snapDateToMinutes(range.nextEnd, SNAP_MINUTES)
-  if (snappedEnd <= snappedStart) {
-    return { nextStart: snappedStart, nextEnd: shiftMinutesBy(snappedStart, SNAP_MINUTES) }
-  }
-  return { nextStart: snappedStart, nextEnd: snappedEnd }
-}
-
-const snapResizeRange = (range: { nextStart: Date; nextEnd: Date }, start: Date) => {
-  const snappedEnd = snapDateToMinutes(range.nextEnd, SNAP_MINUTES)
-  const minEnd = shiftMinutesBy(start, MIN_EVENT_DURATION_MINUTES)
-  return {
-    nextStart: range.nextStart,
-    nextEnd: snappedEnd <= start ? minEnd : snappedEnd,
-  }
-}
-
-const snapResizeStartRange = (range: { nextStart: Date; nextEnd: Date }, end: Date) => {
-  const snappedStart = snapDateToMinutes(range.nextStart, SNAP_MINUTES)
-  const maxStart = shiftMinutesBy(end, -MIN_EVENT_DURATION_MINUTES)
-  return {
-    nextStart: snappedStart >= end ? maxStart : snappedStart,
-    nextEnd: range.nextEnd,
-  }
-}
-
-export type DragMode = 'move' | 'resize' | 'resize-start'
+  buildSnappedDragRange,
+  type DayViewDragMode,
+  getColumnShift,
+  snapMinutes,
+} from './dragMath'
+import { getMinutesPerPixel } from './timeHelpers'
+
+export type DragMode = DayViewDragMode
 export type DragState = {
   event: CalendarEvent
   startClientY: number
@@ -139,22 +107,12 @@ export const useDayViewDragHandlers = (
         if (Math.hypot(deltaX, deltaY) > 6) {
           dragThresholdPassedRef.current = true
         }
-        let columnShift = 0
-        if (gridRect && typeof originColumnIndex === 'number') {
-          const gap = Math.max(columnGapPx, 0)
-          const columnWidth = (gridRect.width - gap) / 2
-          const relativeX = moveEvent.clientX - gridRect.left
-          const clampedX = Math.min(Math.max(relativeX, 0), gridRect.width)
-          const leftBoundary = columnWidth
-          const rightBoundary = columnWidth + gap
-          let targetIndex = originColumnIndex
-          if (clampedX < leftBoundary) {
-            targetIndex = 0
-          } else if (clampedX > rightBoundary) {
-            targetIndex = 1
-          }
-          columnShift = targetIndex - originColumnIndex
-        }
+        const columnShift = getColumnShift({
+          clientX: moveEvent.clientX,
+          gridRect,
+          originColumnIndex,
+          columnGapPx,
+        })
         dragStateRef.current = {
           event: calendarEvent,
           startClientY: pointerStartY,
@@ -171,14 +129,13 @@ export const useDayViewDragHandlers = (
           preview: Boolean(onEventDragPreview),
         }
         if (onEventDragPreview) {
-          const totalMinutes = mode === 'move' ? deltaMinutes + columnShift * 12 * 60 : deltaMinutes
-          const snappedTotalMinutes = snapMinutes(totalMinutes)
-          const nextRange =
-            mode === 'move'
-              ? snapMoveRange(buildMoveRange(start, end, snappedTotalMinutes))
-              : mode === 'resize'
-                ? snapResizeRange(buildResizeRange(start, end, snappedTotalMinutes), start)
-                : snapResizeStartRange(buildResizeStartRange(start, end, snappedTotalMinutes), end)
+          const { nextRange } = buildSnappedDragRange({
+            mode,
+            start,
+            end,
+            deltaMinutes,
+            columnShift,
+          })
           pendingPreviewRef.current = {
             event: calendarEvent,
             start: nextRange.nextStart,
@@ -202,8 +159,13 @@ export const useDayViewDragHandlers = (
         const currentState = dragStateRef.current
         const deltaMinutes = currentState?.deltaMinutes ?? 0
         const columnShift = currentState?.columnShift ?? 0
-        const totalMinutes = mode === 'move' ? deltaMinutes + columnShift * 12 * 60 : deltaMinutes
-        const snappedTotalMinutes = snapMinutes(totalMinutes)
+        const { snappedTotalMinutes, nextRange } = buildSnappedDragRange({
+          mode,
+          start,
+          end,
+          deltaMinutes,
+          columnShift,
+        })
         if (snappedTotalMinutes === 0) {
           if (pointerEvent.currentTarget instanceof HTMLElement) {
             pointerEvent.currentTarget.releasePointerCapture(pointerEvent.pointerId)
@@ -211,12 +173,6 @@ export const useDayViewDragHandlers = (
           cleanup()
           return
         }
-        const nextRange =
-          mode === 'move'
-            ? snapMoveRange(buildMoveRange(start, end, snappedTotalMinutes))
-            : mode === 'resize'
-              ? snapResizeRange(buildResizeRange(start, end, snappedTotalMinutes), start)
-              : snapResizeStartRange(buildResizeStartRange(start, end, snappedTotalMinutes), end)
         if (pointerEvent.currentTarget instanceof HTMLElement) {
           pointerEvent.currentTarget.releasePointerCapture(pointerEvent.pointerId)
         }
diff --git a/src/features/Calendar/components/CustomView/dayView/dragMath.ts b/src/features/Calendar/components/CustomView/dayView/dragMath.ts
new file mode 100644
index 0000000..6aa8c3e
--- /dev/null
+++ b/src/features/Calendar/components/CustomView/dayView/dragMath.ts
@@ -0,0 +1,100 @@
+import { MIN_EVENT_DURATION_MINUTES } from './constants'
+import {
+  buildMoveRange,
+  buildResizeRange,
+  buildResizeStartRange,
+  shiftMinutesBy,
+  snapDateToMinutes,
+} from './timeHelpers'
+
+const SNAP_MINUTES = 30
+
+export type DayViewDragMode = 'move' | 'resize' | 'resize-start'
+export type DateRange = { nextStart: Date; nextEnd: Date }
+
+export const snapMinutes = (value: number) => Math.round(value / SNAP_MINUTES) * SNAP_MINUTES
+
+export const snapMoveRange = (range: DateRange) => {
+  const snappedStart = snapDateToMinutes(range.nextStart, SNAP_MINUTES)
+  const snappedEnd = snapDateToMinutes(range.nextEnd, SNAP_MINUTES)
+  if (snappedEnd <= snappedStart) {
+    return { nextStart: snappedStart, nextEnd: shiftMinutesBy(snappedStart, SNAP_MINUTES) }
+  }
+  return { nextStart: snappedStart, nextEnd: snappedEnd }
+}
+
+export const snapResizeRange = (range: DateRange, start: Date) => {
+  const snappedEnd = snapDateToMinutes(range.nextEnd, SNAP_MINUTES)
+  const minEnd = shiftMinutesBy(start, MIN_EVENT_DURATION_MINUTES)
+  return {
+    nextStart: range.nextStart,
+    nextEnd: snappedEnd <= start ? minEnd : snappedEnd,
+  }
+}
+
+export const snapResizeStartRange = (range: DateRange, end: Date) => {
+  const snappedStart = snapDateToMinutes(range.nextStart, SNAP_MINUTES)
+  const maxStart = shiftMinutesBy(end, -MIN_EVENT_DURATION_MINUTES)
+  return {
+    nextStart: snappedStart >= end ? maxStart : snappedStart,
+    nextEnd: range.nextEnd,
+  }
+}
+
+export const getColumnShift = ({
+  clientX,
+  gridRect,
+  originColumnIndex,
+  columnGapPx,
+}: {
+  clientX: number
+  gridRect: DOMRect | null
+  originColumnIndex?: number
+  columnGapPx: number
+}) => {
+  if (!gridRect || typeof originColumnIndex !== 'number') return 0
+
+  const gap = Math.max(columnGapPx, 0)
+  const columnWidth = (gridRect.width - gap) / 2
+  const relativeX = clientX - gridRect.left
+  const clampedX = Math.min(Math.max(relativeX, 0), gridRect.width)
+  const leftBoundary = columnWidth
+  const rightBoundary = columnWidth + gap
+  let targetIndex = originColumnIndex
+
+  if (clampedX < leftBoundary) {
+    targetIndex = 0
+  } else if (clampedX > rightBoundary) {
+    targetIndex = 1
+  }
+
+  return targetIndex - originColumnIndex
+}
+
+export const buildSnappedDragRange = ({
+  mode,
+  start,
+  end,
+  deltaMinutes,
+  columnShift,
+}: {
+  mode: DayViewDragMode
+  start: Date
+  end: Date
+  deltaMinutes: number
+  columnShift: number
+}) => {
+  const totalMinutes = mode === 'move' ? deltaMinutes + columnShift * 12 * 60 : deltaMinutes
+  const snappedTotalMinutes = snapMinutes(totalMinutes)
+  const nextRange =
+    mode === 'move'
+      ? snapMoveRange(buildMoveRange(start, end, snappedTotalMinutes))
+      : mode === 'resize'
+        ? snapResizeRange(buildResizeRange(start, end, snappedTotalMinutes), start)
+        : snapResizeStartRange(buildResizeStartRange(start, end, snappedTotalMinutes), end)
+
+  return {
+    snappedTotalMinutes,
+    nextRange,
+  }
+}
diff --git a/src/features/Calendar/components/CustomView/dayView/renderGeometry.ts b/src/features/Calendar/components/CustomView/dayView/renderGeometry.ts
new file mode 100644
index 0000000..dd7e835
--- /dev/null
+++ b/src/features/Calendar/components/CustomView/dayView/renderGeometry.ts
@@ -0,0 +1,76 @@
+import { TIMED_SLOT_CONFIG } from '@/features/Calendar/domain/constants'
+
+import type { DragState } from './dragHandlers'
+
+const LANE_GAP = 6
+
+export const getDayEventRenderGeometry = ({
+  top,
+  height,
+  overflowTop,
+  overflowBottom,
+  laneIndex,
+  laneCount,
+  rowHeight,
+  columnWidth,
+  columnGapPx,
+  dragState,
+  eventId,
+}: {
+  top: number
+  height: number
+  overflowTop?: boolean
+  overflowBottom?: boolean
+  laneIndex?: number
+  laneCount?: number
+  rowHeight: number
+  columnWidth: number
+  columnGapPx: number
+  dragState: DragState | null
+  eventId: number
+}) => {
+  const rowHeightForCalc = rowHeight || TIMED_SLOT_CONFIG.SLOT_HEIGHT
+  const columnHeight = rowHeightForCalc * (TIMED_SLOT_CONFIG.MAX_VISUAL_HOURS - 1)
+  const minHeight = TIMED_SLOT_CONFIG.MIN_HEIGHT
+  const isDraggingEvent = dragState?.event.id === eventId
+  const isPreviewing = Boolean(dragState?.preview)
+  const columnShift =
+    isDraggingEvent && dragState?.mode === 'move' && !isPreviewing
+      ? (dragState?.columnShift ?? 0)
+      : 0
+  const translateX = columnShift ? columnShift * (columnWidth + columnGapPx) : 0
+  const moveDeltaMinutes =
+    isDraggingEvent && dragState?.mode === 'move' && !isPreviewing ? dragState.deltaMinutes : 0
+  const resizeDeltaMinutes =
+    isDraggingEvent && dragState?.mode === 'resize' && !isPreviewing ? dragState.deltaMinutes : 0
+  const moveOffset = (moveDeltaMinutes / 60) * rowHeightForCalc
+  const resizeOffset = (resizeDeltaMinutes / 60) * rowHeightForCalc
+  const baseTop = top + moveOffset
+  const clampedTop = Math.min(Math.max(baseTop, 0), columnHeight - minHeight)
+  const baseHeight = Math.max(height + resizeOffset, minHeight)
+  const clampedHeight = Math.min(baseHeight, Math.max(columnHeight - clampedTop, minHeight))
+  const overflowTopResolved = Boolean(overflowTop) || baseTop < 0
+  const overflowBottomResolved = Boolean(overflowBottom) || baseTop + baseHeight > columnHeight
+  const lanes = Math.max(laneCount ?? 1, 1)
+  const lane = Math.max(laneIndex ?? 0, 0)
+  const totalGap = lanes > 1 ? LANE_GAP * (lanes - 1) : 0
+  const laneWidthCss = lanes > 1 ? `calc((100% - ${totalGap}px) / ${lanes})` : '100%'
+  const laneLeftCss =
+    lanes > 1 ? `calc(${lane} * (100% - ${totalGap}px) / ${lanes} + ${lane * LANE_GAP}px)` : '0px'
+
+  return {
+    isDraggingEvent,
+    overflowTopResolved,
+    overflowBottomResolved,
+    style: {
+      top: clampedTop,
+      height: clampedHeight,
+      width: laneWidthCss,
+      left: laneLeftCss,
+      right: 'auto',
+      transform: translateX ? `translateX(${translateX}px)` : undefined,
+      transition: translateX ? 'transform 120ms ease' : undefined,
+      zIndex: isDraggingEvent ? 4 : undefined,
+    },
+  }
+}
diff --git a/src/features/Calendar/components/CustomView/dayView/renderers.tsx b/src/features/Calendar/components/CustomView/dayView/renderers.tsx
index d6121ed..8b46bee 100644
--- a/src/features/Calendar/components/CustomView/dayView/renderers.tsx
+++ b/src/features/Calendar/components/CustomView/dayView/renderers.tsx
@@ -10,6 +10,7 @@ import { getEventOccurrenceKey, type TimedSlotEvent } from '../../../utils/helpe
 import { TodoCheckbox } from '../../CustomEvent/CustomEvent.style'
 import * as S from '../dayView'
 import type { DragState, EventPointerDownHandler } from './dragHandlers'
+import { getDayEventRenderGeometry } from './renderGeometry'
 import { normalizeDateValue } from './timeHelpers'
 
 /** 24시간을 12시간씩 두 컬럼으로 나누어 시간 라인을 렌더링합니다. */
@@ -137,14 +138,11 @@ export const renderTimeOverlayColumn = ({
   columnIndex: number
 }) => {
   const rowHeightForCalc = rowHeight || TIMED_SLOT_CONFIG.SLOT_HEIGHT
-  const columnHeight = rowHeightForCalc * (TIMED_SLOT_CONFIG.MAX_VISUAL_HOURS - 1)
-  const minHeight = TIMED_SLOT_CONFIG.MIN_HEIGHT
   const gridRect = gridRef?.current?.getBoundingClientRect() ?? null
   const columnGapPx = gridRef?.current
     ? Number.parseFloat(getComputedStyle(gridRef.current).columnGap || '0')
     : 0
   const columnWidth = gridRect ? (gridRect.width - columnGapPx) / 2 : 0
-  const laneGap = 6
   return (
     <S.SlotColumn key={startHour}>
       {renderTimeSlotRows(startHour, date, handleSlotDoubleClick, slotRef)}
@@ -153,42 +151,20 @@ export const renderTimeOverlayColumn = ({
           ({ event, top, height, palette, overflowTop, overflowBottom, laneIndex, laneCount }) => {
             const eventStart = normalizeDateValue(event.start)
             const eventEnd = normalizeDateValue(event.end)
-            const currentDragState = dragStateRef.current
-            const isDraggingEvent = currentDragState?.event.id === event.id
-            const isPreviewing = Boolean(currentDragState?.preview)
-            const columnShift =
-              isDraggingEvent && currentDragState?.mode === 'move' && !isPreviewing
-                ? (currentDragState?.columnShift ?? 0)
-                : 0
-            const translateX = columnShift ? columnShift * (columnWidth + columnGapPx) : 0
-            const moveDeltaMinutes =
-              isDraggingEvent && currentDragState?.mode === 'move' && !isPreviewing
-                ? currentDragState.deltaMinutes
-                : 0
-            const resizeDeltaMinutes =
-              isDraggingEvent && currentDragState?.mode === 'resize' && !isPreviewing
-                ? currentDragState.deltaMinutes
-                : 0
-            const moveOffset = (moveDeltaMinutes / 60) * rowHeightForCalc
-            const resizeOffset = (resizeDeltaMinutes / 60) * rowHeightForCalc
-            const baseTop = top + moveOffset
-            const clampedTop = Math.min(Math.max(baseTop, 0), columnHeight - minHeight)
-            const baseHeight = Math.max(height + resizeOffset, minHeight)
-            const clampedHeight = Math.min(
-              baseHeight,
-              Math.max(columnHeight - clampedTop, minHeight),
-            )
-            const overflowTopResolved = Boolean(overflowTop) || baseTop < 0
-            const overflowBottomResolved =
-              Boolean(overflowBottom) || baseTop + baseHeight > columnHeight
-            const lanes = Math.max(laneCount ?? 1, 1)
-            const lane = Math.max(laneIndex ?? 0, 0)
-            const totalGap = lanes > 1 ? laneGap * (lanes - 1) : 0
-            const laneWidthCss = lanes > 1 ? `calc((100% - ${totalGap}px) / ${lanes})` : '100%'
-            const laneLeftCss =
-              lanes > 1
-                ? `calc(${lane} * (100% - ${totalGap}px) / ${lanes} + ${lane * laneGap}px)`
-                : '0px'
+            const { overflowTopResolved, overflowBottomResolved, style } =
+              getDayEventRenderGeometry({
+                top,
+                height,
+                overflowTop,
+                overflowBottom,
+                laneIndex,
+                laneCount,
+                rowHeight: rowHeightForCalc,
+                columnWidth,
+                columnGapPx,
+                dragState: dragStateRef.current,
+                eventId: event.id,
+              })
             return (
               <S.DayEventBadge
                 key={event.id}
@@ -197,16 +173,7 @@ export const renderTimeOverlayColumn = ({
                 isSelected={selectedEventKey === getEventOccurrenceKey(event)}
                 overflowTop={overflowTopResolved}
                 overflowBottom={overflowBottomResolved}
-                style={{
-                  top: clampedTop,
-                  height: clampedHeight,
-                  width: laneWidthCss,
-                  left: laneLeftCss,
-                  right: 'auto',
-                  transform: translateX ? `translateX(${translateX}px)` : undefined,
-                  transition: translateX ? 'transform 120ms ease' : undefined,
-                  zIndex: isDraggingEvent ? 4 : undefined,
-                }}
+                style={style}
                 onClick={() => {
                   if (dragThresholdPassedRef?.current) return
                   onEventSelect?.(event)
diff --git a/src/features/Calendar/utils/weekViewLayout.ts b/src/features/Calendar/utils/weekViewLayout.ts
new file mode 100644
index 0000000..2686099
--- /dev/null
+++ b/src/features/Calendar/utils/weekViewLayout.ts
@@ -0,0 +1,118 @@
+import moment from 'moment'
+
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+
+import {
+  compareByStart,
+  eventCoversDate,
+  getEventOccurrenceKey,
+  isDateOnlyString,
+} from './helpers/dayViewHelpers'
+
+export const KOREAN_WEEKDAYS = ['일', '월', '화', '수', '목', '금', '토'] as const
+
+export type AllDaySegment = {
+  event: CalendarEvent
+  key: string
+  startIndex: number
+  endIndex: number
+  lane: number
+}
+
+export const buildWeekDays = (date: Date) => {
+  const weekStart = moment(date).startOf('week')
+  return Array.from({ length: 7 }, (_, index) => weekStart.clone().add(index, 'day'))
+}
+
+export const getWeeklyAllDayEvents = (events: CalendarEvent[]) =>
+  events.filter((event) => event.isAllDay || isDateOnlyString(event.start)).sort(compareByStart)
+
+export const buildAllDaySegments = (
+  weeklyAllDayEvents: CalendarEvent[],
+  weekDays: Date[],
+): AllDaySegment[] => {
+  const laneLastEndIndexes: number[] = []
+  const segments: AllDaySegment[] = []
+
+  weeklyAllDayEvents.forEach((event) => {
+    const coveredIndexes = weekDays
+      .map((dayDate, index) => (eventCoversDate(event, dayDate) ? index : -1))
+      .filter((index) => index >= 0)
+    if (coveredIndexes.length === 0) return
+
+    const startIndex = coveredIndexes[0]
+    const endIndex = coveredIndexes[coveredIndexes.length - 1]
+    let lane = laneLastEndIndexes.findIndex((lastEnd) => startIndex > lastEnd)
+    if (lane === -1) {
+      lane = laneLastEndIndexes.length
+      laneLastEndIndexes.push(endIndex)
+    } else {
+      laneLastEndIndexes[lane] = endIndex
+    }
+
+    segments.push({
+      event,
+      key: getEventOccurrenceKey(event),
+      startIndex,
+      endIndex,
+      lane,
+    })
+  })
+
+  return segments
+}
+
+export const getAllDayLaneCount = (segments: AllDaySegment[]) =>
+  segments.reduce((maxLane, segment) => Math.max(maxLane, segment.lane), -1) + 1
+
+export const getTimedEventsForDate = (events: CalendarEvent[], date: Date) =>
+  events
+    .filter((event) => eventCoversDate(event, date))
+    .filter((event) => !event.isAllDay && !isDateOnlyString(event.start))
+    .sort(compareByStart)
+
+export const getDropDayIndex = (clientX: number, sectionRect: DOMRect, dayCount = 7) => {
+  const relativeX = Math.max(0, Math.min(clientX - sectionRect.left, sectionRect.width - 1))
+  const dayWidth = sectionRect.width / dayCount
+  return Math.max(0, Math.min(dayCount - 1, Math.floor(relativeX / dayWidth)))
+}
+
+export const buildWeekDropRange = (
+  draggingEvent: CalendarEvent,
+  targetDate: Date,
+  dropAsAllDay: boolean,
+) => {
+  const originalStart = moment(draggingEvent.start)
+  const originalEnd = moment(draggingEvent.end)
+  const originalStartDay = originalStart.clone().startOf('day')
+  const originalEndDay = originalEnd.clone().startOf('day')
+  const originalAllDay = draggingEvent.isAllDay || isDateOnlyString(draggingEvent.start)
+  const durationMs = Math.max(originalEnd.diff(originalStart), 0)
+  const useAllDayTime = dropAsAllDay || originalAllDay
+
+  const nextStart = useAllDayTime
+    ? moment(targetDate).startOf('day')
+    : moment(targetDate).set({
+        hour: originalStart.hour(),
+        minute: originalStart.minute(),
+        second: originalStart.second(),
+        millisecond: originalStart.millisecond(),
+      })
+  const nextEnd = useAllDayTime
+    ? (() => {
+        const spanDays = Math.max(originalEndDay.diff(originalStartDay, 'days') + 1, 1)
+        return nextStart
+          .clone()
+          .add(spanDays - 1, 'days')
+          .endOf('day')
+      })()
+    : durationMs > 0
+      ? nextStart.clone().add(durationMs, 'milliseconds')
+      : nextStart.clone().add(1, 'hour')
+
+  return {
+    start: nextStart.toDate(),
+    end: nextEnd.toDate(),
+    allDay: useAllDayTime,
+  }
+}

From 0c99bf8af1f2f2d78d83295d2c9d902ec8b1ff0b Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sun, 17 May 2026 20:33:44 +0900
Subject: [PATCH 13/23] =?UTF-8?q?refactor:=20=EC=97=90=EB=94=94=ED=84=B0?=
 =?UTF-8?q?=20=ED=8F=BC=20=EA=B3=B5=ED=86=B5=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addSchedule/useSchedulePatchController.ts |  15 +-
 src/shared/hooks/form/index.ts                |   1 +
 .../hooks/form/useEditorFormLifecycle.ts      |  54 ++++++
 .../hooks/form/useScheduleEditorForm.ts       |   7 +-
 .../hooks/form/useScheduleFormFields.ts       | 155 +++++++-----------
 src/shared/hooks/form/useTodoEditorForm.ts    |  61 +------
 src/shared/hooks/form/useTodoFormFields.ts    |  84 +++++-----
 .../hooks/repeat/useRepeatConfigController.ts |  31 ++--
 .../ScheduleEditor/ScheduleEditorContent.tsx  |   2 +-
 .../Modals/TodoEditor/TodoEditorContent.tsx   |  15 +-
 src/shared/utils/editorDateTime.ts            |  62 +++++++
 src/shared/utils/itemEditorDraft.ts           |   5 +-
 12 files changed, 250 insertions(+), 242 deletions(-)
 create mode 100644 src/shared/hooks/form/useEditorFormLifecycle.ts
 create mode 100644 src/shared/utils/editorDateTime.ts

diff --git a/src/shared/hooks/addSchedule/useSchedulePatchController.ts b/src/shared/hooks/addSchedule/useSchedulePatchController.ts
index 4a13ffb..09781ca 100644
--- a/src/shared/hooks/addSchedule/useSchedulePatchController.ts
+++ b/src/shared/hooks/addSchedule/useSchedulePatchController.ts
@@ -6,6 +6,7 @@ import { useCalendarMutation } from '@/shared/hooks/query/useCalendarMutation'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
 import type { RepeatConfigSchema, ScheduleEditorFormValues } from '@/shared/types/event/event'
 import { defaultRepeatConfig } from '@/shared/types/recurrence/repeat'
+import { buildDateTime as buildEditorDateTime } from '@/shared/utils/editorDateTime'
 import {
   mapRecurrenceGroupToRepeatConfig,
   mapRepeatConfigToRecurrenceGroup,
@@ -45,16 +46,10 @@ export const useSchedulePatchController = ({
   }, [initialEvent])
 
   // 날짜 + 시간 문자열을 Date로 합성
-  const buildDateTime = useCallback((dateValue: Date | null, timeValue?: string) => {
-    const nextDate = dateValue ? new Date(dateValue) : new Date()
-    if (!timeValue) {
-      nextDate.setHours(0, 0, 0, 0)
-      return nextDate
-    }
-    const [hour, minute] = timeValue.split(':').map((value) => Number.parseInt(value, 10))
-    nextDate.setHours(Number.isNaN(hour) ? 0 : hour, Number.isNaN(minute) ? 0 : minute, 0, 0)
-    return nextDate
-  }, [])
+  const buildDateTime = useCallback(
+    (dateValue: Date | null, timeValue?: string) => buildEditorDateTime(dateValue, timeValue),
+    [],
+  )
 
   // 변경된 필드만 추려 patch 요청 생성
   const patchSchedule = useSchedulePatch({
diff --git a/src/shared/hooks/form/index.ts b/src/shared/hooks/form/index.ts
index d4d6fd4..3dc93cf 100644
--- a/src/shared/hooks/form/index.ts
+++ b/src/shared/hooks/form/index.ts
@@ -1,4 +1,5 @@
 export * from './useCalendarFieldPicker'
+export * from './useEditorFormLifecycle'
 export * from './useScheduleEditorForm'
 export * from './useScheduleFormFields'
 export * from './useSearchPlaceToggle'
diff --git a/src/shared/hooks/form/useEditorFormLifecycle.ts b/src/shared/hooks/form/useEditorFormLifecycle.ts
new file mode 100644
index 0000000..723b70e
--- /dev/null
+++ b/src/shared/hooks/form/useEditorFormLifecycle.ts
@@ -0,0 +1,54 @@
+import { useEffect, useRef } from 'react'
+import type { FieldValues, Path, UseFormReturn } from 'react-hook-form'
+
+import type { ItemEditorDraft } from '@/shared/types/modal/itemEditor'
+
+type UseEditorFormLifecycleArgs<TValues extends FieldValues> = {
+  formMethods: UseFormReturn<TValues>
+  registeredFields: Array<Path<TValues>>
+  resetKey: string
+  isEditing: boolean
+  initialValues: TValues
+  editingResetValues?: TValues | null
+  onDraftChange?: (draft: ItemEditorDraft) => void
+  mapDraft: (values: TValues) => ItemEditorDraft
+}
+
+export const useEditorFormLifecycle = <TValues extends FieldValues>({
+  formMethods,
+  registeredFields,
+  resetKey,
+  isEditing,
+  initialValues,
+  editingResetValues,
+  onDraftChange,
+  mapDraft,
+}: UseEditorFormLifecycleArgs<TValues>) => {
+  const previousResetKeyRef = useRef(resetKey)
+  const { register, reset } = formMethods
+
+  useEffect(() => {
+    registeredFields.forEach((field) => register(field))
+  }, [register, registeredFields])
+
+  useEffect(() => {
+    if (!isEditing || !editingResetValues) return
+    reset(editingResetValues)
+  }, [editingResetValues, isEditing, reset])
+
+  useEffect(() => {
+    if (isEditing) return
+    if (previousResetKeyRef.current === resetKey) return
+    previousResetKeyRef.current = resetKey
+    reset(initialValues)
+  }, [initialValues, isEditing, reset, resetKey])
+
+  useEffect(() => {
+    if (isEditing || !onDraftChange) return
+    const subscription = formMethods.watch((values) => {
+      onDraftChange(mapDraft(values as TValues))
+    })
+
+    return () => subscription.unsubscribe()
+  }, [formMethods, isEditing, mapDraft, onDraftChange])
+}
diff --git a/src/shared/hooks/form/useScheduleEditorForm.ts b/src/shared/hooks/form/useScheduleEditorForm.ts
index 10d3343..b397a40 100644
--- a/src/shared/hooks/form/useScheduleEditorForm.ts
+++ b/src/shared/hooks/form/useScheduleEditorForm.ts
@@ -60,7 +60,12 @@ export const useScheduleEditorForm = ({
 
   const { handleRepeatType, updateConfig, setEventColor } = useRepeatConfigController({
     repeatConfig,
-    setValue,
+    onRepeatConfigChange: (value) => {
+      setValue('repeatConfig', value, { shouldValidate: true })
+    },
+    onEventColorChange: (value) => {
+      setValue('eventColor', value, { shouldValidate: true })
+    },
   })
 
   return {
diff --git a/src/shared/hooks/form/useScheduleFormFields.ts b/src/shared/hooks/form/useScheduleFormFields.ts
index a75184c..fb8549a 100644
--- a/src/shared/hooks/form/useScheduleFormFields.ts
+++ b/src/shared/hooks/form/useScheduleFormFields.ts
@@ -1,7 +1,8 @@
 import { yupResolver } from '@hookform/resolvers/yup'
-import { useEffect, useMemo, useRef } from 'react'
+import { useCallback, useMemo } from 'react'
 import { type Control, type Resolver, useForm, type UseFormReturn, useWatch } from 'react-hook-form'
 
+import { useEditorFormLifecycle } from '@/shared/hooks/form/useEditorFormLifecycle'
 import { addScheduleSchema } from '@/shared/schemas/schedule'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
 import {
@@ -11,6 +12,12 @@ import {
 } from '@/shared/types/event/event'
 import type { ItemEditorDraft } from '@/shared/types/modal/itemEditor'
 import { defaultRepeatConfig } from '@/shared/types/recurrence/repeat'
+import {
+  formatTimeFromDate,
+  getDefaultEndDate,
+  normalizeScheduleTimeRange,
+  toDate,
+} from '@/shared/utils/editorDateTime'
 import { mapRecurrenceGroupToRepeatConfig } from '@/shared/utils/recurrenceGroup'
 
 type UseScheduleFormFieldsProps = {
@@ -36,55 +43,6 @@ export type UseScheduleFormFieldsResult = {
   eventTitle: string | undefined
 }
 
-const pad2 = (value: number) => String(value).padStart(2, '0')
-
-const formatTimeFromDate = (value: Date) => `${pad2(value.getHours())}:${pad2(value.getMinutes())}`
-
-const toMinutes = (value?: string) => {
-  if (!value) return null
-  const [hour, minute] = value.split(':').map((item) => Number.parseInt(item, 10))
-  if (Number.isNaN(hour) || Number.isNaN(minute)) return null
-  return hour * 60 + minute
-}
-
-const formatTimeFromMinutes = (value: number) => {
-  const normalizedValue = Math.max(0, Math.min(value, 23 * 60 + 59))
-  const hour = Math.floor(normalizedValue / 60)
-  const minute = normalizedValue % 60
-  return `${pad2(hour)}:${pad2(minute)}`
-}
-
-const normalizeScheduleTimeRange = (startTime: string, endTime: string) => {
-  const startMinutes = toMinutes(startTime)
-  const endMinutes = toMinutes(endTime)
-
-  if (startMinutes == null || endMinutes == null || startMinutes !== endMinutes) {
-    return { startTime, endTime }
-  }
-
-  if (endMinutes >= 60) {
-    return { startTime: formatTimeFromMinutes(endMinutes - 60), endTime }
-  }
-
-  return { startTime, endTime: formatTimeFromMinutes(startMinutes + 60) }
-}
-
-const toDate = (value: string | Date) => new Date(value)
-
-const isSameDateTime = (left: string | Date, right: string | Date) =>
-  toDate(left).getTime() === toDate(right).getTime()
-
-const getDefaultEndDate = (
-  defaultStart: Date,
-  initialStart?: CalendarEvent['start'],
-  initialEnd?: CalendarEvent['end'],
-) => {
-  if (initialEnd && initialStart && !isSameDateTime(initialEnd, initialStart)) {
-    return toDate(initialEnd)
-  }
-  return new Date(defaultStart.getTime() + 60 * 60 * 1000)
-}
-
 const buildScheduleDefaultValues = ({
   date,
   initialEvent,
@@ -150,12 +108,19 @@ export const useScheduleFormFields = ({
     () => buildScheduleDefaultValues({ date, initialEvent, draftValues }),
     [date, draftValues, initialEvent],
   )
-  const previousResetKeyRef = useRef(`${date}::${String(initialEvent?.id ?? 'new')}`)
+  const editingResetValues = useMemo(
+    () =>
+      isEditing && initialStart
+        ? buildScheduleDefaultValues({ date, initialEvent, draftValues: null })
+        : null,
+    [date, initialEvent, initialStart, isEditing],
+  )
+  const resetKey = `${date}::${String(initialEvent?.id ?? 'new')}`
   const formMethods = useForm<ScheduleEditorFormValues>({
     resolver,
     defaultValues: initialValues,
   })
-  const { control, register, reset, setValue, handleSubmit } = formMethods
+  const { control, setValue, handleSubmit } = formMethods
 
   const eventStartDate = useWatch({ control, name: 'eventStartDate' })
   const eventEndDate = useWatch({ control, name: 'eventEndDate' })
@@ -167,54 +132,46 @@ export const useScheduleFormFields = ({
   const eventColor = (useWatch({ control, name: 'eventColor' }) ?? 'BLUE') as EventColorType
   const eventTitle = useWatch({ control, name: 'eventTitle' })
 
-  useEffect(() => {
-    register('eventStartDate')
-    register('eventEndDate')
-    register('eventStartTime')
-    register('eventEndTime')
-    register('location')
-    register('address')
-    register('isAllday')
-    register('repeatConfig')
-    register('eventColor')
-    register('friendIds')
-  }, [register])
-
-  useEffect(() => {
-    if (!isEditing || !initialStart) return
-    reset(buildScheduleDefaultValues({ date, initialEvent, draftValues: null }))
-  }, [date, initialEvent, initialStart, isEditing, reset])
-
-  useEffect(() => {
-    if (isEditing) return
-    const nextResetKey = `${date}::${String(initialEvent?.id ?? 'new')}`
-    if (previousResetKeyRef.current === nextResetKey) return
-    previousResetKeyRef.current = nextResetKey
-    reset(initialValues)
-  }, [date, initialEvent?.id, initialValues, isEditing, reset])
-
-  useEffect(() => {
-    if (isEditing || !onDraftChange) return
-    const subscription = formMethods.watch((values) => {
-      onDraftChange({
-        title: values.eventTitle ?? '',
-        description: values.eventDescription ?? '',
-        startDate: values.eventStartDate ?? null,
-        endDate: values.eventEndDate ?? values.eventStartDate ?? null,
-        startTime: values.eventStartTime,
-        endTime: values.eventEndTime,
-        isAllday: values.isAllday ?? false,
-        eventColor: (values.eventColor ?? 'BLUE') as EventColorType,
-        repeatConfig:
-          (values.repeatConfig as RepeatConfigSchema | undefined) ??
-          (defaultRepeatConfig as RepeatConfigSchema),
-        location: values.location ?? '',
-        address: values.address ?? null,
-      })
-    })
+  const mapDraft = useCallback(
+    (values: ScheduleEditorFormValues): ItemEditorDraft => ({
+      title: values.eventTitle ?? '',
+      description: values.eventDescription ?? '',
+      startDate: values.eventStartDate ?? null,
+      endDate: values.eventEndDate ?? values.eventStartDate ?? null,
+      startTime: values.eventStartTime,
+      endTime: values.eventEndTime,
+      isAllday: values.isAllday ?? false,
+      eventColor: (values.eventColor ?? 'BLUE') as EventColorType,
+      repeatConfig:
+        (values.repeatConfig as RepeatConfigSchema | undefined) ??
+        (defaultRepeatConfig as RepeatConfigSchema),
+      location: values.location ?? '',
+      address: values.address ?? null,
+    }),
+    [],
+  )
 
-    return () => subscription.unsubscribe()
-  }, [formMethods, isEditing, onDraftChange])
+  useEditorFormLifecycle({
+    formMethods,
+    registeredFields: [
+      'eventStartDate',
+      'eventEndDate',
+      'eventStartTime',
+      'eventEndTime',
+      'location',
+      'address',
+      'isAllday',
+      'repeatConfig',
+      'eventColor',
+      'friendIds',
+    ],
+    resetKey,
+    isEditing,
+    initialValues,
+    editingResetValues,
+    onDraftChange,
+    mapDraft,
+  })
 
   return {
     formMethods,
diff --git a/src/shared/hooks/form/useTodoEditorForm.ts b/src/shared/hooks/form/useTodoEditorForm.ts
index 03d3490..8c7150a 100644
--- a/src/shared/hooks/form/useTodoEditorForm.ts
+++ b/src/shared/hooks/form/useTodoEditorForm.ts
@@ -1,8 +1,8 @@
-import { useCallback } from 'react'
 import { type Control, type UseFormReturn } from 'react-hook-form'
 
 import { RECURRENCE_TODO_SCOPE } from '@/shared/constants/recurrenceScope'
 import { useTodoMutations } from '@/shared/hooks/query/useTodoMutations'
+import { useRepeatConfigController } from '@/shared/hooks/repeat/useRepeatConfigController'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
 import type {
   EventColorType,
@@ -11,7 +11,7 @@ import type {
 } from '@/shared/types/event/event'
 import type { ItemEditorDraft } from '@/shared/types/modal/itemEditor'
 import type { RecurrenceTodoScope } from '@/shared/types/recurrence/recurrence'
-import type { CustomRepeatBasis, RepeatConfig, RepeatType } from '@/shared/types/recurrence/repeat'
+import type { RepeatConfig, RepeatType } from '@/shared/types/recurrence/repeat'
 import { formatIsoDate } from '@/shared/utils/date'
 import { mapRepeatConfigToRecurrenceGroup } from '@/shared/utils/recurrenceGroup'
 import { isSameYmd, toWeekday, toWeekOfMonth } from '@/shared/utils/recurrencePattern'
@@ -46,9 +46,6 @@ export type UseTodoEditorFormResult = {
   todoTitle: string | undefined
 }
 
-const isCustomBasis = (value: RepeatType): value is CustomRepeatBasis =>
-  value !== 'none' && value !== 'custom'
-
 const parseYmd = (value?: string) => {
   if (!value) return null
   const [year, month, day] = value.split('-').map((item) => Number.parseInt(item, 10))
@@ -81,57 +78,15 @@ export const useTodoEditorForm = ({
     eventColor,
   } = useTodoFormFields({ date, initialEvent, isEditing, draftValues, onDraftChange })
 
-  const handleRepeatType = useCallback(
-    (value: RepeatType) => {
-      if (value === 'custom') {
-        if (repeatConfig.repeatType === 'custom') {
-          setValue(
-            'repeatConfig',
-            { ...repeatConfig, repeatType: 'none', customBasis: null },
-            { shouldValidate: true },
-          )
-          return
-        }
-        setValue(
-          'repeatConfig',
-          {
-            ...repeatConfig,
-            repeatType: 'custom',
-            customBasis: repeatConfig.customBasis ?? 'daily',
-          },
-          { shouldValidate: true },
-        )
-        return
-      }
-
-      if (repeatConfig.repeatType === 'custom' && isCustomBasis(value)) {
-        setValue('repeatConfig', { ...repeatConfig, customBasis: value }, { shouldValidate: true })
-        return
-      }
-
-      const nextType = repeatConfig.repeatType === value ? 'none' : value
-      setValue(
-        'repeatConfig',
-        { ...repeatConfig, repeatType: nextType, customBasis: null },
-        { shouldValidate: true },
-      )
-    },
-    [repeatConfig, setValue],
-  )
-
-  const updateConfig = useCallback(
-    (changes: Partial<RepeatConfig>) => {
-      setValue('repeatConfig', { ...repeatConfig, ...changes }, { shouldValidate: true })
+  const { handleRepeatType, updateConfig, setEventColor } = useRepeatConfigController({
+    repeatConfig,
+    onRepeatConfigChange: (value) => {
+      setValue('repeatConfig', value, { shouldValidate: true })
     },
-    [repeatConfig, setValue],
-  )
-
-  const setEventColor = useCallback(
-    (value: EventColorType) => {
+    onEventColorChange: (value) => {
       setValue('eventColor', value, { shouldValidate: true })
     },
-    [setValue],
-  )
+  })
 
   const onSubmit = (
     values: TodoEditorFormValues,
diff --git a/src/shared/hooks/form/useTodoFormFields.ts b/src/shared/hooks/form/useTodoFormFields.ts
index 0197c5c..64be5f1 100644
--- a/src/shared/hooks/form/useTodoFormFields.ts
+++ b/src/shared/hooks/form/useTodoFormFields.ts
@@ -1,7 +1,8 @@
 import { yupResolver } from '@hookform/resolvers/yup'
-import { useEffect, useMemo, useRef } from 'react'
+import { useCallback, useMemo } from 'react'
 import { type Control, type Resolver, useForm, type UseFormReturn, useWatch } from 'react-hook-form'
 
+import { useEditorFormLifecycle } from '@/shared/hooks/form/useEditorFormLifecycle'
 import { addTodoSchema } from '@/shared/schemas/todo'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
 import {
@@ -11,6 +12,7 @@ import {
 } from '@/shared/types/event/event'
 import type { ItemEditorDraft } from '@/shared/types/modal/itemEditor'
 import { defaultRepeatConfig } from '@/shared/types/recurrence/repeat'
+import { formatTimeFromDate } from '@/shared/utils/editorDateTime'
 
 type UseTodoFormFieldsProps = {
   date: string
@@ -33,10 +35,6 @@ export type UseTodoFormFieldsResult = {
   eventColor: EventColorType
 }
 
-const pad2 = (value: number) => String(value).padStart(2, '0')
-
-const formatTimeFromDate = (value: Date) => `${pad2(value.getHours())}:${pad2(value.getMinutes())}`
-
 const buildTodoDefaultValues = ({
   date,
   initialEvent,
@@ -73,12 +71,12 @@ export const useTodoFormFields = ({
     () => buildTodoDefaultValues({ date, initialEvent, draftValues }),
     [date, draftValues, initialEvent],
   )
-  const previousResetKeyRef = useRef(`${date}::${String(initialEvent?.id ?? 'new')}`)
+  const resetKey = `${date}::${String(initialEvent?.id ?? 'new')}`
   const formMethods = useForm<TodoEditorFormValues>({
     resolver,
     defaultValues: initialValues,
   })
-  const { control, register, reset, setValue, handleSubmit } = formMethods
+  const { control, setValue, handleSubmit } = formMethods
 
   const todoDate = useWatch({ control, name: 'todoDate' })
   const todoEndTime = useWatch({ control, name: 'todoEndTime' })
@@ -88,45 +86,41 @@ export const useTodoFormFields = ({
   const todoTitle = useWatch({ control, name: 'todoTitle' })
   const eventColor = (useWatch({ control, name: 'eventColor' }) ?? 'GRAY') as EventColorType
 
-  useEffect(() => {
-    register('todoDate')
-    register('todoEndTime')
-    register('isAllday')
-    register('eventColor')
-    register('todoPriority')
-    register('repeatConfig')
-  }, [register])
-
-  useEffect(() => {
-    if (isEditing) return
-    const nextResetKey = `${date}::${String(initialEvent?.id ?? 'new')}`
-    if (previousResetKeyRef.current === nextResetKey) return
-    previousResetKeyRef.current = nextResetKey
-    reset(initialValues)
-  }, [date, initialEvent?.id, initialValues, isEditing, reset])
-
-  useEffect(() => {
-    if (isEditing || !onDraftChange) return
-    const subscription = formMethods.watch((values) => {
-      onDraftChange({
-        title: values.todoTitle ?? '',
-        description: values.todoDescription ?? '',
-        startDate: values.todoDate ?? null,
-        endDate: values.todoDate ?? null,
-        startTime: values.todoEndTime,
-        endTime: values.todoEndTime,
-        isAllday: values.isAllday ?? false,
-        eventColor: (values.eventColor ?? 'GRAY') as EventColorType,
-        repeatConfig:
-          (values.repeatConfig as RepeatConfigSchema | undefined) ??
-          (defaultRepeatConfig as RepeatConfigSchema),
-        location: '',
-        address: null,
-      })
-    })
+  const mapDraft = useCallback(
+    (values: TodoEditorFormValues): ItemEditorDraft => ({
+      title: values.todoTitle ?? '',
+      description: values.todoDescription ?? '',
+      startDate: values.todoDate ?? null,
+      endDate: values.todoDate ?? null,
+      startTime: values.todoEndTime,
+      endTime: values.todoEndTime,
+      isAllday: values.isAllday ?? false,
+      eventColor: (values.eventColor ?? 'GRAY') as EventColorType,
+      repeatConfig:
+        (values.repeatConfig as RepeatConfigSchema | undefined) ??
+        (defaultRepeatConfig as RepeatConfigSchema),
+      location: '',
+      address: null,
+    }),
+    [],
+  )
 
-    return () => subscription.unsubscribe()
-  }, [formMethods, isEditing, onDraftChange])
+  useEditorFormLifecycle({
+    formMethods,
+    registeredFields: [
+      'todoDate',
+      'todoEndTime',
+      'isAllday',
+      'eventColor',
+      'todoPriority',
+      'repeatConfig',
+    ],
+    resetKey,
+    isEditing,
+    initialValues,
+    onDraftChange,
+    mapDraft,
+  })
 
   return {
     formMethods,
diff --git a/src/shared/hooks/repeat/useRepeatConfigController.ts b/src/shared/hooks/repeat/useRepeatConfigController.ts
index 098eebe..8f63e95 100644
--- a/src/shared/hooks/repeat/useRepeatConfigController.ts
+++ b/src/shared/hooks/repeat/useRepeatConfigController.ts
@@ -1,11 +1,6 @@
 import { useCallback } from 'react'
-import { type UseFormReturn } from 'react-hook-form'
 
-import {
-  type EventColorType,
-  type RepeatConfigSchema,
-  type ScheduleEditorFormValues,
-} from '@/shared/types/event/event'
+import { type EventColorType, type RepeatConfigSchema } from '@/shared/types/event/event'
 import {
   type CustomRepeatBasis,
   type RepeatConfig,
@@ -14,7 +9,8 @@ import {
 
 type UseRepeatConfigControllerProps = {
   repeatConfig: RepeatConfigSchema
-  setValue: UseFormReturn<ScheduleEditorFormValues>['setValue']
+  onRepeatConfigChange: (value: RepeatConfigSchema) => void
+  onEventColorChange: (value: EventColorType) => void
 }
 
 export type UseRepeatConfigControllerResult = {
@@ -25,22 +21,19 @@ export type UseRepeatConfigControllerResult = {
 
 export const useRepeatConfigController = ({
   repeatConfig,
-  setValue,
+  onRepeatConfigChange,
+  onEventColorChange,
 }: UseRepeatConfigControllerProps): UseRepeatConfigControllerResult => {
-  const handleRepeatConfigChange = (value: RepeatConfigSchema) => {
-    setValue('repeatConfig', value, { shouldValidate: true })
-  }
-
   const isCustomBasis = (value: RepeatType): value is CustomRepeatBasis =>
     value !== 'none' && value !== 'custom'
 
   const handleRepeatType = (value: RepeatType) => {
     if (value === 'custom') {
       if (repeatConfig.repeatType === 'custom') {
-        handleRepeatConfigChange({ ...repeatConfig, repeatType: 'none', customBasis: null })
+        onRepeatConfigChange({ ...repeatConfig, repeatType: 'none', customBasis: null })
         return
       }
-      handleRepeatConfigChange({
+      onRepeatConfigChange({
         ...repeatConfig,
         repeatType: 'custom',
         customBasis: repeatConfig.customBasis ?? 'daily',
@@ -49,12 +42,12 @@ export const useRepeatConfigController = ({
     }
 
     if (repeatConfig.repeatType === 'custom' && isCustomBasis(value)) {
-      handleRepeatConfigChange({ ...repeatConfig, customBasis: value })
+      onRepeatConfigChange({ ...repeatConfig, customBasis: value })
       return
     }
 
     const nextType = repeatConfig.repeatType === value ? 'none' : value
-    handleRepeatConfigChange({
+    onRepeatConfigChange({
       ...repeatConfig,
       repeatType: nextType,
       customBasis: null,
@@ -62,13 +55,13 @@ export const useRepeatConfigController = ({
   }
 
   const updateConfig = (changes: Partial<RepeatConfig>) =>
-    handleRepeatConfigChange({ ...repeatConfig, ...changes })
+    onRepeatConfigChange({ ...repeatConfig, ...changes })
 
   const setEventColor = useCallback(
     (value: EventColorType) => {
-      setValue('eventColor', value, { shouldValidate: true })
+      onEventColorChange(value)
     },
-    [setValue],
+    [onEventColorChange],
   )
 
   return {
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
index 0c24e5c..9aa4a52 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
@@ -66,7 +66,7 @@ const ScheduleEditorContent = ({
       return
     }
     originalTitleRef.current = initialEvent?.title ?? ''
-  }, [eventId, initialEvent?.occurrenceDate, initialEvent?.start, isEditing])
+  }, [eventId, initialEvent?.occurrenceDate, initialEvent?.start, initialEvent?.title, isEditing])
 
   const handleDiscardDraftTitle = useCallback(() => {
     if (!isEditing || eventId == null || eventId === 0) return
diff --git a/src/shared/ui/Modals/TodoEditor/TodoEditorContent.tsx b/src/shared/ui/Modals/TodoEditor/TodoEditorContent.tsx
index 2fec70d..81f0c4f 100644
--- a/src/shared/ui/Modals/TodoEditor/TodoEditorContent.tsx
+++ b/src/shared/ui/Modals/TodoEditor/TodoEditorContent.tsx
@@ -10,6 +10,7 @@ import type { TodoEditorFormProps } from '@/shared/types/modal/todoEditor'
 import { UnsavedChangesConfirmModal } from '@/shared/ui/Modals'
 import TodoEditorConfirmModals from '@/shared/ui/Modals/TodoEditor/TodoEditorConfirmModals'
 import TodoEditorFields from '@/shared/ui/Modals/TodoEditor/TodoEditorFields'
+import { buildDateTime as buildEditorDateTime } from '@/shared/utils/editorDateTime'
 
 type TodoEditorContentProps = TodoEditorFormProps & {
   todo: UseTodoEditorFormResult
@@ -71,16 +72,10 @@ const TodoEditorContent = ({
     })
   const repeatGuardEnabled = isEditing && hasExistingRecurrence
 
-  const buildDateTime = useCallback((dateValue: Date | null, timeValue?: string) => {
-    const nextDate = dateValue ? new Date(dateValue) : new Date()
-    if (!timeValue) {
-      nextDate.setHours(0, 0, 0, 0)
-      return nextDate
-    }
-    const [hour, minute] = timeValue.split(':').map((value) => Number.parseInt(value, 10))
-    nextDate.setHours(Number.isNaN(hour) ? 0 : hour, Number.isNaN(minute) ? 0 : minute, 0, 0)
-    return nextDate
-  }, [])
+  const buildDateTime = useCallback(
+    (dateValue: Date | null, timeValue?: string) => buildEditorDateTime(dateValue, timeValue),
+    [],
+  )
 
   const syncEventTiming = useCallback(
     (values: TodoEditorFormValues) => {
diff --git a/src/shared/utils/editorDateTime.ts b/src/shared/utils/editorDateTime.ts
new file mode 100644
index 0000000..55ffd7f
--- /dev/null
+++ b/src/shared/utils/editorDateTime.ts
@@ -0,0 +1,62 @@
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+
+export const pad2 = (value: number) => String(value).padStart(2, '0')
+
+export const formatTimeFromDate = (value: Date) =>
+  `${pad2(value.getHours())}:${pad2(value.getMinutes())}`
+
+export const toMinutes = (value?: string) => {
+  if (!value) return null
+  const [hour, minute] = value.split(':').map((item) => Number.parseInt(item, 10))
+  if (Number.isNaN(hour) || Number.isNaN(minute)) return null
+  return hour * 60 + minute
+}
+
+export const formatTimeFromMinutes = (value: number) => {
+  const normalizedValue = Math.max(0, Math.min(value, 23 * 60 + 59))
+  const hour = Math.floor(normalizedValue / 60)
+  const minute = normalizedValue % 60
+  return `${pad2(hour)}:${pad2(minute)}`
+}
+
+export const normalizeScheduleTimeRange = (startTime: string, endTime: string) => {
+  const startMinutes = toMinutes(startTime)
+  const endMinutes = toMinutes(endTime)
+
+  if (startMinutes == null || endMinutes == null || startMinutes !== endMinutes) {
+    return { startTime, endTime }
+  }
+
+  if (endMinutes >= 60) {
+    return { startTime: formatTimeFromMinutes(endMinutes - 60), endTime }
+  }
+
+  return { startTime, endTime: formatTimeFromMinutes(startMinutes + 60) }
+}
+
+export const toDate = (value: string | Date) => new Date(value)
+
+export const isSameDateTime = (left: string | Date, right: string | Date) =>
+  toDate(left).getTime() === toDate(right).getTime()
+
+export const getDefaultEndDate = (
+  defaultStart: Date,
+  initialStart?: CalendarEvent['start'],
+  initialEnd?: CalendarEvent['end'],
+) => {
+  if (initialEnd && initialStart && !isSameDateTime(initialEnd, initialStart)) {
+    return toDate(initialEnd)
+  }
+  return new Date(defaultStart.getTime() + 60 * 60 * 1000)
+}
+
+export const buildDateTime = (dateValue: Date | null, timeValue?: string) => {
+  const nextDate = dateValue ? new Date(dateValue) : new Date()
+  if (!timeValue) {
+    nextDate.setHours(0, 0, 0, 0)
+    return nextDate
+  }
+  const [hour, minute] = timeValue.split(':').map((value) => Number.parseInt(value, 10))
+  nextDate.setHours(Number.isNaN(hour) ? 0 : hour, Number.isNaN(minute) ? 0 : minute, 0, 0)
+  return nextDate
+}
diff --git a/src/shared/utils/itemEditorDraft.ts b/src/shared/utils/itemEditorDraft.ts
index 5cfcd18..38e1429 100644
--- a/src/shared/utils/itemEditorDraft.ts
+++ b/src/shared/utils/itemEditorDraft.ts
@@ -2,10 +2,7 @@ import type { CalendarEvent } from '@/shared/types/calendar/types'
 import type { RepeatConfigSchema } from '@/shared/types/event/event'
 import type { ItemEditorDraft } from '@/shared/types/modal/itemEditor'
 import { defaultRepeatConfig } from '@/shared/types/recurrence/repeat'
-
-const pad2 = (value: number) => String(value).padStart(2, '0')
-
-const formatTimeFromDate = (value: Date) => `${pad2(value.getHours())}:${pad2(value.getMinutes())}`
+import { formatTimeFromDate } from '@/shared/utils/editorDateTime'
 
 export const buildDefaultItemEditorDraft = (
   date: string,

From fae23cbab6a9f51c111d5513a5cd71c9da66fa40 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sun, 17 May 2026 20:34:05 +0900
Subject: [PATCH 14/23] =?UTF-8?q?chore:=20=ED=83=80=EC=9E=85=EC=8A=A4?=
 =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EA=B2=BD=EB=A1=9C=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tsconfig.app.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tsconfig.app.json b/tsconfig.app.json
index ccc4228..f423276 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -5,9 +5,8 @@
     "useDefineForClassFields": true,
     "lib": ["ES2022", "DOM", "DOM.Iterable"],
     "module": "ESNext",
-    "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"]
+      "@/*": ["./src/*"]
     },
     "types": ["vite/client"],
     "skipLibCheck": true,

From 6d22bf9ae75e4f3831960c43a9372052a79b27d2 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sun, 17 May 2026 20:56:05 +0900
Subject: [PATCH 15/23] =?UTF-8?q?fix:=20=EC=BA=98=EB=A6=B0=EB=8D=94=20?=
 =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EB=A7=90=EC=A4=84=EC=9E=84=20=EB=B3=B4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CustomEvent/CustomEvent.style.ts   | 15 +++++++++++++--
 .../Calendar/components/CustomView/weekView.ts    |  5 +++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/features/Calendar/components/CustomEvent/CustomEvent.style.ts b/src/features/Calendar/components/CustomEvent/CustomEvent.style.ts
index caf9ff2..7b18b3f 100644
--- a/src/features/Calendar/components/CustomEvent/CustomEvent.style.ts
+++ b/src/features/Calendar/components/CustomEvent/CustomEvent.style.ts
@@ -5,6 +5,7 @@ import { theme } from '@/shared/styles/theme'
 export const Circle = styled.div<{ backgroundColor?: string }>`
   min-width: 10px;
   min-height: 10px;
+  flex: 0 0 auto;
   border-radius: 50%;
   background-color: ${({ backgroundColor }) => backgroundColor ?? 'transparent'};
 `
@@ -14,6 +15,7 @@ export const TodoCheckbox = styled.input`
   max-height: 10px;
   width: 10px;
   height: 10px;
+  flex: 0 0 auto;
   aspect-ratio: 1 / 1;
   appearance: none;
   border: 1px dashed ${({ theme }) => theme.colors.textColor3};
@@ -66,6 +68,8 @@ export const MonthEventContainer = styled.div<{
   align-items: center;
   justify-content: space-between;
   color: #1f1f1f;
+  overflow: hidden;
+  width: 100%;
   background-color: ${({ backgroundColor }) => backgroundColor ?? 'transparent'};
   padding: 0 5px;
   border-radius: 8px;
@@ -98,21 +102,25 @@ export const WeekEventContainer = styled.div<{
 export const EventTitle = styled.div`
   font-weight: 400;
   font-size: 12px;
-  width: 55px;
+  width: 100%;
+  min-width: 0;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 `
 
 export const EventMeta = styled.div`
+  flex: 0 0 auto;
   font-size: 8px;
   color: ${({ theme }) => theme.colors.black};
   white-space: nowrap;
   min-width: fit-content;
 `
 export const EventWeekMeta = styled.div`
+  flex: 0 0 auto;
   font-size: 10px;
   color: ${({ theme }) => theme.colors.black};
+  white-space: nowrap;
 `
 
 export const EventLocation = styled.div`
@@ -121,13 +129,16 @@ export const EventLocation = styled.div`
 `
 
 export const EventRow = styled.div`
+  flex: 1 1 auto;
+  min-width: 0;
   display: flex;
   align-items: center;
   gap: 3px;
-  max-width: 80%;
+  max-width: 100%;
 `
 
 export const WeekEventRow = styled.div`
+  min-width: 0;
   display: flex;
   align-items: center;
   gap: 3px;
diff --git a/src/features/Calendar/components/CustomView/weekView.ts b/src/features/Calendar/components/CustomView/weekView.ts
index 952da86..f5f04c0 100644
--- a/src/features/Calendar/components/CustomView/weekView.ts
+++ b/src/features/Calendar/components/CustomView/weekView.ts
@@ -201,17 +201,20 @@ export const EventHeader = styled.div`
   display: flex;
   align-items: center;
   gap: 4px;
+  min-width: 0;
 `
 
 export const EventDot = styled.div<{ $color?: string }>`
   min-width: 10px;
   min-height: 10px;
+  flex: 0 0 auto;
   border-radius: 50%;
   background-color: ${({ $color }) => $color ?? theme.colors.textColor3};
 `
 
 export const EventTitle = styled.div`
   width: 100%;
+  min-width: 0;
   font-size: 12px;
   color: ${theme.colors.black};
   white-space: nowrap;
@@ -220,8 +223,10 @@ export const EventTitle = styled.div`
 `
 
 export const EventMeta = styled.div`
+  flex: 0 0 auto;
   font-size: 10px;
   color: ${theme.colors.textColor3};
+  white-space: nowrap;
 `
 
 export const EmptyText = styled.div`

From c258966afbe87720a873ead823c59b41cb13698c Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Sun, 17 May 2026 20:56:24 +0900
Subject: [PATCH 16/23] =?UTF-8?q?fix:=20=EC=BA=98=EB=A6=B0=EB=8D=94=20?=
 =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=ED=88=B4=ED=8C=81=20=EB=B9=84=ED=99=9C?=
 =?UTF-8?q?=EC=84=B1=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/Calendar/domain/config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/features/Calendar/domain/config.ts b/src/features/Calendar/domain/config.ts
index b1b5361..8cd6d47 100644
--- a/src/features/Calendar/domain/config.ts
+++ b/src/features/Calendar/domain/config.ts
@@ -61,6 +61,7 @@ export const buildCalendarConfig = ({
     events,
     startAccessor: (event) => normalizeDate(event.start),
     endAccessor: (event) => normalizeDate(event.end),
+    tooltipAccessor: () => '',
     onView,
     onNavigate,
     onSelectEvent,

From d649cb8abda8d4abb973e4557d3f095758ee5660 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Mon, 18 May 2026 15:07:56 +0900
Subject: [PATCH 17/23] =?UTF-8?q?feat:=20=EC=9D=BC=EC=A0=95=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20API=20=EA=B3=B5=EC=9C=A0=20=EC=B0=B8=EC=97=AC?=
 =?UTF-8?q?=EC=9E=90=20=EC=B2=98=EB=A6=AC=20=EB=B0=A9=EC=8B=9D=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shared/api/calendar/api.ts                   |  2 +-
 src/shared/hooks/addSchedule/useSchedulePatch.ts |  6 ++----
 src/shared/hooks/form/useScheduleFormFields.ts   |  6 ++----
 src/shared/types/calendar/types.ts               |  4 +++-
 src/shared/utils/eventParticipants.ts            | 15 +++++++++++++++
 5 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 src/shared/utils/eventParticipants.ts

diff --git a/src/shared/api/calendar/api.ts b/src/shared/api/calendar/api.ts
index b8971db..b375fa9 100644
--- a/src/shared/api/calendar/api.ts
+++ b/src/shared/api/calendar/api.ts
@@ -57,7 +57,7 @@ export const patchEvent = async (
     color?: EventColorType
     isAllDay?: boolean
     recurrenceGroup?: RecurrenceGroup | null
-    friendIds?: number[]
+    friendIds?: number[] | null
   },
   params: {
     occurrenceDate: string
diff --git a/src/shared/hooks/addSchedule/useSchedulePatch.ts b/src/shared/hooks/addSchedule/useSchedulePatch.ts
index 77ba351..0952343 100644
--- a/src/shared/hooks/addSchedule/useSchedulePatch.ts
+++ b/src/shared/hooks/addSchedule/useSchedulePatch.ts
@@ -5,6 +5,7 @@ import { RECURRENCE_EVENT_SCOPE } from '@/shared/constants/recurrenceScope'
 import type { CalendarEvent, Event } from '@/shared/types/calendar/types'
 import type { RepeatConfigSchema, ScheduleEditorFormValues } from '@/shared/types/event/event'
 import type { RecurrenceEventScope, RecurrenceGroup } from '@/shared/types/recurrence/recurrence'
+import { getEventFriendIds } from '@/shared/utils/eventParticipants'
 import { mapRepeatConfigToRecurrenceGroup } from '@/shared/utils/recurrenceGroup'
 import {
   isSameYmd,
@@ -116,10 +117,7 @@ export const useSchedulePatch = ({
       const initialAddress = initialEvent?.address ?? null
       const initialColor = initialEvent?.color
       const initialIsAllday = initialEvent?.isAllDay ?? false
-      const initialFriendIds =
-        initialEvent?.friendIds ??
-        initialEvent?.eventParticipantInfo?.map((participant) => participant.eventParticipantId) ??
-        []
+      const initialFriendIds = getEventFriendIds(initialEvent)
       const initialStart =
         initialEvent?.start != null ? formatDateTime(new Date(initialEvent.start)) : undefined
       const initialEnd =
diff --git a/src/shared/hooks/form/useScheduleFormFields.ts b/src/shared/hooks/form/useScheduleFormFields.ts
index fb8549a..0632e14 100644
--- a/src/shared/hooks/form/useScheduleFormFields.ts
+++ b/src/shared/hooks/form/useScheduleFormFields.ts
@@ -18,6 +18,7 @@ import {
   normalizeScheduleTimeRange,
   toDate,
 } from '@/shared/utils/editorDateTime'
+import { getEventFriendIds } from '@/shared/utils/eventParticipants'
 import { mapRecurrenceGroupToRepeatConfig } from '@/shared/utils/recurrenceGroup'
 
 type UseScheduleFormFieldsProps = {
@@ -66,10 +67,7 @@ const buildScheduleDefaultValues = ({
   const defaultEndTime = draftValues?.endTime ?? formatTimeFromDate(defaultEnd)
   const { startTime, endTime } = normalizeScheduleTimeRange(defaultStartTime, defaultEndTime)
   const mappedRepeatConfig = mapRecurrenceGroupToRepeatConfig(initialEvent?.recurrenceGroup)
-  const initialFriendIds =
-    initialEvent?.friendIds ??
-    initialEvent?.eventParticipantInfo?.map((participant) => participant.eventParticipantId) ??
-    []
+  const initialFriendIds = getEventFriendIds(initialEvent)
   const initialRepeatConfig: RepeatConfigSchema = {
     ...defaultRepeatConfig,
     ...mappedRepeatConfig,
diff --git a/src/shared/types/calendar/types.ts b/src/shared/types/calendar/types.ts
index 28117b4..3661414 100644
--- a/src/shared/types/calendar/types.ts
+++ b/src/shared/types/calendar/types.ts
@@ -15,9 +15,11 @@ export type Event = {
   color: EventColorType
   recurrenceGroup: RecurrenceGroup | null
   isShared?: boolean
-  friendIds?: number[]
+  isOwner?: boolean
+  friendIds?: number[] | null
   eventParticipantInfo?: Array<{
     eventParticipantId: number
+    friendId?: number
     email: string
     name: string
   }>
diff --git a/src/shared/utils/eventParticipants.ts b/src/shared/utils/eventParticipants.ts
new file mode 100644
index 0000000..17a9adc
--- /dev/null
+++ b/src/shared/utils/eventParticipants.ts
@@ -0,0 +1,15 @@
+import type { CalendarEvent } from '@/shared/types/calendar/types'
+
+type EventParticipant = NonNullable<CalendarEvent['eventParticipantInfo']>[number]
+
+export const getEventParticipantFriendId = (participant: EventParticipant) => participant.friendId
+
+export const getEventFriendIds = (event?: CalendarEvent | null) => {
+  if (event?.friendIds != null) return event.friendIds
+
+  return (
+    event?.eventParticipantInfo
+      ?.map(getEventParticipantFriendId)
+      .filter((friendId): friendId is number => friendId != null) ?? []
+  )
+}

From 7f13e3dd4de796aca603b9e31f206ad0a8d462d0 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Mon, 18 May 2026 15:08:41 +0900
Subject: [PATCH 18/23] =?UTF-8?q?feat:=20=EB=B9=84=EC=86=8C=EC=9C=A0?=
 =?UTF-8?q?=EC=9E=90=20=EA=B3=B5=EC=9C=A0=20=EC=9D=BC=EC=A0=95=20=EC=9D=BD?=
 =?UTF-8?q?=EA=B8=B0=20=EC=A0=84=EC=9A=A9=20=EC=B2=98=EB=A6=AC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hooks/addSchedule/useScheduleFooter.tsx   | 20 +++++-
 .../addSchedule/useScheduleSubmitFlow.ts      | 24 +++++++
 .../scheduleTodo/titleSuggestionInput.ts      |  2 +
 .../ItemEditorModal/EditorModalLayout.tsx     | 38 ++++++-----
 .../ui/Modals/ItemEditorModal/index.tsx       | 27 +++++++-
 .../ScheduleDateTimeSection.tsx               | 26 ++++++-
 .../ScheduleEditor/ScheduleDetailsSection.tsx | 27 +++++++-
 .../ScheduleEditor/ScheduleEditorContent.tsx  | 47 ++++++++++++-
 .../ScheduleEditor/ScheduleEditorFields.tsx   | 29 +++++++-
 .../ScheduleEditor/ScheduleRepeatSection.tsx  | 23 +++++--
 .../ScheduleEditor/ScheduleTitleField.tsx     | 14 ++--
 .../ScheduleEditor/ShareSchedulePanel.tsx     | 68 +++++++++++++------
 .../ui/Modals/ScheduleEditor/index.style.ts   |  2 +-
 .../CustomTimePicker/CustomTimePicker.tsx     | 27 +++++++-
 src/shared/ui/common/Checkbox/Checkbox.tsx    | 18 ++++-
 .../scheduleTodo/SelectColor/SelectColor.tsx  | 21 +++++-
 .../TitleSuggestionInput.tsx                  | 26 ++++++-
 17 files changed, 371 insertions(+), 68 deletions(-)

diff --git a/src/shared/hooks/addSchedule/useScheduleFooter.tsx b/src/shared/hooks/addSchedule/useScheduleFooter.tsx
index 0ade81b..e48a2fd 100644
--- a/src/shared/hooks/addSchedule/useScheduleFooter.tsx
+++ b/src/shared/hooks/addSchedule/useScheduleFooter.tsx
@@ -29,6 +29,8 @@ type UseScheduleFooterProps = {
   eventColor: EventColorType
   closeModal: () => void
   occurrenceDate: string
+  canEdit?: boolean
+  onReadOnlyAttempt?: () => void
 }
 
 export const useScheduleFooter = ({
@@ -45,6 +47,8 @@ export const useScheduleFooter = ({
   eventColor,
   closeModal,
   occurrenceDate,
+  canEdit = true,
+  onReadOnlyAttempt,
 }: UseScheduleFooterProps) => {
   const [deleteWarningVisible, setDeleteWarningVisible] = useState(false)
   const { useDeleteEvent } = useCalendarMutation()
@@ -72,6 +76,10 @@ export const useScheduleFooter = ({
   }, [deleteEventMutate])
 
   const handleDelete = useCallback(() => {
+    if (!canEdit) {
+      onReadOnlyAttempt?.()
+      return
+    }
     if (repeatConfigRef.current.repeatType !== 'none') {
       setDeleteWarningVisible(true)
       return
@@ -90,7 +98,7 @@ export const useScheduleFooter = ({
         },
       },
     )
-  }, [])
+  }, [canEdit, onReadOnlyAttempt])
 
   useEffect(() => {
     registerDeleteHandler?.(handleDelete)
@@ -105,6 +113,10 @@ export const useScheduleFooter = ({
 
   const handleColorChange = useCallback(
     (value: EventColorType) => {
+      if (!canEdit) {
+        onReadOnlyAttempt?.()
+        return
+      }
       const previousColor = eventColor
       setEventColor(value)
       if (eventId != null && eventId !== 0) {
@@ -133,17 +145,19 @@ export const useScheduleFooter = ({
       eventColor,
       eventId,
       getValues,
+      canEdit,
       isEditing,
       isExistingRecurring,
       onEventColorChange,
+      onReadOnlyAttempt,
       patchSchedule,
       setEventColor,
     ],
   )
 
   const footerNode = useMemo(
-    () => <SelectColor value={eventColor} onChange={handleColorChange} />,
-    [eventColor, handleColorChange],
+    () => (canEdit ? <SelectColor value={eventColor} onChange={handleColorChange} /> : null),
+    [canEdit, eventColor, handleColorChange],
   )
 
   // 하단 컬러 선택기를 footer에 등록
diff --git a/src/shared/hooks/addSchedule/useScheduleSubmitFlow.ts b/src/shared/hooks/addSchedule/useScheduleSubmitFlow.ts
index 63ce585..ad0771e 100644
--- a/src/shared/hooks/addSchedule/useScheduleSubmitFlow.ts
+++ b/src/shared/hooks/addSchedule/useScheduleSubmitFlow.ts
@@ -29,6 +29,8 @@ type UseScheduleSubmitFlowProps = {
   buildDateTime: (dateValue: Date | null, timeValue?: string) => Date
   formatDateTime: (value: Date) => string
   repeatConfig: ScheduleEditorFormValues['repeatConfig']
+  canEdit?: boolean
+  onReadOnlyAttempt?: () => void
 }
 
 export const useScheduleSubmitFlow = ({
@@ -46,6 +48,8 @@ export const useScheduleSubmitFlow = ({
   buildDateTime,
   formatDateTime,
   repeatConfig,
+  canEdit = true,
+  onReadOnlyAttempt,
 }: UseScheduleSubmitFlowProps) => {
   // 반복 변경 시 편집 확인 모달을 띄우는 guard 훅
   const {
@@ -101,6 +105,10 @@ export const useScheduleSubmitFlow = ({
         shouldConfirmChange?: boolean
       },
     ) => {
+      if (!canEdit) {
+        onReadOnlyAttempt?.()
+        return
+      }
       if (options.shouldConfirmChange) {
         confirmChange()
       }
@@ -126,12 +134,14 @@ export const useScheduleSubmitFlow = ({
       }
     },
     [
+      canEdit,
       clearApplyConfirm,
       confirmChange,
       confirmTitle,
       createSchedule,
       onClose,
       patchSchedule,
+      onReadOnlyAttempt,
       showToast,
       syncEventTiming,
     ],
@@ -140,6 +150,10 @@ export const useScheduleSubmitFlow = ({
   // 폼 제출 처리(일반/반복 분기)
   const handleFormSubmit = handleSubmit(
     async (values) => {
+      if (!canEdit) {
+        onReadOnlyAttempt?.()
+        return
+      }
       if (isExistingRecurring && requestConfirmation()) {
         setPendingScheduleValues(values)
         return
@@ -153,6 +167,10 @@ export const useScheduleSubmitFlow = ({
       })
     },
     (errors) => {
+      if (!canEdit) {
+        onReadOnlyAttempt?.()
+        return
+      }
       showToast({
         title: '일정 입력을 확인해주세요',
         message: getFormErrorMessage(errors, '필수 입력 항목을 다시 확인해주세요.'),
@@ -165,6 +183,10 @@ export const useScheduleSubmitFlow = ({
   const handleConfirmedSubmit = useCallback(
     async (option: EditConfirmOption) => {
       if (!pendingScheduleValues) return
+      if (!canEdit) {
+        onReadOnlyAttempt?.()
+        return
+      }
       const fallbackStartDate = pendingScheduleValues.eventStartDate ?? new Date(date)
       const fallbackOccurrenceDate = formatDateTime(
         buildDateTime(fallbackStartDate, pendingScheduleValues.eventStartTime),
@@ -187,10 +209,12 @@ export const useScheduleSubmitFlow = ({
     },
     [
       buildDateTime,
+      canEdit,
       date,
       formatDateTime,
       initialEvent,
       isEditConfirmOpen,
+      onReadOnlyAttempt,
       pendingScheduleValues,
       submitScheduleValues,
     ],
diff --git a/src/shared/types/scheduleTodo/titleSuggestionInput.ts b/src/shared/types/scheduleTodo/titleSuggestionInput.ts
index 604ce1b..25a977d 100644
--- a/src/shared/types/scheduleTodo/titleSuggestionInput.ts
+++ b/src/shared/types/scheduleTodo/titleSuggestionInput.ts
@@ -17,10 +17,12 @@ export type TitleSuggestionInputProps<TFieldValues extends FieldValues> = {
   placeholder?: string
   suggestions?: string[]
   autoFocus?: boolean
+  readOnly?: boolean
   formController?: TitleSuggestionInputFormController<TFieldValues>
   inputColor?: string
   onConfirm?: (value: string) => void
   onLiveChange?: (value: string) => void
+  onReadOnlyAttempt?: () => void
 }
 
 export type HighlightedSegment = {
diff --git a/src/shared/ui/Modals/ItemEditorModal/EditorModalLayout.tsx b/src/shared/ui/Modals/ItemEditorModal/EditorModalLayout.tsx
index fdc3282..5567773 100644
--- a/src/shared/ui/Modals/ItemEditorModal/EditorModalLayout.tsx
+++ b/src/shared/ui/Modals/ItemEditorModal/EditorModalLayout.tsx
@@ -16,6 +16,7 @@ const EditorModalLayout = ({
   handleDelete,
   headerExtras,
   submitButtonLabel,
+  hideActions = false,
   mode,
   headerTitleContainerRef,
   modalWrapperRef,
@@ -30,6 +31,7 @@ const EditorModalLayout = ({
   handleDelete?: () => void
   headerExtras?: React.ReactNode
   submitButtonLabel?: string
+  hideActions?: boolean
   headerTitleContainerRef?: Ref<HTMLDivElement>
   modalWrapperRef?: Ref<HTMLDivElement>
 }) => {
@@ -53,23 +55,25 @@ const EditorModalLayout = ({
         <S.ModalContent>{children}</S.ModalContent>
         <S.ModalFooter>
           <S.FooterLeft>{footerChildren}</S.FooterLeft>
-          <S.FooterRight>
-            <Trash onClick={handleDelete} css={{ cursor: 'pointer' }} color="#757575" />
-            <S.Button
-              type={submitFormId ? 'submit' : 'button'}
-              form={submitFormId}
-              onClick={
-                submitFormId
-                  ? undefined
-                  : () => {
-                      onSubmit()
-                    }
-              }
-            >
-              {submitButtonLabel && <span>{submitButtonLabel}</span>}
-              <Check color="#ffffff" />
-            </S.Button>
-          </S.FooterRight>
+          {!hideActions && (
+            <S.FooterRight>
+              <Trash onClick={handleDelete} css={{ cursor: 'pointer' }} color="#757575" />
+              <S.Button
+                type={submitFormId ? 'submit' : 'button'}
+                form={submitFormId}
+                onClick={
+                  submitFormId
+                    ? undefined
+                    : () => {
+                        onSubmit()
+                      }
+                }
+              >
+                {submitButtonLabel && <span>{submitButtonLabel}</span>}
+                <Check color="#ffffff" />
+              </S.Button>
+            </S.FooterRight>
+          )}
         </S.ModalFooter>
       </S.ModalWrapper>
     </S.ModalInner>
diff --git a/src/shared/ui/Modals/ItemEditorModal/index.tsx b/src/shared/ui/Modals/ItemEditorModal/index.tsx
index cfea258..cd2b578 100644
--- a/src/shared/ui/Modals/ItemEditorModal/index.tsx
+++ b/src/shared/ui/Modals/ItemEditorModal/index.tsx
@@ -8,6 +8,7 @@ import TodoEditorForm from '@/shared/ui/Modals/TodoEditor/TodoEditorForm'
 import { useEditorDraft } from '@/shared/utils/useEditorDraft'
 import { useEditorRegistry } from '@/shared/utils/useEditorRegistry'
 import { useEditorTypeSync } from '@/shared/utils/useEditorTypeSync'
+import { useToastStore } from '@/store/useToastStore'
 
 import EditorModalLayout from './EditorModalLayout'
 import * as S from './ItemEditorModal.style'
@@ -84,6 +85,15 @@ const ItemEditorModal = ({
 
   const [modalWrapperElement, setModalWrapperElement] = useState<HTMLDivElement | null>(null)
   const modalWrapperRef = useRef<HTMLDivElement | null>(null)
+  const isReadOnlySchedule =
+    isEditing && initialType === 'schedule' && initialEvent?.isOwner === false
+  const showReadOnlyScheduleToast = useCallback(() => {
+    useToastStore.getState().showToast({
+      title: '일정을 수정할 수 없습니다',
+      message: '일정 소유자만 수정할 수 있습니다.',
+      toastType: 'warning',
+    })
+  }, [])
 
   const handleSubmit = useCallback(() => {
     const submitFormId = activeType === 'todo' ? 'add-todo-form' : 'add-schedule-form'
@@ -105,14 +115,26 @@ const ItemEditorModal = ({
       <S.TabButton
         type="button"
         $isActive={activeType === 'todo'}
-        onClick={() => setActiveType('todo')}
+        onClick={() => {
+          if (isReadOnlySchedule) {
+            showReadOnlyScheduleToast()
+            return
+          }
+          setActiveType('todo')
+        }}
       >
         할 일
       </S.TabButton>
       <S.TabButton
         type="button"
         $isActive={activeType === 'schedule'}
-        onClick={() => setActiveType('schedule')}
+        onClick={() => {
+          if (isReadOnlySchedule) {
+            showReadOnlyScheduleToast()
+            return
+          }
+          setActiveType('schedule')
+        }}
       >
         일정
       </S.TabButton>
@@ -154,6 +176,7 @@ const ItemEditorModal = ({
       submitFormId={activeType === 'todo' ? 'add-todo-form' : 'add-schedule-form'}
       handleDelete={deleteHandler}
       footerChildren={footerChildren}
+      hideActions={isReadOnlySchedule && activeType === 'schedule'}
       submitButtonLabel={
         activeType === 'schedule' && isScheduleShared ? '저장 및 초대 전송' : undefined
       }
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleDateTimeSection.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleDateTimeSection.tsx
index 4b246cc..32084fd 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleDateTimeSection.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleDateTimeSection.tsx
@@ -14,11 +14,15 @@ import { formatDisplayDate } from '@/shared/utils/date'
 
 type ScheduleDateTimeSectionProps = Pick<ScheduleEditorFormProps, 'mode'> & {
   handleAllDayToggle: () => void
+  readOnly?: boolean
+  onReadOnlyAttempt?: () => void
 }
 
 const ScheduleDateTimeSection = ({
   mode = 'modal',
   handleAllDayToggle,
+  readOnly = false,
+  onReadOnlyAttempt,
 }: ScheduleDateTimeSectionProps) => {
   const { control, setValue } = useFormContext<ScheduleEditorFormValues>()
   const isAllday = useWatch({ control, name: 'isAllday' }) ?? false
@@ -55,7 +59,10 @@ const ScheduleDateTimeSection = ({
       <S.Selection>
         <S.SelectionColumn isAllday={isAllday}>
           <S.FieldRow isAllday={isAllday}>
-            <S.DateFieldButton type="button" onClick={handleCalendarButtonClick('start')}>
+            <S.DateFieldButton
+              type="button"
+              onClick={readOnly ? onReadOnlyAttempt : handleCalendarButtonClick('start')}
+            >
               {startDate}
             </S.DateFieldButton>
             {!isAllday && (
@@ -63,12 +70,17 @@ const ScheduleDateTimeSection = ({
                 field="start"
                 value={eventStartTime ?? ''}
                 onChange={(value) => handleTimeChange('start', value)}
+                readOnly={readOnly}
+                onReadOnlyAttempt={onReadOnlyAttempt}
               />
             )}
           </S.FieldRow>
           {isAllday && '-'}
           <S.FieldRow isAllday={isAllday}>
-            <S.DateFieldButton type="button" onClick={handleCalendarButtonClick('end')}>
+            <S.DateFieldButton
+              type="button"
+              onClick={readOnly ? onReadOnlyAttempt : handleCalendarButtonClick('end')}
+            >
               {endDate}
             </S.DateFieldButton>
             {!isAllday && (
@@ -76,6 +88,8 @@ const ScheduleDateTimeSection = ({
                 field="end"
                 value={eventEndTime ?? ''}
                 onChange={(value) => handleTimeChange('end', value)}
+                readOnly={readOnly}
+                onReadOnlyAttempt={onReadOnlyAttempt}
               />
             )}
           </S.FieldRow>
@@ -99,7 +113,13 @@ const ScheduleDateTimeSection = ({
             document.getElementById('modal-root')!,
           )}
       </S.Selection>
-      <Checkbox checked={isAllday} onChange={handleAllDayToggle} label="종일" />
+      <Checkbox
+        checked={isAllday}
+        onChange={handleAllDayToggle}
+        label="종일"
+        readOnly={readOnly}
+        onReadOnlyAttempt={onReadOnlyAttempt}
+      />
     </>
   )
 }
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleDetailsSection.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleDetailsSection.tsx
index c6b48ef..2fa55a6 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleDetailsSection.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleDetailsSection.tsx
@@ -8,13 +8,19 @@ import type { ScheduleEditorFormProps } from '@/shared/types/modal/scheduleEdito
 import * as S from '@/shared/ui/Modals/ScheduleEditor/index.style'
 import SearchPlace from '@/shared/ui/scheduleTodo/SearchPlace/SearchPlace'
 
-type ScheduleDetailsSectionProps = Pick<ScheduleEditorFormProps, 'modalWrapperElement' | 'mode'>
+type ScheduleDetailsSectionProps = Pick<ScheduleEditorFormProps, 'modalWrapperElement' | 'mode'> & {
+  readOnly?: boolean
+  onReadOnlyAttempt?: () => void
+}
 
 const ScheduleDetailsSection = ({
   modalWrapperElement,
   mode = 'modal',
+  readOnly = false,
+  onReadOnlyAttempt,
 }: ScheduleDetailsSectionProps) => {
   const { control, register, setValue } = useFormContext<ScheduleEditorFormValues>()
+  const descriptionField = register('eventDescription')
   const location = useWatch({ control, name: 'location' }) ?? ''
   const {
     closeSearchPlace,
@@ -37,12 +43,27 @@ const ScheduleDetailsSection = ({
       <S.BottomSection>
         <S.TextareaWrapper>
           <S.TextareaHeader>메모</S.TextareaHeader>
-          <S.Textarea {...register('eventDescription')} />
+          <S.Textarea
+            {...descriptionField}
+            readOnly={readOnly}
+            aria-readonly={readOnly}
+            onFocus={() => {
+              if (readOnly) onReadOnlyAttempt?.()
+            }}
+            onChange={(event) => {
+              if (readOnly) {
+                event.preventDefault()
+                onReadOnlyAttempt?.()
+                return
+              }
+              descriptionField.onChange(event)
+            }}
+          />
         </S.TextareaWrapper>
         <S.FieldRow style={{ width: '100%' }}>
           <S.FieldMap
             type="button"
-            onClick={() => openSearchPlace()}
+            onClick={readOnly ? onReadOnlyAttempt : () => openSearchPlace()}
             $hasValue={Boolean(location)}
             title={location || '장소 추가'}
           >
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
index 9aa4a52..4494b03 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
@@ -1,5 +1,5 @@
 // 일정 편집 본문을 조합하고 제출, 패치, 삭제, 닫기 보호 흐름을 연결합니다.
-import { useCallback, useEffect, useRef } from 'react'
+import { type FormEvent, useCallback, useEffect, useRef } from 'react'
 import { useFormContext } from 'react-hook-form'
 
 import { RECURRENCE_EVENT_SCOPE } from '@/shared/constants/recurrenceScope'
@@ -17,6 +17,7 @@ import type { ScheduleEditorFormProps } from '@/shared/types/modal/scheduleEdito
 import { UnsavedChangesConfirmModal } from '@/shared/ui/Modals'
 import ScheduleEditorConfirmModals from '@/shared/ui/Modals/ScheduleEditor/ScheduleEditorConfirmModals'
 import ScheduleEditorFields from '@/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields'
+import { useToastStore } from '@/store/useToastStore'
 
 type ScheduleEditorContentProps = ScheduleEditorFormProps & {
   schedule: UseScheduleEditorFormResult
@@ -59,6 +60,14 @@ const ScheduleEditorContent = ({
   const { setValue, getValues, formState } = useFormContext<ScheduleEditorFormValues>()
   const { isDirty } = formState
   const originalTitleRef = useRef('')
+  const canEdit = !isEditing || initialEvent?.isOwner !== false
+  const showReadOnlyToast = useCallback(() => {
+    useToastStore.getState().showToast({
+      title: '일정을 수정할 수 없습니다',
+      message: '일정 소유자만 수정할 수 있습니다.',
+      toastType: 'warning',
+    })
+  }, [])
 
   useEffect(() => {
     if (!isEditing) {
@@ -91,6 +100,10 @@ const ScheduleEditorContent = ({
 
   // 종일 토글 처리 (시간 필드 초기화 포함)
   const handleAllDayToggle = useCallback(() => {
+    if (!canEdit) {
+      showReadOnlyToast()
+      return
+    }
     const nextIsAllDay = !isAllday
     const isExistingRecurring = initialEvent?.recurrenceGroup != null
     setValue('isAllday', nextIsAllDay, {
@@ -111,7 +124,16 @@ const ScheduleEditorContent = ({
         isExistingRecurring ? RECURRENCE_EVENT_SCOPE.THIS_EVENT : undefined,
       )
     }
-  }, [getValues, initialEvent?.recurrenceGroup, isAllday, isEditing, patchSchedule, setValue])
+  }, [
+    canEdit,
+    getValues,
+    initialEvent?.recurrenceGroup,
+    isAllday,
+    isEditing,
+    patchSchedule,
+    setValue,
+    showReadOnlyToast,
+  ])
 
   // 로컬 이벤트 동기화(타이틀/시간)
   const { syncEventTiming, handleTitleConfirm } = useScheduleEventSync({
@@ -158,6 +180,8 @@ const ScheduleEditorContent = ({
     handleTitleConfirm,
     buildDateTime,
     formatDateTime,
+    canEdit,
+    onReadOnlyAttempt: showReadOnlyToast,
   })
 
   // 하단 컬러 선택/삭제 핸들러
@@ -175,11 +199,26 @@ const ScheduleEditorContent = ({
     eventColor,
     closeModal: () => requestClose(true),
     occurrenceDate: initialEvent?.occurrenceDate ?? date,
+    canEdit,
+    onReadOnlyAttempt: showReadOnlyToast,
   })
 
+  const handleReadOnlyFormSubmit = useCallback(
+    (event: FormEvent<HTMLFormElement>) => {
+      if (canEdit) {
+        void handleFormSubmit(event)
+        return
+      }
+      event.preventDefault()
+      event.stopPropagation()
+      showReadOnlyToast()
+    },
+    [canEdit, handleFormSubmit, showReadOnlyToast],
+  )
+
   return (
     <>
-      <form id="add-schedule-form" onSubmit={handleFormSubmit}>
+      <form id="add-schedule-form" onSubmit={handleReadOnlyFormSubmit}>
         <ScheduleEditorFields
           headerTitlePortalTarget={headerTitlePortalTarget}
           isEditing={isEditing}
@@ -192,6 +231,8 @@ const ScheduleEditorContent = ({
           handleRepeatType={handleRepeatType}
           onTitleConfirm={handleTitleConfirm}
           onSharedChange={onSharedChange}
+          readOnly={!canEdit}
+          onReadOnlyAttempt={showReadOnlyToast}
         />
       </form>
       <ScheduleEditorConfirmModals
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx
index 413a3a5..b31947b 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx
@@ -23,6 +23,8 @@ type ScheduleEditorFieldsProps = Pick<
   handleAllDayToggle: () => void
   onTitleConfirm: (value: string) => void
   onSharedChange?: (isShared: boolean) => void
+  readOnly?: boolean
+  onReadOnlyAttempt?: () => void
 }
 
 const ScheduleEditorFields = ({
@@ -37,6 +39,8 @@ const ScheduleEditorFields = ({
   handleAllDayToggle,
   onTitleConfirm,
   onSharedChange,
+  readOnly = false,
+  onReadOnlyAttempt,
 }: ScheduleEditorFieldsProps) => {
   return (
     <>
@@ -46,15 +50,34 @@ const ScheduleEditorFields = ({
           autoFocus={!isEditing}
           isShared={isShared}
           onTitleConfirm={onTitleConfirm}
+          readOnly={readOnly}
+          onReadOnlyAttempt={onReadOnlyAttempt}
+        />
+        <ScheduleDateTimeSection
+          mode={mode}
+          handleAllDayToggle={handleAllDayToggle}
+          readOnly={readOnly}
+          onReadOnlyAttempt={onReadOnlyAttempt}
+        />
+        <ScheduleDetailsSection
+          mode={mode}
+          modalWrapperElement={modalWrapperElement}
+          readOnly={readOnly}
+          onReadOnlyAttempt={onReadOnlyAttempt}
         />
-        <ScheduleDateTimeSection mode={mode} handleAllDayToggle={handleAllDayToggle} />
-        <ScheduleDetailsSection mode={mode} modalWrapperElement={modalWrapperElement} />
       </S.FormContent>
-      <ScheduleRepeatSection updateConfig={updateConfig} handleRepeatType={handleRepeatType} />
+      <ScheduleRepeatSection
+        updateConfig={updateConfig}
+        handleRepeatType={handleRepeatType}
+        readOnly={readOnly}
+        onReadOnlyAttempt={onReadOnlyAttempt}
+      />
       <ShareSchedulePanel
         isShared={isShared}
         invitedParticipants={invitedParticipants}
         onSharedChange={onSharedChange}
+        readOnly={readOnly}
+        onReadOnlyAttempt={onReadOnlyAttempt}
       />
     </>
   )
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx
index 87b5177..ebc0336 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx
@@ -1,5 +1,5 @@
 // 일정 반복 규칙과 종료 조건을 편집하는 섹션입니다.
-import { useState } from 'react'
+import { useCallback, useState } from 'react'
 import { useFormContext, useWatch } from 'react-hook-form'
 
 import type { RepeatConfigSchema, ScheduleEditorFormValues } from '@/shared/types/event/event'
@@ -12,18 +12,33 @@ import TerminationPanel from '@/shared/ui/scheduleTodo/TerminationPanel/Terminat
 type ScheduleRepeatSectionProps = {
   updateConfig: (changes: Partial<RepeatConfig>) => void
   handleRepeatType: (value: RepeatType) => void
+  readOnly?: boolean
+  onReadOnlyAttempt?: () => void
 }
 
-const ScheduleRepeatSection = ({ updateConfig, handleRepeatType }: ScheduleRepeatSectionProps) => {
+const ScheduleRepeatSection = ({
+  updateConfig,
+  handleRepeatType,
+  readOnly = false,
+  onReadOnlyAttempt,
+}: ScheduleRepeatSectionProps) => {
   const { control } = useFormContext<ScheduleEditorFormValues>()
   const repeatConfig = useWatch({ control, name: 'repeatConfig' }) as RepeatConfigSchema
   const eventEndDate = useWatch({ control, name: 'eventEndDate' }) ?? null
   const [isRepeatDetailOpen, setIsRepeatDetailOpen] = useState(false)
   const hasRepeatType = Boolean(repeatConfig && repeatConfig.repeatType !== 'none')
+  const handleReadOnlyConfigChange = useCallback(() => {
+    onReadOnlyAttempt?.()
+  }, [onReadOnlyAttempt])
+  const resolvedUpdateConfig = readOnly ? handleReadOnlyConfigChange : updateConfig
 
   if (!repeatConfig) return null
 
   const handleToggleRepeatType = (value: RepeatType) => {
+    if (readOnly) {
+      onReadOnlyAttempt?.()
+      return
+    }
     const willClearRepeatType = repeatConfig.repeatType === value && value !== 'custom'
     const willClearCustomRepeat = repeatConfig.repeatType === 'custom' && value === 'custom'
 
@@ -54,13 +69,13 @@ const ScheduleRepeatSection = ({ updateConfig, handleRepeatType }: ScheduleRepea
             <CustomBasisPanel
               config={repeatConfig}
               customBasis={repeatConfig.customBasis}
-              updateConfig={updateConfig}
+              updateConfig={resolvedUpdateConfig}
             />
           )}
           {repeatConfig.repeatType !== 'none' && (
             <TerminationPanel
               config={repeatConfig}
-              updateConfig={updateConfig}
+              updateConfig={resolvedUpdateConfig}
               minDate={eventEndDate}
             />
           )}
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx
index d8b105f..a47794f 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx
@@ -14,21 +14,25 @@ type ScheduleTitleFieldProps = {
   portalTarget?: HTMLElement | null
   autoFocus?: boolean
   isShared?: boolean
+  readOnly?: boolean
   onTitleConfirm: (value: string) => void
+  onReadOnlyAttempt?: () => void
 }
 
 const ScheduleTitleField = ({
   portalTarget,
   autoFocus = true,
   isShared = false,
+  readOnly = false,
   onTitleConfirm,
+  onReadOnlyAttempt,
 }: ScheduleTitleFieldProps) => {
   const { control } = useFormContext<ScheduleEditorFormValues>()
   const eventTitleKeyword = (useWatch({ control, name: 'eventTitle' }) ?? '').trim()
   const throttledEventTitleKeyword = useThrottledValue(eventTitleKeyword, TITLE_SEARCH_THROTTLE_MS)
   const { data: eventTitleHistoryData } = useEventTitleHistoryQuery(
     throttledEventTitleKeyword,
-    Boolean(throttledEventTitleKeyword),
+    !readOnly && Boolean(throttledEventTitleKeyword),
   )
   const suggestions = eventTitleHistoryData?.result.titleHistory ?? []
 
@@ -36,11 +40,13 @@ const ScheduleTitleField = ({
     <TitleSuggestionInput
       fieldName="eventTitle"
       placeholder="새로운 일정"
-      autoFocus={autoFocus}
+      autoFocus={autoFocus && !readOnly}
+      readOnly={readOnly}
       suggestions={suggestions}
       inputColor={isShared ? theme.colors.share.point : undefined}
-      onLiveChange={onTitleConfirm}
-      onConfirm={onTitleConfirm}
+      onLiveChange={readOnly ? undefined : onTitleConfirm}
+      onConfirm={readOnly ? undefined : onTitleConfirm}
+      onReadOnlyAttempt={onReadOnlyAttempt}
     />
   )
 
diff --git a/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx b/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
index 25c3b2f..9dddff9 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
@@ -7,6 +7,7 @@ import type { CalendarEvent } from '@/shared/types/calendar/types'
 import type { ScheduleEditorFormValues } from '@/shared/types/event/event'
 import type { ScheduleShareFriend } from '@/shared/types/schedule/shareFriend'
 import SearchFriend from '@/shared/ui/scheduleTodo/SearchFriend/SearchFriend'
+import { getEventParticipantFriendId } from '@/shared/utils/eventParticipants'
 
 import * as S from './index.style'
 
@@ -14,25 +15,37 @@ type ShareSchedulePanelProps = {
   isShared?: boolean
   invitedParticipants?: CalendarEvent['eventParticipantInfo']
   onSharedChange?: (isShared: boolean) => void
+  readOnly?: boolean
+  onReadOnlyAttempt?: () => void
 }
 
 const ShareSchedulePanel = ({
   isShared = false,
   invitedParticipants = [],
   onSharedChange,
+  readOnly = false,
+  onReadOnlyAttempt,
 }: ShareSchedulePanelProps) => {
   const { control, setValue } = useFormContext<ScheduleEditorFormValues>()
   const [isOpen, setIsOpen] = useState(false)
   const [selectedFriends, setSelectedFriends] = useState<ScheduleShareFriend[]>([])
   const selectedFriendIds = useWatch({ control, name: 'friendIds' }) ?? []
-  const visibleInvitedParticipants = invitedParticipants.filter((participant) =>
-    selectedFriendIds.includes(participant.eventParticipantId),
-  )
+  const visibleInvitedParticipants = readOnly
+    ? invitedParticipants
+    : invitedParticipants.filter((participant) => {
+        const friendId = getEventParticipantFriendId(participant)
+
+        return friendId != null && selectedFriendIds.includes(friendId)
+      })
   const displayedFriends = [
-    ...visibleInvitedParticipants.map((participant) => ({
-      id: String(participant.eventParticipantId),
-      name: participant.name,
-    })),
+    ...visibleInvitedParticipants.map((participant) => {
+      const friendId = getEventParticipantFriendId(participant)
+
+      return {
+        id: String(friendId ?? participant.eventParticipantId),
+        name: participant.name,
+      }
+    }),
     ...selectedFriends.map((friend) => ({
       id: friend.userId,
       name: friend.userName,
@@ -40,6 +53,10 @@ const ShareSchedulePanel = ({
   ]
 
   const handleToggleFriend = (friend: ScheduleShareFriend) => {
+    if (readOnly) {
+      onReadOnlyAttempt?.()
+      return
+    }
     const friendId = Number(friend.userId)
     const isSelected = selectedFriendIds.includes(friendId)
     const nextFriendIds = isSelected
@@ -59,6 +76,10 @@ const ShareSchedulePanel = ({
   }
 
   const handleRemoveFriend = (friendId: ScheduleShareFriend['userId']) => {
+    if (readOnly) {
+      onReadOnlyAttempt?.()
+      return
+    }
     const numericFriendId = Number(friendId)
     const nextFriendIds = selectedFriendIds.filter(
       (selectedFriendId) => selectedFriendId !== numericFriendId,
@@ -84,25 +105,32 @@ const ShareSchedulePanel = ({
       </S.FriendSectionOpenButton>
       {isOpen && (
         <S.FriendSection>
-          <SearchFriend selectedFriendIds={selectedFriendIds} onToggleFriend={handleToggleFriend} />
+          {!readOnly && (
+            <SearchFriend
+              selectedFriendIds={selectedFriendIds}
+              onToggleFriend={handleToggleFriend}
+            />
+          )}
 
           {displayedFriends.length > 0 && (
             <div className="added-friend-list">
               {displayedFriends.map((friend) => (
                 <div key={friend.id} className="added-friend">
                   {friend.name}
-                  <button
-                    type="button"
-                    className="remove-friend-button"
-                    onClick={(event) => {
-                      event.stopPropagation()
-                      handleRemoveFriend(friend.id)
-                    }}
-                    aria-label={`${friend.name} 삭제`}
-                    title={`${friend.name} 삭제`}
-                  >
-                    <Close width={14} height={14} />
-                  </button>
+                  {!readOnly && (
+                    <button
+                      type="button"
+                      className="remove-friend-button"
+                      onClick={(event) => {
+                        event.stopPropagation()
+                        handleRemoveFriend(friend.id)
+                      }}
+                      aria-label={`${friend.name} 삭제`}
+                      title={`${friend.name} 삭제`}
+                    >
+                      <Close width={14} height={14} />
+                    </button>
+                  )}
                 </div>
               ))}
             </div>
diff --git a/src/shared/ui/Modals/ScheduleEditor/index.style.ts b/src/shared/ui/Modals/ScheduleEditor/index.style.ts
index 4235a4c..a3e7a18 100644
--- a/src/shared/ui/Modals/ScheduleEditor/index.style.ts
+++ b/src/shared/ui/Modals/ScheduleEditor/index.style.ts
@@ -204,7 +204,7 @@ export const FriendSection = styled.div`
     border: 1px solid #d5d4e3;
     background: #fff;
     display: flex;
-    padding: 6px 8px 6px 12px;
+    padding: 6px 8px;
     justify-content: center;
     align-items: center;
     gap: 5px;
diff --git a/src/shared/ui/calendar/CustomTimePicker/CustomTimePicker.tsx b/src/shared/ui/calendar/CustomTimePicker/CustomTimePicker.tsx
index 87bd130..f1f3f49 100644
--- a/src/shared/ui/calendar/CustomTimePicker/CustomTimePicker.tsx
+++ b/src/shared/ui/calendar/CustomTimePicker/CustomTimePicker.tsx
@@ -9,7 +9,17 @@ const getTimeParts = (time?: string) => {
   return { nextHour, nextMinute }
 }
 
-const CustomTimePicker = ({ value = '09:00', onChange }: TimePickerRenderProps) => {
+type CustomTimePickerProps = TimePickerRenderProps & {
+  readOnly?: boolean
+  onReadOnlyAttempt?: () => void
+}
+
+const CustomTimePicker = ({
+  value = '09:00',
+  onChange,
+  readOnly = false,
+  onReadOnlyAttempt,
+}: CustomTimePickerProps) => {
   const hourRef = useRef<HTMLInputElement | null>(null)
   const minuteRef = useRef<HTMLInputElement | null>(null)
   const { nextHour: initialHour, nextMinute: initialMinute } = getTimeParts(value)
@@ -29,6 +39,10 @@ const CustomTimePicker = ({ value = '09:00', onChange }: TimePickerRenderProps)
   const formatTwoDigits = (value?: string) => value?.padStart(2, '0') ?? '00'
 
   const handleInputChange = (e: ChangeEvent<HTMLInputElement>, type: 'hour' | 'minute') => {
+    if (readOnly) {
+      onReadOnlyAttempt?.()
+      return
+    }
     const max = type === 'hour' ? 23 : 59
     const digits = sanitizeDigits(e.target.value)
     let val = digits
@@ -54,6 +68,7 @@ const CustomTimePicker = ({ value = '09:00', onChange }: TimePickerRenderProps)
 
   // 포커스 아웃 시 1자리 숫자를 2자리로 보정 (예: '9' -> '09')
   const handleBlur = () => {
+    if (readOnly) return
     const formattedHour = formatTwoDigits(hourRef.current?.value ?? initialHour)
     const formattedMin = formatTwoDigits(minuteRef.current?.value ?? initialMinute)
     if (hourRef.current) hourRef.current.value = formattedHour
@@ -70,6 +85,11 @@ const CustomTimePicker = ({ value = '09:00', onChange }: TimePickerRenderProps)
           pattern="[0-9]*"
           defaultValue={initialHour}
           ref={hourRef}
+          readOnly={readOnly}
+          aria-readonly={readOnly}
+          onFocus={() => {
+            if (readOnly) onReadOnlyAttempt?.()
+          }}
           onChange={(e) => handleInputChange(e, 'hour')}
           onBlur={handleBlur}
           placeholder="HH"
@@ -81,6 +101,11 @@ const CustomTimePicker = ({ value = '09:00', onChange }: TimePickerRenderProps)
           pattern="[0-9]*"
           defaultValue={initialMinute}
           ref={minuteRef}
+          readOnly={readOnly}
+          aria-readonly={readOnly}
+          onFocus={() => {
+            if (readOnly) onReadOnlyAttempt?.()
+          }}
           onChange={(e) => handleInputChange(e, 'minute')}
           onBlur={handleBlur}
           placeholder="mm"
diff --git a/src/shared/ui/common/Checkbox/Checkbox.tsx b/src/shared/ui/common/Checkbox/Checkbox.tsx
index 57a9b1d..1d8b771 100644
--- a/src/shared/ui/common/Checkbox/Checkbox.tsx
+++ b/src/shared/ui/common/Checkbox/Checkbox.tsx
@@ -8,10 +8,14 @@ const Checkbox = ({
   checked,
   onChange,
   label,
+  readOnly = false,
+  onReadOnlyAttempt,
 }: {
   label?: string
   checked: boolean
   onChange: (e: React.ChangeEvent<HTMLInputElement>) => void
+  readOnly?: boolean
+  onReadOnlyAttempt?: () => void
 }) => {
   const id = useId()
   return (
@@ -22,7 +26,19 @@ const Checkbox = ({
           isChecked={checked}
           type="checkbox"
           checked={checked}
-          onChange={onChange}
+          onChange={(event) => {
+            if (readOnly) {
+              event.preventDefault()
+              onReadOnlyAttempt?.()
+              return
+            }
+            onChange(event)
+          }}
+          onClick={(event) => {
+            if (!readOnly) return
+            event.preventDefault()
+            onReadOnlyAttempt?.()
+          }}
         />
         <S.CheckIcon isVisible={checked}>
           <Check color="#ffffff" width={12} height={12} />
diff --git a/src/shared/ui/scheduleTodo/SelectColor/SelectColor.tsx b/src/shared/ui/scheduleTodo/SelectColor/SelectColor.tsx
index a59d4b0..69f23e1 100644
--- a/src/shared/ui/scheduleTodo/SelectColor/SelectColor.tsx
+++ b/src/shared/ui/scheduleTodo/SelectColor/SelectColor.tsx
@@ -11,9 +11,16 @@ import * as S from './SelectColor.style'
 type SelectColorProps = {
   value?: EventColorType
   onChange: (value: EventColorType) => void
+  readOnly?: boolean
+  onReadOnlyAttempt?: () => void
 }
 
-const SelectColor = ({ value, onChange }: SelectColorProps) => {
+const SelectColor = ({
+  value,
+  onChange,
+  readOnly = false,
+  onReadOnlyAttempt,
+}: SelectColorProps) => {
   const [dropdownOpen, setDropdownOpen] = useState(false)
   const dropdownRef = useRef<HTMLDivElement | null>(null)
 
@@ -58,7 +65,13 @@ const SelectColor = ({ value, onChange }: SelectColorProps) => {
         aria-haspopup="listbox"
         aria-expanded={dropdownOpen}
         aria-label="색상 선택"
-        onClick={() => setDropdownOpen((prev) => !prev)}
+        onClick={() => {
+          if (readOnly) {
+            onReadOnlyAttempt?.()
+            return
+          }
+          setDropdownOpen((prev) => !prev)
+        }}
       >
         <S.Circle color={palette.point} />
         <Arrow css={{ rotate: '-90deg' }} color="#A5A5A5" />
@@ -75,6 +88,10 @@ const SelectColor = ({ value, onChange }: SelectColorProps) => {
               color={theme.colors[colorName].point}
               isSelected={resolvedValue === colorName}
               onClick={() => {
+                if (readOnly) {
+                  onReadOnlyAttempt?.()
+                  return
+                }
                 onChange(colorName)
                 setDropdownOpen(false)
               }}
diff --git a/src/shared/ui/scheduleTodo/TitleSuggestionInput/TitleSuggestionInput.tsx b/src/shared/ui/scheduleTodo/TitleSuggestionInput/TitleSuggestionInput.tsx
index e6389ec..14072e9 100644
--- a/src/shared/ui/scheduleTodo/TitleSuggestionInput/TitleSuggestionInput.tsx
+++ b/src/shared/ui/scheduleTodo/TitleSuggestionInput/TitleSuggestionInput.tsx
@@ -18,10 +18,12 @@ const TitleSuggestionInput = <TFieldValues extends FieldValues>({
   placeholder = '새로운 일정',
   suggestions = [],
   autoFocus = false,
+  readOnly = false,
   formController,
   inputColor,
   onConfirm,
   onLiveChange,
+  onReadOnlyAttempt,
 }: TitleSuggestionInputProps<TFieldValues>) => {
   const context = useFormContext<TFieldValues>()
   const registerFn = formController?.register ?? context?.register
@@ -89,6 +91,10 @@ const TitleSuggestionInput = <TFieldValues extends FieldValues>({
   }, [autoFocus])
 
   const handleSelectSuggestion = (value: string) => {
+    if (readOnly) {
+      onReadOnlyAttempt?.()
+      return
+    }
     setValueFn(fieldName, value as PathValue<TFieldValues, typeof fieldName>, {
       shouldDirty: true,
       shouldTouch: true,
@@ -101,6 +107,11 @@ const TitleSuggestionInput = <TFieldValues extends FieldValues>({
   }
 
   const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+    if (readOnly) {
+      event.preventDefault()
+      onReadOnlyAttempt?.()
+      return
+    }
     if (event.key !== 'Enter') return
     event.preventDefault()
     const value = (watchFn(fieldName) as string | undefined) ?? ''
@@ -108,18 +119,31 @@ const TitleSuggestionInput = <TFieldValues extends FieldValues>({
   }
 
   return (
-    <S.Wrapper ref={wrapperRef}>
+    <S.Wrapper
+      ref={wrapperRef}
+      onMouseDownCapture={() => {
+        if (!readOnly) return
+        onReadOnlyAttempt?.()
+      }}
+    >
       <S.Input
         {...registerProps}
         ref={handleInputRef}
         $color={inputColor}
         placeholder={placeholder}
         autoComplete="off"
+        readOnly={readOnly}
+        aria-readonly={readOnly}
         onFocus={() => {
+          if (readOnly) return
           setIsInputActive(true)
           setDismissedTitleQuery(null)
         }}
         onChange={(event) => {
+          if (readOnly) {
+            onReadOnlyAttempt?.()
+            return
+          }
           registerProps.onChange?.(event)
           setDismissedTitleQuery(null)
           setIsInputActive(true)

From f69cf10e487b6a830e9e3ebb8a7c94750d03eb73 Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Mon, 18 May 2026 15:09:00 +0900
Subject: [PATCH 19/23] =?UTF-8?q?fix:=20=EC=BA=98=EB=A6=B0=EB=8D=94=20?=
 =?UTF-8?q?=EC=A7=81=EC=A0=91=20=EC=A1=B0=EC=9E=91=20=EC=8B=9C=20=EB=B9=84?=
 =?UTF-8?q?=EC=86=8C=EC=9C=A0=EC=9E=90=20=EC=9D=BC=EC=A0=95=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=B0=A8=EB=8B=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hooks/useCalendarDayViewTiming.ts         | 22 +++++++++++++++---
 .../Calendar/hooks/useCalendarDragDrop.ts     | 23 ++++++++++++++++---
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/features/Calendar/hooks/useCalendarDayViewTiming.ts b/src/features/Calendar/hooks/useCalendarDayViewTiming.ts
index 7b1c3a0..e6be172 100644
--- a/src/features/Calendar/hooks/useCalendarDayViewTiming.ts
+++ b/src/features/Calendar/hooks/useCalendarDayViewTiming.ts
@@ -5,6 +5,7 @@ import { getEventOccurrenceScope } from '@/features/Calendar/utils/helpers/calen
 import { resolveOccurrenceDateTime } from '@/features/Calendar/utils/helpers/dayViewHelpers'
 import type { RecurrenceEventSeriesScope } from '@/shared/constants/recurrenceScope'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
+import { useToastStore } from '@/store/useToastStore'
 
 import type { PatchTodoTiming } from './useCalendarTodoTimingPatch'
 
@@ -39,10 +40,18 @@ export const useCalendarDayViewTiming = ({
   patchTodoTiming,
   updateLocalEventTime,
 }: UseCalendarDayViewTimingArgs) => {
+  const showReadOnlyToast = useCallback(() => {
+    useToastStore.getState().showToast({
+      title: '일정을 수정할 수 없습니다',
+      message: '일정 소유자만 수정할 수 있습니다.',
+      toastType: 'warning',
+    })
+  }, [])
+
   const handleDayViewEventTimeChange = useCallback(
     (eventId: CalendarEvent['id'], start: Date, end: Date, type?: CalendarEvent['type']) => {
-      updateLocalEventTime(eventId, start, end, type)
       if (type === 'todo') {
+        updateLocalEventTime(eventId, start, end, type)
         const todoEvent = events.find(
           (eventItem) => eventItem.id === eventId && eventItem.type === 'todo',
         )
@@ -53,6 +62,11 @@ export const useCalendarDayViewTiming = ({
       }
 
       const targetEvent = events.find((eventItem) => eventItem.id === eventId)
+      if (targetEvent?.isOwner === false) {
+        showReadOnlyToast()
+        return
+      }
+      updateLocalEventTime(eventId, start, end, type)
       const occurrenceDate = resolveOccurrenceDateTime(
         targetEvent?.occurrenceDate,
         targetEvent?.start ?? start,
@@ -71,14 +85,16 @@ export const useCalendarDayViewTiming = ({
         },
       })
     },
-    [events, patchEventMutate, patchTodoTiming, updateLocalEventTime],
+    [events, patchEventMutate, patchTodoTiming, showReadOnlyToast, updateLocalEventTime],
   )
 
   const handleDayViewEventTimePreview = useCallback(
     (eventId: CalendarEvent['id'], start: Date, end: Date, type?: CalendarEvent['type']) => {
+      const targetEvent = events.find((eventItem) => eventItem.id === eventId)
+      if (type !== 'todo' && targetEvent?.isOwner === false) return
       updateLocalEventTime(eventId, start, end, type)
     },
-    [updateLocalEventTime],
+    [events, updateLocalEventTime],
   )
 
   return {
diff --git a/src/features/Calendar/hooks/useCalendarDragDrop.ts b/src/features/Calendar/hooks/useCalendarDragDrop.ts
index 94cf352..6cfed1f 100644
--- a/src/features/Calendar/hooks/useCalendarDragDrop.ts
+++ b/src/features/Calendar/hooks/useCalendarDragDrop.ts
@@ -17,6 +17,7 @@ import {
   toWeekday,
   toWeekOfMonth,
 } from '@/shared/utils/recurrencePattern'
+import { useToastStore } from '@/store/useToastStore'
 
 export const buildRecurringGroupForFutureDrop = (
   recurrenceGroup: CalendarEvent['recurrenceGroup'],
@@ -99,6 +100,14 @@ export const useCalendarDragDrop = ({
   patchTodoTiming,
   onRequireRecurringDropConfirm,
 }: UseCalendarDragDropArgs) => {
+  const showReadOnlyToast = useCallback(() => {
+    useToastStore.getState().showToast({
+      title: '일정을 수정할 수 없습니다',
+      message: '일정 소유자만 수정할 수 있습니다.',
+      toastType: 'warning',
+    })
+  }, [])
+
   const applyEventDrop = useCallback(
     (
       args: EventInteractionArgs<CalendarEvent>,
@@ -107,9 +116,13 @@ export const useCalendarDragDrop = ({
         todoScope?: RecurrenceTodoScope
       },
     ) => {
+      const { event, start, end } = args
+      if (event.type !== 'todo' && event.isOwner === false) {
+        showReadOnlyToast()
+        return
+      }
       moveEvent(args)
       if (view !== Views.MONTH && view !== Views.WEEK) return
-      const { event, start, end } = args
       if (event.type === 'todo') {
         const defaultOccurrenceDate = moment(event.occurrenceDate ?? event.start).format(
           'YYYY-MM-DD',
@@ -144,12 +157,16 @@ export const useCalendarDragDrop = ({
         },
       })
     },
-    [moveEvent, patchEventMutate, patchTodoTiming, view],
+    [moveEvent, patchEventMutate, patchTodoTiming, showReadOnlyToast, view],
   )
 
   const handleEventDrop = useCallback(
     (args: EventInteractionArgs<CalendarEvent>) => {
       const { event } = args
+      if (event.type !== 'todo' && event.isOwner === false) {
+        showReadOnlyToast()
+        return
+      }
       if (
         (view === Views.MONTH || view === Views.WEEK) &&
         event.type !== 'todo' &&
@@ -168,7 +185,7 @@ export const useCalendarDragDrop = ({
       }
       applyEventDrop(args)
     },
-    [applyEventDrop, onRequireRecurringDropConfirm, view],
+    [applyEventDrop, onRequireRecurringDropConfirm, showReadOnlyToast, view],
   )
 
   return { handleEventDrop, applyEventDrop }

From 2fc796a6783a3425c21afe40f08bb967d2f6476a Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Mon, 18 May 2026 17:53:18 +0900
Subject: [PATCH 20/23] =?UTF-8?q?feat:=20=EC=84=A4=EC=A0=95=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B3=B8=20=EC=BA=98=EB=A6=B0=EB=8D=94=20=EB=B3=B4=EA=B8=B0=20?=
 =?UTF-8?q?=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CustomCalendar/CustomCalendar.tsx  |  6 ++++--
 src/features/Calendar/domain/config.ts            |  2 +-
 .../hooks/useCustomCalendarController.tsx         |  6 ++++--
 .../Calendar/hooks/useStoredCalendarView.ts       | 15 +++++++++++++--
 src/pages/main/CalendarPage/CalendarPage.tsx      | 12 +++++++++++-
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx b/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx
index 8b57592..1b84c93 100644
--- a/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx
+++ b/src/features/Calendar/components/CustomCalendar/CustomCalendar.tsx
@@ -3,6 +3,7 @@ import 'moment/locale/ko'
 import 'react-big-calendar/lib/css/react-big-calendar.css'
 
 import moment from 'moment'
+import type { View } from 'react-big-calendar'
 import { Calendar, momentLocalizer } from 'react-big-calendar'
 import withDragAndDrop from 'react-big-calendar/lib/addons/dragAndDrop'
 
@@ -20,10 +21,11 @@ const DragAndDropCalendar = withDragAndDrop<CalendarEvent, object>(Calendar)
 export type { SelectDateSource } from './CustomCalendar.types'
 
 type CustomCalendarProps = {
+  initialView?: View
   onSelectedDateChange?: (selectedDate: Date) => void
 }
 
-const CustomCalendar = ({ onSelectedDateChange }: CustomCalendarProps) => {
+const CustomCalendar = ({ initialView, onSelectedDateChange }: CustomCalendarProps) => {
   const {
     view,
     date,
@@ -43,7 +45,7 @@ const CustomCalendar = ({ onSelectedDateChange }: CustomCalendarProps) => {
     handleCloseRecurringDropConfirm,
     handleConfirmRecurringDrop,
     onView,
-  } = useCustomCalendarController({ localizer, onSelectedDateChange })
+  } = useCustomCalendarController({ localizer, initialView, onSelectedDateChange })
 
   return (
     <div css={{ position: 'relative', height: 'fit-content', width: '100%' }}>
diff --git a/src/features/Calendar/domain/config.ts b/src/features/Calendar/domain/config.ts
index 8cd6d47..0c9219e 100644
--- a/src/features/Calendar/domain/config.ts
+++ b/src/features/Calendar/domain/config.ts
@@ -55,7 +55,7 @@ export const buildCalendarConfig = ({
     localizer,
     culture: 'ko',
     views,
-    defaultView: Views.MONTH,
+    defaultView: view,
     view,
     date,
     events,
diff --git a/src/features/Calendar/hooks/useCustomCalendarController.tsx b/src/features/Calendar/hooks/useCustomCalendarController.tsx
index e24b68b..fdcb31d 100644
--- a/src/features/Calendar/hooks/useCustomCalendarController.tsx
+++ b/src/features/Calendar/hooks/useCustomCalendarController.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from 'react'
-import type { DateLocalizer } from 'react-big-calendar'
+import type { DateLocalizer, View } from 'react-big-calendar'
 
 import type { CalendarEventActions } from '@/features/Calendar/components/CustomCalendar/CustomCalendar.types'
 import { useCalendarApiEvents } from '@/features/Calendar/hooks/useCalendarApiEvents'
@@ -24,14 +24,16 @@ import { getCalendarModalEvent } from '@/features/Calendar/utils/helpers/calenda
 
 type UseCustomCalendarControllerArgs = {
   localizer: DateLocalizer
+  initialView?: View
   onSelectedDateChange?: (selectedDate: Date) => void
 }
 
 export const useCustomCalendarController = ({
   localizer,
+  initialView,
   onSelectedDateChange,
 }: UseCustomCalendarControllerArgs) => {
-  const { view, setView } = useStoredCalendarView()
+  const { view, setView } = useStoredCalendarView({ initialView })
   const [date, setDate] = useState<Date>(new Date())
   const { startDate, endDate } = useCalendarDateRange(view, date)
   const { events: apiEvents, refetch: refetchEvents } = useCalendarApiEvents(startDate, endDate)
diff --git a/src/features/Calendar/hooks/useStoredCalendarView.ts b/src/features/Calendar/hooks/useStoredCalendarView.ts
index 36b30a6..fa3b93f 100644
--- a/src/features/Calendar/hooks/useStoredCalendarView.ts
+++ b/src/features/Calendar/hooks/useStoredCalendarView.ts
@@ -3,8 +3,16 @@ import { useEffect, useState } from 'react'
 import type { View } from 'react-big-calendar'
 import { Views } from 'react-big-calendar'
 
+import type { CalendarView } from '@/shared/types/settings/settings'
+
 const VIEW_STORAGE_KEY = 'calendar.view'
 
+const SETTINGS_VIEW_MAP: Record<CalendarView, View> = {
+  MONTH: Views.MONTH,
+  WEEK: Views.WEEK,
+  DAY: Views.DAY,
+}
+
 const getStoredView = (): View | null => {
   if (typeof window === 'undefined') return null
   const stored = window.localStorage.getItem(VIEW_STORAGE_KEY)
@@ -14,16 +22,19 @@ const getStoredView = (): View | null => {
   return null
 }
 
+export const mapSettingsDefaultView = (defaultView: CalendarView): View =>
+  SETTINGS_VIEW_MAP[defaultView] ?? Views.MONTH
+
 type UseStoredCalendarViewArgs = {
   initialView?: View | null
 }
 
 export const useStoredCalendarView = ({ initialView }: UseStoredCalendarViewArgs = {}) => {
-  const storedView = getStoredView()
-  const [userView, setUserView] = useState<View | null>(() => storedView ?? null)
+  const [userView, setUserView] = useState<View | null>(() => initialView ?? getStoredView())
   const view = userView ?? initialView ?? Views.MONTH
 
   useEffect(() => {
+    if (typeof window === 'undefined') return
     window.localStorage.setItem(VIEW_STORAGE_KEY, view)
   }, [view])
 
diff --git a/src/pages/main/CalendarPage/CalendarPage.tsx b/src/pages/main/CalendarPage/CalendarPage.tsx
index df10c20..8040d0f 100644
--- a/src/pages/main/CalendarPage/CalendarPage.tsx
+++ b/src/pages/main/CalendarPage/CalendarPage.tsx
@@ -3,14 +3,24 @@ import { useRef, useState } from 'react'
 
 import CustomCalendar from '@/features/Calendar/components/CustomCalendar/CustomCalendar'
 import EventsCard from '@/features/Calendar/components/EventsCard/EventsCard'
+import { mapSettingsDefaultView } from '@/features/Calendar/hooks/useStoredCalendarView'
+import { SettingsAPI } from '@/shared/api/settings/settings'
+import { useCustomSuspenseQuery } from '@/shared/hooks/common/customQuery'
 
 import * as S from './CalendarPage.styles'
 const CalendarPage = () => {
   const [selectedDate, setSelectedDate] = useState<Date>(new Date())
   const cardAreaRef = useRef<HTMLDivElement | null>(null)
+  const { data: settings } = useCustomSuspenseQuery(['settings'], async () => {
+    const res = await SettingsAPI.getSettings()
+    if (!res.isSuccess) throw new Error('설정 불러오기 실패')
+    return res.result
+  })
+  const initialView = mapSettingsDefaultView(settings.defaultView)
+
   return (
     <S.PageWrapper>
-      <CustomCalendar onSelectedDateChange={setSelectedDate} />
+      <CustomCalendar initialView={initialView} onSelectedDateChange={setSelectedDate} />
       <div
         ref={cardAreaRef}
         id="desktop-card-area"

From f7f9f5065e30e318d5728b54ff9ef1f7daae34bd Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Mon, 18 May 2026 17:53:31 +0900
Subject: [PATCH 21/23] =?UTF-8?q?fix:=20=EB=8B=A8=EC=9D=BC=20=EC=9D=BC?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=98=EB=B3=B5=20=EC=A0=84=ED=99=98=20scope=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/shared/hooks/addSchedule/useSchedulePatch.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/shared/hooks/addSchedule/useSchedulePatch.ts b/src/shared/hooks/addSchedule/useSchedulePatch.ts
index 0952343..4c66d92 100644
--- a/src/shared/hooks/addSchedule/useSchedulePatch.ts
+++ b/src/shared/hooks/addSchedule/useSchedulePatch.ts
@@ -105,8 +105,14 @@ export const useSchedulePatch = ({
       const shouldSendRecurrenceGroup =
         JSON.stringify(nextRecurrenceGroupPayload ?? null) !==
         JSON.stringify(initialRecurrenceGroupPayload ?? null)
+      const isConvertingSingleToRecurring =
+        initialEvent?.recurrenceGroup == null &&
+        nextRecurrenceGroupPayload != null &&
+        shouldSendRecurrenceGroup
       const patchScope = shouldSendRecurrenceGroup
-        ? RECURRENCE_EVENT_SCOPE.THIS_AND_FOLLOWING_EVENTS
+        ? isConvertingSingleToRecurring
+          ? undefined
+          : RECURRENCE_EVENT_SCOPE.THIS_AND_FOLLOWING_EVENTS
         : isRecurring
           ? (scope ?? RECURRENCE_EVENT_SCOPE.THIS_EVENT)
           : undefined

From 5de8795cd28da94278a7b1e5bd0af5c0b99f434c Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Mon, 18 May 2026 17:53:50 +0900
Subject: [PATCH 22/23] =?UTF-8?q?fix:=20=EC=9D=BC=EC=A0=95=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=AA=A8=EB=8B=AC=20=EB=B3=80=EA=B2=BD=20=EA=B0=90?=
 =?UTF-8?q?=EC=A7=80=EC=99=80=20=EA=B3=B5=EC=9C=A0=20=EC=B9=9C=EA=B5=AC=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomCalendar/CalendarModals.tsx         |  4 +-
 .../hooks/common/useUnsavedCloseGuard.ts      | 48 ++++++++++++++++++-
 .../ScheduleDateTimeSection.tsx               | 17 +++++--
 .../ScheduleEditor/ScheduleDetailsSection.tsx |  4 ++
 .../ScheduleEditor/ScheduleEditorContent.tsx  | 14 ++++--
 .../ScheduleEditor/ScheduleEditorFields.tsx   |  7 +++
 .../ScheduleEditor/ScheduleRepeatSection.tsx  | 10 +++-
 .../ScheduleEditor/ScheduleTitleField.tsx     | 20 +++++++-
 .../ScheduleEditor/ShareSchedulePanel.tsx     | 27 ++++++++++-
 .../SearchFriend/SearchFriend.tsx             |  4 ++
 10 files changed, 141 insertions(+), 14 deletions(-)

diff --git a/src/features/Calendar/components/CustomCalendar/CalendarModals.tsx b/src/features/Calendar/components/CustomCalendar/CalendarModals.tsx
index f17d8b5..0c2d33d 100644
--- a/src/features/Calendar/components/CustomCalendar/CalendarModals.tsx
+++ b/src/features/Calendar/components/CustomCalendar/CalendarModals.tsx
@@ -1,5 +1,6 @@
 import moment from 'moment'
 import { useMemo, useState } from 'react'
+import { useLocation } from 'react-router-dom'
 
 import { useDetailEventQuery } from '@/shared/hooks/query/useCalendarQueries'
 import type { CalendarEvent } from '@/shared/types/calendar/types'
@@ -98,7 +99,8 @@ const CalendarModals = ({
   onCloseModal,
   eventActions,
 }: CalendarModalsProps) => {
-  const shouldRenderModal = modalEventId != null
+  const location = useLocation()
+  const shouldRenderModal = modalEventId != null && location.pathname.startsWith('/calendar')
   const isTodoModal = modalEvent?.type === 'todo'
   const safeDetailEventId = isModalEditing && !isTodoModal ? modalEventId : null
   const occurrenceDate = useMemo(() => {
diff --git a/src/shared/hooks/common/useUnsavedCloseGuard.ts b/src/shared/hooks/common/useUnsavedCloseGuard.ts
index 6389779..ab79f58 100644
--- a/src/shared/hooks/common/useUnsavedCloseGuard.ts
+++ b/src/shared/hooks/common/useUnsavedCloseGuard.ts
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
+import { useLocation, useNavigate } from 'react-router-dom'
 
 type UseUnsavedCloseGuardArgs = {
   isDirty: boolean
@@ -14,7 +15,10 @@ export const useUnsavedCloseGuard = ({
   registerCloseGuard,
 }: UseUnsavedCloseGuardArgs) => {
   const allowCloseRef = useRef(false)
+  const pendingPathRef = useRef<string | null>(null)
   const [isUnsavedConfirmOpen, setIsUnsavedConfirmOpen] = useState(false)
+  const location = useLocation()
+  const navigate = useNavigate()
 
   const requestClose = useCallback(
     (force?: boolean) => {
@@ -39,14 +43,56 @@ export const useUnsavedCloseGuard = ({
   }, [isDirty])
 
   const handleCloseUnsavedConfirm = useCallback(() => {
+    pendingPathRef.current = null
     setIsUnsavedConfirmOpen(false)
   }, [])
 
   const handleLeaveUnsavedForm = useCallback(() => {
+    const pendingPath = pendingPathRef.current
+    pendingPathRef.current = null
     setIsUnsavedConfirmOpen(false)
     onDiscard?.()
+    if (pendingPath) {
+      navigate(pendingPath)
+      return
+    }
     requestClose(true)
-  }, [onDiscard, requestClose])
+  }, [navigate, onDiscard, requestClose])
+
+  useEffect(() => {
+    if (!isDirty) return undefined
+
+    const handleDocumentClick = (event: MouseEvent) => {
+      if (event.defaultPrevented) return
+      if (event.button !== 0) return
+      if (event.metaKey || event.altKey || event.ctrlKey || event.shiftKey) return
+
+      const target = event.target
+      if (!(target instanceof Element)) return
+
+      const anchor = target.closest('a[href]')
+      if (!(anchor instanceof HTMLAnchorElement)) return
+      if (anchor.target && anchor.target !== '_self') return
+
+      const nextUrl = new URL(anchor.href, window.location.href)
+      if (nextUrl.origin !== window.location.origin) return
+
+      const currentPath = `${location.pathname}${location.search}${location.hash}`
+      const nextPath = `${nextUrl.pathname}${nextUrl.search}${nextUrl.hash}`
+      if (nextPath === currentPath) return
+
+      event.preventDefault()
+      event.stopPropagation()
+      pendingPathRef.current = nextPath
+      setIsUnsavedConfirmOpen(true)
+    }
+
+    document.addEventListener('click', handleDocumentClick, true)
+
+    return () => {
+      document.removeEventListener('click', handleDocumentClick, true)
+    }
+  }, [isDirty, location.hash, location.pathname, location.search])
 
   useEffect(() => {
     if (!registerCloseGuard) return
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleDateTimeSection.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleDateTimeSection.tsx
index 32084fd..ed0340d 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleDateTimeSection.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleDateTimeSection.tsx
@@ -16,6 +16,7 @@ type ScheduleDateTimeSectionProps = Pick<ScheduleEditorFormProps, 'mode'> & {
   handleAllDayToggle: () => void
   readOnly?: boolean
   onReadOnlyAttempt?: () => void
+  onUserEdit?: () => void
 }
 
 const ScheduleDateTimeSection = ({
@@ -23,6 +24,7 @@ const ScheduleDateTimeSection = ({
   handleAllDayToggle,
   readOnly = false,
   onReadOnlyAttempt,
+  onUserEdit,
 }: ScheduleDateTimeSectionProps) => {
   const { control, setValue } = useFormContext<ScheduleEditorFormValues>()
   const isAllday = useWatch({ control, name: 'isAllday' }) ?? false
@@ -69,7 +71,10 @@ const ScheduleDateTimeSection = ({
               <CustomTimePicker
                 field="start"
                 value={eventStartTime ?? ''}
-                onChange={(value) => handleTimeChange('start', value)}
+                onChange={(value) => {
+                  onUserEdit?.()
+                  handleTimeChange('start', value)
+                }}
                 readOnly={readOnly}
                 onReadOnlyAttempt={onReadOnlyAttempt}
               />
@@ -87,7 +92,10 @@ const ScheduleDateTimeSection = ({
               <CustomTimePicker
                 field="end"
                 value={eventEndTime ?? ''}
-                onChange={(value) => handleTimeChange('end', value)}
+                onChange={(value) => {
+                  onUserEdit?.()
+                  handleTimeChange('end', value)
+                }}
                 readOnly={readOnly}
                 onReadOnlyAttempt={onReadOnlyAttempt}
               />
@@ -107,7 +115,10 @@ const ScheduleDateTimeSection = ({
                     ? (eventStartDate ?? null)
                     : (eventEndDate ?? null)
                 }
-                onSelectDate={handleDateSelect}
+                onSelectDate={(selectedDate) => {
+                  onUserEdit?.()
+                  handleDateSelect(selectedDate)
+                }}
               />
             </S.CalendarPortal>,
             document.getElementById('modal-root')!,
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleDetailsSection.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleDetailsSection.tsx
index 2fa55a6..dbf1d99 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleDetailsSection.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleDetailsSection.tsx
@@ -11,6 +11,7 @@ import SearchPlace from '@/shared/ui/scheduleTodo/SearchPlace/SearchPlace'
 type ScheduleDetailsSectionProps = Pick<ScheduleEditorFormProps, 'modalWrapperElement' | 'mode'> & {
   readOnly?: boolean
   onReadOnlyAttempt?: () => void
+  onUserEdit?: () => void
 }
 
 const ScheduleDetailsSection = ({
@@ -18,6 +19,7 @@ const ScheduleDetailsSection = ({
   mode = 'modal',
   readOnly = false,
   onReadOnlyAttempt,
+  onUserEdit,
 }: ScheduleDetailsSectionProps) => {
   const { control, register, setValue } = useFormContext<ScheduleEditorFormValues>()
   const descriptionField = register('eventDescription')
@@ -56,6 +58,7 @@ const ScheduleDetailsSection = ({
                 onReadOnlyAttempt?.()
                 return
               }
+              onUserEdit?.()
               descriptionField.onChange(event)
             }}
           />
@@ -76,6 +79,7 @@ const ScheduleDetailsSection = ({
                 <SearchPlace
                   selectedLocation={location}
                   onSelectLocation={(nextLocation, options) => {
+                    onUserEdit?.()
                     setValue('location', nextLocation, {
                       shouldDirty: true,
                       shouldValidate: true,
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
index 4494b03..7be4349 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorContent.tsx
@@ -1,5 +1,5 @@
 // 일정 편집 본문을 조합하고 제출, 패치, 삭제, 닫기 보호 흐름을 연결합니다.
-import { type FormEvent, useCallback, useEffect, useRef } from 'react'
+import { type FormEvent, useCallback, useEffect, useRef, useState } from 'react'
 import { useFormContext } from 'react-hook-form'
 
 import { RECURRENCE_EVENT_SCOPE } from '@/shared/constants/recurrenceScope'
@@ -57,10 +57,13 @@ const ScheduleEditorContent = ({
     setEventColor,
     eventTitle,
   } = schedule
-  const { setValue, getValues, formState } = useFormContext<ScheduleEditorFormValues>()
-  const { isDirty } = formState
+  const { setValue, getValues } = useFormContext<ScheduleEditorFormValues>()
+  const [hasUserEdited, setHasUserEdited] = useState(false)
   const originalTitleRef = useRef('')
   const canEdit = !isEditing || initialEvent?.isOwner !== false
+  const markUserEdited = useCallback(() => {
+    setHasUserEdited(true)
+  }, [])
   const showReadOnlyToast = useCallback(() => {
     useToastStore.getState().showToast({
       title: '일정을 수정할 수 없습니다',
@@ -84,7 +87,7 @@ const ScheduleEditorContent = ({
 
   const { isUnsavedConfirmOpen, requestClose, handleCloseUnsavedConfirm, handleLeaveUnsavedForm } =
     useUnsavedCloseGuard({
-      isDirty,
+      isDirty: hasUserEdited,
       onClose,
       onDiscard: handleDiscardDraftTitle,
       registerCloseGuard,
@@ -105,6 +108,7 @@ const ScheduleEditorContent = ({
       return
     }
     const nextIsAllDay = !isAllday
+    markUserEdited()
     const isExistingRecurring = initialEvent?.recurrenceGroup != null
     setValue('isAllday', nextIsAllDay, {
       shouldDirty: true,
@@ -132,6 +136,7 @@ const ScheduleEditorContent = ({
     isEditing,
     patchSchedule,
     setValue,
+    markUserEdited,
     showReadOnlyToast,
   ])
 
@@ -233,6 +238,7 @@ const ScheduleEditorContent = ({
           onSharedChange={onSharedChange}
           readOnly={!canEdit}
           onReadOnlyAttempt={showReadOnlyToast}
+          onUserEdit={markUserEdited}
         />
       </form>
       <ScheduleEditorConfirmModals
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx
index b31947b..9803685 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleEditorFields.tsx
@@ -25,6 +25,7 @@ type ScheduleEditorFieldsProps = Pick<
   onSharedChange?: (isShared: boolean) => void
   readOnly?: boolean
   onReadOnlyAttempt?: () => void
+  onUserEdit?: () => void
 }
 
 const ScheduleEditorFields = ({
@@ -41,6 +42,7 @@ const ScheduleEditorFields = ({
   onSharedChange,
   readOnly = false,
   onReadOnlyAttempt,
+  onUserEdit,
 }: ScheduleEditorFieldsProps) => {
   return (
     <>
@@ -52,18 +54,21 @@ const ScheduleEditorFields = ({
           onTitleConfirm={onTitleConfirm}
           readOnly={readOnly}
           onReadOnlyAttempt={onReadOnlyAttempt}
+          onUserEdit={onUserEdit}
         />
         <ScheduleDateTimeSection
           mode={mode}
           handleAllDayToggle={handleAllDayToggle}
           readOnly={readOnly}
           onReadOnlyAttempt={onReadOnlyAttempt}
+          onUserEdit={onUserEdit}
         />
         <ScheduleDetailsSection
           mode={mode}
           modalWrapperElement={modalWrapperElement}
           readOnly={readOnly}
           onReadOnlyAttempt={onReadOnlyAttempt}
+          onUserEdit={onUserEdit}
         />
       </S.FormContent>
       <ScheduleRepeatSection
@@ -71,6 +76,7 @@ const ScheduleEditorFields = ({
         handleRepeatType={handleRepeatType}
         readOnly={readOnly}
         onReadOnlyAttempt={onReadOnlyAttempt}
+        onUserEdit={onUserEdit}
       />
       <ShareSchedulePanel
         isShared={isShared}
@@ -78,6 +84,7 @@ const ScheduleEditorFields = ({
         onSharedChange={onSharedChange}
         readOnly={readOnly}
         onReadOnlyAttempt={onReadOnlyAttempt}
+        onUserEdit={onUserEdit}
       />
     </>
   )
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx
index ebc0336..1c99074 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleRepeatSection.tsx
@@ -14,6 +14,7 @@ type ScheduleRepeatSectionProps = {
   handleRepeatType: (value: RepeatType) => void
   readOnly?: boolean
   onReadOnlyAttempt?: () => void
+  onUserEdit?: () => void
 }
 
 const ScheduleRepeatSection = ({
@@ -21,6 +22,7 @@ const ScheduleRepeatSection = ({
   handleRepeatType,
   readOnly = false,
   onReadOnlyAttempt,
+  onUserEdit,
 }: ScheduleRepeatSectionProps) => {
   const { control } = useFormContext<ScheduleEditorFormValues>()
   const repeatConfig = useWatch({ control, name: 'repeatConfig' }) as RepeatConfigSchema
@@ -30,7 +32,12 @@ const ScheduleRepeatSection = ({
   const handleReadOnlyConfigChange = useCallback(() => {
     onReadOnlyAttempt?.()
   }, [onReadOnlyAttempt])
-  const resolvedUpdateConfig = readOnly ? handleReadOnlyConfigChange : updateConfig
+  const resolvedUpdateConfig = readOnly
+    ? handleReadOnlyConfigChange
+    : (changes: Partial<RepeatConfig>) => {
+        onUserEdit?.()
+        updateConfig(changes)
+      }
 
   if (!repeatConfig) return null
 
@@ -42,6 +49,7 @@ const ScheduleRepeatSection = ({
     const willClearRepeatType = repeatConfig.repeatType === value && value !== 'custom'
     const willClearCustomRepeat = repeatConfig.repeatType === 'custom' && value === 'custom'
 
+    onUserEdit?.()
     handleRepeatType(value)
     if (willClearRepeatType || willClearCustomRepeat) {
       setIsRepeatDetailOpen(false)
diff --git a/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx b/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx
index a47794f..09f3c01 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ScheduleTitleField.tsx
@@ -17,6 +17,7 @@ type ScheduleTitleFieldProps = {
   readOnly?: boolean
   onTitleConfirm: (value: string) => void
   onReadOnlyAttempt?: () => void
+  onUserEdit?: () => void
 }
 
 const ScheduleTitleField = ({
@@ -26,6 +27,7 @@ const ScheduleTitleField = ({
   readOnly = false,
   onTitleConfirm,
   onReadOnlyAttempt,
+  onUserEdit,
 }: ScheduleTitleFieldProps) => {
   const { control } = useFormContext<ScheduleEditorFormValues>()
   const eventTitleKeyword = (useWatch({ control, name: 'eventTitle' }) ?? '').trim()
@@ -44,8 +46,22 @@ const ScheduleTitleField = ({
       readOnly={readOnly}
       suggestions={suggestions}
       inputColor={isShared ? theme.colors.share.point : undefined}
-      onLiveChange={readOnly ? undefined : onTitleConfirm}
-      onConfirm={readOnly ? undefined : onTitleConfirm}
+      onLiveChange={
+        readOnly
+          ? undefined
+          : (value) => {
+              onUserEdit?.()
+              onTitleConfirm(value)
+            }
+      }
+      onConfirm={
+        readOnly
+          ? undefined
+          : (value) => {
+              onUserEdit?.()
+              onTitleConfirm(value)
+            }
+      }
       onReadOnlyAttempt={onReadOnlyAttempt}
     />
   )
diff --git a/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx b/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
index 9dddff9..7a3c26c 100644
--- a/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
+++ b/src/shared/ui/Modals/ScheduleEditor/ShareSchedulePanel.tsx
@@ -11,12 +11,28 @@ import { getEventParticipantFriendId } from '@/shared/utils/eventParticipants'
 
 import * as S from './index.style'
 
+type DisplayedFriend = {
+  id: string
+  name: string
+}
+
+const dedupeFriends = (friends: DisplayedFriend[]) => {
+  const seenIds = new Set<string>()
+
+  return friends.filter((friend) => {
+    if (seenIds.has(friend.id)) return false
+    seenIds.add(friend.id)
+    return true
+  })
+}
+
 type ShareSchedulePanelProps = {
   isShared?: boolean
   invitedParticipants?: CalendarEvent['eventParticipantInfo']
   onSharedChange?: (isShared: boolean) => void
   readOnly?: boolean
   onReadOnlyAttempt?: () => void
+  onUserEdit?: () => void
 }
 
 const ShareSchedulePanel = ({
@@ -25,6 +41,7 @@ const ShareSchedulePanel = ({
   onSharedChange,
   readOnly = false,
   onReadOnlyAttempt,
+  onUserEdit,
 }: ShareSchedulePanelProps) => {
   const { control, setValue } = useFormContext<ScheduleEditorFormValues>()
   const [isOpen, setIsOpen] = useState(false)
@@ -37,7 +54,7 @@ const ShareSchedulePanel = ({
 
         return friendId != null && selectedFriendIds.includes(friendId)
       })
-  const displayedFriends = [
+  const displayedFriends = dedupeFriends([
     ...visibleInvitedParticipants.map((participant) => {
       const friendId = getEventParticipantFriendId(participant)
 
@@ -50,7 +67,7 @@ const ShareSchedulePanel = ({
       id: friend.userId,
       name: friend.userName,
     })),
-  ]
+  ])
 
   const handleToggleFriend = (friend: ScheduleShareFriend) => {
     if (readOnly) {
@@ -63,6 +80,7 @@ const ShareSchedulePanel = ({
       ? selectedFriendIds.filter((selectedFriendId) => selectedFriendId !== friendId)
       : [...selectedFriendIds, friendId]
 
+    onUserEdit?.()
     setValue('friendIds', nextFriendIds, { shouldDirty: true, shouldValidate: true })
     onSharedChange?.(nextFriendIds.length > 0)
 
@@ -71,6 +89,10 @@ const ShareSchedulePanel = ({
         return previous.filter((selectedFriend) => selectedFriend.userId !== friend.userId)
       }
 
+      if (previous.some((selectedFriend) => selectedFriend.userId === friend.userId)) {
+        return previous
+      }
+
       return [...previous, friend]
     })
   }
@@ -84,6 +106,7 @@ const ShareSchedulePanel = ({
     const nextFriendIds = selectedFriendIds.filter(
       (selectedFriendId) => selectedFriendId !== numericFriendId,
     )
+    onUserEdit?.()
     setValue('friendIds', nextFriendIds, { shouldDirty: true, shouldValidate: true })
     onSharedChange?.(nextFriendIds.length > 0)
     setSelectedFriends((previous) => previous.filter((friend) => friend.userId !== friendId))
diff --git a/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx b/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx
index ee731b8..29dca5b 100644
--- a/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx
+++ b/src/shared/ui/scheduleTodo/SearchFriend/SearchFriend.tsx
@@ -164,6 +164,10 @@ const SearchFriend = ({ selectedFriendIds, onToggleFriend }: SearchFriendProps)
       <S.InputWrapper ref={inputWrapperRef}>
         <S.SearchInput
           type="text"
+          name="schedule-friend-search"
+          autoComplete="off"
+          autoCorrect="off"
+          spellCheck={false}
           value={keyword}
           placeholder="일정 공유할 친구 찾기"
           onChange={(event) => handleKeywordChange(event.target.value)}

From 9f375970480b1d1ebc94a515f9aed5d3304bbb1b Mon Sep 17 00:00:00 2001
From: Yeonjin Kim <kyj0719@gmail.com>
Date: Mon, 18 May 2026 17:54:04 +0900
Subject: [PATCH 23/23] =?UTF-8?q?fix:=20=EC=9D=BC=EC=A0=95=20footer=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EB=AC=B4=ED=95=9C=20=EC=97=85=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=EB=B0=A9=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hooks/addSchedule/useScheduleFooter.tsx   | 115 +++++++++---------
 1 file changed, 55 insertions(+), 60 deletions(-)

diff --git a/src/shared/hooks/addSchedule/useScheduleFooter.tsx b/src/shared/hooks/addSchedule/useScheduleFooter.tsx
index e48a2fd..a36964f 100644
--- a/src/shared/hooks/addSchedule/useScheduleFooter.tsx
+++ b/src/shared/hooks/addSchedule/useScheduleFooter.tsx
@@ -58,26 +58,32 @@ export const useScheduleFooter = ({
   const occurrenceDateRef = useRef(occurrenceDate)
   const closeModalRef = useRef(closeModal)
   const deleteEventMutateRef = useRef(deleteEventMutate)
+  const canEditRef = useRef(canEdit)
+  const onReadOnlyAttemptRef = useRef(onReadOnlyAttempt)
+  const eventColorRef = useRef(eventColor)
+  const setEventColorRef = useRef(setEventColor)
+  const onEventColorChangeRef = useRef(onEventColorChange)
+  const isEditingRef = useRef(isEditing)
+  const getValuesRef = useRef(getValues)
+  const patchScheduleRef = useRef(patchSchedule)
 
-  useEffect(() => {
-    repeatConfigRef.current = repeatConfig
-  }, [repeatConfig])
-  useEffect(() => {
-    eventIdRef.current = eventId
-  }, [eventId])
-  useEffect(() => {
-    occurrenceDateRef.current = occurrenceDate
-  }, [occurrenceDate])
-  useEffect(() => {
-    closeModalRef.current = closeModal
-  }, [closeModal])
-  useEffect(() => {
-    deleteEventMutateRef.current = deleteEventMutate
-  }, [deleteEventMutate])
+  repeatConfigRef.current = repeatConfig
+  eventIdRef.current = eventId
+  occurrenceDateRef.current = occurrenceDate
+  closeModalRef.current = closeModal
+  deleteEventMutateRef.current = deleteEventMutate
+  canEditRef.current = canEdit
+  onReadOnlyAttemptRef.current = onReadOnlyAttempt
+  eventColorRef.current = eventColor
+  setEventColorRef.current = setEventColor
+  onEventColorChangeRef.current = onEventColorChange
+  isEditingRef.current = isEditing
+  getValuesRef.current = getValues
+  patchScheduleRef.current = patchSchedule
 
   const handleDelete = useCallback(() => {
-    if (!canEdit) {
-      onReadOnlyAttempt?.()
+    if (!canEditRef.current) {
+      onReadOnlyAttemptRef.current?.()
       return
     }
     if (repeatConfigRef.current.repeatType !== 'none') {
@@ -98,7 +104,7 @@ export const useScheduleFooter = ({
         },
       },
     )
-  }, [canEdit, onReadOnlyAttempt])
+  }, [])
 
   useEffect(() => {
     registerDeleteHandler?.(handleDelete)
@@ -110,50 +116,39 @@ export const useScheduleFooter = ({
     () => initialEvent?.recurrenceGroup != null,
     [initialEvent?.recurrenceGroup],
   )
+  const isExistingRecurringRef = useRef(isExistingRecurring)
+  isExistingRecurringRef.current = isExistingRecurring
 
-  const handleColorChange = useCallback(
-    (value: EventColorType) => {
-      if (!canEdit) {
-        onReadOnlyAttempt?.()
-        return
-      }
-      const previousColor = eventColor
-      setEventColor(value)
-      if (eventId != null && eventId !== 0) {
-        onEventColorChange?.(eventId, value)
-      }
-      if (!isEditing) {
-        return
-      }
-      const nextValues = { ...getValues(), eventColor: value }
-      void (async () => {
-        try {
-          await patchSchedule(
-            nextValues,
-            isExistingRecurring ? RECURRENCE_EVENT_SCOPE.THIS_EVENT : undefined,
-          )
-        } catch (error) {
-          setEventColor(previousColor)
-          if (eventId != null && eventId !== 0) {
-            onEventColorChange?.(eventId, previousColor)
-          }
-          console.error('[ScheduleEditorForm] color patch failed', error)
+  const handleColorChange = useCallback((value: EventColorType) => {
+    if (!canEditRef.current) {
+      onReadOnlyAttemptRef.current?.()
+      return
+    }
+    const previousColor = eventColorRef.current
+    const currentEventId = eventIdRef.current
+    setEventColorRef.current(value)
+    if (currentEventId != null && currentEventId !== 0) {
+      onEventColorChangeRef.current?.(currentEventId, value)
+    }
+    if (!isEditingRef.current) {
+      return
+    }
+    const nextValues = { ...getValuesRef.current(), eventColor: value }
+    void (async () => {
+      try {
+        await patchScheduleRef.current(
+          nextValues,
+          isExistingRecurringRef.current ? RECURRENCE_EVENT_SCOPE.THIS_EVENT : undefined,
+        )
+      } catch (error) {
+        setEventColorRef.current(previousColor)
+        if (currentEventId != null && currentEventId !== 0) {
+          onEventColorChangeRef.current?.(currentEventId, previousColor)
         }
-      })()
-    },
-    [
-      eventColor,
-      eventId,
-      getValues,
-      canEdit,
-      isEditing,
-      isExistingRecurring,
-      onEventColorChange,
-      onReadOnlyAttempt,
-      patchSchedule,
-      setEventColor,
-    ],
-  )
+        console.error('[ScheduleEditorForm] color patch failed', error)
+      }
+    })()
+  }, [])
 
   const footerNode = useMemo(
     () => (canEdit ? <SelectColor value={eventColor} onChange={handleColorChange} /> : null),