@iternio/react-native-auto-play 0.1.17 → 0.2.0-alpha.1

package/ios/hybrid/HybridSearchTemplate.swift

@@ -10,26 +10,25 @@ import NitroModules
 class HybridSearchTemplate: HybridSearchTemplateSpec {
     func createSearchTemplate(config: SearchTemplateConfig) throws {
         let template = SearchTemplate(config: config)
-        TemplateStore.addTemplate(
-            template: template,
-            templateId: config.id
-        )
+
+        try RootModule.withTemplateStore { templateStore in
+            templateStore.addTemplate(
+                template: template,
+                templateId: config.id
+            )
+        }
     }
 
     func updateSearchResults(templateId: String, results: NitroSection) throws
         -> Promise<Void>
     {
         return Promise.async {
-            guard
-                let template = TemplateStore.getTemplate(templateId: templateId)
-                    as? SearchTemplate
-            else {
-                throw AutoPlayError.invalidTemplateType(
-                    "\(templateId) is not a SearchTemplate"
-                )
+            try await MainActor.run {
+                try RootModule.withAutoPlayTemplate(templateId: templateId) {
+                    (template: SearchTemplate) in
+                    template.updateSearchResults(results: results)
+                }
             }
-
-            await template.updateSearchResults(results: results)
         }
     }
 }

package/ios/scenes/AutoPlayInterfaceController.swift

@@ -77,7 +77,9 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
             animated: animated
         )
 
-        TemplateStore.removeTemplate(templateId: templateId)
+        try RootModule.withTemplateStore { templateStore in
+            templateStore.removeTemplate(templateId: templateId)
+        }
 
         return templateId
     }
@@ -103,7 +105,9 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
             animated: animated
         )
 
-        TemplateStore.removeTemplates(templateIds: templateIds)
+        try RootModule.withTemplateStore { templateStore in
+            templateStore.removeTemplates(templateIds: templateIds)
+        }
 
         return templateIds
     }
@@ -171,9 +175,12 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
     ) {
         let templateId = aTemplate.id
 
-        TemplateStore.getTemplate(templateId: templateId)?.onWillAppear(
-            animated: animated
-        )
+        try? RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: AutoPlayTemplate) in
+            template.onWillAppear(
+                animated: animated
+            )
+        }
     }
 
     func templateDidAppear(
@@ -184,11 +191,18 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
 
         if rootTemplateId == templateId {
             // this makes sure we purge outdated CPSearchTemplate since that one can be popped on with a CarPlay native button we can not intercept
-            TemplateStore.purge()
+            try? RootModule.withTemplateStore { templateStore in
+                templateStore.purge()
+            }
         }
 
-        TemplateStore.getTemplate(templateId: templateId)?.onDidAppear(
-            animated: animated
+        try? RootModule.withAutoPlayTemplate(
+            templateId: templateId,
+            perform: { (template: AutoPlayTemplate) in
+                template.onDidAppear(
+                    animated: animated
+                )
+            }
         )
     }
 
@@ -198,8 +212,15 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
     ) {
         let templateId = aTemplate.id
 
-        TemplateStore.getTemplate(templateId: templateId)?.onWillDisappear(
-            animated: animated
+        try? RootModule.withAutoPlayTemplate(
+            templateId: templateId,
+            perform: {
+                (template: AutoPlayTemplate)
+                in
+                template.onWillDisappear(
+                    animated: animated
+                )
+            }
         )
     }
 
@@ -209,12 +230,19 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
     ) {
         let templateId = aTemplate.id
 
-        TemplateStore.getTemplate(templateId: templateId)?.onDidDisappear(
-            animated: animated
+        try? RootModule.withAutoPlayTemplate(
+            templateId: templateId,
+            perform: { (template: AutoPlayTemplate) in
+                template.onDidDisappear(
+                    animated: animated
+                )
+            }
         )
 
         if aTemplate is CPAlertTemplate {
-            TemplateStore.removeTemplate(templateId: templateId)
+            try? RootModule.withTemplateStore { templateStore in
+                templateStore.removeTemplate(templateId: templateId)
+            }
 
             HybridAutoPlay.removeListeners(
                 templateId: templateId

package/ios/scenes/AutoPlayScene.swift

@@ -57,6 +57,7 @@ class AutoPlayScene: UIResponder {
         self.window = nil
         isConnected = false
 
+        templateStore.disconnect()
         SceneStore.removeScene(moduleName: moduleName)
     }
 
@@ -97,7 +98,7 @@ class AutoPlayScene: UIResponder {
             return
         }
         self.traitCollection = traitCollection
-        TemplateStore.traitCollectionDidChange()
+        templateStore.traitCollectionDidChange()
     }
 
     open func safeAreaInsetsDidChange(safeAreaInsets: UIEdgeInsets) {

package/ios/scenes/AutoPlaySceneViewController.swift

@@ -22,14 +22,20 @@ class AutoPlaySceneViewController: UIViewController {
     override func traitCollectionDidChange(
         _ previousTraitCollection: UITraitCollection?
     ) {
-        SceneStore.getScene(moduleName: moduleName)!.traitCollectionDidChange(
+        guard let scene = SceneStore.getScene(moduleName: moduleName) else {
+            return
+        }
+        scene.traitCollectionDidChange(
             traitCollection: traitCollection
         )
     }
 
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
-        SceneStore.getScene(moduleName: moduleName)!.safeAreaInsetsDidChange(
+        guard let scene = SceneStore.getScene(moduleName: moduleName) else {
+            return
+        }
+        scene.safeAreaInsetsDidChange(
             safeAreaInsets: self.view.safeAreaInsets
         )
     }

package/ios/scenes/DashboardSceneDelegate.swift

@@ -20,7 +20,8 @@ class DashboardSceneDelegate: AutoPlayScene,
             launchHeadUnitSceneUrl = URL(
                 string: "\(bundleIdentifier)://\(UUID())"
             )
-        } else {
+        }
+        else {
             launchHeadUnitSceneUrl = nil
         }
 
@@ -91,16 +92,22 @@ class DashboardSceneDelegate: AutoPlayScene,
                 .dashboardWindow.traitCollection
         else { return }
 
-        dashboardController?.shortcutButtons = buttons.map { button in
-            CPDashboardButton(
-                titleVariants: button.titleVariants,
-                subtitleVariants: button.subtitleVariants,
-                image: Parser.parseNitroImage(
+        dashboardController?.shortcutButtons = buttons.compactMap { button in
+            guard
+                let image = Parser.parseNitroImage(
                     image: button.image,
                     traitCollection: traitCollection
-                )!
+                )
+            else {
+                return nil
+            }
+            let dashboardButton = CPDashboardButton(
+                titleVariants: button.titleVariants,
+                subtitleVariants: button.subtitleVariants,
+                image: image
             ) { _ in
                 button.onPress()
+
                 if button.launchHeadUnitScene == true {
                     guard let url = self.launchHeadUnitSceneUrl
                     else { return }
@@ -110,6 +117,7 @@ class DashboardSceneDelegate: AutoPlayScene,
                     )
                 }
             }
+            return dashboardButton
         }
     }
 

package/ios/scenes/HeadUnitSceneDelegate.swift

@@ -58,12 +58,14 @@ class HeadUnitSceneDelegate: AutoPlayScene, CPTemplateApplicationSceneDelegate {
             CPInterfaceController
     ) {
         HybridAutoPlay.emit(event: .diddisconnect)
+        
+        if let mapTemplate = try? templateStore.getTemplate(
+            templateId: SceneStore.rootModuleName
+        ) as? MapTemplate {
+            mapTemplate.stopNavigation()
+        }
+        
         disconnect()
-
-        let mapTemplate =
-            TemplateStore.getTemplate(templateId: SceneStore.rootModuleName)
-            as? MapTemplate
-        mapTemplate?.stopNavigation()
     }
 
     func sceneWillResignActive(_ scene: UIScene) {

package/ios/scenes/WindowApplicationSceneDelegate.swift

@@ -53,7 +53,7 @@ class WindowApplicationSceneDelegate: UIResponder, UIWindowSceneDelegate {
         guard let urlContext = URLContexts.first else { return }
         NitroLinkingManager.shared().openURL(urlContext)
     }
-    
+
     func scene(
         _ scene: UIScene,
         continue userActivity: NSUserActivity

package/ios/templates/AutoPlayTemplate.swift

@@ -7,23 +7,31 @@
 
 import CarPlay
 
-protocol AutoPlayTemplate {
-    var autoDismissMs: Double? { get }
-
-    @MainActor func invalidate()
-    func onWillAppear(animated: Bool)
-    func onDidAppear(animated: Bool)
-    func onWillDisappear(animated: Bool)
-    func onDidDisappear(animated: Bool)
-    func onPopped()
-    func traitCollectionDidChange()
-    func getTemplate() -> CPTemplate
-}
+class AutoPlayTemplate: NSObject {
+    public private(set) var autoDismissMs: Double?
+
+    func getTemplate() -> CPTemplate {
+        fatalError("getTemplate not implemented")
+    }
 
-extension AutoPlayTemplate {
-    func traitCollectionDidChange() {
-        // this can be implemented optionally
+    @MainActor final func invalidate() {
+        if SceneStore.getRootScene() == nil {
+            return
+        }
+
+        _invalidate()
     }
+
+    /// Override in subclasses to perform template invalidation.
+    /// Do not call this method directly. Call `invalidate()` instead.
+    @MainActor func _invalidate() {}
+    @MainActor func traitCollectionDidChange() {}
+
+    func onWillAppear(animated: Bool) {}
+    func onDidAppear(animated: Bool) {}
+    func onWillDisappear(animated: Bool) {}
+    func onDidDisappear(animated: Bool) {}
+    func onPopped() {}
 }
 
 protocol AutoPlayHeaderProviding {

package/ios/templates/GridTemplate.swift

@@ -21,11 +21,11 @@ class GridTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
         }
     }
 
-    var autoDismissMs: Double? {
+    override var autoDismissMs: Double? {
         return config.autoDismissMs
     }
-    
-    func getTemplate() -> CPTemplate {
+
+    override func getTemplate() -> CPTemplate {
         return template
     }
 
@@ -44,61 +44,68 @@ class GridTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
 
         if #available(iOS 26.0, *) {
             gridButtonHeight = CPGridTemplate.maximumGridButtonImageSize.height
-        } else {
+        }
+        else {
             gridButtonHeight = 44
         }
 
-        return buttons.map { button in
+        let traitCollection = SceneStore.getRootTraitCollection()
+
+        return buttons.compactMap { button in
             var image: UIImage?
 
             if let glyphImage = button.image.glyphImage {
                 image = SymbolFont.imageFromNitroImage(
                     image: glyphImage,
                     size: gridButtonHeight,
-                    traitCollection: SceneStore.getRootTraitCollection()
-                )!
+                    traitCollection: traitCollection
+                )
             }
 
             if let assetImage = button.image.assetImage {
                 image = Parser.parseAssetImage(
                     assetImage: assetImage,
-                    traitCollection: SceneStore.getRootTraitCollection()
+                    traitCollection: traitCollection
                 )
             }
 
+            guard let image = image else { return nil }
+            guard let title = Parser.parseText(text: button.title) else { return nil }
+
             return CPGridButton(
-                titleVariants: [Parser.parseText(text: button.title)!],
-                image: image!
+                titleVariants: [title],
+                image: image
             ) { _ in
                 button.onPress()
             }
         }
     }
 
-    func invalidate() {
+    @MainActor
+    override func _invalidate() {
         setBarButtons(template: template, barButtons: config.headerActions)
 
         let buttons = GridTemplate.parseButtons(buttons: config.buttons)
         template.updateGridButtons(buttons)
     }
 
-    func onWillAppear(animated: Bool) {
+    override func onWillAppear(animated: Bool) {
         config.onWillAppear?(animated)
     }
 
-    func onDidAppear(animated: Bool) {
+    override func onDidAppear(animated: Bool) {
         config.onDidAppear?(animated)
     }
 
-    func onWillDisappear(animated: Bool) {
+    override func onWillDisappear(animated: Bool) {
         config.onWillDisappear?(animated)
     }
 
-    func onDidDisappear(animated: Bool) {
+    override func onDidDisappear(animated: Bool) {
         config.onDidDisappear?(animated)
     }
 
-    func onPopped() {
+    override func onPopped() {
         config.onPopped?()
     }
 

package/ios/templates/InformationTemplate.swift

@@ -10,7 +10,7 @@ import CarPlay
 class InformationTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
     let template: CPInformationTemplate
     var config: InformationTemplateConfig
-    
+
     var barButtons: [NitroAction]? {
         get {
             return config.headerActions
@@ -20,12 +20,12 @@ class InformationTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
             setBarButtons(template: template, barButtons: newValue)
         }
     }
-    
-    var autoDismissMs: Double? {
+
+    override var autoDismissMs: Double? {
         return config.autoDismissMs
     }
-    
-    func getTemplate() -> CPTemplate {
+
+    override func getTemplate() -> CPTemplate {
         return template
     }
 
@@ -41,28 +41,29 @@ class InformationTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
         )
     }
 
-    func invalidate() {
+    @MainActor
+    override func _invalidate() {
         setBarButtons(template: template, barButtons: barButtons)
         template.items = Parser.parseInformationItems(section: config.section)
     }
 
-    func onWillAppear(animated: Bool) {
+    override func onWillAppear(animated: Bool) {
         config.onWillAppear?(animated)
     }
 
-    func onDidAppear(animated: Bool) {
+    override func onDidAppear(animated: Bool) {
         config.onDidAppear?(animated)
     }
 
-    func onWillDisappear(animated: Bool) {
+    override func onWillDisappear(animated: Bool) {
         config.onWillDisappear?(animated)
     }
 
-    func onDidDisappear(animated: Bool) {
+    override func onDidDisappear(animated: Bool) {
         config.onDidDisappear?(animated)
     }
 
-    func onPopped() {
+    override func onPopped() {
         config.onPopped?()
     }
 

package/ios/templates/ListTemplate.swift

@@ -10,7 +10,7 @@ import CarPlay
 class ListTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
     let template: CPListTemplate
     var config: ListTemplateConfig
-    
+
     var barButtons: [NitroAction]? {
         get {
             return config.headerActions
@@ -20,12 +20,12 @@ class ListTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
             setBarButtons(template: template, barButtons: newValue)
         }
     }
-    
-    var autoDismissMs: Double? {
+
+    override var autoDismissMs: Double? {
         return config.autoDismissMs
     }
-    
-    func getTemplate() -> CPTemplate {
+
+    override func getTemplate() -> CPTemplate {
         return template
     }
 
@@ -41,7 +41,7 @@ class ListTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
     }
 
     @MainActor
-    func invalidate() {
+    override func _invalidate() {
         setBarButtons(template: template, barButtons: barButtons)
 
         template.updateSections(
@@ -53,23 +53,23 @@ class ListTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
         )
     }
 
-    func onWillAppear(animated: Bool) {
+    override func onWillAppear(animated: Bool) {
         config.onWillAppear?(animated)
     }
 
-    func onDidAppear(animated: Bool) {
+    override func onDidAppear(animated: Bool) {
         config.onDidAppear?(animated)
     }
 
-    func onWillDisappear(animated: Bool) {
+    override func onWillDisappear(animated: Bool) {
         config.onWillDisappear?(animated)
     }
 
-    func onDidDisappear(animated: Bool) {
+    override func onDidDisappear(animated: Bool) {
         config.onDidDisappear?(animated)
     }
 
-    func onPopped() {
+    override func onPopped() {
         config.onPopped?()
     }