Skip to content

Commit f5f30c9

Browse files
Merge pull request #1120 from liveview-native/navigation-page-clear
Fix navigation root URL state
2 parents b2b7016 + 9fef0aa commit f5f30c9

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

Sources/LiveViewNative/Coordinators/LiveSessionCoordinator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
8383
let last = next.last ?? .init(url: self.url, coordinator: self.rootCoordinator)
8484
if last.coordinator.url != last.url {
8585
last.coordinator.url = last.url
86-
Task { @MainActor in
86+
Task {
8787
try await last.coordinator.connect(domValues: self.domValues, redirect: true)
8888
}
8989
}

Sources/LiveViewNative/Coordinators/LiveViewCoordinator.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,11 @@ public class LiveViewCoordinator<R: RootRegistry>: ObservableObject {
308308
}
309309
}
310310
}
311-
channel = nil
312-
self.internalState = .notConnected
313-
self.document = nil
311+
await MainActor.run { [weak self] in
312+
self?.channel = nil
313+
self?.internalState = .notConnected
314+
self?.document = nil
315+
}
314316
}
315317

316318
enum JoinResult {

Sources/LiveViewNative/LiveView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public struct LiveView<R: RootRegistry>: View {
219219
}
220220

221221
private var navigationRoot: some View {
222-
NavStackEntryView(.init(url: storage.session.rootCoordinator.url, coordinator: rootCoordinator))
222+
NavStackEntryView(.init(url: storage.session.url, coordinator: rootCoordinator))
223223
}
224224
}
225225

0 commit comments

Comments
 (0)