Fix an issue with filter only working once:

kean · Jan 24, 2023 · 9a674ca · 9a674ca
1 parent dad8d82
commit 9a674ca
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 27 deletions.
diff --git a/Sources/PulseUI/Features/Console/ConsoleView-ios.swift b/Sources/PulseUI/Features/Console/ConsoleView-ios.swift
@@ -26,7 +26,14 @@ public struct ConsoleView: View {
             .onAppear { viewModel.isViewVisible = true }
             .onDisappear { viewModel.isViewVisible = false }
             .navigationTitle(viewModel.title)
-            .navigationBarItems(leading: leadingNavigationBarItems, trailing: trailingNavigationBarItems)
+            .toolbar {
+                ToolbarItemGroup(placement: .navigationBarLeading) {
+                    leadingNavigationBarItems
+                }
+                ToolbarItemGroup(placement: .navigationBarTrailing) {
+                    trailingNavigationBarItems
+                }
+            }
             .background(ConsoleRouterView(viewModel: viewModel))
     }
 
@@ -40,13 +47,11 @@ public struct ConsoleView: View {
     private var trailingNavigationBarItems: some View {
         switch viewModel.source {
         case .store:
-            HStack {
-                ConsoleShareButton(viewModel: viewModel)
-                Button(action: { viewModel.router.isShowingFilters = true }) {
-                    Image(systemName: "line.horizontal.3.decrease.circle")
-                }
-                ConsoleContextMenu(viewModel: viewModel)
+            ConsoleShareButton(viewModel: viewModel)
+            Button(action: { viewModel.router.isShowingFilters = true }) {
+                Image(systemName: "line.horizontal.3.decrease.circle")
             }
+            ConsoleContextMenu(viewModel: viewModel)
         case .entities:
             ConsoleShareButton(viewModel: viewModel)
         }

diff --git a/Sources/PulseUI/Features/Console/Views/ConsoleToolbarView.swift b/Sources/PulseUI/Features/Console/Views/ConsoleToolbarView.swift
@@ -25,7 +25,7 @@ struct ConsoleToolbarView: View {
                 }
             }
             Spacer()
-            HStack(spacing: 12) {
+            HStack(spacing: 14) {
                 ConsoleFiltersView(viewModel: viewModel)
             }.padding(.trailing, -2)
         }

diff --git a/Sources/PulseUI/Features/Inspector/NetworkInspectorView-ios.swift b/Sources/PulseUI/Features/Inspector/NetworkInspectorView-ios.swift
@@ -20,7 +20,11 @@ struct NetworkInspectorView: View {
             contents
         }
         .inlineNavigationTitle(viewModel.title)
-        .navigationBarItems(trailing: trailingNavigationBarItems)
+        .toolbar {
+            ToolbarItemGroup(placement: .navigationBarTrailing) {
+                trailingNavigationBarItems
+            }
+        }
         .sheet(item: $shareItems, content: ShareView.init)
     }
 
@@ -62,24 +66,22 @@ struct NetworkInspectorView: View {
 
     @ViewBuilder
     private var trailingNavigationBarItems: some View {
-        HStack {
-            viewModel.pinViewModel.map { PinButton(viewModel: $0, isTextNeeded: false) }
-            Menu(content: {
-                AttributedStringShareMenu(shareItems: $shareItems) {
-                    TextRenderer(options: .sharing).make { $0.render(viewModel.task, content: .sharing) }
-                }
-                Button(action: { shareItems = ShareItems([viewModel.task.cURLDescription()]) }) {
-                    Label("Share as cURL", systemImage: "square.and.arrow.up")
-                }
-            }, label: {
-                Image(systemName: "square.and.arrow.up")
-            })
-            Menu(content: {
-                NetworkMessageContextMenu(task: viewModel.task, sharedItems: $shareItems)
-            }, label: {
-                Image(systemName: "ellipsis.circle")
-            })
-        }
+        viewModel.pinViewModel.map { PinButton(viewModel: $0, isTextNeeded: false) }
+        Menu(content: {
+            AttributedStringShareMenu(shareItems: $shareItems) {
+                TextRenderer(options: .sharing).make { $0.render(viewModel.task, content: .sharing) }
+            }
+            Button(action: { shareItems = ShareItems([viewModel.task.cURLDescription()]) }) {
+                Label("Share as cURL", systemImage: "square.and.arrow.up")
+            }
+        }, label: {
+            Image(systemName: "square.and.arrow.up")
+        })
+        Menu(content: {
+            NetworkMessageContextMenu(task: viewModel.task, sharedItems: $shareItems)
+        }, label: {
+            Image(systemName: "ellipsis.circle")
+        })
     }
 }