@iternio/react-native-auto-play 0.5.7 → 0.5.8

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridAutoPlay.kt

@@ -264,7 +264,6 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
         fun removeListeners(templateId: String) {
             renderStateListeners.remove(templateId)
             safeAreaInsetsListeners.remove(templateId)
-            HybridAndroidWindowInformation.removeListeners(templateId)
         }
 
         fun emit(event: EventName) {

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/VirtualRenderer.kt

@@ -42,24 +42,20 @@ class VirtualRenderer(
 ) {
     private var virtualDisplay: VirtualDisplay? = null
 
-    private var reactSurfaceImpl: ReactSurfaceImpl? = null
+    private lateinit var reactSurfaceImpl: ReactSurfaceImpl
     private var reactSurfaceView: ReactSurfaceView? = null
     private var reactSurfaceId: Int? = null
 
     private var height: Int = 0
     private var width: Int = 0
-    private var dpi: Int = 0
 
     private var splashWillDisappear = false
 
     /**
-     * scale is the actual scale factor required to calculate proper insets and is passed in initialProperties to js side.
-     * The density is derived from the surface container's dpi so it always matches the VirtualDisplay,
-     * and is recomputed on every onSurfaceAvailable since the host may recreate the surface with new metrics.
+     * scale is the actual scale factor required to calculate proper insets and is passed in initialProperties to js side
      */
-    private var virtualScreenDensity = context.resources.displayMetrics.density
-    var scale = BuildConfig.SCALE_FACTOR * virtualScreenDensity
-        private set
+    private val virtualScreenDensity = context.resources.displayMetrics.density
+    val scale = BuildConfig.SCALE_FACTOR * virtualScreenDensity
 
     private fun isSurfaceReady(surfaceContainer: SurfaceContainer): Boolean {
         return surfaceContainer.surface != null && surfaceContainer.dpi != 0 && surfaceContainer.height != 0 && surfaceContainer.width != 0
@@ -72,7 +68,7 @@ class VirtualRenderer(
             val areaDebouncer = Debouncer(200)
 
             // 12dp seems to be the default margin on AA for the ETA widget and the maneuver so use it as fallback
-            val defaultMargin get() = (12.0 * virtualScreenDensity).toInt()
+            val defaultMargin = (12.0 * context.resources.displayMetrics.density).toInt()
             var minMargin = Int.MAX_VALUE
             var stableArea = Rect(0, 0, 0, 0)
             var visibleArea = Rect(0, 0, 0, 0)
@@ -82,16 +78,25 @@ class VirtualRenderer(
                     return
                 }
 
-                applySurface(surfaceContainer)
+                val manager = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
+                virtualDisplay?.release()
+                virtualDisplay = manager.createVirtualDisplay(
+                    moduleName,
+                    surfaceContainer.width,
+                    surfaceContainer.height,
+                    surfaceContainer.dpi,
+                    surfaceContainer.surface,
+                    DisplayManager.VIRTUAL_DISPLAY_FLAG_PRESENTATION,
+                )
+
+                val display = virtualDisplay?.display ?: return
+                height = surfaceContainer.height
+                width = surfaceContainer.width
+
+                initRenderer(display)
             }
 
             override fun onSurfaceDestroyed(surfaceContainer: SurfaceContainer) {
-                // the host re-emits visible/stable areas for the next surface, so drop state derived
-                // from the old surface instead of combining it with the new dimensions
-                minMargin = Int.MAX_VALUE
-                stableArea = Rect(0, 0, 0, 0)
-                visibleArea = Rect(0, 0, 0, 0)
-
                 virtualDisplay?.release()
                 virtualDisplay = null
             }
@@ -225,46 +230,6 @@ class VirtualRenderer(
         })
     }
 
-    @MainThread
-    private fun applySurface(surfaceContainer: SurfaceContainer) {
-        val surfaceWidth = surfaceContainer.width
-        val surfaceHeight = surfaceContainer.height
-
-        // The host signals surface size changes only via onSurfaceDestroyed -> onSurfaceAvailable
-        // with new dimensions, so all size-derived state (layout params, scale, Fabric measure
-        // specs) must be recomputed when the metrics differ from the current ones. The react
-        // surface itself is kept alive so JS state survives the resize; the JS side is informed
-        // via the windowInformation listener since the window initial prop stays stale.
-        val isResize = reactSurfaceView != null && (width != surfaceWidth
-            || height != surfaceHeight || dpi != surfaceContainer.dpi)
-
-        val manager = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
-        virtualDisplay?.release()
-        virtualDisplay = manager.createVirtualDisplay(
-            moduleName,
-            surfaceWidth,
-            surfaceHeight,
-            surfaceContainer.dpi,
-            surfaceContainer.surface,
-            DisplayManager.VIRTUAL_DISPLAY_FLAG_PRESENTATION,
-        )
-
-        val display = virtualDisplay?.display ?: return
-        height = surfaceHeight
-        width = surfaceWidth
-        dpi = surfaceContainer.dpi
-        virtualScreenDensity = surfaceContainer.dpi / 160f
-        scale = BuildConfig.SCALE_FACTOR * virtualScreenDensity
-
-        initRenderer(display)
-
-        if (isResize) {
-            getWindowInformation(moduleName)?.let {
-                HybridAndroidWindowInformation.emitWindowInformation(moduleName, it)
-            }
-        }
-    }
-
     private fun getMapTemplateConfig(): MapTemplateConfig? {
         val screenManager = AndroidAutoScreen.getScreen(moduleName)?.screenManager ?: return null
         val marker = screenManager.top.marker ?: return null
@@ -325,48 +290,19 @@ class VirtualRenderer(
             val appTheme = context.applicationContext.applicationInfo.theme
             val themedContext = ContextThemeWrapper(context.applicationContext, appTheme)
 
-            val surfaceImpl = reactSurfaceImpl ?: ReactSurfaceImpl(
-                themedContext, moduleName, initialProperties
-            ).also {
-                reactSurfaceImpl = it
+            if (!this@VirtualRenderer::reactSurfaceImpl.isInitialized) {
+                reactSurfaceImpl = ReactSurfaceImpl(themedContext, moduleName, initialProperties)
             }
 
             var splashScreenView: View? = null
 
             reactSurfaceView?.let {
                 (it.parent as ViewGroup).removeView(it)
-
-                // the surface may have been recreated with new dimensions, so reapply all
-                // size-derived values and push the new layout specs into the running Fabric surface
-                it.layoutParams = FrameLayout.LayoutParams(
-                    (width / reactNativeScale).toInt(), (height / reactNativeScale).toInt()
-                )
-                it.scaleX = reactNativeScale
-                it.scaleY = reactNativeScale
-
-                reactSurfaceId?.let { surfaceId ->
-                    fabricUiManager.updateRootLayoutSpecs(
-                        surfaceId,
-                        View.MeasureSpec.makeMeasureSpec(
-                            (width / reactNativeScale).toInt(), View.MeasureSpec.EXACTLY
-                        ),
-                        View.MeasureSpec.makeMeasureSpec(
-                            (height / reactNativeScale).toInt(), View.MeasureSpec.EXACTLY
-                        ),
-                        0,
-                        0
-                    )
-                }
             } ?: run {
-                // skip the splash when the surface is rebuilt after a resize, content is already loaded
                 splashScreenView =
-                    if (isCluster && !splashWillDisappear) {
-                        getClusterSplashScreen(themedContext, height, width)
-                    } else {
-                        null
-                    }
+                    if (isCluster) getClusterSplashScreen(themedContext, height, width) else null
 
-                val surfaceView = ReactSurfaceView(themedContext, surfaceImpl).apply {
+                val surfaceView = ReactSurfaceView(themedContext, reactSurfaceImpl).apply {
                     layoutParams = FrameLayout.LayoutParams(
                         (width / reactNativeScale).toInt(), (height / reactNativeScale).toInt()
                     )
@@ -466,7 +402,10 @@ class VirtualRenderer(
     }
 
     @MainThread
-    private fun stopReactSurface() {
+    private fun stop() {
+        virtualDisplay?.release()
+        virtualDisplay = null
+
         val uiManager = NitroModules.applicationContext?.let {
             UIManagerHelper.getUIManager(
                 it, UIManagerType.FABRIC
@@ -481,19 +420,6 @@ class VirtualRenderer(
             // Fabric already invalidated
         } finally {
             reactSurfaceId = null
-            reactSurfaceView = null
-            reactSurfaceImpl = null
-        }
-    }
-
-    @MainThread
-    private fun stop() {
-        virtualDisplay?.release()
-        virtualDisplay = null
-
-        try {
-            stopReactSurface()
-        } finally {
             virtualRenderer.remove(moduleName)
         }
     }
@@ -507,19 +433,6 @@ class VirtualRenderer(
             return virtualRenderer.contains(moduleId)
         }
 
-        fun getWindowInformation(moduleId: String): WindowInformation? {
-            val renderer = virtualRenderer[moduleId] ?: return null
-            if (renderer.width == 0 || renderer.height == 0) {
-                return null
-            }
-
-            return WindowInformation(
-                width = (renderer.width / renderer.scale).toInt().toDouble(),
-                height = (renderer.height / renderer.scale).toInt().toDouble(),
-                scale = renderer.scale.toDouble()
-            )
-        }
-
         fun removeRenderer(moduleId: String) {
             virtualRenderer[moduleId]?.stop()
             virtualRenderer.remove(moduleId)

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/VoiceInputManager.kt

@@ -23,6 +23,7 @@ import androidx.annotation.RequiresApi
 import androidx.car.app.CarContext
 import androidx.car.app.media.CarAudioRecord
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import com.facebook.react.bridge.UiThreadUtil
 import com.margelo.nitro.NitroModules
 import com.margelo.nitro.core.ArrayBuffer
@@ -495,7 +496,7 @@ class VoiceInputManager(
                     .setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE)
                     .build()
             )
-            player.setDataSource(context, Uri.parse(uri))
+            player.setDataSource(context, resolveUri(context, uri))
             player.setOnCompletionListener {
                 it.release()
                 if (cont.isActive) { cont.resume(Unit) }
@@ -516,6 +517,21 @@ class VoiceInputManager(
         }
     }
 
+    private fun resolveUri(context: Context, uri: String): Uri {
+        val parsed = uri.toUri()
+        return if (parsed.scheme != null) {
+            // Real URI already (dev/Metro http://, file://, content://, etc.)
+            parsed
+        } else {
+            // Release build: bare raw-resource name from RN's Android asset packager
+            val resId = context.resources.getIdentifier(uri, "raw", context.packageName)
+            if (resId == 0) {
+                throw IllegalArgumentException("Raw resource not found for: $uri")
+            }
+            "android.resource://${context.packageName}/$resId".toUri()
+        }
+    }
+
     @RequiresApi(Build.VERSION_CODES.O)
     private fun releaseResources() {
         carAudioRecord?.stopRecording()

package/ios/templates/MapTemplate.swift

@@ -733,7 +733,7 @@ class MapTemplate: AutoPlayHeaderProviding,
                     Parser.parseTravelEstimates(
                         travelEstimates: nitroManeuver.travelEstimates
                     ),
-                    for: navigationSession.upcomingManeuvers[maneuverIndex]
+                    for: sessionManeuvers[maneuverIndex]
                 )
 
                 if index != maneuverIndex {
@@ -805,6 +805,19 @@ class MapTemplate: AutoPlayHeaderProviding,
             }
 
             navigationSession.upcomingManeuvers = upcomingManeuvers
+
+            // CarPlay only applies an estimate update if the maneuver is already active,
+            // since we set new upcomingManeuvers we need to apply the latest travelEstimates on the active maneuver here
+            if let currentManeuver = navigationSession.upcomingManeuvers.first,
+                let currentNitroManeuver = maneuvers.first
+            {
+                navigationSession.updateEstimates(
+                    Parser.parseTravelEstimates(
+                        travelEstimates: currentNitroManeuver.travelEstimates
+                    ),
+                    for: currentManeuver
+                )
+            }
         }
     }
 

package/lib/index.d.ts

@@ -1,9 +1,8 @@
 import { HybridAndroidAutoTelemetry } from './hybrid/HybridAndroidAutoTelemetry';
-import { HybridAndroidWindowInformation } from './hybrid/HybridAndroidWindowInformation';
 import { HybridAutoPlay } from './hybrid/HybridAutoPlay';
 import { HybridVoice } from './hybrid/HybridVoice';
 import type { AndroidAutomotive } from './specs/AndroidAutomotive.nitro';
-export { HybridAndroidAutoTelemetry, HybridAndroidWindowInformation, HybridAutoPlay, HybridVoice };
+export { HybridAndroidAutoTelemetry, HybridAutoPlay, HybridVoice };
 export declare const HybridAndroidAutomotive: AndroidAutomotive | null;
 /**
  * These are the static module names for the app running on the mobile device, head unit screen and the CarPlay dashboard.

package/lib/index.js

@@ -2,11 +2,10 @@ import { Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
 import AutoPlayHeadlessJsTask from './AutoPlayHeadlessJsTask';
 import { HybridAndroidAutoTelemetry } from './hybrid/HybridAndroidAutoTelemetry';
-import { HybridAndroidWindowInformation } from './hybrid/HybridAndroidWindowInformation';
 import { HybridAutoPlay } from './hybrid/HybridAutoPlay';
 import { HybridVoice } from './hybrid/HybridVoice';
 AutoPlayHeadlessJsTask.registerHeadlessTask(HybridAutoPlay);
-export { HybridAndroidAutoTelemetry, HybridAndroidWindowInformation, HybridAutoPlay, HybridVoice };
+export { HybridAndroidAutoTelemetry, HybridAutoPlay, HybridVoice };
 export const HybridAndroidAutomotive = Platform.OS === 'android'
     ? NitroModules.createHybridObject('AndroidAutomotive')
     : null;

package/lib/scenes/AutoPlayCluster.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { AppRegistry, Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
 import { SafeAreaInsetsProvider } from '../components/SafeAreaInsetsContext';
-import { WindowInformationWrapper } from '../components/WindowInformationWrapper';
 import { NitroImageUtil } from '../utils/NitroImage';
 const HybridCluster = NitroModules.createHybridObject('Cluster');
 class Cluster {
@@ -50,11 +49,7 @@ class Cluster {
             AppRegistry.registerComponent(clusterId, () => (props) => React.createElement(SafeAreaInsetsProvider, {
                 moduleName: clusterId,
                 // biome-ignore lint/correctness/noChildrenProp: there is no other way in a ts file
-                children: React.createElement(WindowInformationWrapper, {
-                    moduleName: clusterId,
-                    component,
-                    componentProps: props,
-                }),
+                children: React.createElement(component, props),
             }));
             this.clusters[clusterId] = true;
             await HybridCluster.initRootView(clusterId);

package/lib/templates/MapTemplate.js

@@ -3,7 +3,6 @@ import { AppRegistry, Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
 import { MapTemplateProvider } from '../components/MapTemplateContext';
 import { SafeAreaInsetsProvider } from '../components/SafeAreaInsetsContext';
-import { WindowInformationWrapper } from '../components/WindowInformationWrapper';
 import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 import { NitroActionUtil } from '../utils/NitroAction';
 import { NitroAlertUtil } from '../utils/NitroAlert';
@@ -24,11 +23,7 @@ export class MapTemplate extends Template {
             children: React.createElement(SafeAreaInsetsProvider, {
                 moduleName: this.id,
                 // biome-ignore lint/correctness/noChildrenProp: there is no other way in a ts file
-                children: React.createElement(WindowInformationWrapper, {
-                    moduleName: this.id,
-                    component,
-                    componentProps: props,
-                }),
+                children: React.createElement(component, props),
             }),
         }));
         const nitroConfig = {

package/lib/types/RootComponent.d.ts

@@ -19,10 +19,6 @@ export type RootComponentInitialProps = {
      * this is the initial color scheme, add onAppearanceDidChange on MapTemplate to get updates
      */
     colorScheme: ColorScheme;
-    /**
-     * the dimensions of the render surface, kept up to date when the host resizes the surface
-     * (e.g. head units running Android Auto windowed)
-     */
     window: WindowInformation;
 };
 export type AutoPlayClusterInitialProps = RootComponentInitialProps & {

package/nitro.json

@@ -29,12 +29,6 @@
         "language": "swift"
       }
     },
-    "AndroidWindowInformation": {
-      "android": {
-        "implementationClassName": "HybridAndroidWindowInformation",
-        "language": "kotlin"
-      }
-    },
     "AndroidAutoTelemetry": {
       "android": {
         "implementationClassName": "HybridAndroidAutoTelemetry",

package/nitrogen/generated/android/ReactNativeAutoPlay+autolinking.cmake

@@ -35,7 +35,6 @@ target_sources(
   # Shared Nitrogen C++ sources
   ../nitrogen/generated/shared/c++/HybridAndroidAutomotiveSpec.cpp
   ../nitrogen/generated/shared/c++/HybridAndroidAutoTelemetrySpec.cpp
-  ../nitrogen/generated/shared/c++/HybridAndroidWindowInformationSpec.cpp
   ../nitrogen/generated/shared/c++/HybridAutoPlaySpec.cpp
   ../nitrogen/generated/shared/c++/HybridCarPlayDashboardSpec.cpp
   ../nitrogen/generated/shared/c++/HybridClusterSpec.cpp
@@ -50,7 +49,6 @@ target_sources(
   # Android-specific Nitrogen C++ sources
   ../nitrogen/generated/android/c++/JHybridAndroidAutomotiveSpec.cpp
   ../nitrogen/generated/android/c++/JHybridAndroidAutoTelemetrySpec.cpp
-  ../nitrogen/generated/android/c++/JHybridAndroidWindowInformationSpec.cpp
   ../nitrogen/generated/android/c++/JHybridAutoPlaySpec.cpp
   ../nitrogen/generated/android/c++/JVariant_GlyphImage_AssetImage_RemoteImage.cpp
   ../nitrogen/generated/android/c++/JHybridClusterSpec.cpp

package/nitrogen/generated/android/ReactNativeAutoPlayOnLoad.cpp

@@ -21,8 +21,6 @@
 #include "JFunc_void_AppFocusState.hpp"
 #include "JHybridAndroidAutoTelemetrySpec.hpp"
 #include "JFunc_void_std__optional_Telemetry_.hpp"
-#include "JHybridAndroidWindowInformationSpec.hpp"
-#include "JFunc_void_WindowInformation.hpp"
 #include "JHybridAutoPlaySpec.hpp"
 #include "JFunc_void_VisibilityState.hpp"
 #include "JFunc_void_std__optional_Location__std__optional_std__string_.hpp"
@@ -76,14 +74,6 @@ struct JHybridAutoPlaySpecImpl: public jni::JavaClass<JHybridAutoPlaySpecImpl, J
     return javaPart->getJHybridAutoPlaySpec();
   }
 };
-struct JHybridAndroidWindowInformationSpecImpl: public jni::JavaClass<JHybridAndroidWindowInformationSpecImpl, JHybridAndroidWindowInformationSpec::JavaPart> {
-  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridAndroidWindowInformation;";
-  static std::shared_ptr<JHybridAndroidWindowInformationSpec> create() {
-    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridAndroidWindowInformationSpecImpl::javaobject()>();
-    jni::local_ref<JHybridAndroidWindowInformationSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
-    return javaPart->getJHybridAndroidWindowInformationSpec();
-  }
-};
 struct JHybridAndroidAutoTelemetrySpecImpl: public jni::JavaClass<JHybridAndroidAutoTelemetrySpecImpl, JHybridAndroidAutoTelemetrySpec::JavaPart> {
   static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridAndroidAutoTelemetry;";
   static std::shared_ptr<JHybridAndroidAutoTelemetrySpec> create() {
@@ -176,8 +166,6 @@ void registerAllNatives() {
   margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_AppFocusState_cxx::registerNatives();
   margelo::nitro::swe::iternio::reactnativeautoplay::JHybridAndroidAutoTelemetrySpec::CxxPart::registerNatives();
   margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__optional_Telemetry__cxx::registerNatives();
-  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridAndroidWindowInformationSpec::CxxPart::registerNatives();
-  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_WindowInformation_cxx::registerNatives();
   margelo::nitro::swe::iternio::reactnativeautoplay::JHybridAutoPlaySpec::CxxPart::registerNatives();
   margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_VisibilityState_cxx::registerNatives();
   margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__optional_Location__std__optional_std__string__cxx::registerNatives();
@@ -219,12 +207,6 @@ void registerAllNatives() {
       return JHybridAutoPlaySpecImpl::create();
     }
   );
-  HybridObjectRegistry::registerHybridObjectConstructor(
-    "AndroidWindowInformation",
-    []() -> std::shared_ptr<HybridObject> {
-      return JHybridAndroidWindowInformationSpecImpl::create();
-    }
-  );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "AndroidAutoTelemetry",
     []() -> std::shared_ptr<HybridObject> {

package/package.json

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

package/src/index.ts

@@ -2,14 +2,13 @@ import { Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
 import AutoPlayHeadlessJsTask from './AutoPlayHeadlessJsTask';
 import { HybridAndroidAutoTelemetry } from './hybrid/HybridAndroidAutoTelemetry';
-import { HybridAndroidWindowInformation } from './hybrid/HybridAndroidWindowInformation';
 import { HybridAutoPlay } from './hybrid/HybridAutoPlay';
 import { HybridVoice } from './hybrid/HybridVoice';
 import type { AndroidAutomotive } from './specs/AndroidAutomotive.nitro';
 
 AutoPlayHeadlessJsTask.registerHeadlessTask(HybridAutoPlay);
 
-export { HybridAndroidAutoTelemetry, HybridAndroidWindowInformation, HybridAutoPlay, HybridVoice };
+export { HybridAndroidAutoTelemetry, HybridAutoPlay, HybridVoice };
 
 export const HybridAndroidAutomotive =
   Platform.OS === 'android'

package/src/scenes/AutoPlayCluster.ts

@@ -2,7 +2,6 @@ import React from 'react';
 import { AppRegistry, Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
 import { SafeAreaInsetsProvider } from '../components/SafeAreaInsetsContext';
-import { WindowInformationWrapper } from '../components/WindowInformationWrapper';
 import type { Cluster as NitroCluster, ZoomEvent } from '../specs/Cluster.nitro';
 import type { ColorScheme, RootComponentInitialProps } from '../types/RootComponent';
 import type { AutoAttributedString } from '../utils/NitroAttributedString';
@@ -63,11 +62,7 @@ class Cluster {
           React.createElement(SafeAreaInsetsProvider, {
             moduleName: clusterId,
             // biome-ignore lint/correctness/noChildrenProp: there is no other way in a ts file
-            children: React.createElement(WindowInformationWrapper, {
-              moduleName: clusterId,
-              component,
-              componentProps: props,
-            }),
+            children: React.createElement(component, props),
           })
       );
 

package/src/templates/MapTemplate.ts

@@ -4,7 +4,6 @@ import { NitroModules } from 'react-native-nitro-modules';
 import type { AutoText } from '..';
 import { MapTemplateProvider } from '../components/MapTemplateContext';
 import { SafeAreaInsetsProvider } from '../components/SafeAreaInsetsContext';
-import { WindowInformationWrapper } from '../components/WindowInformationWrapper';
 import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 import type { MapTemplate as NitroMapTemplate } from '../specs/MapTemplate.nitro';
 import type { ActionButtonAndroid, MapButton, MapPanButton } from '../types/Button';
@@ -197,11 +196,7 @@ export class MapTemplate extends Template<MapTemplateConfig, MapTemplateConfig['
           children: React.createElement(SafeAreaInsetsProvider, {
             moduleName: this.id,
             // biome-ignore lint/correctness/noChildrenProp: there is no other way in a ts file
-            children: React.createElement(WindowInformationWrapper, {
-              moduleName: this.id,
-              component,
-              componentProps: props,
-            }),
+            children: React.createElement(component, props),
           }),
         })
     );

package/src/types/RootComponent.ts

@@ -21,10 +21,6 @@ export type RootComponentInitialProps = {
    * this is the initial color scheme, add onAppearanceDidChange on MapTemplate to get updates
    */
   colorScheme: ColorScheme;
-  /**
-   * the dimensions of the render surface, kept up to date when the host resizes the surface
-   * (e.g. head units running Android Auto windowed)
-   */
   window: WindowInformation;
 };
 

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridAndroidWindowInformation.kt

@@ -1,49 +0,0 @@
-package com.margelo.nitro.swe.iternio.reactnativeautoplay
-
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.CopyOnWriteArrayList
-
-class HybridAndroidWindowInformation : HybridAndroidWindowInformationSpec() {
-    init {
-        windowInformationListeners.clear()
-    }
-
-    override fun addWindowInformationListener(
-        moduleName: String, callback: (WindowInformation) -> Unit
-    ): () -> Unit {
-        val callbacks = windowInformationListeners.getOrPut(moduleName) {
-            CopyOnWriteArrayList()
-        }
-        callbacks.add(callback)
-
-        VirtualRenderer.getWindowInformation(moduleName)?.let {
-            callback(it)
-        }
-
-        return {
-            windowInformationListeners[moduleName]?.let {
-                it.remove(callback)
-                if (it.isEmpty()) {
-                    windowInformationListeners.remove(moduleName)
-                }
-            }
-        }
-    }
-
-    companion object {
-        const val TAG = "HybridAndroidWindowInformation"
-
-        private val windowInformationListeners =
-            ConcurrentHashMap<String, CopyOnWriteArrayList<(WindowInformation) -> Unit>>()
-
-        fun removeListeners(templateId: String) {
-            windowInformationListeners.remove(templateId)
-        }
-
-        fun emitWindowInformation(moduleName: String, window: WindowInformation) {
-            windowInformationListeners[moduleName]?.forEach {
-                it(window)
-            }
-        }
-    }
-}

package/lib/HybridAutoPlay.d.ts

@@ -1,2 +0,0 @@
-import type { AutoPlay } from './specs/AutoPlay.nitro';
-export declare const HybridAutoPlay: AutoPlay;

package/lib/HybridAutoPlay.js

@@ -1,2 +0,0 @@
-import { NitroModules } from 'react-native-nitro-modules';
-export const HybridAutoPlay = NitroModules.createHybridObject('AutoPlay');

package/lib/components/OnAppearedChildRenderer.d.ts

@@ -1,10 +0,0 @@
-type Props = {
-    children: React.ReactNode;
-    moduleName: string;
-};
-/**
- * renders the passed children when the specified scene/screen appeared
- * this makes sure child hooks are executed only when the map template is ready
- */
-export default function OnAppearedChildRenderer({ children, moduleName }: Props): import("react").ReactNode;
-export {};

package/lib/components/OnAppearedChildRenderer.js

@@ -1,26 +0,0 @@
-import { useEffect, useState } from 'react';
-import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
-/**
- * renders the passed children when the specified scene/screen appeared
- * this makes sure child hooks are executed only when the map template is ready
- */
-export default function OnAppearedChildRenderer({ children, moduleName }) {
-    const [didAppear, setDidAppear] = useState(false);
-    useEffect(() => {
-        let remove = HybridAutoPlay.addListenerRenderState(moduleName, (renderState) => {
-            if (renderState === 'didAppear') {
-                remove?.();
-                remove = null;
-                setDidAppear(true);
-            }
-        });
-        return () => {
-            remove?.();
-            remove = null;
-        };
-    }, [moduleName]);
-    if (didAppear) {
-        return children;
-    }
-    return null;
-}

package/lib/components/WindowInformationWrapper.d.ts

@@ -1,15 +0,0 @@
-import type React from 'react';
-import type { RootComponentInitialProps } from '../types/RootComponent';
-/**
- * Renders a user-provided root component and keeps its `window` prop up to date when the host
- * recreates the render surface with new dimensions (some head units run Android Auto windowed
- * and resize it at runtime), so consumers can simply read `props.window` without registering a
- * listener themselves.
- * On iOS this only passes the initial props through — CarPlay windows keep their size for the
- * lifetime of a scene, so there is nothing to subscribe to.
- */
-export declare function WindowInformationWrapper({ moduleName, component, componentProps, }: {
-    moduleName: string;
-    component: React.ComponentType<RootComponentInitialProps>;
-    componentProps: RootComponentInitialProps;
-}): React.ReactElement<RootComponentInitialProps, string | React.JSXElementConstructor<any>>;