refactor: Todo 편집 윈도우 이벤트 전달 구조 개선

opficdev · opficdev · commit 2a64384de825 · 2026-06-01T15:44:45.000+09:00
diff --git a/Application/DevLogApp/Sources/App/DevLogApp.swift b/Application/DevLogApp/Sources/App/DevLogApp.swift
@@ -30,21 +30,23 @@ struct DevLogApp: App {
                 systemThemeUseCase: container.resolve(ObserveSystemThemeUseCase.self),
                 trackAnalyticsEventUseCase: container.resolve(TrackAnalyticsEventUseCase.self),
                 widgetURLTab: { MainTab(widgetURL: $0) },
+                windowEvent: windowEvent,
                 pushNotificationTodoIdPublisher: PushNotificationRoute.shared.observe(),
                 clearPushNotificationRoute: { PushNotificationRoute.shared.clear() }
             )
             .autocorrectionDisabled()
-            .environment(windowEvent)
             .onChange(of: scenePhase) { _, phase in
                 guard phase == .background else { return }
                 container.resolve(WidgetSyncEventBus.self).publish(.syncRequested)
             }
         }
         WindowGroup(id: TodoEditorWindowValue.sceneId, for: TodoEditorWindowValue.self) { value in
             if let value = value.wrappedValue {
-                TodoEditorWindowView(value: value)
+                TodoEditorWindowView(
+                    value: value,
+                    windowEvent: windowEvent
+                )
                 .autocorrectionDisabled()
-                .environment(windowEvent)
             } else {
                 ContentUnavailableView(
                     String(localized: "todo_edit"),
diff --git a/Application/DevLogPresentation/Sources/Home/Home/HomeView.swift b/Application/DevLogPresentation/Sources/Home/Home/HomeView.swift
@@ -9,7 +9,6 @@ import SwiftUI
 import DevLogDomain
 
 struct HomeView: View {
-    @Environment(TodoEditorWindowEvent.self) private var windowEvent
     @Environment(\.openWindow) private var openWindow
     @Environment(\.isiOSAppOnMac) private var isiOSAppOnMac
     @ScaledMetric(relativeTo: .largeTitle) private var labelWidth = CGFloat(34)
@@ -89,9 +88,6 @@ struct HomeView: View {
                 LoadingView()
             }
         }
-        .onChange(of: windowEvent.submitted) { _, submitted in
-            handleTodoEditorSubmit(submitted)
-        }
     }
 
     @ViewBuilder
@@ -403,11 +399,6 @@ struct HomeView: View {
         }
     }
 
-    private func handleTodoEditorSubmit(_ submit: TodoEditorWindowSubmit?) {
-        guard let submit, submit.value.matchesCreate(source: .home) else { return }
-        coordinator.viewModel.send(.fetchData)
-    }
-
 }
 
 enum HomeRoute: Hashable {
diff --git a/Application/DevLogPresentation/Sources/Home/Home/HomeViewCoordinator.swift b/Application/DevLogPresentation/Sources/Home/Home/HomeViewCoordinator.swift
@@ -5,6 +5,7 @@
 //  Created by opfic on 5/10/26.
 //
 
+import Combine
 import Foundation
 import DevLogCore
 import DevLogDomain
@@ -15,6 +16,8 @@ final class HomeViewCoordinator {
     let viewModel: HomeViewModel
     let router = NavigationRouter<HomeRoute>()
     private let diContainer: DIContainer
+    @ObservationIgnored
+    private var cancellable: AnyCancellable?
 
     init(container: DIContainer) {
         self.diContainer = container
@@ -35,6 +38,16 @@ final class HomeViewCoordinator {
         viewModel.send(.fetchData)
     }
 
+    func bindWindowEvent(_ windowEvent: TodoEditorWindowEvent) {
+        guard cancellable == nil else { return }
+
+        cancellable = windowEvent.submits
+            .sink { [weak self] submit in
+                guard submit.value.matchesCreate(source: .home) else { return }
+                self?.viewModel.send(.fetchData)
+            }
+    }
+
     func makeTodoManageViewModel() -> TodoManageViewModel {
         TodoManageViewModel(viewModel.state.preferences)
     }
diff --git a/Application/DevLogPresentation/Sources/Home/TodoDetailView.swift b/Application/DevLogPresentation/Sources/Home/TodoDetailView.swift
@@ -11,7 +11,6 @@ import DevLogDomain
 
 struct TodoDetailView: View {
     @Environment(\.diContainer) private var container: DIContainer
-    @Environment(TodoEditorWindowEvent.self) private var windowEvent
     @Environment(\.openWindow) private var openWindow
     @Environment(\.isiOSAppOnMac) private var isiOSAppOnMac
     @State var viewModel: TodoDetailViewModel
@@ -32,9 +31,6 @@ struct TodoDetailView: View {
             }
         }
         .onAppear { viewModel.send(.onAppear) }
-        .onChange(of: windowEvent.submitted) { _, submitted in
-            handleTodoEditorSubmit(submitted)
-        }
         .navigationBarTitleDisplayMode(.inline)
         .sheet(isPresented: Binding(
             get: { viewModel.state.showInfo },
@@ -119,12 +115,6 @@ struct TodoDetailView: View {
         }
     }
 
-    private func handleTodoEditorSubmit(_ submit: TodoEditorWindowSubmit?) {
-        guard let submit,
-              submit.value.matchesEdit(todoId: viewModel.todoId) else { return }
-        viewModel.send(.setTodo(submit.todo))
-    }
-
     @ViewBuilder
     private var sheetContent: some View {
         if let todo = viewModel.state.todo {
diff --git a/Application/DevLogPresentation/Sources/Home/TodoEditorWindowEvent.swift b/Application/DevLogPresentation/Sources/Home/TodoEditorWindowEvent.swift
@@ -5,20 +5,22 @@
 //  Created by opfic on 5/31/26.
 //
 
-import Foundation
+import Combine
 import DevLogDomain
 
-@MainActor
-@Observable
 public final class TodoEditorWindowEvent {
-    var submitted: TodoEditorWindowSubmit?
+    private let subject = PassthroughSubject<TodoEditorWindowSubmit, Never>()
+
+    var submits: AnyPublisher<TodoEditorWindowSubmit, Never> {
+        subject.eraseToAnyPublisher()
+    }
 
     public init() { }
 
     func submit(
         value: TodoEditorWindowValue,
         todo: Todo
     ) {
-        submitted = TodoEditorWindowSubmit(value: value, todo: todo)
+        subject.send(TodoEditorWindowSubmit(value: value, todo: todo))
     }
 }
diff --git a/Application/DevLogPresentation/Sources/Home/TodoEditorWindowView.swift b/Application/DevLogPresentation/Sources/Home/TodoEditorWindowView.swift
@@ -11,12 +11,16 @@ import DevLogDomain
 
 public struct TodoEditorWindowView: View {
     @Environment(\.diContainer) private var container: DIContainer
-    @Environment(TodoEditorWindowEvent.self) private var windowEvent
     @State private var windowScene: UIWindowScene?
     private let value: TodoEditorWindowValue
+    private let windowEvent: TodoEditorWindowEvent
 
-    public init(value: TodoEditorWindowValue) {
+    public init(
+        value: TodoEditorWindowValue,
+        windowEvent: TodoEditorWindowEvent
+    ) {
         self.value = value
+        self.windowEvent = windowEvent
     }
 
     public var body: some View {
diff --git a/Application/DevLogPresentation/Sources/Home/TodoListView.swift b/Application/DevLogPresentation/Sources/Home/TodoListView.swift
@@ -11,7 +11,6 @@ import DevLogDomain
 
 struct TodoListView: View {
     @Environment(NavigationRouter<HomeRoute>.self) private var router
-    @Environment(TodoEditorWindowEvent.self) private var windowEvent
     @Environment(\.diContainer) var container: DIContainer
     @Environment(\.colorScheme) private var colorScheme
     @Environment(\.openWindow) private var openWindow
@@ -118,9 +117,6 @@ struct TodoListView: View {
         }
         .background(NavigationBarConfigurator())
         .task { viewModel.send(.onAppear) }
-        .onChange(of: windowEvent.submitted) { _, submitted in
-            handleTodoEditorSubmit(submitted)
-        }
     }
 
     @ViewBuilder
@@ -252,12 +248,6 @@ struct TodoListView: View {
         }
     }
 
-    private func handleTodoEditorSubmit(_ submit: TodoEditorWindowSubmit?) {
-        guard let submit,
-              submit.value.matchesCreate(category: viewModel.category, source: .list) else { return }
-        viewModel.send(.refresh)
-    }
-
     @ViewBuilder
     private var searchResultsContent: some View {
         let searchResults = viewModel.state.searchResults.filter { !$0.isHidden }
diff --git a/Application/DevLogPresentation/Sources/Home/TodoWindowCoordinator.swift b/Application/DevLogPresentation/Sources/Home/TodoWindowCoordinator.swift
@@ -5,6 +5,7 @@
 //  Created by opfic on 5/31/26.
 //
 
+import Combine
 import Foundation
 import DevLogCore
 import DevLogDomain
@@ -17,11 +18,22 @@ final class TodoWindowCoordinator {
     private var listViewModel: TodoListViewModel?
     @ObservationIgnored
     private var detailViewModel: TodoDetailViewModel?
+    @ObservationIgnored
+    private var cancellable: AnyCancellable?
 
     init(container: DIContainer) {
         self.diContainer = container
     }
 
+    func bindWindowEvent(_ windowEvent: TodoEditorWindowEvent) {
+        guard cancellable == nil else { return }
+
+        cancellable = windowEvent.submits
+            .sink { [weak self] submit in
+                self?.handleTodoEditorSubmit(submit)
+            }
+    }
+
     func makeListViewModel(category: TodoCategory) -> TodoListViewModel {
         if let listViewModel,
            listViewModel.category == category {
@@ -60,4 +72,16 @@ final class TodoWindowCoordinator {
         self.detailViewModel = detailViewModel
         return detailViewModel
     }
+
+    private func handleTodoEditorSubmit(_ submit: TodoEditorWindowSubmit) {
+        if let listViewModel,
+           submit.value.matchesCreate(category: listViewModel.category, source: .list) {
+            listViewModel.send(.refresh)
+        }
+
+        if let detailViewModel,
+           submit.value.matchesEdit(todoId: detailViewModel.todoId) {
+            detailViewModel.send(.setTodo(submit.todo))
+        }
+    }
 }
diff --git a/Application/DevLogPresentation/Sources/Main/MainView.swift b/Application/DevLogPresentation/Sources/Main/MainView.swift
@@ -18,9 +18,11 @@ struct MainView: View {
     @State private var pushNotificationListViewCoordinator: PushNotificationListViewCoordinator
     @State private var profileViewCoordinator: ProfileViewCoordinator
     @Binding var selectedTab: MainTab?
+    private let windowEvent: TodoEditorWindowEvent
 
     init(
         container: DIContainer,
+        windowEvent: TodoEditorWindowEvent,
         selectedTab: Binding<MainTab?>
     ) {
         self._coordinator = State(initialValue: MainViewCoordinator(container: container))
@@ -31,6 +33,7 @@ struct MainView: View {
             initialValue: PushNotificationListViewCoordinator(container: container)
         )
         self._profileViewCoordinator = State(initialValue: ProfileViewCoordinator(container: container))
+        self.windowEvent = windowEvent
         self._selectedTab = selectedTab
     }
 
@@ -46,6 +49,8 @@ struct MainView: View {
         }
         .onAppear {
             coordinator.viewModel.send(.onAppear)
+            homeViewCoordinator.bindWindowEvent(windowEvent)
+            todoWindowCoordinator.bindWindowEvent(windowEvent)
         }
         .onChange(of: selectedTab, initial: true) { _, newValue in
             guard let newValue else { return }
diff --git a/Application/DevLogPresentation/Sources/Root/RootView.swift b/Application/DevLogPresentation/Sources/Root/RootView.swift
@@ -16,6 +16,7 @@ public struct RootView: View {
     @State private var selectedRoute: Route?
     @State private var selectedMainTab: MainTab?
     private let widgetURLTab: (URL) -> MainTab?
+    private let windowEvent: TodoEditorWindowEvent
     private let pushNotificationTodoIdPublisher: AnyPublisher<String, Never>
     private let clearPushNotificationRoute: () -> Void
 
@@ -25,6 +26,7 @@ public struct RootView: View {
         systemThemeUseCase: ObserveSystemThemeUseCase,
         trackAnalyticsEventUseCase: TrackAnalyticsEventUseCase,
         widgetURLTab: @escaping (URL) -> MainTab?,
+        windowEvent: TodoEditorWindowEvent,
         pushNotificationTodoIdPublisher: AnyPublisher<String, Never>,
         clearPushNotificationRoute: @escaping () -> Void
     ) {
@@ -35,6 +37,7 @@ public struct RootView: View {
             trackAnalyticsEventUseCase: trackAnalyticsEventUseCase
         ))
         self.widgetURLTab = widgetURLTab
+        self.windowEvent = windowEvent
         self.pushNotificationTodoIdPublisher = pushNotificationTodoIdPublisher
         self.clearPushNotificationRoute = clearPushNotificationRoute
     }
@@ -46,6 +49,7 @@ public struct RootView: View {
                 if signIn {
                     MainView(
                         container: container,
+                        windowEvent: windowEvent,
                         selectedTab: $selectedMainTab
                     )
                 } else {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ import SwiftUI`
`9`	`9`	`import DevLogDomain`
`10`	`10`
`11`	`11`	`struct HomeView: View {`
`12`		`- @Environment(TodoEditorWindowEvent.self) private var windowEvent`
`13`	`12`	`@Environment(\.openWindow) private var openWindow`
`14`	`13`	`@Environment(\.isiOSAppOnMac) private var isiOSAppOnMac`
`15`	`14`	`@ScaledMetric(relativeTo: .largeTitle) private var labelWidth = CGFloat(34)`
`@@ -89,9 +88,6 @@ struct HomeView: View {`
`89`	`88`	`LoadingView()`
`90`	`89`	`}`
`91`	`90`	`}`
`92`		`- .onChange(of: windowEvent.submitted) { _, submitted in`
`93`		`- handleTodoEditorSubmit(submitted)`
`94`		`- }`
`95`	`91`	`}`
`96`	`92`
`97`	`93`	`@ViewBuilder`
`@@ -403,11 +399,6 @@ struct HomeView: View {`
`403`	`399`	`}`
`404`	`400`	`}`
`405`	`401`
`406`		`- private func handleTodoEditorSubmit(_ submit: TodoEditorWindowSubmit?) {`
`407`		`- guard let submit, submit.value.matchesCreate(source: .home) else { return }`
`408`		`- coordinator.viewModel.send(.fetchData)`
`409`		`- }`
`410`		`-`
`411`	`402`	`}`
`412`	`403`
`413`	`404`	`enum HomeRoute: Hashable {`