@reactvision/react-viro 2.54.0 → 2.55.0

package/dist/plugins/withViroVisionOS.js

@@ -0,0 +1,265 @@
+"use strict";
+/**
+ * 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.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withViroVisionOS = void 0;
+const config_plugins_1 = require("@expo/config-plugins");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+// ─── Constants ────────────────────────────────────────────────────────────────
+const TARGET_SUFFIX = "Vision";
+const VISIONOS_DEPLOYMENT_TARGET = "1.0";
+const PODFILE_MARKER = "# viro-visionos-target";
+// ─── Swift App entry point template ──────────────────────────────────────────
+function viroVisionAppSwift(targetName, bundleId) {
+    return `// ViroVisionApp.swift
+// Auto-generated by @reactvision/react-viro — DO NOT EDIT MANUALLY.
+// Re-generated on every expo prebuild run.
+
+import SwiftUI
+import ViroReact
+
+@main
+struct ${targetName}App: App {
+    /// Current immersion style — driven by ViroVisionOSModule.enterImmersiveSpace(style).
+    @State private var immersionStyle: ImmersionStyle = .mixed
+
+    var body: some Scene {
+        // Main 2D window (hosts React Native UI if needed, or acts as launch host).
+        WindowGroup {
+            ViroVisionLaunchView()
+                .viroImmersiveSpaceController()
+        }
+
+        // The Viro immersive rendering space.
+        // Opened via ViroVisionOSModule.enterImmersiveSpace() from JavaScript.
+        ImmersiveSpace(id: ViroImmersiveSpace.id) {
+            ViroImmersiveSpaceView()
+        }
+        .immersionStyle(selection: $immersionStyle, in: .mixed, .full, .progressive)
+    }
+}
+
+/// Minimal launch view displayed in the 2D window.
+/// Replace with your own SwiftUI content or a React Native root view.
+struct ViroVisionLaunchView: View {
+    @State private var isImmersed = false
+
+    var body: some View {
+        VStack(spacing: 20) {
+            Text("ReactVision AR")
+                .font(.largeTitle)
+                .fontWeight(.bold)
+
+            Button(isImmersed ? "Exit Immersive Space" : "Enter Immersive Space") {
+                Task {
+                    if isImmersed {
+                        await ViroImmersiveCoordinator.shared.exit()
+                    } else {
+                        await ViroImmersiveCoordinator.shared.enter(styleString: "mixed")
+                    }
+                    isImmersed.toggle()
+                }
+            }
+            .buttonStyle(.borderedProminent)
+        }
+        .padding(40)
+    }
+}
+`;
+}
+// ─── 1. Write Swift files ─────────────────────────────────────────────────────
+const withVisionOSSwiftFiles = (config) => {
+    return (0, config_plugins_1.withDangerousMod)(config, [
+        "ios",
+        async (newConfig) => {
+            const root = newConfig.modRequest.platformProjectRoot;
+            const projectName = newConfig.modRequest.projectName;
+            const targetName = `${projectName}${TARGET_SUFFIX}`;
+            const bundleId = `${newConfig.ios?.bundleIdentifier ?? "com.example"}.vision`;
+            const targetDir = path_1.default.join(root, targetName);
+            if (!fs_1.default.existsSync(targetDir)) {
+                fs_1.default.mkdirSync(targetDir, { recursive: true });
+            }
+            // Always overwrite — it's auto-generated.
+            fs_1.default.writeFileSync(path_1.default.join(targetDir, "ViroVisionApp.swift"), viroVisionAppSwift(targetName, bundleId), "utf-8");
+            return newConfig;
+        },
+    ]);
+};
+// ─── 2. Podfile target block ──────────────────────────────────────────────────
+const withVisionOSPodfile = (config) => {
+    return (0, config_plugins_1.withDangerousMod)(config, [
+        "ios",
+        async (newConfig) => {
+            const root = newConfig.modRequest.platformProjectRoot;
+            const projectName = newConfig.modRequest.projectName;
+            const targetName = `${projectName}${TARGET_SUFFIX}`;
+            const podfilePath = path_1.default.join(root, "Podfile");
+            let podfile = fs_1.default.readFileSync(podfilePath, "utf-8");
+            // Idempotent — skip if already present.
+            if (podfile.includes(PODFILE_MARKER))
+                return newConfig;
+            const podBlock = [
+                "",
+                PODFILE_MARKER,
+                `# ViroKit (iOS-only) and ViroReact (ObjC) are excluded until ViroKit`,
+                `# is compiled for xros SDK (Week 2). The POC uses Metal + CompositorServices directly.`,
+                `target '${targetName}' do`,
+                `end`,
+                "",
+            ].join("\n");
+            fs_1.default.writeFileSync(podfilePath, podfile + podBlock, "utf-8");
+            return newConfig;
+        },
+    ]);
+};
+// ─── 3. Xcode target ─────────────────────────────────────────────────────────
+const withVisionOSXcodeTarget = (config) => {
+    return (0, config_plugins_1.withXcodeProject)(config, (newConfig) => {
+        const pbxProject = newConfig.modResults;
+        const projectName = newConfig.modRequest.projectName;
+        const targetName = `${projectName}${TARGET_SUFFIX}`;
+        const bundleId = `${newConfig.ios?.bundleIdentifier ?? "com.example"}.vision`;
+        const targetDir = targetName; // relative path inside ios/
+        // ── Check for existing target ────────────────────────────────────────────
+        const nativeTargets = pbxProject.pbxNativeTargetSection();
+        const alreadyExists = Object.values(nativeTargets).some((t) => t &&
+            typeof t === "object" &&
+            (t.name === targetName || t.name === `"${targetName}"`));
+        if (alreadyExists)
+            return newConfig;
+        // ── Add the target (creates PBX phases + config list) ────────────────────
+        const target = pbxProject.addTarget(targetName, "application", targetDir, bundleId);
+        if (!target) {
+            config_plugins_1.WarningAggregator.addWarningIOS("withViroVisionOS", `Failed to add visionOS target "${targetName}" to Xcode project. ` +
+                "Add it manually in Xcode: File → New → Target → visionOS → App.");
+            return newConfig;
+        }
+        // ── Set visionOS build settings on every config for this target ──────────
+        const configList = pbxProject.pbxXCBuildConfigurationSection();
+        for (const conf of Object.values(configList)) {
+            if (!conf || typeof conf !== "object" || !conf.buildSettings)
+                continue;
+            const name = conf.buildSettings.PRODUCT_NAME;
+            if (!name)
+                continue;
+            const normalized = name.replace(/^"(.*)"$/, "$1");
+            if (normalized !== targetName)
+                continue;
+            const bs = conf.buildSettings;
+            // visionOS SDK
+            bs.SDKROOT = "xros";
+            bs.SUPPORTED_PLATFORMS = '"xros xrsimulator"';
+            bs[`"DEPLOYMENT_TARGET[sdk=xros*]"`] = `"${VISIONOS_DEPLOYMENT_TARGET}"`;
+            bs.TARGETED_DEVICE_FAMILY = '"7"';
+            // Swift
+            bs.SWIFT_VERSION = '"5.0"';
+            bs.CLANG_ENABLE_MODULES = "YES";
+            // Runpath for dynamic frameworks (CocoaPods)
+            bs.LD_RUNPATH_SEARCH_PATHS = '"$(inherited) @executable_path/Frameworks"';
+            // Embed Swift standard libraries
+            bs.ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "YES";
+            // App-specific
+            bs.PRODUCT_BUNDLE_IDENTIFIER = `"${bundleId}"`;
+            bs.INFOPLIST_FILE = `"${targetDir}/Info.plist"`;
+            bs.GENERATE_INFOPLIST_FILE = "NO";
+            bs.ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon";
+            // Don't strip Swift symbols in debug
+            if (conf.name === "Debug") {
+                bs.SWIFT_OPTIMIZATION_LEVEL = '"-Onone"';
+                bs.SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG";
+            }
+        }
+        // ── Write Info.plist for the visionOS target ──────────────────────────────
+        // (written during the dangerous mod pass — cannot write files here)
+        // Logged as a reminder.
+        config_plugins_1.WarningAggregator.addWarningIOS("withViroVisionOS", `visionOS target "${targetName}" added. ` +
+            `Run "pod install" in ios/ then build the target in Xcode. ` +
+            `An Info.plist will be auto-generated by Xcode for the new target.`);
+        return newConfig;
+    });
+};
+// ─── 4. Info.plist for visionOS target ───────────────────────────────────────
+const INFOPLIST_CONTENT = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>$(DEVELOPMENT_LANGUAGE)</string>
+    <key>CFBundleExecutable</key>
+    <string>$(EXECUTABLE_NAME)</string>
+    <key>CFBundleIdentifier</key>
+    <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>$(PRODUCT_NAME)</string>
+    <key>CFBundlePackageType</key>
+    <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+    <key>CFBundleVersion</key>
+    <string>1</string>
+    <key>UIApplicationSceneManifest</key>
+    <dict>
+        <key>UIApplicationSupportsMultipleScenes</key>
+        <true/>
+    </dict>
+    <key>NSHandsTrackingUsageDescription</key>
+    <string>Hand tracking is used for interaction in AR experiences.</string>
+</dict>
+</plist>
+`;
+const withVisionOSInfoPlist = (config) => {
+    return (0, config_plugins_1.withDangerousMod)(config, [
+        "ios",
+        async (newConfig) => {
+            const root = newConfig.modRequest.platformProjectRoot;
+            const projectName = newConfig.modRequest.projectName;
+            const targetName = `${projectName}${TARGET_SUFFIX}`;
+            const targetDir = path_1.default.join(root, targetName);
+            if (!fs_1.default.existsSync(targetDir)) {
+                fs_1.default.mkdirSync(targetDir, { recursive: true });
+            }
+            const plistPath = path_1.default.join(targetDir, "Info.plist");
+            if (!fs_1.default.existsSync(plistPath)) {
+                fs_1.default.writeFileSync(plistPath, INFOPLIST_CONTENT, "utf-8");
+            }
+            return newConfig;
+        },
+    ]);
+};
+// ─── Main export ──────────────────────────────────────────────────────────────
+const withViroVisionOS = (config) => {
+    return (0, config_plugins_1.withPlugins)(config, [
+        withVisionOSSwiftFiles,
+        withVisionOSInfoPlist,
+        withVisionOSPodfile,
+        withVisionOSXcodeTarget,
+    ]);
+};
+exports.withViroVisionOS = withViroVisionOS;
+exports.default = exports.withViroVisionOS;

package/index.ts

@@ -4,6 +4,8 @@
  *
  */
 import { ViroAnimations } from "./components/Animation/ViroAnimations";
+import { StudioSceneNavigator, StudioARScene } from "./components/Studio";
+import { ViroVisionOSModule, isVisionOS, enterImmersiveSpace, exitImmersiveSpace } from "./components/VisionOS/ViroVisionOSModule";
 import { Viro3DObject } from "./components/Viro3DObject";
 import { Viro360Image } from "./components/Viro360Image";
 import { Viro360Video } from "./components/Viro360Video";
@@ -59,7 +61,11 @@ import { ViroSpotLight } from "./components/ViroSpotLight";
 import { ViroText } from "./components/ViroText";
 import { ViroVideo } from "./components/ViroVideo";
 import { ViroVRSceneNavigator } from "./components/ViroVRSceneNavigator";
+import { ViroXRSceneNavigator } from "./components/ViroXRSceneNavigator";
 import { Viro3DSceneNavigator } from "./components/Viro3DSceneNavigator";
+import { hasOpenXRSupport, isQuest } from "./components/Utilities/ViroPlatform";
+import { useAnySourceHover } from "./components/Utilities/useAnySourceHover";
+import { useAnySourcePressed } from "./components/Utilities/useAnySourcePressed";
 import { ViroTextStyle } from "./components/Styles/ViroTextStyle";
 import { ViroStyle } from "./components/Styles/ViroStyle";
 import {
@@ -161,10 +167,25 @@ import {
   ViroMonocularDepthSupportResult,
   ViroMonocularDepthModelAvailableResult,
   ViroMonocularDepthPreferenceResult,
+  // Quest / OpenXR Hand Tracking Types
+  ViroJoint,
+  ViroHandJoints,
+  ViroHandPinchEvent,
+  ViroHandUpdateEvent,
 } from "./components/Types/ViroEvents";
 import { ViroSurface } from "./components/ViroSurface";
 import { ViroSceneNavigator } from "./components/ViroSceneNavigator";
 import { VIRO_VERSION } from "./components/Utilities/ViroVersion";
+import { ViroQuestEntryPoint } from "./components/ViroQuestEntryPoint";
+import { VRQuestNavigatorBridge } from "./components/Utilities/VRQuestNavigatorBridge";
+import { VRModuleOpenXR, useVRViewTag, exitVRScene } from "./components/Utilities/VRModuleOpenXR";
+import type { VRModuleOpenXRType } from "./components/Utilities/VRModuleOpenXR";
+import { AppRegistry } from "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.
+AppRegistry.registerComponent("VRQuestScene", () => ViroQuestEntryPoint);
 
 export {
   ViroARImageMarker,
@@ -215,8 +236,19 @@ export {
   ViroText,
   ViroVideo,
   ViroVRSceneNavigator,
+  ViroXRSceneNavigator,
+  ViroQuestEntryPoint,
+  // Quest bridge — for custom VR roots and VRModuleOpenXR viewTag access
+  VRQuestNavigatorBridge,
+  VRModuleOpenXR,
+  useVRViewTag,
+  exitVRScene,
   Viro3DSceneNavigator,
   // Utilities
+  hasOpenXRSupport,
+  isQuest,
+  useAnySourceHover,
+  useAnySourcePressed,
   ViroARTrackingReasonConstants,
   ViroRecordingErrorConstants,
   ViroTrackingStateConstants,
@@ -323,4 +355,30 @@ export {
   ViroMonocularDepthSupportResult,
   ViroMonocularDepthModelAvailableResult,
   ViroMonocularDepthPreferenceResult,
+  // Quest / OpenXR Hand Tracking Types
+  ViroJoint,
+  ViroHandJoints,
+  ViroHandPinchEvent,
+  ViroHandUpdateEvent,
+  // Studio Integration
+  StudioSceneNavigator,
+  StudioARScene,
+  // VisionOS
+  ViroVisionOSModule,
+  isVisionOS,
+  enterImmersiveSpace,
+  exitImmersiveSpace,
 };
+
+export type { VRModuleOpenXRType };
+export type { ImmersiveSpaceStyle } from "./components/VisionOS/ViroVisionOSModule";
+
+export type {
+  StudioSceneResponse,
+  StudioAsset,
+  StudioAnimation,
+  StudioCollisionBinding,
+  StudioSceneFunction,
+  StudioSceneMeta,
+  StudioProjectMeta,
+} from "./components/Studio";

package/ios/ViroReact.podspec

@@ -12,10 +12,14 @@ Pod::Spec.new do |s|
   s.author              = 'ReactVision'
   s.requires_arc        = true
   s.platform            = :ios, '12.0'
-  s.ios.deployment_target = '12.0'
-  
+  s.ios.deployment_target     = '12.0'
+  s.visionos.deployment_target = '1.0'
+
+  # visionOS: CompositorServices drives the immersive render loop.
+  s.visionos.frameworks = ['Metal', 'MetalKit', 'CompositorServices', 'ARKit']
+
   # Base source files (always included)
-  source_files_array = ['ViroReact/**/*.{h,m,mm}']
+  source_files_array = ['ViroReact/**/*.{h,m,mm,swift}']
   header_files_array = ['ViroReact/**/*.h']
   
   # Include dist files if they exist (for release builds)
@@ -26,7 +30,12 @@ Pod::Spec.new do |s|
   
   s.source_files        = source_files_array
   s.public_header_files = header_files_array
-  
+
+  # visionOS-only sources: keep them out of the iOS build so consumers running
+  # `pod install` for iOS don't pull CompositorServices / VRODriverVisionOS.h
+  # into a target where those symbols don't exist.
+  s.ios.exclude_files = ['ViroReact/VisionOS/**/*']
+
   if File.exist?(File.join(__dir__, 'dist/lib/libViroReact.a'))
     s.vendored_libraries = 'dist/lib/libViroReact.a'
   end

package/ios/dist/ViroRenderer/ViroKit.framework/Headers/VROARSession.h

@@ -571,11 +571,21 @@ public:
         std::function<void(bool success, std::string error)> callback) {
         if (callback) callback(false, "Not supported");
     }
+    virtual void rvGetScene(
+        const std::string& sceneId,
+        std::function<void(bool success, std::string jsonData, std::string error)> callback) {
+        if (callback) callback(false, "", "Not supported");
+    }
     virtual void rvGetSceneAssets(
         const std::string& sceneId,
         std::function<void(bool success, std::string jsonData, std::string error)> callback) {
         if (callback) callback(false, "", "Not supported");
     }
+    virtual void rvGetProject(
+        const std::string& projectId,
+        std::function<void(bool success, std::string jsonData, std::string error)> callback) {
+        if (callback) callback(false, "", "Not supported");
+    }
 
     // ========================================================================
     // ReactVision Geospatial CRUD API

package/ios/dist/ViroRenderer/ViroKit.framework/Headers/VROARSessioniOS.h

@@ -197,6 +197,10 @@ public:
         double confidence, int matchCount, int inlierCount, int processingTimeMs,
         const std::string& platform, const std::string& externalUserId,
         std::function<void(bool, std::string)> callback) override;
+    void rvGetProject(const std::string& projectId,
+        std::function<void(bool, std::string, std::string)> callback) override;
+    void rvGetScene(const std::string& sceneId,
+        std::function<void(bool, std::string, std::string)> callback) override;
     void rvGetSceneAssets(const std::string& sceneId,
         std::function<void(bool, std::string, std::string)> callback) override;
 

package/ios/dist/ViroRenderer/ViroKit.framework/Headers/VROInputControllerBase.h

@@ -27,6 +27,7 @@
 #define VROInputControllerBase_h
 
 #include <stdio.h>
+#include <map>
 #include <vector>
 #include <string>
 #include <memory>
@@ -180,6 +181,23 @@ protected:
      */
     void updateHitNode(const VROCamera &camera, VROVector3f origin, VROVector3f ray);
 
+    /*
+     Source-aware hit-node update. Stores the result both in the legacy
+     `_hitResult` (so single-pointer subsystems — drag, fuse, pinch, rotate —
+     keep working unchanged) and in `_hitResultsBySource[source]` so that
+     gaze/click events can resolve against the specific input source that
+     produced them. Used by backends with multiple simultaneous pointers
+     (e.g. OpenXR with two hands tracked at once).
+     */
+    void updateHitNode(int source, const VROCamera &camera,
+                       VROVector3f origin, VROVector3f ray);
+
+    /*
+     Returns the per-source hit result if one was recorded for this source,
+     otherwise falls back to the legacy single-source `_hitResult`.
+     */
+    std::shared_ptr<VROHitTestResult> getHitResultForSource(int source) const;
+
     /*
      VRODraggedObject encapsulates all the information that needs to be tracked
      and processed for onDrag events for a given dragged node.
@@ -226,6 +244,12 @@ protected:
      Last result that was returned from the hit test.
      */
     std::shared_ptr<VROHitTestResult> _hitResult;
+
+    /*
+     Per-source hit results, populated by the source-aware updateHitNode
+     overload. Empty entry → no per-source override; falls back to `_hitResult`.
+     */
+    std::map<int, std::shared_ptr<VROHitTestResult>> _hitResultsBySource;
     
     /*
      Last known posiiton of the controller.
@@ -296,11 +320,61 @@ private:
      */
     std::shared_ptr<VRONode> _lastClickedNode;
 
+    /*
+     Per-source last clicked node — used to detect a "completed" click
+     (ClickDown + ClickUp on the same node from the same source) when
+     multiple pointers are active simultaneously.
+     */
+    std::map<int, std::shared_ptr<VRONode>> _lastClickedNodesBySource;
+
     /*
      Last known that was successfully hovered upon.
      */
     std::shared_ptr<VRONode> _lastHoveredNode;
 
+    /*
+     Per-source last hovered node, used by the source-aware hover dispatch in
+     `processGazeEvent`. An entry's presence is the signal that this source
+     has its own hover state; otherwise we fall back to `_lastHoveredNode`.
+     */
+    std::map<int, std::shared_ptr<VRONode>> _lastHoveredNodesBySource;
+
+    /*
+     Hover hysteresis state, per source.
+
+     OpenXR controller / hand aim ray-casts naturally jitter — pointing at a
+     small target with a controller held by an unsteady hand causes the
+     hit-test to alternate between the target node and the surrounding
+     background every 1–3 frames. Without hysteresis, every alternation
+     produced an `onHover(false)` / `onHover(true)` pair to JS, which
+     manifested as a flickering hover state and "the click takes dozens of
+     presses to register" — because if the user pulled the trigger on a
+     "miss" frame, `onButtonEvent` resolved the click against the background
+     instead of the target.
+
+     The hysteresis works as a grace period: when the hit changes from
+     `lastHovered` to a different node, we do NOT immediately fire the
+     exit — instead we record the candidate change and the timestamp.
+     If, within `kHoverHysteresisMillis`, the hit returns to `lastHovered`,
+     the exit is cancelled (no `onHover(false)` ever fires). If the new
+     candidate persists past the window, the exit is confirmed and the
+     normal enter/exit dispatch happens.
+
+     The same window is consulted by `onButtonEvent` so that clicks landing
+     on a transient miss-frame are still routed to `lastHovered` if the
+     pending-exit window is still open. That eliminates the "many presses
+     to click" symptom even though the underlying ray-cast still oscillates.
+     */
+    static constexpr double kHoverHysteresisMillis = 75.0;
+    struct HoverPending {
+        std::shared_ptr<VRONode> candidateNode;   // node the hit currently resolves to
+        VROVector3f candidatePos;                 // hit location at the moment of pending start
+        bool candidateBgHit = false;              // whether candidate is a background hit
+        double startedMillis = -1.0;              // wall-clock time when the candidate first appeared
+    };
+    std::map<int, HoverPending> _hoverPendingBySource;
+    HoverPending _hoverPending;  // legacy single-source fallback
+
     /*
      Returns the first node that is able to handle the event action by bubbling it up.
      If nothing is able to handle the event, nullptr is returned.

package/ios/dist/ViroRenderer/ViroKit.framework/Headers/VROInputType.h

@@ -57,9 +57,17 @@ namespace ViroCardBoard{
 
 namespace ViroOculus{
     enum InputSource{
-        Controller = 1,
-        TouchPad = 2,
-        BackButton = 3
+        Controller      = 1,  // right controller primary ray (legacy alias for RightController)
+        TouchPad        = 2,
+        BackButton      = 3,  // menu (left) and B (right) buttons — navigation / back
+        LeftController  = 4,  // left controller primary ray
+        AButton         = 5,  // right-hand A button
+        XButton         = 6,  // left-hand X button
+        YButton         = 7,  // left-hand Y button
+        LeftGrip        = 8,  // left grip / squeeze
+        RightGrip       = 9,  // right grip / squeeze
+        LeftThumbstick  = 10, // left thumbstick scroll axis
+        RightThumbstick = 11, // right thumbstick scroll axis
     };
 }
 #endif

package/ios/dist/ViroRenderer/ViroKit.framework/Headers/VROPlatformUtil.h

@@ -53,6 +53,7 @@ enum class VROPlatformType {
     Unknown,
     AndroidGVR,
     AndroidOVR,
+    AndroidOpenXR,
     AndroidARCore,
     AndroidSceneView,
     iOSCardboard,
@@ -163,6 +164,18 @@ VROTextureFormat VROPlatformGetBitmapFormat(jobject jbitmap);
  */
 void VROPlatformDispatchAsyncRenderer(std::function<void()> fcn);
 
+/*
+ OpenXR / headless-GL renderers that own their own render thread should call
+ VROPlatformSetUseDirectRendererQueue(true) during initialisation. All
+ subsequent VROPlatformDispatchAsyncRenderer calls will enqueue into a C++
+ queue instead of going through the GLSurfaceView Java path.
+
+ The render thread must call VROPlatformDrainRendererQueue() every frame to
+ execute queued work (e.g. setSceneController, texture uploads).
+ */
+void VROPlatformSetUseDirectRendererQueue(bool use);
+void VROPlatformDrainRendererQueue();
+
 /*
  Run the given function on a background thread. The thread can be pooled, 
  or spun up fresh. The caller should make no assumptions.

package/ios/dist/ViroRenderer/ViroKit.framework/Headers/VRORenderer.h

@@ -282,6 +282,14 @@ public:
     
 #pragma mark - Camera
    
+    /*
+     Returns true if the render context has been initialized (initRenderer called).
+     Safe to call before any scene is set.
+     */
+    bool hasRenderContext() const {
+        return _context != nullptr;
+    }
+
     /*
      Get the camera used in the last frame.
      */

package/ios/dist/ViroRenderer/ViroKit.framework/Shaders.dat

@@ -1,5 +1,5 @@
 dependencies: \
   /Users/dorantes/Documents/ViroWorkspace/virocore/ViroRenderer/Shaders.metal \
-  /private/var/run/com.apple.security.cryptexd/mnt/com.apple.MobileAsset.MetalToolchain-v17.5.188.0.TTgSDB/Metal.xctoolchain/usr/metal/32023/lib/clang/32023.883/include/metal/module.modulemap \
+  /private/var/run/com.apple.security.cryptexd/mnt/com.apple.MobileAsset.MetalToolchain-v17.5.188.0.qU0cxL/Metal.xctoolchain/usr/metal/32023/lib/clang/32023.883/include/metal/module.modulemap \
   /Users/dorantes/Documents/ViroWorkspace/virocore/ViroRenderer/VROSharedStructures.h \
   /Users/dorantes/Documents/ViroWorkspace/virocore/ViroRenderer/VRODefines.h

package/ios/dist/ViroRenderer/ViroKit.podspec

@@ -27,8 +27,13 @@ Pod::Spec.new do |s|
   s.author              = 'ReactVision'
   s.requires_arc        = true
   s.platform            = :ios, '13.0'
+  s.visionos.deployment_target = '1.0'
   s.dependency 'React'
 
+  # visionOS requires CompositorServices for the immersive render loop.
+  # Metal and MetalKit are available on both iOS and visionOS.
+  s.visionos.frameworks = ['Metal', 'MetalKit', 'CompositorServices', 'ARKit']
+
   # ARCore frameworks and Firebase dependencies are weak-linked via post_install hook
   # This prevents linker errors when ARCore pods are not installed
   # The following frameworks are weakly linked when ARCore is enabled:

package/ios/dist/include/VRTARSceneNavigator.h

@@ -208,6 +208,9 @@ typedef void (^GeospatialAnchorCompletionHandler)(BOOL success,
                           radius:(double)radius
                            limit:(int)limit
                completionHandler:(void (^)(BOOL success, NSArray *anchors, NSString *error))completionHandler;
+- (void)rvGetProject:(void (^)(BOOL success, NSString *data, NSString *error))completionHandler;
+- (void)rvGetScene:(NSString *)sceneId
+ completionHandler:(void (^)(BOOL success, NSString *data, NSString *error))completionHandler;
 - (void)rvGetSceneAssets:(NSString *)sceneId
       completionHandler:(void (^)(BOOL success, NSArray *assets, NSString *error))completionHandler;
 - (void)rvAttachAssetToCloudAnchor:(NSString *)anchorId

package/ios/dist/include/VRTStudioModule.h

@@ -0,0 +1,6 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTBridge.h>
+
+@interface VRTStudioModule : NSObject <RCTBridgeModule>
+
+@end

package/package.json

@@ -3,7 +3,7 @@
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "version": "2.54.0",
+  "version": "2.55.0",
   "license": "MIT",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"