refactor: SheetState 적용

Author: opficdev

Application/DevLogPresentation/Sources/Root/RootFeature.swift

@@ -22,6 +22,7 @@ struct RootFeature {
     @ObservableState
     struct State: Equatable {
         @Presents var alert: AlertState<Never>?
+        @Presents var sheet: SheetState?
         var isNetworkConnected = true
         var signIn: Bool?
         var theme: SystemTheme = .automatic
@@ -30,13 +31,25 @@ struct RootFeature {
         var isObservingTheme = false
     }
 
+    @ObservableState
+    struct SheetState: Equatable, Identifiable {
+        let todoId: String
+        var id: String { todoId }
+    }
+
     enum Action: Equatable {
         case alert(PresentationAction<Never>)
+        case sheet(PresentationAction<Sheet>)
         case view(ViewAction)
         case store(StoreAction)
 
         enum ViewAction: Equatable {
             case onAppear
+            case presentTodoDetail(String)
+        }
+
+        enum Sheet: Equatable {
+            case tapCloseButton
         }
 
         enum StoreAction: Equatable {
@@ -57,6 +70,10 @@ struct RootFeature {
             switch action {
             case .alert:
                 break
+            case .sheet(.dismiss), .sheet(.presented(.tapCloseButton)):
+                state.sheet = nil
+            case .sheet:
+                break
             case .view(.onAppear):
                 var effect = clearApplicationBadgeCountEffect()
 
@@ -76,6 +93,8 @@ struct RootFeature {
                 }
 
                 return effect
+            case .view(.presentTodoDetail(let todoId)):
+                state.sheet = .init(todoId: todoId)
             case .store(.networkStatusChanged(let isConnected)):
                 let wasConnected = state.isNetworkConnected
                 state.isNetworkConnected = isConnected
@@ -94,6 +113,18 @@ struct RootFeature {
             return .none
         }
         .ifLet(\.$alert, action: \.alert)
+        .ifLet(\.$sheet, action: \.sheet) {
+            RootSheetFeature()
+        }
+    }
+}
+
+private struct RootSheetFeature: Reducer {
+    typealias State = RootFeature.SheetState
+    typealias Action = RootFeature.Action.Sheet
+
+    var body: some ReducerOf<Self> {
+        EmptyReducer()
     }
 }
 

Application/DevLogPresentation/Sources/Root/RootView.swift

@@ -14,7 +14,6 @@ import DevLogDomain
 public struct RootView: View {
     @Environment(\.diContainer) var container: DIContainer
     @State private var store: StoreOf<RootFeature>
-    @State private var selectedRoute: Route?
     @State private var selectedMainTab = MainTab.home
     private let widgetURLTab: (URL) -> MainTab?
     private let windowEvent: TodoEditorWindowEvent
@@ -80,42 +79,28 @@ public struct RootView: View {
             }
         }
         .alert($store.scope(state: \.alert, action: \.alert))
-        .sheet(item: $selectedRoute) { route in
-            switch route {
-            case .todoDetail(let todoId):
-                NavigationStack {
-                    TodoDetailView(store: Store(
-                        initialState: TodoDetailFeature.State(todoId: todoId, showEditButton: false)
-                    ) {
-                        TodoDetailFeature()
-                    } withDependencies: {
-                        $0.fetchTodoByIdUseCase = container.resolve(FetchTodoByIdUseCase.self)
-                        $0.fetchReferenceItemsUseCase = container.resolve(FetchReferenceItemsUseCase.self)
-                    })
-                    .toolbar {
-                        ToolbarLeadingButton {
-                            selectedRoute = nil
-                        }
+        .sheet(item: $store.scope(state: \.sheet, action: \.sheet)) { sheetStore in
+            NavigationStack {
+                TodoDetailView(store: Store(
+                    initialState: TodoDetailFeature.State(todoId: sheetStore.todoId, showEditButton: false)
+                ) {
+                    TodoDetailFeature()
+                } withDependencies: {
+                    $0.fetchTodoByIdUseCase = container.resolve(FetchTodoByIdUseCase.self)
+                    $0.fetchReferenceItemsUseCase = container.resolve(FetchReferenceItemsUseCase.self)
+                })
+                .toolbar {
+                    ToolbarLeadingButton {
+                        sheetStore.send(.tapCloseButton)
                     }
                 }
-                .background(Color(.systemGroupedBackground))
-                .presentationDragIndicator(.visible)
             }
+            .background(Color(.systemGroupedBackground))
+            .presentationDragIndicator(.visible)
         }
         .onReceive(pushNotificationTodoIdPublisher) { todoId in
-            selectedRoute = .todoDetail(todoId)
+            store.send(.view(.presentTodoDetail(todoId)))
             clearPushNotificationRoute()
         }
     }
 }
-
-private enum Route: Equatable, Identifiable {
-    case todoDetail(String)
-
-    var id: String {
-        switch self {
-        case .todoDetail(let todoId):
-            return "todo:\(todoId)"
-        }
-    }
-}

Application/DevLogPresentation/Tests/Root/RootFeatureTestSupport.swift

@@ -15,12 +15,15 @@ import Testing
 @MainActor
 protocol RootStateDriving {
     var snapshot: RootStateSnapshot { get }
+    var sheetTodoId: String? { get }
 
     func onAppear() async
     func setAlert(_ isPresented: Bool) async
     func networkStatusChanged(_ isConnected: Bool) async
     func setTheme(_ theme: SystemTheme) async
     func didLogined(_ signIn: Bool) async
+    func presentTodoDetail(_ todoId: String) async
+    func dismissSheet() async
 }
 
 struct RootStateSnapshot: Equatable {
@@ -44,6 +47,7 @@ struct RootStoreTestAdapter: RootStateDriving {
             theme: store.state.theme
         )
     }
+    var sheetTodoId: String? { store.state.sheet?.todoId }
 
     init(
         sessionUseCase: ObserveAuthSessionUseCase = ObserveAuthSessionUseCaseSpy(currentValue: true),
@@ -95,6 +99,14 @@ struct RootStoreTestAdapter: RootStateDriving {
         await store.send(.store(.didLogined(signIn)))
     }
 
+    func presentTodoDetail(_ todoId: String) async {
+        await store.send(.view(.presentTodoDetail(todoId)))
+    }
+
+    func dismissSheet() async {
+        await store.send(.sheet(.dismiss))
+    }
+
     private func drainReceivedActions() async {
         for _ in 0..<8 {
             await store.skipReceivedActions(strict: false)
@@ -191,6 +203,15 @@ func verifyObservedInitialValues(adapter: some RootStateDriving) async {
     )
 }
 
+@MainActor
+func verifyTodoDetailSheetPresentation(adapter: some RootStateDriving) async {
+    await adapter.presentTodoDetail("todo-1")
+    #expect(adapter.sheetTodoId == "todo-1")
+
+    await adapter.dismissSheet()
+    #expect(adapter.sheetTodoId == nil)
+}
+
 final class ObserveAuthSessionUseCaseSpy: ObserveAuthSessionUseCase {
     let subject: CurrentValueSubject<Bool, Never>
     private(set) var observeCallCount = 0

Application/DevLogPresentation/Tests/Root/RootFeatureTests.swift

@@ -90,4 +90,11 @@ struct RootFeatureTests {
 
         #expect(badgeSpy.counts == [0, 0])
     }
+
+    @Test("RootFeature는 TodoDetail sheet 표시와 해제를 store state로 관리한다")
+    func RootFeature는_TodoDetail_sheet_표시와_해제를_store_state로_관리한다() async {
+        let adapter = RootStoreTestAdapter()
+
+        await verifyTodoDetailSheetPresentation(adapter: adapter)
+    }
 }