Skip to content

fix(ios): hold navigation views weakly in the view registry so they deallocate on teardown #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rafmsou wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −11
Open

fix(ios): hold navigation views weakly in the view registry so they deallocate on teardown #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7b7467
fix(ios): hold navigation views weakly in the view registry
rafmsou Aug 13, 2026
ce58210
fix(ios): use generic WeakRef and rename registry dict to viewRefs
rafmsou Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions ...vigation_flutter/Sources/google_navigation_flutter/GoogleMapsNavigationViewRegistry.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Dispatch
import Foundation

class GoogleMapsNavigationViewRegistry {
private var views: [Int64: GoogleMapsNavigationView] = [:]
private var viewRefs: [Int64: WeakRef<GoogleMapsNavigationView>] = [:]
private var carPlayView: GoogleMapsNavigationView? {
didSet {
onHasCarPlayViewChanged?(carPlayView != nil)
Expand All @@ -34,41 +34,44 @@ class GoogleMapsNavigationViewRegistry {

func registerView(viewId: Int64, view: GoogleMapsNavigationView) {
queue.sync(flags: .barrier) { [weak self] in
self?.views[viewId] = view
self?.viewRefs[viewId] = WeakRef(view)
}
}

func unregisterView(viewId: Int64, viewInstanceIdToUnregister: ObjectIdentifier) {
queue.async(flags: .barrier) { [weak self] in
if let registeredView = self?.views[viewId],
ObjectIdentifier(registeredView) == viewInstanceIdToUnregister
{
self?.views.removeValue(forKey: viewId)
guard let self else { return }
if let registeredView = self.viewRefs[viewId]?.value {
if ObjectIdentifier(registeredView) == viewInstanceIdToUnregister {
self.viewRefs.removeValue(forKey: viewId)
}
} else {
self.viewRefs.removeValue(forKey: viewId)
}
}
}

func getView(viewId: Int64) -> GoogleMapsNavigationView? {
queue.sync {
views[viewId]
viewRefs[viewId]?.value
}
}

func getAllRegisteredViewIds() -> [Int64] {
queue.sync {
Array(views.keys)
viewRefs.compactMap { id, ref in ref.value != nil ? id : nil }
}
}

func getAllRegisteredViews() -> [GoogleMapsNavigationView] {
queue.sync {
Array(views.values)
viewRefs.values.compactMap { $0.value }
}
}

func getAllRegisteredNavigationViewIds() -> [Int64] {
// Filter the views dictionary to include only those views that are navigation views
views.filter { $0.value.isNavigationView() }.map(\.key)
viewRefs.compactMap { id, ref in ref.value?.isNavigationView() == true ? id : nil }
}

func registerCarPlayView(view: GoogleMapsNavigationView) {
Expand All @@ -95,7 +98,7 @@ class GoogleMapsNavigationViewRegistry {

func sendPromptVisibilityChangedToAllViews(promptVisible: Bool) {
queue.sync {
for view in views.values {
for view in viewRefs.values.compactMap({ $0.value }) {
view.sendPromptVisibilityChangedEvent(promptVisible: promptVisible)
}
// Also send to CarPlay view if it exists
Expand Down
8 changes: 8 additions & 0 deletions ios/google_navigation_flutter/Sources/google_navigation_flutter/Utilities.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@

import UIKit

final class WeakRef<T: AnyObject> {
weak var value: T?

init(_ value: T) {
self.value = value
}
}

extension String {
static var empty: String { "" }
}
Expand Down