@reactvision/react-viro 2.54.0 → 2.55.0

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ViroARTrackingReasonConstants = exports.Viro3DSceneNavigator = exports.ViroVRSceneNavigator = exports.ViroVideo = exports.ViroText = exports.ViroSpotLight = exports.ViroSpinner = exports.ViroSphere = exports.ViroSpatialSound = exports.ViroSoundField = exports.ViroSound = exports.ViroAnimatedComponent = exports.ViroAmbientLight = exports.ViroAnimatedImage = exports.Viro360Video = exports.Viro360Image = exports.Viro3DObject = exports.ViroAnimations = exports.ViroSkyBox = exports.ViroSceneNavigator = exports.ViroSurface = exports.ViroScene = exports.ViroQuad = exports.ViroPortalScene = exports.ViroPortal = exports.ViroPolyline = exports.ViroPolygon = exports.ViroParticleEmitter = exports.ViroOrbitCamera = exports.ViroOmniLight = exports.ViroNode = exports.ViroMaterialVideo = exports.ViroARCamera = exports.ViroMaterials = exports.ViroImage = exports.ViroLightingEnvironment = exports.ViroGeometry = exports.ViroFlexView = exports.ViroDirectionalLight = exports.ViroController = exports.ViroCamera = exports.ViroButton = exports.ViroBox = exports.ViroARSceneNavigator = exports.ViroARScene = exports.ViroARPlaneSelector = exports.ViroARPlane = exports.ViroARTrackingTargets = exports.ViroARObjectMarker = exports.ViroARImageMarker = void 0;
-exports.VIRO_VERSION = exports.ViroRotateStateTypes = exports.ViroPinchStateTypes = exports.ViroClickStateTypes = exports.gpsToArWorld = exports.latLngToMercator = exports.checkPermissions = exports.requestRequiredPermissions = exports.isARSupportedOnDevice = exports.polarToCartesianActual = exports.polarToCartesian = exports.ViroTrackingStateConstants = exports.ViroRecordingErrorConstants = void 0;
+exports.ViroQuestEntryPoint = exports.ViroXRSceneNavigator = exports.ViroVRSceneNavigator = exports.ViroVideo = exports.ViroText = exports.ViroSpotLight = exports.ViroSpinner = exports.ViroSphere = exports.ViroSpatialSound = exports.ViroSoundField = exports.ViroSound = exports.ViroAnimatedComponent = exports.ViroAmbientLight = exports.ViroAnimatedImage = exports.Viro360Video = exports.Viro360Image = exports.Viro3DObject = exports.ViroAnimations = exports.ViroSkyBox = exports.ViroSceneNavigator = exports.ViroSurface = exports.ViroScene = exports.ViroQuad = exports.ViroPortalScene = exports.ViroPortal = exports.ViroPolyline = exports.ViroPolygon = exports.ViroParticleEmitter = exports.ViroOrbitCamera = exports.ViroOmniLight = exports.ViroNode = exports.ViroMaterialVideo = exports.ViroARCamera = exports.ViroMaterials = exports.ViroImage = exports.ViroLightingEnvironment = exports.ViroGeometry = exports.ViroFlexView = exports.ViroDirectionalLight = exports.ViroController = exports.ViroCamera = exports.ViroButton = exports.ViroBox = exports.ViroARSceneNavigator = exports.ViroARScene = exports.ViroARPlaneSelector = exports.ViroARPlane = exports.ViroARTrackingTargets = exports.ViroARObjectMarker = exports.ViroARImageMarker = void 0;
+exports.exitImmersiveSpace = exports.enterImmersiveSpace = exports.isVisionOS = exports.ViroVisionOSModule = exports.StudioARScene = exports.StudioSceneNavigator = exports.VIRO_VERSION = exports.ViroRotateStateTypes = exports.ViroPinchStateTypes = exports.ViroClickStateTypes = exports.gpsToArWorld = exports.latLngToMercator = exports.checkPermissions = exports.requestRequiredPermissions = exports.isARSupportedOnDevice = exports.polarToCartesianActual = exports.polarToCartesian = exports.ViroTrackingStateConstants = exports.ViroRecordingErrorConstants = exports.ViroARTrackingReasonConstants = exports.useAnySourcePressed = exports.useAnySourceHover = exports.isQuest = exports.hasOpenXRSupport = exports.Viro3DSceneNavigator = exports.exitVRScene = exports.useVRViewTag = exports.VRModuleOpenXR = exports.VRQuestNavigatorBridge = void 0;
 /**
  * Copyright (c) 2016-present, Viro Media, Inc.
  * All rights reserved.
@@ -9,6 +9,14 @@ exports.VIRO_VERSION = exports.ViroRotateStateTypes = exports.ViroPinchStateType
  */
 const ViroAnimations_1 = require("./components/Animation/ViroAnimations");
 Object.defineProperty(exports, "ViroAnimations", { enumerable: true, get: function () { return ViroAnimations_1.ViroAnimations; } });
+const Studio_1 = require("./components/Studio");
+Object.defineProperty(exports, "StudioSceneNavigator", { enumerable: true, get: function () { return Studio_1.StudioSceneNavigator; } });
+Object.defineProperty(exports, "StudioARScene", { enumerable: true, get: function () { return Studio_1.StudioARScene; } });
+const ViroVisionOSModule_1 = require("./components/VisionOS/ViroVisionOSModule");
+Object.defineProperty(exports, "ViroVisionOSModule", { enumerable: true, get: function () { return ViroVisionOSModule_1.ViroVisionOSModule; } });
+Object.defineProperty(exports, "isVisionOS", { enumerable: true, get: function () { return ViroVisionOSModule_1.isVisionOS; } });
+Object.defineProperty(exports, "enterImmersiveSpace", { enumerable: true, get: function () { return ViroVisionOSModule_1.enterImmersiveSpace; } });
+Object.defineProperty(exports, "exitImmersiveSpace", { enumerable: true, get: function () { return ViroVisionOSModule_1.exitImmersiveSpace; } });
 const Viro3DObject_1 = require("./components/Viro3DObject");
 Object.defineProperty(exports, "Viro3DObject", { enumerable: true, get: function () { return Viro3DObject_1.Viro3DObject; } });
 const Viro360Image_1 = require("./components/Viro360Image");
@@ -101,8 +109,17 @@ const ViroVideo_1 = require("./components/ViroVideo");
 Object.defineProperty(exports, "ViroVideo", { enumerable: true, get: function () { return ViroVideo_1.ViroVideo; } });
 const ViroVRSceneNavigator_1 = require("./components/ViroVRSceneNavigator");
 Object.defineProperty(exports, "ViroVRSceneNavigator", { enumerable: true, get: function () { return ViroVRSceneNavigator_1.ViroVRSceneNavigator; } });
+const ViroXRSceneNavigator_1 = require("./components/ViroXRSceneNavigator");
+Object.defineProperty(exports, "ViroXRSceneNavigator", { enumerable: true, get: function () { return ViroXRSceneNavigator_1.ViroXRSceneNavigator; } });
 const Viro3DSceneNavigator_1 = require("./components/Viro3DSceneNavigator");
 Object.defineProperty(exports, "Viro3DSceneNavigator", { enumerable: true, get: function () { return Viro3DSceneNavigator_1.Viro3DSceneNavigator; } });
+const ViroPlatform_1 = require("./components/Utilities/ViroPlatform");
+Object.defineProperty(exports, "hasOpenXRSupport", { enumerable: true, get: function () { return ViroPlatform_1.hasOpenXRSupport; } });
+Object.defineProperty(exports, "isQuest", { enumerable: true, get: function () { return ViroPlatform_1.isQuest; } });
+const useAnySourceHover_1 = require("./components/Utilities/useAnySourceHover");
+Object.defineProperty(exports, "useAnySourceHover", { enumerable: true, get: function () { return useAnySourceHover_1.useAnySourceHover; } });
+const useAnySourcePressed_1 = require("./components/Utilities/useAnySourcePressed");
+Object.defineProperty(exports, "useAnySourcePressed", { enumerable: true, get: function () { return useAnySourcePressed_1.useAnySourcePressed; } });
 const ViroUtils_1 = require("./components/Utilities/ViroUtils");
 Object.defineProperty(exports, "polarToCartesian", { enumerable: true, get: function () { return ViroUtils_1.polarToCartesian; } });
 Object.defineProperty(exports, "polarToCartesianActual", { enumerable: true, get: function () { return ViroUtils_1.polarToCartesianActual; } });
@@ -123,3 +140,16 @@ const ViroSceneNavigator_1 = require("./components/ViroSceneNavigator");
 Object.defineProperty(exports, "ViroSceneNavigator", { enumerable: true, get: function () { return ViroSceneNavigator_1.ViroSceneNavigator; } });
 const ViroVersion_1 = require("./components/Utilities/ViroVersion");
 Object.defineProperty(exports, "VIRO_VERSION", { enumerable: true, get: function () { return ViroVersion_1.VIRO_VERSION; } });
+const ViroQuestEntryPoint_1 = require("./components/ViroQuestEntryPoint");
+Object.defineProperty(exports, "ViroQuestEntryPoint", { enumerable: true, get: function () { return ViroQuestEntryPoint_1.ViroQuestEntryPoint; } });
+const VRQuestNavigatorBridge_1 = require("./components/Utilities/VRQuestNavigatorBridge");
+Object.defineProperty(exports, "VRQuestNavigatorBridge", { enumerable: true, get: function () { return VRQuestNavigatorBridge_1.VRQuestNavigatorBridge; } });
+const VRModuleOpenXR_1 = require("./components/Utilities/VRModuleOpenXR");
+Object.defineProperty(exports, "VRModuleOpenXR", { enumerable: true, get: function () { return VRModuleOpenXR_1.VRModuleOpenXR; } });
+Object.defineProperty(exports, "useVRViewTag", { enumerable: true, get: function () { return VRModuleOpenXR_1.useVRViewTag; } });
+Object.defineProperty(exports, "exitVRScene", { enumerable: true, get: function () { return VRModuleOpenXR_1.exitVRScene; } });
+const react_native_1 = require("react-native");
+// Auto-register the Quest VR entry point. VRActivity launches this component
+// as 'VRQuestScene'. Registering here means apps need no manual setup.
+// Apps that need a custom VR root can re-register after importing this package.
+react_native_1.AppRegistry.registerComponent("VRQuestScene", () => ViroQuestEntryPoint_1.ViroQuestEntryPoint);

package/dist/plugins/withViro.d.ts

@@ -1,5 +1,5 @@
 import { ConfigPlugin } from "@expo/config-plugins";
-export type XrMode = "GVR" | "AR" | "OVR_MOBILE";
+export type XrMode = "GVR" | "AR" | "OVR_MOBILE" | "QUEST";
 /**
  * Anchor provider type.
  * - "none": Disabled
@@ -55,6 +55,13 @@ export interface ViroConfigurationOptions {
      * Written to AndroidManifest as com.reactvision.RVProjectId and to Info.plist as RVProjectId.
      */
     rvProjectId?: string;
+    /**
+     * Override the ReactVision platform base URL.
+     * Omit for production. Set to a staging URL for testing.
+     *
+     * Written to AndroidManifest as com.reactvision.RVEndpoint and to Info.plist as RVEndpoint.
+     */
+    rvEndpoint?: string;
     /**
      * Anchor provider for both cloud anchors and geospatial anchors.
      * Replaces the deprecated cloudAnchorProvider + geospatialAnchorProvider props.
@@ -132,6 +139,15 @@ export interface ViroConfigurationOptions {
     };
     android?: {
         xRMode?: XrMode[];
+        /**
+         * Meta Developer Portal App ID (numeric string).
+         * Written to AndroidManifest as com.oculus.app_id meta-data.
+         * Eliminates the "App Name Unavailable" popup on Meta Quest.
+         *
+         * Get your App ID from the Meta Developer Portal:
+         * https://developer.oculus.com/manage
+         */
+        questAppId?: string;
     };
 }
 /**

package/dist/plugins/withViroAndroid.js

@@ -46,9 +46,9 @@ const withBranchAndroid = (config) => {
                 const viroPlugin = config?.plugins?.find((plugin) => Array.isArray(plugin) && plugin[0] === "@reactvision/react-viro");
                 if (Array.isArray(viroPlugin)) {
                     if (Array.isArray(viroPlugin[1].android?.xRMode)) {
-                        viroPluginConfig = (viroPlugin[1].android?.xRMode).filter((mode) => ["AR", "GVR", "OVR_MOBILE"].includes(mode));
+                        viroPluginConfig = (viroPlugin[1].android?.xRMode).filter((mode) => ["AR", "GVR", "OVR_MOBILE", "QUEST"].includes(mode));
                     }
-                    else if (["AR", "GVR", "OVR_MOBILE"].includes(viroPlugin[1]?.android?.xRMode)) {
+                    else if (["AR", "GVR", "OVR_MOBILE", "QUEST"].includes(viroPlugin[1]?.android?.xRMode)) {
                         viroPluginConfig = [viroPlugin[1]?.android.xRMode];
                     }
                 }
@@ -197,6 +197,14 @@ const withViroManifest = (config) => (0, config_plugins_1.withAndroidManifest)(c
                 },
             });
         }
+        if (pluginOptions.rvEndpoint) {
+            contents?.manifest?.application?.[0]["meta-data"]?.push({
+                $: {
+                    "android:name": "com.reactvision.RVEndpoint",
+                    "android:value": pluginOptions.rvEndpoint,
+                },
+            });
+        }
         // Add location permissions when geospatial provider is active
         if (geospatialAnchorProvider === "arcore" || geospatialAnchorProvider === "reactvision") {
             const existingPermissions = (contents.manifest["uses-permission"] || [])
@@ -281,14 +289,311 @@ const withViroManifest = (config) => (0, config_plugins_1.withAndroidManifest)(c
             "tools:replace": "required",
         },
     });
+    // Quest-specific features and permissions — after uses-feature is initialized
+    if (viroPluginConfig.includes("QUEST")) {
+        contents.manifest["uses-feature"].push({
+            $: {
+                "android:name": "android.hardware.vr.headtracking",
+                "android:required": "true",
+                "android:version": "1",
+            },
+        });
+        contents.manifest["uses-feature"].push({
+            $: {
+                "android:name": "oculus.software.handtracking",
+                "android:required": "false",
+            },
+        });
+        // XR_FB_passthrough requires this uses-feature; without it the OpenXR
+        // runtime silently strips the extension. required=false so apps that
+        // only render fully-virtual scenes still install on Quest 2 etc.
+        contents.manifest["uses-feature"].push({
+            $: {
+                "android:name": "com.oculus.feature.PASSTHROUGH",
+                "android:required": "false",
+            },
+        });
+        const existingPermissions = (contents.manifest["uses-permission"] || [])
+            .map((p) => p.$?.["android:name"]);
+        if (!existingPermissions.includes("com.oculus.permission.HAND_TRACKING")) {
+            contents.manifest["uses-permission"].push({
+                $: { "android:name": "com.oculus.permission.HAND_TRACKING" },
+            });
+        }
+        if (!existingPermissions.includes("com.oculus.permission.EYE_TRACKING")) {
+            contents.manifest["uses-permission"].push({
+                $: { "android:name": "com.oculus.permission.EYE_TRACKING" },
+            });
+        }
+    }
     return newConfig;
 });
+// ── Quest VRActivity generation ────────────────────────────────────────────────
+/**
+ * When QUEST mode is active, generate VRActivity.kt in the app's android source
+ * and register it in AndroidManifest with com.oculus.intent.category.VR.
+ *
+ * VRActivity is a ReactActivity that mounts "VRQuestScene" — a root component
+ * the app must register via AppRegistry. Running in a separate Activity with the
+ * VR intent category causes Horizon OS to grant exclusive OpenXR display access.
+ */
+const withViroQuestActivity = (config, props) => {
+    // Read xRMode directly from config.plugins. We cannot rely on the
+    // module-level `viroPluginConfig` here: that variable is only updated
+    // when `withBranchAndroid`'s withDangerousMod callback runs (mod-apply
+    // time), which is *after* this chain-time check executes. On the first
+    // prebuild of a new project, viroPluginConfig still holds the default
+    // ["AR", "GVR"] when this plugin is composed, and QUEST mods would be
+    // silently skipped — no VRActivity.kt and no manifest entry.
+    const viroPluginEntry = config?.plugins?.find((plugin) => Array.isArray(plugin) && plugin[0] === "@reactvision/react-viro");
+    let xrModes = ["AR", "GVR"];
+    if (Array.isArray(viroPluginEntry)) {
+        const xrMode = viroPluginEntry[1]?.android?.xRMode;
+        if (Array.isArray(xrMode)) {
+            xrModes = xrMode.filter((m) => ["AR", "GVR", "OVR_MOBILE", "QUEST"].includes(m));
+        }
+        else if (typeof xrMode === "string" &&
+            ["AR", "GVR", "OVR_MOBILE", "QUEST"].includes(xrMode)) {
+            xrModes = [xrMode];
+        }
+    }
+    if (!xrModes.includes("QUEST"))
+        return config;
+    // 1. Generate VRActivity.kt
+    config = (0, config_plugins_1.withDangerousMod)(config, [
+        "android",
+        async (config) => {
+            const packageName = config?.android?.package ?? "";
+            const packagePath = packageName.split(".");
+            const activityDir = path_1.default.join(config.modRequest.platformProjectRoot, "app", "src", "main", "java", ...packagePath);
+            if (!fs_1.default.existsSync(activityDir)) {
+                fs_1.default.mkdirSync(activityDir, { recursive: true });
+            }
+            const activityPath = path_1.default.join(activityDir, "VRActivity.kt");
+            // Only write if not already present (preserve manual edits)
+            if (!fs_1.default.existsSync(activityPath)) {
+                const kotlinContent = `package ${packageName}
+
+import android.app.Activity
+import android.app.Application
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
+import com.facebook.react.runtime.ReactHostImpl
+
+/**
+ * VRActivity — generated by @reactvision/react-viro Expo plugin.
+ * Carries com.oculus.intent.category.VR so Horizon OS grants exclusive
+ * OpenXR display access. Mounts the "VRQuestScene" React root component.
+ * Launch via NativeModules.VRLauncher.launchVRScene().
+ *
+ * Lifecycle (requires React Native >= 0.83 / Expo >= 55):
+ *   VRActivity and MainActivity share one ReactHostImpl singleton. On Quest,
+ *   VRActivity launches into a separate task (FLAG_ACTIVITY_NEW_TASK), so
+ *   MainActivity.onPause is dispatched *later* via ActivityManager IPC —
+ *   often after VRActivity.onResume has already promoted the host to RESUMED
+ *   with currentActivity = VRActivity. When that delayed onPause arrives,
+ *   the standard delegate calls onHostPause(MainActivity); the identity-
+ *   mismatch assertion is downgraded to a warning by
+ *   skipActivityIdentityAssertionOnHostPause (set in VRLauncherModule before
+ *   startActivity), but the rest of onHostPause runs unconditionally:
+ *   devSupport is disabled and JavaTimerManager clears its TIMERS_EVENTS
+ *   callback. Result: timers / requestAnimationFrame stop, Metro Fast Refresh
+ *   dies.
+ *
+ *   We catch this by listening for that delayed MainActivity.onPause via
+ *   Application.ActivityLifecycleCallbacks.onActivityPaused(other) and re-
+ *   promoting the host on the main looper. A Handler.post inside our own
+ *   onResume would fire too early (the ActivityManager hasn't queued
+ *   MainActivity.onPause yet), which is why we hook the actual pause event.
+ *
+ *   On exit, VRActivity.onPause runs while currentActivity == this, so the
+ *   identity assertion passes; MainActivity.onResume then re-promotes via
+ *   its standard delegate. We do *not* re-promote on a self-pause — the
+ *   onActivityPaused callback skips when other === this.
+ *
+ * Mutual exclusion with MainActivity:
+ *   Quest will happily run MainActivity (panel) and VRActivity (immersive) at
+ *   the same time if the user taps the app icon in the dock while VR is
+ *   running. The same Application.ActivityLifecycleCallbacks finishes self
+ *   when any other Activity in this app resumes — returning the user cleanly
+ *   to the panel.
+ *
+ * Surface cleanup on destroy:
+ *   When VRActivity is destroyed we unload its React surface (reactSurface.stop()
+ *   in bridgeless arch) so its component tree — including all VRT* components
+ *   — is unmounted. Without this, the React surface stayed alive in the shared
+ *   ReactHost across VR re-entries, and on the second/third VR launch each
+ *   stale surface remounted alongside the fresh one. The C++ scene-graph
+ *   resolves a click hit to a single viewTag, but multiple VRTComponents
+ *   claimed it across surfaces — most with a ReactContext bound to a
+ *   destroyed VRActivity. Click events to the stale ReactContexts crashed in
+ *   ComponentEventDelegate as IllegalArgumentException SoftExceptions and were
+ *   silently dropped, so onClick took dozens of presses to register.
+ *   We still no-op the *delegate* onDestroy() so MainActivity keeps its
+ *   ReactHost; we only stop the surface explicitly.
+ */
+class VRActivity : ReactActivity() {
+
+    private val mainHandler = Handler(Looper.getMainLooper())
+    private var lifecycleCallbacks: Application.ActivityLifecycleCallbacks? = null
+
+    // Set true on every VRActivity.onResume; consumed by the first
+    // onActivityPaused(other) that follows. One-shot — defends against the
+    // single MainActivity.onPause that the NEW_TASK ordering schedules late.
+    // Without one-shot semantics, every subsequent foreign pause would re-fire
+    // ReactHostImpl.onHostResume, which re-fires every LifecycleEventListener
+    // (AppState → "active" → ViroXRSceneNavigator's AppState handler calls
+    // launchVRScene() again → visible scene flicker).
+    private var expectingForeignPause = false
+
+    override fun getMainComponentName(): String = "VRQuestScene"
+
+    override fun createReactActivityDelegate(): ReactActivityDelegate =
+        object : DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled) {
+            // VRActivity destruction MUST NOT tear down the shared ReactHost.
+            // MainActivity is still alive (and re-foreground after VR exit) and
+            // depends on the same ReactContext. The standard delegate's
+            // onDestroy forwards to ReactHostImpl.onHostDestroy(VR), which
+            // fires LifecycleEventListener.onHostDestroy on every native module
+            // — releasing native resources MainActivity still uses. The next
+            // Cmd+R reload then runs the JS bundle re-init against a partially
+            // destroyed native side and fails with
+            //   [runtime not ready]: TypeError: Cannot read property
+            //   'EventEmitter' of undefined
+            // followed by AppRegistryBinding::stopSurface failed and the
+            // surface never recovers. By no-op'ing onDestroy here, host
+            // destruction is left to MainActivity's standard delegate (the real
+            // last activity). The surface itself is stopped explicitly in
+            // VRActivity.onDestroy() below.
+            override fun onDestroy() {
+                // intentionally no-op — see comment above
+            }
+        }
+
+    override fun onResume() {
+        super.onResume()  // delegate.onResume() -> reactHost.onHostResume(this)
+        expectingForeignPause = true
+    }
+
+    // onPause not overridden: the default delegate forwards to
+    // reactHost.onHostPause(this) while currentActivity matches us, which is
+    // what we want.
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val callbacks = object : Application.ActivityLifecycleCallbacks {
+            override fun onActivityResumed(other: Activity) {
+                if (other !== this@VRActivity && !isFinishing && !isDestroyed) {
+                    finish()
+                }
+            }
+            override fun onActivityPaused(other: Activity) {
+                if (other === this@VRActivity || isFinishing || isDestroyed) return
+                if (!expectingForeignPause) return
+                expectingForeignPause = false
+                // MainActivity.onPause was dispatched after our onResume (the
+                // NEW_TASK race). The standard delegate already called
+                // onHostPause(MainActivity), demoting the host to PAUSED and
+                // disabling devSupport / clearing JavaTimerManager's frame
+                // callback. Re-promote so VR keeps timers + Fast Refresh.
+                mainHandler.post {
+                    if (isFinishing || isDestroyed) return@post
+                    (reactHost as? ReactHostImpl)?.onHostResume(this@VRActivity)
+                }
+            }
+            override fun onActivityCreated(a: Activity, b: Bundle?) {}
+            override fun onActivityStarted(a: Activity) {}
+            override fun onActivityStopped(a: Activity) {}
+            override fun onActivitySaveInstanceState(a: Activity, b: Bundle) {}
+            override fun onActivityDestroyed(a: Activity) {}
+        }
+        application.registerActivityLifecycleCallbacks(callbacks)
+        lifecycleCallbacks = callbacks
+    }
+
+    override fun onDestroy() {
+        // Stop the React surface attached to this VRActivity so its component
+        // tree unmounts cleanly. In bridgeless arch this calls
+        // reactSurface.stop() + reactSurface = null, leaving the shared
+        // ReactHost intact for MainActivity. Without this the React tree from
+        // each VR session piles up across re-entries and stale VRTComponents
+        // intercept hit-tested viewTags with dead ReactContexts, breaking
+        // onClick / onHover until you press dozens of times.
+        try {
+            reactDelegate?.unloadApp()
+        } catch (t: Throwable) {
+            android.util.Log.w("VRActivity", "reactDelegate.unloadApp() failed", t)
+        }
+        lifecycleCallbacks?.let { application.unregisterActivityLifecycleCallbacks(it) }
+        lifecycleCallbacks = null
+        mainHandler.removeCallbacksAndMessages(null)
+        super.onDestroy()
+    }
+}
+`;
+                fs_1.default.writeFileSync(activityPath, kotlinContent, "utf-8");
+            }
+            return config;
+        },
+    ]);
+    // 2. Add VRActivity to AndroidManifest
+    config = (0, config_plugins_1.withAndroidManifest)(config, async (config) => {
+        const app = config.modResults.manifest.application?.[0];
+        if (!app)
+            return config;
+        if (!app.activity)
+            app.activity = [];
+        const alreadyAdded = app.activity.some((a) => a.$?.["android:name"] === ".VRActivity");
+        if (!alreadyAdded) {
+            app.activity.push({
+                $: {
+                    "android:name": ".VRActivity",
+                    "android:screenOrientation": "landscape",
+                    "android:exported": "false",
+                    "android:configChanges": "keyboard|keyboardHidden|orientation|screenSize|uiMode",
+                    "android:launchMode": "singleTask",
+                },
+                "intent-filter": [
+                    {
+                        action: [{ $: { "android:name": "android.intent.action.MAIN" } }],
+                        category: [
+                            { $: { "android:name": "com.oculus.intent.category.VR" } },
+                        ],
+                    },
+                ],
+            });
+        }
+        // Inject com.oculus.app_id into <application> for Meta Quest App Name
+        const questAppId = props?.android?.questAppId;
+        if (questAppId) {
+            if (!app["meta-data"])
+                app["meta-data"] = [];
+            const alreadyHasAppId = app["meta-data"].some((m) => m.$?.["android:name"] === "com.oculus.app_id");
+            if (!alreadyHasAppId) {
+                app["meta-data"].push({
+                    $: {
+                        "android:name": "com.oculus.app_id",
+                        "android:value": questAppId,
+                    },
+                });
+            }
+        }
+        return config;
+    });
+    return config;
+};
 const withViroAndroid = (config, props) => {
-    (0, config_plugins_1.withPlugins)(config, [[withBranchAndroid, props]]);
-    withViroProjectBuildGradle(config);
-    withViroManifest(config);
-    withViroSettingsGradle(config);
-    withViroAppBuildGradle(config);
+    config = withBranchAndroid(config, props);
+    config = withViroProjectBuildGradle(config);
+    config = withViroManifest(config);
+    config = withViroSettingsGradle(config);
+    config = withViroAppBuildGradle(config);
+    config = withViroQuestActivity(config, props);
     return config;
 };
 exports.withViroAndroid = withViroAndroid;

package/dist/plugins/withViroIos.js

@@ -171,6 +171,7 @@ const withDefaultInfoPlist = (config, _props) => {
     let googleCloudApiKey;
     let rvApiKey;
     let rvProjectId;
+    let rvEndpoint;
     let cloudAnchorProvider;
     let geospatialAnchorProvider;
     let includeARCore;
@@ -190,6 +191,7 @@ const withDefaultInfoPlist = (config, _props) => {
             googleCloudApiKey = pluginOptions.googleCloudApiKey;
             rvApiKey = pluginOptions.rvApiKey;
             rvProjectId = pluginOptions.rvProjectId;
+            rvEndpoint = pluginOptions.rvEndpoint;
             // Resolve unified provider prop; old props override for backward compat.
             // Default to "reactvision" only when rvApiKey is present (implies RV intent).
             const defaultProvider2 = pluginOptions.rvApiKey ? "reactvision" : undefined;
@@ -224,6 +226,9 @@ const withDefaultInfoPlist = (config, _props) => {
     if (rvProjectId) {
         config.ios.infoPlist.RVProjectId = rvProjectId;
     }
+    if (rvEndpoint) {
+        config.ios.infoPlist.RVEndpoint = rvEndpoint;
+    }
     // Add location permissions for Geospatial API
     if (geospatialAnchorProvider === "arcore" || geospatialAnchorProvider === "reactvision" || includeARCore === true) {
         config.ios.infoPlist.NSLocationWhenInUseUsageDescription =

package/dist/plugins/withViroVisionOS.d.ts

@@ -0,0 +1,24 @@
+/**
+ * withViroVisionOS.ts
+ *
+ * Expo config plugin that adds a visionOS target to your app's Xcode project.
+ *
+ * What it does:
+ *   1. Writes the SwiftUI App entry point (ViroVisionApp.swift) into the target folder
+ *   2. Adds a visionOS pod target to the Podfile
+ *   3. Creates a visionOS Xcode target in the .pbxproj with correct SDK + build settings
+ *
+ * Usage in app.json:
+ *   {
+ *     "plugins": [
+ *       ["@reactvision/react-viro", { ... }],
+ *       "@reactvision/react-viro/plugins/withViroVisionOS"
+ *     ]
+ *   }
+ *
+ * After running `expo prebuild`, run `pod install` in ios/ then build the
+ * <AppName>Vision target in Xcode targeting the visionOS simulator.
+ */
+import { ConfigPlugin } from "@expo/config-plugins";
+export declare const withViroVisionOS: ConfigPlugin;
+export default withViroVisionOS;