@iternio/react-native-auto-play 0.3.0 → 0.3.2

package/ReactNativeAutoPlay.podspec

@@ -37,7 +37,6 @@ Pod::Spec.new do |s|
   load 'nitrogen/generated/ios/ReactNativeAutoPlay+autolinking.rb'
   add_nitrogen_files(s)
 
-  s.dependency 'React-Core'
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
   install_modules_dependencies(s)

package/ios/ReactHelpers/NitroConvert.h

@@ -0,0 +1,19 @@
+//
+//  NitroConvert.h
+//  Pods
+//
+//  Created by Manuel Auer on 04.11.25.
+//
+
+// this is required for old architecture support since the React pod can not be imported
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NitroConvert : NSObject
++ (UIColor *)uiColor:(id)json;
++ (UIImage *)uiImage:(id)json;
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/ReactHelpers/NitroConvert.m

@@ -0,0 +1,21 @@
+//
+//  NitroConvert.m
+//  Pods
+//
+//  Created by Manuel Auer on 04.11.25.
+//
+
+// this is required for old architecture support since the React pod can not be imported
+
+#import "NitroConvert.h"
+#import <React/RCTConvert.h>
+
+@implementation NitroConvert
++ (UIColor *)uiColor:(id)json {
+    return [RCTConvert UIColor:json];
+}
+
++ (nonnull UIImage *)uiImage:(nonnull id)json {
+    return [RCTConvert UIImage:json];
+}
+@end

package/ios/ReactHelpers/NitroSurface.h

@@ -0,0 +1,10 @@
+//
+//  NitroSurface.h
+//  Pods
+//
+//  Created by Manuel Auer on 28.11.25.
+//
+
+@interface NitroSurface : NSObject
++ (void)stop:(nullable UIView *)view;
+@end

package/ios/ReactHelpers/NitroSurface.m

@@ -0,0 +1,37 @@
+//
+//  NitroSurface.m
+//  Pods
+//
+//  Created by Manuel Auer on 28.11.25.
+//
+
+#import "NitroSurface.h"
+#import <React/RCTInvalidating.h>
+#import <React/RCTRootView.h>
+#import <React/RCTSurface.h>
+#import <React/RCTSurfaceHostingView.h>
+
+@implementation NitroSurface
+
++ (void)stop:(nullable UIView *)view {
+    if (view == nil) {
+        NSLog(@"[AutoPlay] View is nil, ignoring");
+        return;
+    }
+
+    if ([view isKindOfClass:[RCTSurfaceHostingView class]]) {
+        RCTSurfaceHostingView *rootView =
+            (RCTSurfaceHostingView *)view;
+        
+        if (rootView == nil) {
+            NSLog(@"[AutoPlay] rootView == nil, cannot stop");
+            return;
+        }
+        
+        [rootView.surface stop];
+    }
+
+    NSLog(@"[AutoPlay] View is not recognized type, ignoring");
+}
+
+@end

package/ios/Types.swift

@@ -12,7 +12,6 @@ struct TemplateEventPayload {
 
 enum AutoPlayError: Error {
     case templateNotFound(String)
-    case sceneNotFound(String)
     case interfaceControllerNotFound(String)
     case invalidTemplateError(String)
     case propertyNotFoundError(String)

package/ios/hybrid/HybridAutoPlay.swift

@@ -147,7 +147,7 @@ class HybridAutoPlay: HybridAutoPlaySpec {
         -> NitroModules.Promise<Void>
     {
         return Promise.async {
-            return try await RootModule.withSceneAndInterfaceController {
+            try await RootModule.withSceneAndInterfaceController {
                 scene,
                 interfaceController in
 
@@ -196,7 +196,7 @@ class HybridAutoPlay: HybridAutoPlaySpec {
 
     func popTemplate(animate: Bool?) throws -> NitroModules.Promise<Void> {
         return Promise.async {
-            return try await RootModule.withInterfaceController {
+            try await RootModule.withInterfaceController {
                 interfaceController in
 
                 if try await interfaceController.dismissTemplate(
@@ -240,7 +240,7 @@ class HybridAutoPlay: HybridAutoPlaySpec {
         Void
     > {
         return Promise.async {
-            return try await RootModule.withInterfaceController {
+            try await RootModule.withInterfaceController {
                 interfaceController in
 
                 let _ = try await interfaceController.dismissTemplate(

package/ios/hybrid/HybridCarPlayDashboard.swift

@@ -32,7 +32,7 @@ class HybridCarPlayDashboard: HybridCarPlayDashboardSpec {
 
     func initRootView() throws -> Promise<Void> {
         return Promise.async {
-            guard let scene = try SceneStore.getDashboardScene() else { return }
+            guard let scene = SceneStore.getDashboardScene() else { return }
             try await MainActor.run {
                 try scene.initRootView()
             }
@@ -43,9 +43,9 @@ class HybridCarPlayDashboard: HybridCarPlayDashboardSpec {
         Void
     > {
         return Promise.async {
-            try await MainActor.run {
-                let scene = try SceneStore.getDashboardScene()
-                scene?.setButtons(buttons: buttons)
+            await MainActor.run {
+                guard let scene = SceneStore.getDashboardScene() else { return }
+                scene.setButtons(buttons: buttons)
             }
         }
     }

package/ios/hybrid/HybridCluster.swift

@@ -57,10 +57,13 @@ class HybridCluster: HybridClusterSpec {
         return Promise.async {
             if #available(iOS 15.4, *) {
                 try await MainActor.run {
-                    let scene = try SceneStore.getClusterScene(
+                    guard let scene = SceneStore.getClusterScene(
                         clusterId: clusterId
-                    )
-                    try scene?.initRootView()
+                    ) else {
+                        return
+                    }
+                    
+                    try scene.initRootView()
                 }
             }
             else {
@@ -77,10 +80,13 @@ class HybridCluster: HybridClusterSpec {
             [NitroAttributedString]
     ) throws {
         if #available(iOS 15.4, *) {
-            let scene = try SceneStore.getClusterScene(
+            guard let scene = SceneStore.getClusterScene(
                 clusterId: clusterId
-            )
-            scene?.setAttributedInactiveDescriptionVariants(
+            ) else {
+                return
+            }
+            
+            scene.setAttributedInactiveDescriptionVariants(
                 attributedInactiveDescriptionVariants:
                     attributedInactiveDescriptionVariants
             )

package/ios/scenes/AutoPlayScene.swift

@@ -6,7 +6,6 @@
 //
 
 import CarPlay
-import React
 
 class AutoPlayScene: UIResponder {
     var initialProperties: [String: Any] = [:]
@@ -54,10 +53,7 @@ class AutoPlayScene: UIResponder {
     }
 
     func disconnect() {
-        if let view = self.window?.rootViewController?.view, let rootView = view as? RCTSurfaceHostingProxyRootView {
-            rootView.surface.stop()
-        }
-
+        NitroSurface.stop(self.window?.rootViewController?.view)
         self.window = nil
         isConnected = false
 

package/ios/scenes/SceneStore.swift

@@ -49,22 +49,20 @@ class SceneStore {
         )
     }
 
-    static func getDashboardScene() throws -> DashboardSceneDelegate? {
+    static func getDashboardScene() -> DashboardSceneDelegate? {
         guard
             let scene = SceneStore.getScene(
                 moduleName: SceneStore.dashboardModuleName
             )
         else {
-            throw AutoPlayError.sceneNotFound(
-                "operation failed, \(SceneStore.dashboardModuleName) scene not found"
-            )
+            return nil
         }
 
         return scene as? DashboardSceneDelegate
     }
 
     @available(iOS 15.4, *)
-    static func getClusterScene(clusterId: String) throws
+    static func getClusterScene(clusterId: String)
         -> ClusterSceneDelegate?
     {
         guard
@@ -72,9 +70,7 @@ class SceneStore {
                 moduleName: clusterId
             )
         else {
-            throw AutoPlayError.sceneNotFound(
-                "operation failed, \(clusterId) scene not found"
-            )
+            return nil
         }
 
         return scene as? ClusterSceneDelegate

package/ios/templates/MapTemplate.swift

@@ -580,10 +580,10 @@ class MapTemplate: AutoPlayHeaderProviding,
 
         guard let trip = navigationSession?.trip else { return }
 
-        let travelEstaimtes = trip.routeChoices.first?
+        let travelEstimates = trip.routeChoices.first?
             .travelEstimates
         if let estimates = self.visibleTravelEstimate == .first
-            ? travelEstaimtes?.first : travelEstaimtes?.last
+            ? travelEstimates?.first : travelEstimates?.last
         {
             template.updateEstimates(estimates, for: trip)
         }

package/ios/templates/Parser.swift

@@ -7,7 +7,6 @@
 
 import CarPlay
 import UIKit
-import React
 
 struct HeaderActions {
     let leadingNavigationBarButtons: [CPBarButton]
@@ -740,7 +739,7 @@ class Parser {
     }
 
     static func doubleToColor(value: Double) -> UIColor {
-        return RCTConvert.uiColor(value)
+        return NitroConvert.uiColor(value)
     }
 
     static func parseNitroImage(
@@ -768,7 +767,7 @@ class Parser {
         assetImage: AssetImage,
         traitCollection: UITraitCollection
     ) -> UIImage? {
-        let uiImage = RCTConvert.uiImage([
+        let uiImage = NitroConvert.uiImage([
             "height": assetImage.height, "width": assetImage.width,
             "uri": assetImage.uri, "scale": assetImage.scale,
             "__packager_asset": assetImage.packager_asset,
@@ -777,10 +776,6 @@ class Parser {
         guard let color = assetImage.color else {
             return uiImage
         }
-        
-        guard let uiImage = uiImage else {
-            return nil
-        }
 
         return getTintedImageAsset(
             color: color,

package/ios/utils/RootModule.swift

@@ -16,9 +16,7 @@ class RootModule {
                 moduleName: SceneStore.rootModuleName
             )
         else {
-            throw AutoPlayError.sceneNotFound(
-                "operation failed, \(SceneStore.rootModuleName) scene not found"
-            )
+            return
         }
 
         try action(scene)
@@ -51,35 +49,16 @@ class RootModule {
         }
     }
 
-    static func withTemplate<T: CPTemplate>(
-        templateId: String,
-        perform action: @escaping (T) throws -> Void
-    ) throws {
-        try withAutoPlayTemplate(templateId: templateId) {
-            (autoPlayTemplate: AutoPlayTemplate) in
-            if let template = autoPlayTemplate.getTemplate() as? T {
-                try! action(template)
-            }
-            else {
-                throw AutoPlayError.invalidTemplateType(
-                    "\(autoPlayTemplate) is not a \(T.self) template"
-                )
-            }
-        }
-    }
-
     static func withScene<T>(
         perform action:
             @escaping (AutoPlayScene) async throws -> T
-    ) async throws -> T {
+    ) async throws -> T? {
         guard
             let scene = SceneStore.getScene(
                 moduleName: SceneStore.rootModuleName
             )
         else {
-            throw AutoPlayError.sceneNotFound(
-                "operation failed, \(SceneStore.rootModuleName) scene not found"
-            )
+            return nil
         }
 
         return try await action(scene)
@@ -90,7 +69,7 @@ class RootModule {
         perform action:
             @escaping (AutoPlayScene, AutoPlayInterfaceController) async throws
             -> T
-    ) async throws -> T {
+    ) async throws -> T? {
         return try await withScene { scene in
             guard let interfaceController = scene.interfaceController else {
                 throw AutoPlayError.interfaceControllerNotFound(
@@ -106,7 +85,7 @@ class RootModule {
     static func withInterfaceController<T>(
         perform action:
             @escaping (AutoPlayInterfaceController) async throws -> T
-    ) async throws -> T {
+    ) async throws -> T? {
         try await withSceneAndInterfaceController { _, interfaceController in
             try await action(interfaceController)
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iternio/react-native-auto-play",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",