move the bottom sheet where it can get to the router

ngageoint · Sep 19, 2024 · 3e81da8 · 3e81da8
1 parent 69d0b98
commit 3e81da8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Marlin/Marlin/MarlinView.swift b/Marlin/Marlin/MarlinView.swift
@@ -30,7 +30,7 @@ struct MarlinView: View {
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
     @EnvironmentObject var dataSourceList: DataSourceList
     @EnvironmentObject var appState: AppState
-
+    
     @State var selection: String?
     @State var showBottomSheet: Bool = false
 
@@ -87,9 +87,6 @@ struct MarlinView: View {
                 }
             }
         }
-        .background {
-            MarlinDataBottomSheet()
-        }
         .background {
             MappedDataSourcesFilter(showBottomSheet: $filterOpen)
                 .environmentObject(dataSourceList)

diff --git a/Marlin/Marlin/Views/MarlinCompactWidth.swift b/Marlin/Marlin/Views/MarlinCompactWidth.swift
@@ -36,6 +36,9 @@ struct MarlinCompactWidth: View {
                         .accessibilityElement(children: .contain)
                         .accessibilityLabel("Marlin Map Tab")
                 }
+                .background {
+                    MarlinDataBottomSheet()
+                }
                 // this affects text buttons, image buttons need .foregroundColor set on them
                 .tint(Color.onPrimaryColor)
                 .navigationViewStyle(.stack)

diff --git a/Marlin/Marlin/Views/MarlinRegularWidth.swift b/Marlin/Marlin/Views/MarlinRegularWidth.swift
@@ -88,6 +88,9 @@ struct MarlinRegularWidth: View {
                     loadingCapsule()
                 }
             }
+            .background {
+                MarlinDataBottomSheet()
+            }
             .marlinRoutes()
             .modifier(CombinedSourcesFilterButton(
                 filterOpen: $filterOpen,