refactor: better placement for .navigationDestination() (#35)

kouprlabs · Nov 27, 2024 · 72943e0 · 72943e0
1 parent f10c656
commit 72943e0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Sources/Screens/Group/GroupList.swift b/Sources/Screens/Group/GroupList.swift
@@ -54,11 +54,6 @@ struct GroupList: View, ViewDataProvider, LoadStateProvider, TimerLifecycle, Tok
                         .onChange(of: searchText) {
                             groupStore.searchPublisher.send($1)
                         }
-                        .navigationDestination(isPresented: $overviewIsPresented) {
-                            if let newGroup {
-                                GroupOverview(newGroup, groupStore: groupStore)
-                            }
-                        }
                     }
                 }
             }
@@ -83,6 +78,11 @@ struct GroupList: View, ViewDataProvider, LoadStateProvider, TimerLifecycle, Tok
                     overviewIsPresented = true
                 }
             }
+            .navigationDestination(isPresented: $overviewIsPresented) {
+                if let newGroup {
+                    GroupOverview(newGroup, groupStore: groupStore)
+                }
+            }
         }
         .onAppear {
             if let token = tokenStore.token {

diff --git a/Sources/Screens/Organization/OrganizationList.swift b/Sources/Screens/Organization/OrganizationList.swift
@@ -47,11 +47,6 @@ struct OrganizationList: View, ViewDataProvider, LoadStateProvider, TimerLifecyc
                                         }
                                     }
                                 }
-                                .navigationDestination(isPresented: $overviewIsPresented) {
-                                    if let newOrganization {
-                                        OrganizationOverview(newOrganization, organizationStore: organizationStore)
-                                    }
-                                }
                             }
                         }
                         .refreshable {
@@ -85,6 +80,11 @@ struct OrganizationList: View, ViewDataProvider, LoadStateProvider, TimerLifecyc
                     overviewIsPresented = true
                 }
             }
+            .navigationDestination(isPresented: $overviewIsPresented) {
+                if let newOrganization {
+                    OrganizationOverview(newOrganization, organizationStore: organizationStore)
+                }
+            }
         }
         .onAppear {
             if let token = tokenStore.token {

diff --git a/Sources/Screens/Workspace/WorkspaceList.swift b/Sources/Screens/Workspace/WorkspaceList.swift
@@ -58,11 +58,6 @@ struct WorkspaceList: View, ViewDataProvider, LoadStateProvider, TimerLifecycle,
                         .onChange(of: searchText) {
                             workspaceStore.searchPublisher.send($1)
                         }
-                        .navigationDestination(isPresented: $overviewIsPresented) {
-                            if let newWorkspace {
-                                WorkspaceOverview(newWorkspace, workspaceStore: workspaceStore)
-                            }
-                        }
                     }
                 }
             }
@@ -95,6 +90,11 @@ struct WorkspaceList: View, ViewDataProvider, LoadStateProvider, TimerLifecycle,
                     overviewIsPresented = true
                 }
             }
+            .navigationDestination(isPresented: $overviewIsPresented) {
+                if let newWorkspace {
+                    WorkspaceOverview(newWorkspace, workspaceStore: workspaceStore)
+                }
+            }
             .sheet(isPresented: $accountIsPresented) {
                 AccountOverview()
             }