From 432aff6804943baa61fe042eea8916fc7432a289 Mon Sep 17 00:00:00 2001
From: Bela Bohlender <bela@bohlender.email>
Date: Fri, 1 Nov 2024 14:53:08 +0100
Subject: [PATCH] support <XRSpace space="grib-space" /> and more

---
 packages/react/xr/src/hand.tsx  |  5 ++--
 packages/react/xr/src/space.tsx | 51 +++++++++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/packages/react/xr/src/hand.tsx b/packages/react/xr/src/hand.tsx
index 283be55d..220c5a78 100644
--- a/packages/react/xr/src/hand.tsx
+++ b/packages/react/xr/src/hand.tsx
@@ -37,18 +37,19 @@ export const XRHandModel = forwardRef<Object3D, XRHandModelOptions>((options, re
 })
 
 /**
+ * @deprecated use `<XRSpace space="wrist">` instead of `<XRHandJoint joint="wrist">`
  * component for placing content in the hand anchored at a specific joint such as the index finger tip
  *
  * properties
  * - `joint` is the name of the joint (e.g. `"wrist"`)
  *
  * the component allows children to be placed inside for e.g. visualizing a tooltip over the index finger tip
+ *
  */
 export const XRHandJoint = forwardRef<Object3D, { joint: XRHandJoint; children?: ReactNode }>(
   ({ joint, children }, ref) => {
-    const state = useXRInputSourceStateContext('hand')
     return (
-      <XRSpace ref={ref} space={state.inputSource.hand.get(joint)!}>
+      <XRSpace ref={ref} space={joint}>
         {children}
       </XRSpace>
     )
diff --git a/packages/react/xr/src/space.tsx b/packages/react/xr/src/space.tsx
index 732042c2..2eefec64 100644
--- a/packages/react/xr/src/space.tsx
+++ b/packages/react/xr/src/space.tsx
@@ -14,6 +14,8 @@ import {
 import { Group, Object3D } from 'three'
 import { xrSpaceContext } from './contexts.js'
 import { useXR } from './xr.js'
+import { useXRControllerButtonEvent } from './controller.js'
+import { useXRInputSourceStateContext } from './input.js'
 
 /**
  * component that puts its children at the provided space (or reference space type)
@@ -21,13 +23,13 @@ import { useXR } from './xr.js'
 export const XRSpace = forwardRef<
   Object3D,
   {
-    space: XRSpace | XRReferenceSpaceType
+    space: XRSpace | XRSpaceType
     children?: ReactNode
   }
 >(({ space, children }, ref) => {
   const internalRef = useRef<Group | null>(null)
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const resolvedSpace = typeof space === 'string' ? useXRSpace(space) : space
+  const resolvedSpace = useXRSpace(space as any)
   useImperativeHandle(ref, () => internalRef.current!, [])
   useApplyXRSpaceMatrix(internalRef, resolvedSpace)
   const setRef = useCallback((group: Group | null) => {
@@ -44,14 +46,57 @@ export const XRSpace = forwardRef<
   )
 })
 
+export type XRSpaceType = XRReferenceSpaceType | XRInputSourceSpaceType | XRHandJointSpaceType
+
+export type XRInputSourceSpaceType = 'grip-space' | 'target-ray-space'
+
+export type XRHandJointSpaceType = XRHandJoint
+
 /**
  * hook for retrieving getting xr space from the context
  */
 export function useXRSpace(): XRSpace
 
+export function useXRSpace(type: XRInputSourceSpaceType | XRHandJointSpaceType): XRSpace | undefined
+
 export function useXRSpace(type: XRReferenceSpaceType): XRReferenceSpace | undefined
 
-export function useXRSpace(type?: XRReferenceSpaceType): XRSpace | XRReferenceSpace | undefined {
+export function useXRSpace(type?: XRSpaceType): XRSpace | XRReferenceSpace | undefined {
+  switch (type) {
+    case 'grip-space':
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      return useXRInputSourceStateContext().inputSource.gripSpace
+    case 'target-ray-space':
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      return useXRInputSourceStateContext().inputSource.targetRaySpace
+    case 'wrist':
+    case 'thumb-metacarpal':
+    case 'thumb-phalanx-proximal':
+    case 'thumb-phalanx-distal':
+    case 'thumb-tip':
+    case 'index-finger-metacarpal':
+    case 'index-finger-phalanx-proximal':
+    case 'index-finger-phalanx-intermediate':
+    case 'index-finger-phalanx-distal':
+    case 'index-finger-tip':
+    case 'middle-finger-metacarpal':
+    case 'middle-finger-phalanx-proximal':
+    case 'middle-finger-phalanx-intermediate':
+    case 'middle-finger-phalanx-distal':
+    case 'middle-finger-tip':
+    case 'ring-finger-metacarpal':
+    case 'ring-finger-phalanx-proximal':
+    case 'ring-finger-phalanx-intermediate':
+    case 'ring-finger-phalanx-distal':
+    case 'ring-finger-tip':
+    case 'pinky-finger-metacarpal':
+    case 'pinky-finger-phalanx-proximal':
+    case 'pinky-finger-phalanx-intermediate':
+    case 'pinky-finger-phalanx-distal':
+    case 'pinky-finger-tip':
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      return useXRInputSourceStateContext('hand').inputSource.hand.get(type)
+  }
   if (type == null) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     const context = useContext(xrSpaceContext)