@threlte/xr 1.0.4 → 1.0.6

package/dist/components/XR.svelte

@@ -18,7 +18,7 @@ This should be placed within a Threlte `<Canvas />`.
 
 -->
 <script lang="ts">
-  import { onMount, type Snippet } from 'svelte'
+  import { onDestroy, onMount, type Snippet } from 'svelte'
   import { useThrelte, watch } from '@threlte/core'
   import type { XRSessionEvent } from '../types'
   import {
@@ -168,6 +168,12 @@ This should be placed within a Threlte `<Canvas />`.
       xr.removeEventListener('sessionend', handleSessionEnd)
     }
   })
+  onDestroy(() => {
+    // if unmounted while presenting (e.g. due to sveltekit navigation), end the session
+    if (session.current) {
+      session.current.end()
+    }
+  })
 
   $effect.pre(() => updateTargetFrameRate(frameRate))
   $effect.pre(() => xr.setFoveation(foveation))

package/dist/plugins/pointerControls/setup.js

@@ -169,29 +169,43 @@ export const setupPointerControls = (context, handContext, fixedStep = 1 / 40) =
         fixedStep,
         autoStart: false
     });
-    watch(controller, (input) => {
+    watch([controller, handContext.enabled], ([input, enabled]) => {
         if (input === undefined)
             return;
-        input.targetRay.addEventListener('selectstart', handlePointerDown);
-        input.targetRay.addEventListener('selectend', handlePointerUp);
-        input.targetRay.addEventListener('select', handleClick);
-        return () => {
+        const removeHandlers = () => {
             input.targetRay.removeEventListener('selectstart', handlePointerDown);
             input.targetRay.removeEventListener('selectend', handlePointerUp);
             input.targetRay.removeEventListener('select', handleClick);
         };
+        if (enabled) {
+            input.targetRay.addEventListener('selectstart', handlePointerDown);
+            input.targetRay.addEventListener('selectend', handlePointerUp);
+            input.targetRay.addEventListener('select', handleClick);
+            return removeHandlers;
+        }
+        else {
+            removeHandlers();
+            return;
+        }
     });
-    watch(hand, (input) => {
+    watch([hand, handContext.enabled], ([input, enabled]) => {
         if (input === undefined)
             return;
-        input.hand.addEventListener('pinchstart', handlePointerDown);
-        input.hand.addEventListener('pinchend', handlePointerUp);
-        input.hand.addEventListener('pinchend', handleClick);
-        return () => {
+        const removeHandlers = () => {
             input.hand.removeEventListener('pinchstart', handlePointerDown);
             input.hand.removeEventListener('pinchend', handlePointerUp);
             input.hand.removeEventListener('pinchend', handleClick);
         };
+        if (enabled) {
+            input.hand.addEventListener('pinchstart', handlePointerDown);
+            input.hand.addEventListener('pinchend', handlePointerUp);
+            input.hand.addEventListener('pinchend', handleClick);
+            return removeHandlers;
+        }
+        else {
+            removeHandlers();
+            return;
+        }
     });
     watch([useXR().isPresenting, handContext.enabled], ([isPresenting, enabled]) => {
         if (isPresenting && enabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threlte/xr",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "author": "Micheal Parks <michealparks1989@gmail.com> (https://parks.lol)",
   "license": "MIT",
   "description": "Tools to more easily create VR and AR experiences with Threlte",