refactor: 웹페이지 액션을 ContentPicker 내로 이전

Author: opficdev

Application/DevLogPresentation/Sources/Home/Home/HomeFeature+Effects.swift

@@ -153,7 +153,7 @@ extension HomeFeature {
                 state.selectedTodoCategory = nil
             }
         case .contentPicker:
-            state.sheet = isPresented ? .contentPicker : state.showContentPicker ? nil : state.sheet
+            state.sheet = isPresented ? .contentPicker(.init()) : state.showContentPicker ? nil : state.sheet
         case .searchView:
             state.fullScreenCover = isPresented ? .search : nil
         }

Application/DevLogPresentation/Sources/Home/Home/HomeFeature.swift

@@ -16,7 +16,6 @@ struct HomeFeature {
         @Presents var alert: AlertState<Never>?
         @Presents var sheet: SheetState?
         @Presents var fullScreenCover: FullScreenCoverState?
-        @Presents var webPageInput: WebPageInputState?
         var preferences = [TodoCategoryItem]()
         var recentTodos = [RecentTodoItem]()
         var webPages = [WebPageItem]()
@@ -27,7 +26,7 @@ struct HomeFeature {
         var deletedWebPageURLString: String?
         var loading = LoadingFeature.State()
 
-        var showContentPicker: Bool { sheet == .contentPicker }
+        var showContentPicker: Bool { sheet?.contentPickerState != nil }
         var showTodoEditor: Bool { fullScreenCover?.destination == .todoEditor }
 
         var isPreferencesLoading: Bool {
@@ -51,12 +50,10 @@ struct HomeFeature {
         case alert(PresentationAction<Never>)
         case sheet(PresentationAction<Sheet>)
         case fullScreenCover(PresentationAction<Never>)
-        case webPageInput(PresentationAction<Never>)
         case startObserving
         case fetchData
         case refreshRecentTodos
         case networkStatusChanged(Bool)
-        case tapWebPageInput
         case setSheet(SheetState?)
         case setPresentation(Presentation, Bool)
         case setAlert(isPresented: Bool, type: AlertType? = nil)
@@ -85,11 +82,46 @@ struct HomeFeature {
         case error
     }
 
+    @ObservableState
+    struct ContentPickerState: Equatable {
+        @Presents var webPageInput: WebPageInputState?
+    }
+
     @ObservableState
     struct WebPageInputState: Equatable, Identifiable {
         let id = UUID()
     }
 
+    @ObservableState
+    @CasePathable
+    enum SheetState: Equatable {
+        case reorderTodo
+        case contentPicker(ContentPickerState)
+
+        var contentPickerState: ContentPickerState? {
+            get {
+                guard case .contentPicker(let state) = self else { return nil }
+                return state
+            }
+            set {
+                guard let newValue else { return }
+                self = .contentPicker(newValue)
+            }
+        }
+    }
+
+    @CasePathable
+    enum Sheet: Equatable {
+        case tapCloseButton
+        case contentPicker(ContentPicker)
+
+        @CasePathable
+        enum ContentPicker: Equatable {
+            case tapWebPageInput
+            case webPageInput(PresentationAction<Never>)
+        }
+    }
+
     @ObservableState
     struct FullScreenCoverState: Equatable {
         var destination: Destination
@@ -107,17 +139,6 @@ struct HomeFeature {
         static let search = Self(destination: .search)
     }
 
-    @ObservableState
-    @CasePathable
-    enum SheetState: Equatable {
-        case reorderTodo
-        case contentPicker
-    }
-
-    enum Sheet: Equatable {
-        case tapCloseButton
-    }
-
     enum ModalType: Hashable {
         case todoEditor
     }
@@ -172,10 +193,6 @@ struct HomeFeature {
                 state.selectedTodoCategory = nil
             case .fullScreenCover:
                 break
-            case .webPageInput(.dismiss):
-                state.webPageInput = nil
-            case .webPageInput:
-                break
             case .sheet(.dismiss), .sheet(.presented(.tapCloseButton)):
                 state.sheet = nil
             case .sheet:
@@ -192,8 +209,6 @@ struct HomeFeature {
                 return fetchRecentTodosEffect()
             case .networkStatusChanged(let isConnected):
                 state.isNetworkConnected = isConnected
-            case .tapWebPageInput:
-                state.webPageInput = .init()
             case .setSheet(let sheet):
                 state.sheet = sheet
             case .setPresentation(let presentation, let isPresented):
@@ -232,7 +247,6 @@ struct HomeFeature {
                     Self.setAlert(&state, isPresented: true, type: .invalidURL)
                     return .none
                 }
-                state.webPageInput = nil
                 state.sheet = nil
                 Self.setAlert(&state, isPresented: false, type: nil)
                 return addWebPageEffect(normalizedURL)
@@ -266,7 +280,39 @@ struct HomeFeature {
         }
         .ifLet(\.$alert, action: \.alert)
         .ifLet(\.$sheet, action: \.sheet) {
-            EmptyReducer()
+            HomeSheetFeature()
+        }
+    }
+}
+
+private struct HomeSheetFeature: Reducer {
+    typealias State = HomeFeature.SheetState
+    typealias Action = HomeFeature.Sheet
+
+    var body: some ReducerOf<Self> {
+        EmptyReducer()
+        .ifCaseLet(\.contentPicker, action: \.contentPicker) {
+            HomeContentPickerFeature()
+        }
+    }
+}
+
+private struct HomeContentPickerFeature: Reducer {
+    typealias State = HomeFeature.ContentPickerState
+    typealias Action = HomeFeature.Sheet.ContentPicker
+
+    var body: some ReducerOf<Self> {
+        Reduce { state, action in
+            switch action {
+            case .tapWebPageInput:
+                state.webPageInput = .init()
+            case .webPageInput(.dismiss):
+                state.webPageInput = nil
+            case .webPageInput:
+                break
+            }
+
+            return .none
         }
         .ifLet(\.$webPageInput, action: \.webPageInput) {
             HomeWebPageInputFeature()

Application/DevLogPresentation/Sources/Home/Home/HomeView.swift

@@ -149,7 +149,7 @@ struct HomeView: View {
     private var toolbar: some ToolbarContent {
         ToolbarItem(placement: .topBarTrailing) {
             Button {
-                store.send(.setSheet(.contentPicker))
+                store.send(.setSheet(.contentPicker(.init())))
             } label: {
                 Image(systemName: "plus")
             }
@@ -169,7 +169,8 @@ struct HomeView: View {
 
     @ViewBuilder
     private func sheetContent(_ sheetStore: Store<HomeFeature.SheetState, HomeFeature.Sheet>) -> some View {
-        if sheetStore.state == .contentPicker {
+        if let contentPickerStore = sheetStore.scope(state: \.contentPickerState, action: \.contentPicker) {
+            @Bindable var contentPickerStore = contentPickerStore
             NavigationStack {
                 List {
                     Section {
@@ -199,7 +200,7 @@ struct HomeView: View {
 
                     Section {
                         Button {
-                            store.send(.tapWebPageInput)
+                            contentPickerStore.send(.tapWebPageInput)
                         } label: {
                             labelImage(
                                 text: "URL",
@@ -214,7 +215,7 @@ struct HomeView: View {
                     }
                 }
                 .navigationDestination(
-                    item: $store.scope(state: \.webPageInput, action: \.webPageInput)
+                    item: $contentPickerStore.scope(state: \.webPageInput, action: \.webPageInput)
                 ) { _ in
                     Form {
                         Section {

Application/DevLogPresentation/Tests/Home/HomeFeatureTestSupport.swift

@@ -136,7 +136,9 @@ struct HomeStoreTestAdapter: HomeStateDriving {
     var webPages: [WebPageItem] { store.state.webPages }
     var isNetworkConnected: Bool { store.state.isNetworkConnected }
     var showContentPicker: Bool { store.state.showContentPicker }
-    var showWebPageInputNavigation: Bool { store.state.showWebPageInput }
+    var showWebPageInputNavigation: Bool {
+        store.state.sheet?.contentPickerState?.webPageInput != nil
+    }
     var showTodoEditor: Bool { store.state.showTodoEditor }
     var showAlert: Bool { store.state.alert != nil }
     var alertType: HomeFeature.AlertType? {