refactor: sheet용 State 분리

Author: opficdev

Application/DevLogPresentation/Sources/Home/Editor/TodoEditorFeature.swift

@@ -15,15 +15,14 @@ struct TodoEditorFeature {
     @ObservableState
     struct State: Equatable {
         @Presents var alert: AlertState<Never>?
+        @Presents var sheet: SheetState?
         var isCompleted: Bool = false
         var completedAt: Date?
         var isPinned: Bool = false
-        var selectedTodoId: TodoIdItem?
         var title: String = ""
         var content: String = ""
         var referenceItems: [Int: TodoReferenceItem] = [:]
         var dueDate: Date?
-        var showInfo: Bool = false
         var loading = LoadingFeature.State()
         var tags: OrderedSet<String> = []
         var tagText: String = ""
@@ -91,6 +90,13 @@ struct TodoEditorFeature {
         }
     }
 
+    @ObservableState
+    @CasePathable
+    enum SheetState: Equatable {
+        case info
+        case todo(TodoIdItem)
+    }
+
     enum EditorTab: Equatable {
         case editor
         case preview
@@ -103,16 +109,22 @@ struct TodoEditorFeature {
 
     enum Action: BindableAction, Equatable {
         case alert(PresentationAction<Never>)
+        case sheet(PresentationAction<Sheet>)
         case binding(BindingAction<State>)
         case onAppear
         case addTag(String)
         case removeTag(String)
         case setCompleted(Bool)
+        case setSheet(SheetState?)
         case upsertTodo
         case createSucceeded
         case saveFailed
         case updateSucceeded(Todo)
         case loading(LoadingFeature.Action)
+
+        enum Sheet: Equatable {
+            case tapCloseButton
+        }
     }
 
     @Dependency(\.date.now) var now
@@ -130,6 +142,12 @@ struct TodoEditorFeature {
             switch action {
             case .alert:
                 break
+            case .sheet(.dismiss):
+                state.sheet = nil
+            case .sheet(.presented(.tapCloseButton)):
+                state.sheet = nil
+            case .sheet:
+                break
             case .binding(\.content):
                 if state.tabViewTag == .preview {
                     return resolveMarkdownEffect(content: state.content)
@@ -160,6 +178,8 @@ struct TodoEditorFeature {
                     state.completedAt = isCompleted ? now : nil
                 }
                 state.isCompleted = isCompleted
+            case .setSheet(let sheet):
+                state.sheet = sheet
             case .upsertTodo:
                 state.saveResult = nil
                 if state.originalDraft == nil {
@@ -180,6 +200,18 @@ struct TodoEditorFeature {
             return .none
         }
         .ifLet(\.$alert, action: \.alert)
+        .ifLet(\.$sheet, action: \.sheet) {
+            TodoEditorSheetFeature()
+        }
+    }
+}
+
+private struct TodoEditorSheetFeature: Reducer {
+    typealias State = TodoEditorFeature.SheetState
+    typealias Action = TodoEditorFeature.Action.Sheet
+
+    var body: some ReducerOf<Self> {
+        EmptyReducer()
     }
 }
 

Application/DevLogPresentation/Sources/Home/Editor/TodoEditorView.swift

@@ -53,37 +53,16 @@ struct TodoEditorView: View {
             .navigationTitle(store.navigationTitle)
             .navigationBarTitleDisplayMode(.inline)
             .toolbarBackground(.background, for: .navigationBar)
-            .sheet(isPresented: $store.showInfo) {
-                TodoEditorInfoSheetView(store: store) {
-                    store.send(.binding(.set(\.showInfo, false)))
-                }
-            }
-            .sheet(item: $store.selectedTodoId) { item in
-                NavigationStack {
-                    TodoDetailView(store: Store(
-                        initialState: TodoDetailFeature.State(todoId: item.id, showEditButton: false)
-                    ) {
-                        TodoDetailFeature()
-                    } withDependencies: {
-                        $0.fetchTodoByIdUseCase = container.resolve(FetchTodoByIdUseCase.self)
-                        $0.fetchReferenceItemsUseCase = container.resolve(FetchReferenceItemsUseCase.self)
-                    })
-                    .toolbar {
-                        ToolbarLeadingButton {
-                            store.send(.binding(.set(\.selectedTodoId, nil)))
-                        }
-                    }
-                }
-                .background(Color(.systemGroupedBackground))
-                .presentationDragIndicator(.visible)
+            .sheet(item: $store.scope(state: \.sheet, action: \.sheet)) { sheetStore in
+                sheetContent(sheetStore)
             }
             .toolbar {
                 if !isiOSAppOnMac {
                     ToolbarLeadingButton { close() }
                 }
                 ToolbarItem(placement: .topBarTrailing) {
                     Button {
-                        store.send(.binding(.set(\.showInfo, true)))
+                        store.send(.setSheet(.info))
                     } label: {
                         Image(systemName: "info.circle")
                     }
@@ -165,7 +144,7 @@ struct TodoEditorView: View {
                     TodoMarkdownContentView(
                         content: store.content,
                         referenceItems: store.referenceItems,
-                        onOpenTodoID: { store.send(.binding(.set(\.selectedTodoId, TodoIdItem(id: $0)))) }
+                        onOpenTodoID: { store.send(.setSheet(.todo(TodoIdItem(id: $0)))) }
                     )
                 }
             }
@@ -223,6 +202,36 @@ struct TodoEditorView: View {
         }
     }
 
+    @ViewBuilder
+    private func sheetContent(
+        _ sheetStore: Store<TodoEditorFeature.SheetState, TodoEditorFeature.Action.Sheet>
+    ) -> some View {
+        switch sheetStore.state {
+        case .info:
+            TodoEditorInfoSheetView(store: store) {
+                sheetStore.send(.tapCloseButton)
+            }
+        case .todo(let item):
+            NavigationStack {
+                TodoDetailView(store: Store(
+                    initialState: TodoDetailFeature.State(todoId: item.id, 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)
+        }
+    }
+
     private enum Field: Hashable {
         case title, content
     }

Application/DevLogPresentation/Tests/Home/TodoEditorFeatureTestDoubles.swift

@@ -25,6 +25,7 @@ final class TodoEditorStoreTestAdapter {
     var content: String { store.state.content }
     var referenceItems: [Int: TodoReferenceItem] { store.state.referenceItems }
     var dueDate: Date? { store.state.dueDate }
+    var sheet: TodoEditorFeature.SheetState? { store.state.sheet }
     var isLoading: Bool { store.state.isLoading }
     var tags: [String] { Array(store.state.tags) }
     var categories: [TodoCategoryItem] { store.state.categories }
@@ -112,6 +113,24 @@ final class TodoEditorStoreTestAdapter {
         }
     }
 
+    func setSheet(_ sheet: TodoEditorFeature.SheetState?) async {
+        await store.send(.setSheet(sheet)) {
+            $0.sheet = sheet
+        }
+    }
+
+    func dismissSheet() async {
+        await store.send(.sheet(.dismiss)) {
+            $0.sheet = nil
+        }
+    }
+
+    func tapSheetCloseButton() async {
+        await store.send(.sheet(.presented(.tapCloseButton))) {
+            $0.sheet = nil
+        }
+    }
+
     func setDueDate(_ dueDate: Date?) async {
         let expectedDueDate = expectedDueDate(for: dueDate)
         await store.send(.binding(.set(\.dueDate, dueDate))) {

Application/DevLogPresentation/Tests/Home/TodoEditorFeatureTests.swift

@@ -143,6 +143,28 @@ struct TodoEditorFeatureTests {
         #expect(adapter.referenceItems[5] == TodoReferenceItem(from: reference5))
     }
 
+    @Test("정보와 참조 Todo 시트 상태를 액션에 맞게 변경한다")
+    func 정보와_참조_Todo_시트_상태를_액션에_맞게_변경한다() async {
+        let adapter = TodoEditorStoreTestAdapter(category: .system(.doc))
+        let item = TodoIdItem(id: "todo-2")
+
+        await adapter.setSheet(.info)
+
+        #expect(adapter.sheet == .info)
+
+        await adapter.dismissSheet()
+
+        #expect(adapter.sheet == nil)
+
+        await adapter.setSheet(.todo(item))
+
+        #expect(adapter.sheet == .todo(item))
+
+        await adapter.tapSheetCloseButton()
+
+        #expect(adapter.sheet == nil)
+    }
+
     @Test("새 Todo 저장 성공은 draft를 저장하고 생성 완료 상태를 남긴다")
     func 새_Todo_저장_성공은_draft를_저장하고_생성_완료_상태를_남긴다() async {
         let upsertSpy = TodoEditorUpsertTodoUseCaseSpy()