@react-three/fiber 8.15.0 → 8.15.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @react-three/fiber
 
+## 8.15.2
+
+### Patch Changes
+
+- 086d3932: fix: size check and raycaster camera
+
+## 8.15.1
+
+### Patch Changes
+
+- 2d39676d: fix: ignore deprecated types, use correct XRFrame definition
+
 ## 8.15.0
 
 ### Minor Changes

package/dist/declarations/src/core/loop.d.ts

@@ -1,4 +1,3 @@
-import * as THREE from 'three';
 import { Root } from './renderer';
 import { RootState } from './store';
 export declare type GlobalRenderCallback = (timeStamp: number) => void;
@@ -10,5 +9,5 @@ export declare function flushGlobalEffects(type: GlobalEffectType, timestamp: nu
 export declare function createLoop<TCanvas>(roots: Map<TCanvas, Root>): {
     loop: (timestamp: number) => void;
     invalidate: (state?: RootState | undefined, frames?: number) => void;
-    advance: (timestamp: number, runGlobalEffects?: boolean, state?: RootState | undefined, frame?: THREE.XRFrame | undefined) => void;
+    advance: (timestamp: number, runGlobalEffects?: boolean, state?: RootState | undefined, frame?: import("three").XRFrame | undefined) => void;
 };

package/dist/declarations/src/core/store.d.ts

@@ -2,7 +2,7 @@ import * as THREE from 'three';
 import * as React from 'react';
 import { GetState, SetState, StoreApi, UseBoundStore } from 'zustand';
 import { DomEvent, EventManager, PointerCaptureTarget, ThreeEvent } from './events';
-import { Camera } from './utils';
+import { _XRFrame, Camera } from './utils';
 export declare const privateKeys: readonly ["set", "get", "setSize", "setFrameloop", "setDpr", "events", "invalidate", "advance", "size", "viewport"];
 export declare type PrivateKeys = typeof privateKeys[number];
 export interface Intersection extends THREE.Intersection {
@@ -28,7 +28,7 @@ export declare type Viewport = Size & {
     distance: number;
     aspect: number;
 };
-export declare type RenderCallback = (state: RootState, delta: number, frame?: THREE.XRFrame) => void;
+export declare type RenderCallback = (state: RootState, delta: number, frame?: _XRFrame) => void;
 export declare type Performance = {
     current: number;
     min: number;

package/dist/declarations/src/core/utils.d.ts

@@ -1,7 +1,12 @@
+/// <reference types="webxr" />
 import * as THREE from 'three';
 import * as React from 'react';
 import { AttachType, Instance, InstanceProps, LocalState } from './renderer';
 import { Dpr, Renderer, RootState, Size } from './store';
+declare type _DeprecatedXRFrame = THREE.XRFrame;
+export declare type _XRFrame = THREE.WebGLRenderTargetOptions extends {
+    samples?: number;
+} ? XRFrame : _DeprecatedXRFrame;
 export declare const hasColorSpace: <T extends object | Renderer | THREE.Texture, P = T extends Renderer ? {
     outputColorSpace: string;
 } : {
@@ -92,3 +97,4 @@ export declare function updateInstance(instance: Instance): void;
 export declare function updateCamera(camera: Camera & {
     manual?: boolean;
 }, size: Size): void;
+export {};

package/dist/declarations/src/three-types.d.ts

@@ -105,7 +105,7 @@ export declare type ConeGeometryProps = BufferGeometryNode<THREE.ConeGeometry, t
 export declare type CylinderGeometryProps = BufferGeometryNode<THREE.CylinderGeometry, typeof THREE.CylinderGeometry>;
 export declare type CircleGeometryProps = BufferGeometryNode<THREE.CircleGeometry, typeof THREE.CircleGeometry>;
 export declare type BoxGeometryProps = BufferGeometryNode<THREE.BoxGeometry, typeof THREE.BoxGeometry>;
-export declare type CapsuleGeometryProps = BufferGeometryNode<THREE.CapsuleBufferGeometry, typeof THREE.CapsuleBufferGeometry>;
+export declare type CapsuleGeometryProps = BufferGeometryNode<THREE.CapsuleGeometry, typeof THREE.CapsuleGeometry>;
 export declare type MaterialProps = MaterialNode<THREE.Material, [THREE.MaterialParameters]>;
 export declare type ShadowMaterialProps = MaterialNode<THREE.ShadowMaterial, [THREE.ShaderMaterialParameters]>;
 export declare type SpriteMaterialProps = MaterialNode<THREE.SpriteMaterial, [THREE.SpriteMaterialParameters]>;

package/dist/{index-5918012a.esm.js → index-594193f5.esm.js}

@@ -1423,7 +1423,7 @@ const createStore = (invalidate, advance) => {
     } = rootState.getState();
 
     // Resize camera and renderer on changes to size and pixelratio
-    if (size !== oldSize || viewport.dpr !== oldDpr) {
+    if (size.width !== oldSize.width || size.height !== oldSize.height || viewport.dpr !== oldDpr) {
       var _size$updateStyle;
       oldSize = size;
       oldDpr = viewport.dpr;
@@ -1713,8 +1713,23 @@ const createRendererInstance = (gl, canvas) => {
   });
 };
 function computeInitialSize(canvas, defaultSize) {
-  if (defaultSize) return defaultSize;
-  if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement && canvas.parentElement) {
+  const defaultStyle = typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement;
+  if (defaultSize) {
+    const {
+      width,
+      height,
+      top,
+      left,
+      updateStyle = defaultStyle
+    } = defaultSize;
+    return {
+      width,
+      height,
+      top,
+      left,
+      updateStyle
+    };
+  } else if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement && canvas.parentElement) {
     const {
       width,
       height,
@@ -1725,14 +1740,16 @@ function computeInitialSize(canvas, defaultSize) {
       width,
       height,
       top,
-      left
+      left,
+      updateStyle: defaultStyle
     };
   } else if (typeof OffscreenCanvas !== 'undefined' && canvas instanceof OffscreenCanvas) {
     return {
       width: canvas.width,
       height: canvas.height,
       top: 0,
-      left: 0
+      left: 0,
+      updateStyle: defaultStyle
     };
   }
   return {
@@ -1835,6 +1852,10 @@ function createRoot(canvas) {
         state.set({
           camera
         });
+
+        // Configure raycaster
+        // https://github.com/pmndrs/react-xr/issues/300
+        raycaster.camera = camera;
       }
 
       // Set up scene (one time only!)

package/dist/{index-34a45f4c.cjs.dev.js → index-d26c5c57.cjs.dev.js}

@@ -1450,7 +1450,7 @@ const createStore = (invalidate, advance) => {
     } = rootState.getState();
 
     // Resize camera and renderer on changes to size and pixelratio
-    if (size !== oldSize || viewport.dpr !== oldDpr) {
+    if (size.width !== oldSize.width || size.height !== oldSize.height || viewport.dpr !== oldDpr) {
       var _size$updateStyle;
       oldSize = size;
       oldDpr = viewport.dpr;
@@ -1740,8 +1740,23 @@ const createRendererInstance = (gl, canvas) => {
   });
 };
 function computeInitialSize(canvas, defaultSize) {
-  if (defaultSize) return defaultSize;
-  if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement && canvas.parentElement) {
+  const defaultStyle = typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement;
+  if (defaultSize) {
+    const {
+      width,
+      height,
+      top,
+      left,
+      updateStyle = defaultStyle
+    } = defaultSize;
+    return {
+      width,
+      height,
+      top,
+      left,
+      updateStyle
+    };
+  } else if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement && canvas.parentElement) {
     const {
       width,
       height,
@@ -1752,14 +1767,16 @@ function computeInitialSize(canvas, defaultSize) {
       width,
       height,
       top,
-      left
+      left,
+      updateStyle: defaultStyle
     };
   } else if (typeof OffscreenCanvas !== 'undefined' && canvas instanceof OffscreenCanvas) {
     return {
       width: canvas.width,
       height: canvas.height,
       top: 0,
-      left: 0
+      left: 0,
+      updateStyle: defaultStyle
     };
   }
   return {
@@ -1862,6 +1879,10 @@ function createRoot(canvas) {
         state.set({
           camera
         });
+
+        // Configure raycaster
+        // https://github.com/pmndrs/react-xr/issues/300
+        raycaster.camera = camera;
       }
 
       // Set up scene (one time only!)

package/dist/{index-f4d4539a.cjs.prod.js → index-e6d64601.cjs.prod.js}

@@ -1450,7 +1450,7 @@ const createStore = (invalidate, advance) => {
     } = rootState.getState();
 
     // Resize camera and renderer on changes to size and pixelratio
-    if (size !== oldSize || viewport.dpr !== oldDpr) {
+    if (size.width !== oldSize.width || size.height !== oldSize.height || viewport.dpr !== oldDpr) {
       var _size$updateStyle;
       oldSize = size;
       oldDpr = viewport.dpr;
@@ -1740,8 +1740,23 @@ const createRendererInstance = (gl, canvas) => {
   });
 };
 function computeInitialSize(canvas, defaultSize) {
-  if (defaultSize) return defaultSize;
-  if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement && canvas.parentElement) {
+  const defaultStyle = typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement;
+  if (defaultSize) {
+    const {
+      width,
+      height,
+      top,
+      left,
+      updateStyle = defaultStyle
+    } = defaultSize;
+    return {
+      width,
+      height,
+      top,
+      left,
+      updateStyle
+    };
+  } else if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement && canvas.parentElement) {
     const {
       width,
       height,
@@ -1752,14 +1767,16 @@ function computeInitialSize(canvas, defaultSize) {
       width,
       height,
       top,
-      left
+      left,
+      updateStyle: defaultStyle
     };
   } else if (typeof OffscreenCanvas !== 'undefined' && canvas instanceof OffscreenCanvas) {
     return {
       width: canvas.width,
       height: canvas.height,
       top: 0,
-      left: 0
+      left: 0,
+      updateStyle: defaultStyle
     };
   }
   return {
@@ -1862,6 +1879,10 @@ function createRoot(canvas) {
         state.set({
           camera
         });
+
+        // Configure raycaster
+        // https://github.com/pmndrs/react-xr/issues/300
+        raycaster.camera = camera;
       }
 
       // Set up scene (one time only!)

package/dist/react-three-fiber.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-34a45f4c.cjs.dev.js');
+var index = require('./index-d26c5c57.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

package/dist/react-three-fiber.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-f4d4539a.cjs.prod.js');
+var index = require('./index-e6d64601.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

package/dist/react-three-fiber.esm.js

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMutableCallback, a as useIsomorphicLayoutEffect, b as createRoot, i as isRef, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from './index-5918012a.esm.js';
-export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, f as context, c as createEvents, g as createPortal, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from './index-5918012a.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, a as useIsomorphicLayoutEffect, b as createRoot, i as isRef, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from './index-594193f5.esm.js';
+export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, f as context, c as createEvents, g as createPortal, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from './index-594193f5.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';

package/native/dist/react-three-fiber-native.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-34a45f4c.cjs.dev.js');
+var index = require('../../dist/index-d26c5c57.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -283,6 +283,7 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function CanvasWrapper(p
 });
 
 function polyfills() {
+  // http://stackoverflow.com/questions/105034
   function uuidv4() {
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
       const r = Math.random() * 16 | 0,
@@ -292,6 +293,7 @@ function polyfills() {
   }
 
   // Patch Blob for ArrayBuffer if unsupported
+  // https://github.com/facebook/react-native/pull/39276
   try {
     new Blob([new ArrayBuffer(4)]);
   } catch (_) {
@@ -360,7 +362,7 @@ function polyfills() {
 
       // Create safe URI for JSI
       if (input.startsWith('data:')) {
-        const [header, data] = input.split(',');
+        const [header, data] = input.split(';base64,');
         const [, type] = header.split('/');
         const uri = fs__namespace.cacheDirectory + uuidv4() + `.${type}`;
         await fs__namespace.writeAsStringAsync(uri, data, {
@@ -396,6 +398,7 @@ function polyfills() {
     this.manager.itemStart(url);
     const texture = new THREE__namespace.Texture();
     getAsset(url).then(async uri => {
+      // https://github.com/expo/expo-three/pull/266
       const {
         width,
         height
@@ -404,17 +407,17 @@ function polyfills() {
         height
       }), rej));
       texture.image = {
+        // Special case for EXGLImageUtils::loadImage
         data: {
           localUri: uri
         },
         width,
         height
       };
-      texture.flipY = true;
-      texture.unpackAlignment = 1;
+      texture.flipY = true; // Since expo-gl@12.4.0
       texture.needsUpdate = true;
 
-      // Force non-DOM upload for EXGL fast paths
+      // Force non-DOM upload for EXGL texImage2D
       // @ts-ignore
       texture.isDataTexture = true;
       onLoad == null ? void 0 : onLoad(texture);
@@ -427,7 +430,7 @@ function polyfills() {
     return texture;
   };
 
-  // Fetches assets via XMLHttpRequest
+  // Fetches assets via FS
   THREE__namespace.FileLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
     if (this.path && typeof url === 'string') url = this.path + url;
     this.manager.itemStart(url);

package/native/dist/react-three-fiber-native.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-f4d4539a.cjs.prod.js');
+var index = require('../../dist/index-e6d64601.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -283,6 +283,7 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function CanvasWrapper(p
 });
 
 function polyfills() {
+  // http://stackoverflow.com/questions/105034
   function uuidv4() {
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
       const r = Math.random() * 16 | 0,
@@ -292,6 +293,7 @@ function polyfills() {
   }
 
   // Patch Blob for ArrayBuffer if unsupported
+  // https://github.com/facebook/react-native/pull/39276
   try {
     new Blob([new ArrayBuffer(4)]);
   } catch (_) {
@@ -360,7 +362,7 @@ function polyfills() {
 
       // Create safe URI for JSI
       if (input.startsWith('data:')) {
-        const [header, data] = input.split(',');
+        const [header, data] = input.split(';base64,');
         const [, type] = header.split('/');
         const uri = fs__namespace.cacheDirectory + uuidv4() + `.${type}`;
         await fs__namespace.writeAsStringAsync(uri, data, {
@@ -396,6 +398,7 @@ function polyfills() {
     this.manager.itemStart(url);
     const texture = new THREE__namespace.Texture();
     getAsset(url).then(async uri => {
+      // https://github.com/expo/expo-three/pull/266
       const {
         width,
         height
@@ -404,17 +407,17 @@ function polyfills() {
         height
       }), rej));
       texture.image = {
+        // Special case for EXGLImageUtils::loadImage
         data: {
           localUri: uri
         },
         width,
         height
       };
-      texture.flipY = true;
-      texture.unpackAlignment = 1;
+      texture.flipY = true; // Since expo-gl@12.4.0
       texture.needsUpdate = true;
 
-      // Force non-DOM upload for EXGL fast paths
+      // Force non-DOM upload for EXGL texImage2D
       // @ts-ignore
       texture.isDataTexture = true;
       onLoad == null ? void 0 : onLoad(texture);
@@ -427,7 +430,7 @@ function polyfills() {
     return texture;
   };
 
-  // Fetches assets via XMLHttpRequest
+  // Fetches assets via FS
   THREE__namespace.FileLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
     if (this.path && typeof url === 'string') url = this.path + url;
     this.manager.itemStart(url);

package/native/dist/react-three-fiber-native.esm.js

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMutableCallback, b as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-5918012a.esm.js';
-export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, f as context, c as createEvents, g as createPortal, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from '../../dist/index-5918012a.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, b as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-594193f5.esm.js';
+export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, f as context, c as createEvents, g as createPortal, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from '../../dist/index-594193f5.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
@@ -258,6 +258,7 @@ const Canvas = /*#__PURE__*/React.forwardRef(function CanvasWrapper(props, ref)
 });
 
 function polyfills() {
+  // http://stackoverflow.com/questions/105034
   function uuidv4() {
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
       const r = Math.random() * 16 | 0,
@@ -267,6 +268,7 @@ function polyfills() {
   }
 
   // Patch Blob for ArrayBuffer if unsupported
+  // https://github.com/facebook/react-native/pull/39276
   try {
     new Blob([new ArrayBuffer(4)]);
   } catch (_) {
@@ -335,7 +337,7 @@ function polyfills() {
 
       // Create safe URI for JSI
       if (input.startsWith('data:')) {
-        const [header, data] = input.split(',');
+        const [header, data] = input.split(';base64,');
         const [, type] = header.split('/');
         const uri = fs.cacheDirectory + uuidv4() + `.${type}`;
         await fs.writeAsStringAsync(uri, data, {
@@ -371,6 +373,7 @@ function polyfills() {
     this.manager.itemStart(url);
     const texture = new THREE.Texture();
     getAsset(url).then(async uri => {
+      // https://github.com/expo/expo-three/pull/266
       const {
         width,
         height
@@ -379,17 +382,17 @@ function polyfills() {
         height
       }), rej));
       texture.image = {
+        // Special case for EXGLImageUtils::loadImage
         data: {
           localUri: uri
         },
         width,
         height
       };
-      texture.flipY = true;
-      texture.unpackAlignment = 1;
+      texture.flipY = true; // Since expo-gl@12.4.0
       texture.needsUpdate = true;
 
-      // Force non-DOM upload for EXGL fast paths
+      // Force non-DOM upload for EXGL texImage2D
       // @ts-ignore
       texture.isDataTexture = true;
       onLoad == null ? void 0 : onLoad(texture);
@@ -402,7 +405,7 @@ function polyfills() {
     return texture;
   };
 
-  // Fetches assets via XMLHttpRequest
+  // Fetches assets via FS
   THREE.FileLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
     if (this.path && typeof url === 'string') url = this.path + url;
     this.manager.itemStart(url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.15.0",
+  "version": "8.15.2",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",
@@ -44,6 +44,7 @@
   "dependencies": {
     "@babel/runtime": "^7.17.8",
     "@types/react-reconciler": "^0.26.7",
+    "@types/webxr": "*",
     "base64-js": "^1.5.1",
     "buffer": "^6.0.3",
     "its-fine": "^1.0.6",