Merge pull request #484 from Esri/Caleb/Fix-SearchForWebMapNavigation

[Fix] `Search for web map` navigation bugs

Author: CalebRas

Shared/Samples/Augment reality to show hidden infrastructure/AugmentRealityToShowHiddenInfrastructureView.swift

@@ -104,14 +104,12 @@ struct AugmentRealityToShowHiddenInfrastructureView: View {
         .disabled(!geometryEditorCanUndo && !canDelete)
         Spacer()
 
-        NavigationStack {
-            NavigationLink {
-                ARPipesSceneView(model: model.sceneModel)
-            } label: {
-                Image(systemName: "camera")
-            }
-            .disabled(geometryEditorCanUndo || !canDelete)
+        NavigationLink {
+            ARPipesSceneView(model: model.sceneModel)
+        } label: {
+            Image(systemName: "camera")
         }
+        .disabled(geometryEditorCanUndo || !canDelete)
         Spacer()
 
         Button("Done", systemImage: "checkmark") {

Shared/Samples/Search for web map/SearchForWebMapView.swift

@@ -29,65 +29,63 @@ struct SearchForWebMapView: View {
     @State private var error: Error?
 
     var body: some View {
-        NavigationStack {
-            ScrollView {
-                LazyVStack {
-                    ForEach(model.portalItems, id: \.id) { item in
-                        NavigationLink {
-                            SafeMapView(map: Map(item: item))
-                                .navigationTitle(item.title)
-                        } label: {
-                            PortalItemRowView(item: item)
-                        }
-                        .buttonStyle(.plain)
-                        .task {
-                            // Load the next results when the last item is reached.
-                            guard item.id == model.portalItems.last?.id else { return }
-                            
-                            resultsAreLoading = true
-                            defer { resultsAreLoading = false }
-                            
-                            do {
-                                try await model.findNextItems()
-                            } catch {
-                                self.error = error
-                            }
-                        }
+        ScrollView {
+            LazyVStack {
+                ForEach(model.portalItems, id: \.id) { item in
+                    NavigationLink {
+                        SafeMapView(map: Map(item: item))
+                            .navigationTitle(item.title)
+                    } label: {
+                        PortalItemRowView(item: item)
                     }
-                    
-                    if resultsAreLoading {
-                        ProgressView()
-                            .padding()
-                    } else if !query.isEmpty && model.portalItems.isEmpty {
-                        VStack {
-                            Text("No Results")
-                                .font(.headline)
-                            Text("Check spelling or try a new search.")
-                                .font(.footnote)
+                    .buttonStyle(.plain)
+                    .task {
+                        // Load the next results when the last item is reached.
+                        guard item.id == model.portalItems.last?.id else { return }
+                        
+                        resultsAreLoading = true
+                        defer { resultsAreLoading = false }
+                        
+                        do {
+                            try await model.findNextItems()
+                        } catch {
+                            self.error = error
                         }
-                        .padding()
                     }
                 }
-            }
-            .background(Color(.secondarySystemBackground))
-            .searchable(
-                text: $query,
-                placement: .navigationBarDrawer(displayMode: .always),
-                prompt: "Web Maps"
-            )
-            .task(id: query) {
-                // Load new results when the query changes.
-                resultsAreLoading = true
-                defer { resultsAreLoading = false }
 
-                do {
-                    try await model.findItems(for: query)
-                } catch {
-                    self.error = error
+                if resultsAreLoading {
+                    ProgressView()
+                        .padding()
+                } else if !query.isEmpty && model.portalItems.isEmpty {
+                    VStack {
+                        Text("No Results")
+                            .font(.headline)
+                        Text("Check spelling or try a new search.")
+                            .font(.footnote)
+                    }
+                    .padding()
                 }
             }
-            .errorAlert(presentingError: $error)
         }
+        .background(Color(.secondarySystemBackground))
+        .searchable(
+            text: $query,
+            placement: .navigationBarDrawer(displayMode: .always),
+            prompt: "Web Maps"
+        )
+        .task(id: query) {
+            // Load new results when the query changes.
+            resultsAreLoading = true
+            defer { resultsAreLoading = false }
+            
+            do {
+                try await model.findItems(for: query)
+            } catch {
+                self.error = error
+            }
+        }
+        .errorAlert(presentingError: $error)
     }
 }
 

Shared/Supporting Files/Views/ContentView.swift

@@ -38,7 +38,9 @@ struct ContentView: View {
         } content: {
             Text("No Category Selected")
         } detail: {
-            Text("No Sample Selected")
+            NavigationStack {
+                Text("No Sample Selected")
+            }
         }
     }
 }