Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Commit 42b095e

Browse files
committed
pass nav state
1 parent 4a4e97e commit 42b095e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Marlin/Marlin/BottomSheet/BottomSheetView.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ struct MarlinDataBottomSheet: View {
6666
}
6767

6868
struct MarlinBottomSheet: View {
69+
@StateObject var navState = NavState()
6970
@ObservedObject var itemList: BottomSheetItemList
7071
@State var selectedItem: Int = 0
7172

@@ -154,6 +155,7 @@ struct MarlinBottomSheet: View {
154155
if let dataSource = item.item as? DataSourceViewBuilder {
155156
dataSource.summaryView(showMoreDetails: true, showSectionHeader: true, mapName: item.mapName, showTitle: true)
156157
.transition(.opacity)
158+
.environmentObject(navState)
157159
}
158160
}
159161

Marlin/Marlin/DataSources/NavigationalWarning/Views/NavigationalWarningActionBar.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import SwiftUI
99
import MapKit
1010

11-
struct NavigationalWarningActionBar: View {
12-
@EnvironmentObject var navState: NavState
13-
11+
struct NavigationalWarningActionBar: View {
1412
var navigationalWarning: NavigationalWarning
1513
var showMoreDetails: Bool
1614
var mapName: String?

Marlin/Marlin/Views/MapNavigationView.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import SwiftUI
99

1010
struct MapNavigationView: View {
1111
@EnvironmentObject var dataSourceList: DataSourceList
12-
12+
@StateObject var navState: NavState = NavState()
1313
@Binding var filterOpen: Bool
1414
@Binding var selection: String?
1515
@Binding var menuOpen: Bool
@@ -45,6 +45,7 @@ struct MapNavigationView: View {
4545
NavigationLink(tag: "detail", selection: $selection) {
4646
if let data = itemWrapper.dataSource as? DataSourceViewBuilder {
4747
data.detailView
48+
.environmentObject(navState)
4849
}
4950
} label: {
5051
EmptyView()

0 commit comments

Comments
 (0)