before adding the hit test example

bbohlender · bbohlender · commit 70e09365cc1f · 2025-01-28T19:48:53.000+01:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,6 +6,7 @@ To get started, make sure you have [Node](https://nodejs.org) and [PNPM](https:/
 
 ```bash
 pnpm i
+pnpm -r copy
 pnpm -r build
 ```
 
diff --git a/examples/demo-controller/vite.config.ts b/examples/demo-controller/vite.config.ts
@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/editor/vite.config.ts b/examples/editor/vite.config.ts
@@ -8,7 +8,13 @@ export default defineConfig({
   plugins: [react(), basicSsl()],
   base: '/xr/examples/editor/',
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/handheld-ar/vite.config.ts b/examples/handheld-ar/vite.config.ts
@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/handle-vanilla/vite.config.ts b/examples/handle-vanilla/vite.config.ts
@@ -1,9 +1,19 @@
+import path from 'path'
 import { defineConfig } from 'vite'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-    build: {
-        outDir: "./dist"
-    },
-    base: '/pointer-events/',
+  build: {
+    outDir: './dist',
+  },
+  base: '/pointer-events/',
+  resolve: {
+    alias: [
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
+    dedupe: ['three'],
+  },
 })
diff --git a/examples/handle/vite.config.ts b/examples/handle/vite.config.ts
@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/hit-test-anchor/vite.config.ts b/examples/hit-test-anchor/vite.config.ts
@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/layers/vite.config.ts b/examples/layers/vite.config.ts
@@ -8,7 +8,13 @@ export default defineConfig({
   plugins: [react(), basicSsl()],
   base: '/xr/examples/layers/',
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/minecraft/vite.config.ts b/examples/minecraft/vite.config.ts
@@ -8,7 +8,13 @@ export default defineConfig({
   plugins: [react(), basicSsl()],
   base: '/xr/examples/minecraft/',
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/miniature/vite.config.ts b/examples/miniature/vite.config.ts
@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/pingpong/vite.config.ts b/examples/pingpong/vite.config.ts
@@ -8,7 +8,13 @@ export default defineConfig({
   plugins: [react(), basicSsl()],
   base: '/xr/examples/pingpong/',
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/pointer-events/vite.config.ts b/examples/pointer-events/vite.config.ts
@@ -1,9 +1,19 @@
+import path from 'path'
 import { defineConfig } from 'vite'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-    build: {
-        outDir: "./dist"
-    },
-    base: '/pointer-events/',
+  build: {
+    outDir: './dist',
+  },
+  resolve: {
+    alias: [
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
+    dedupe: ['three'],
+  },
+  base: '/pointer-events/',
 })
diff --git a/examples/rag-doll/vite.config.ts b/examples/rag-doll/vite.config.ts
@@ -8,7 +8,13 @@ export default defineConfig({
   plugins: [react(), basicSsl()],
   base: '/xr/examples/rag-doll/',
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/react-three-xr/vite.config.ts b/examples/react-three-xr/vite.config.ts
@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/rollercoaster/vite.config.ts b/examples/rollercoaster/vite.config.ts
@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/room-with-shadows/vite.config.ts b/examples/room-with-shadows/vite.config.ts
@@ -8,7 +8,13 @@ export default defineConfig({
   plugins: [react(), basicSsl()],
   base: '/xr/examples/room-with-shadows/',
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/secondary-input-sources/vite.config.ts b/examples/secondary-input-sources/vite.config.ts
@@ -8,7 +8,13 @@ export default defineConfig({
   plugins: [react(), basicSsl()],
   base: '/xr/examples/secondary-input-sources/',
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/stage/vite.config.ts b/examples/stage/vite.config.ts
@@ -8,7 +8,13 @@ export default defineConfig({
   plugins: [react(), basicSsl()],
   base: '/xr/examples/stage/',
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/uikit/vite.config.ts b/examples/uikit/vite.config.ts
@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/use-gesture/vite.config.ts b/examples/use-gesture/vite.config.ts
@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/examples/vanilla/vite.config.ts b/examples/vanilla/vite.config.ts
@@ -7,7 +7,13 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 export default defineConfig({
   plugins: [react(), basicSsl()],
   resolve: {
-    alias: [{ find: '@pmndrs/xr', replacement: path.resolve(__dirname, '../../packages/xr/src/index.ts') }],
+    alias: [
+      { find: '@pmndrs/xr', replacement: path.resolve(__dirname, '../../packages/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['three'],
   },
 })
diff --git a/examples/watch/vite.config.ts b/examples/watch/vite.config.ts
@@ -8,7 +8,13 @@ export default defineConfig({
   plugins: [react(), basicSsl()],
   base: '/xr/examples/watch/',
   resolve: {
-    alias: [{ find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') }],
+    alias: [
+      { find: '@react-three/xr', replacement: path.resolve(__dirname, '../../packages/react/xr/src/index.ts') },
+      {
+        find: '@pmndrs/pointer-events',
+        replacement: path.resolve(__dirname, '../../packages/pointer-events/src/index.ts'),
+      },
+    ],
     dedupe: ['@react-three/fiber', 'three'],
   },
 })
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "@types/react": "^19",
     "@types/react-dom": "^19",
     "@types/three": "latest",
-    "@types/webxr": "^0.5.16",
+    "@types/webxr": "^0.5.21",
     "@typescript-eslint/eslint-plugin": "^7.12.0",
     "@typescript-eslint/parser": "^7.12.0",
     "@vitejs/plugin-basic-ssl": "^1.1.0",
diff --git a/packages/pointer-events/src/pointer.ts b/packages/pointer-events/src/pointer.ts
@@ -54,7 +54,13 @@ export type PointerOptions = {
   ) => boolean
 }
 
-const pointerMap = new Map<number, Pointer>()
+globalThis.pointerEventspointerMap ??= new Map<number, Pointer>()
+
+declare global {
+  namespace globalThis {
+    var pointerEventspointerMap: Map<number, Pointer> | undefined
+  }
+}
 
 declare module 'three' {
   interface Object3D {
@@ -90,7 +96,7 @@ Object3D.prototype.hasPointerCapture = function (this: Object3D, pointerId: numb
 }
 
 export function getPointerById(pointerId: number) {
-  return pointerMap.get(pointerId)
+  return globalThis.pointerEventspointerMap?.get(pointerId)
 }
 
 export type GetCamera = () => PerspectiveCamera | OrthographicCamera
@@ -128,7 +134,7 @@ export class Pointer {
     private readonly parentReleasePointerCapture?: () => void,
     public readonly options: PointerOptions = {},
   ) {
-    pointerMap.set(id, this)
+    globalThis.pointerEventspointerMap?.set(id, this)
   }
 
   getPointerCapture(): PointerCapture | undefined {
diff --git a/packages/xr/.gitignore b/packages/xr/.gitignore
@@ -0,0 +1 @@
+src/default-environment.json
diff --git a/packages/xr/package.json b/packages/xr/package.json
diff --git a/packages/xr/src/emulate.ts b/packages/xr/src/emulate.ts
diff --git a/packages/xr/src/store.ts b/packages/xr/src/store.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
