Refactoring

playbook-ui · May 16, 2024 · b276b6a · b276b6a
1 parent 9b6548d
commit b276b6a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/Sources/PlaybookUI/Internal/Views/CatalogDrawer.swift b/Sources/PlaybookUI/Internal/Views/CatalogDrawer.swift
@@ -3,23 +3,22 @@ import SwiftUI
 
 @available(iOS 15.0, *)
 internal struct CatalogDrawer: View {
-    @EnvironmentObject
-    private var catalogState: CatalogState
-
     var body: some View {
         ZStack {
             CatalogTop()
-            Drawer(isCollapsed: $catalogState.isSearchPainCollapsed)
+            Drawer()
         }
     }
 }
 
 @available(iOS 15.0, *)
 private struct Drawer: View {
-    @Binding
-    var isCollapsed: Bool
+    @EnvironmentObject
+    private var catalogState: CatalogState
 
     var body: some View {
+        let isCollapsed = catalogState.isSearchPainCollapsed
+
         GeometryReader { geometry in
             let drawerWidth =
                 geometry.safeAreaInsets.leading
@@ -33,17 +32,20 @@ private struct Drawer: View {
                     .opacity(isCollapsed ? 0 : 0.3)
                     .ignoresSafeArea()
                     .onTapGesture {
-                        isCollapsed = true
+                        catalogState.isSearchPainCollapsed = true
                     }
 
                 HStack(spacing: 0) {
-                    CatalogSearchPane()
-                        .frame(width: drawerWidth)
-                        .background {
-                            Rectangle()
-                                .ignoresSafeArea()
-                                .shadow(radius: 10)
-                        }
+                    CatalogSearchPane { data in
+                        catalogState.selected = data
+                        catalogState.isSearchPainCollapsed = true
+                    }
+                    .frame(width: drawerWidth)
+                    .background {
+                        Rectangle()
+                            .ignoresSafeArea()
+                            .shadow(radius: 10)
+                    }
 
                     Spacer.zero
                 }

diff --git a/Sources/PlaybookUI/Internal/Views/CatalogSearchPane.swift b/Sources/PlaybookUI/Internal/Views/CatalogSearchPane.swift
@@ -9,6 +9,8 @@ internal struct CatalogSearchPane: View {
     @FocusState
     private var isFocused
 
+    let onSelect: (SelectData) -> Void
+
     var body: some View {
         HStack(spacing: 0) {
             VStack(spacing: 0) {
@@ -59,8 +61,7 @@ internal struct CatalogSearchPane: View {
                                             data: data,
                                             isSelected: catalogState.selected?.id == select.id
                                         ) {
-                                            catalogState.selected = select
-                                            catalogState.isSearchPainCollapsed = true
+                                            onSelect(select)
                                         }
                                     }
                                 }

diff --git a/Sources/PlaybookUI/Internal/Views/CatalogSplit.swift b/Sources/PlaybookUI/Internal/Views/CatalogSplit.swift
@@ -22,9 +22,11 @@ internal struct CatalogSplit: View {
                         }
                 }
 
-                CatalogSearchPane()
-                    .frame(width: sidebarWidth)
-                    .offset(x: catalogState.isSearchPainCollapsed ? -sidebarWidth : 0)
+                CatalogSearchPane { data in
+                    catalogState.selected = data
+                }
+                .frame(width: sidebarWidth)
+                .offset(x: catalogState.isSearchPainCollapsed ? -sidebarWidth : 0)
             }
         }
         .animation(.snappy(duration: 0.3), value: catalogState.isSearchPainCollapsed)

diff --git a/Tests/CatalogScenarios.swift b/Tests/CatalogScenarios.swift
@@ -70,7 +70,7 @@ enum CatalogScenarios: ScenarioProvider {
                 catalogState.expandedKinds = ["Kind 1"]
                 catalogState.isSearchPainCollapsed = false
 
-                return CatalogSearchPane()
+                return CatalogSearchPane { _ in }
                     .environmentObject(SearchState(playbook: .test))
                     .environmentObject(catalogState)
             }