@react-three/fiber 8.0.2 → 8.0.5

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @react-three/fiber
 
+## 8.0.5
+
+### Patch Changes
+
+- 227c328: fix pointer for root and portals
+
+## 8.0.4
+
+### Patch Changes
+
+- e981a72: fix: mock three color management, loosen peer dep
+
+## 8.0.3
+
+### Patch Changes
+
+- 3252aed: setevents needs to spread and be mirrored in portals
+
 ## 8.0.2
 
 ### Patch Changes

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

@@ -67,6 +67,7 @@ export declare type RootState = {
     controls: THREE.EventDispatcher | null;
     pointer: THREE.Vector2;
     mouse: THREE.Vector2;
+    legacy: boolean;
     linear: boolean;
     flat: boolean;
     frameloop: 'always' | 'demand' | 'never';
@@ -89,9 +90,9 @@ export declare type StoreProps = {
     gl: THREE.WebGLRenderer;
     size: Size;
     shadows?: boolean | Partial<THREE.WebGLShadowMap>;
+    legacy?: boolean;
     linear?: boolean;
     flat?: boolean;
-    legacy?: boolean;
     orthographic?: boolean;
     frameloop?: 'always' | 'demand' | 'never';
     performance?: Partial<Omit<Performance, 'regress'>>;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import * as THREE from 'three';
 import { EventHandlers } from './core/events';
 import { AttachType } from './core/renderer';

package/dist/{index-1a4e6043.cjs.prod.js → index-1ff856c3.cjs.prod.js}

@@ -334,10 +334,22 @@ function applyProps$1(instance, data) {
 
               if (!isColor && targetProp.setScalar) targetProp.setScalar(value); // Layers have no copy function, we must therefore copy the mask property
               else if (targetProp instanceof THREE__namespace.Layers && value instanceof THREE__namespace.Layers) targetProp.mask = value.mask; // Otherwise just set ...
-                else targetProp.set(value);
+                else targetProp.set(value); // For versions of three which don't support THREE.ColorManagement,
+              // Auto-convert sRGB colors
+              // https://github.com/pmndrs/react-three-fiber/issues/344
+
+              const supportsColorManagement = THREE__namespace.ColorManagement;
+              if (!supportsColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
             } // Else, just overwrite the value
 
-      } else currentInstance[key] = value;
+      } else {
+        currentInstance[key] = value; // Auto-convert sRGB textures, for now ...
+        // https://github.com/pmndrs/react-three-fiber/issues/344
+
+        if (!rootState.linear && currentInstance[key] instanceof THREE__namespace.Texture) {
+          currentInstance[key].encoding = THREE__namespace.sRGBEncoding;
+        }
+      }
 
     invalidateInstance(instance);
   });
@@ -468,7 +480,13 @@ function createEvents(store) {
       if (state) {
         state.raycaster.camera = undefined;
       }
-    }); // Collect events
+    });
+
+    if (!state.previousRoot) {
+      // Make sure root-level pointer and ray are set up
+      state.events.compute == null ? void 0 : state.events.compute(event, state);
+    } // Collect events
+
 
     let hits = eventsObjects // Intersect objects
     .flatMap(obj => {
@@ -1192,6 +1210,7 @@ const createStore = (invalidate, advance) => {
       xr: null,
       invalidate: () => invalidate(get()),
       advance: (timestamp, runGlobalEffects) => advance(timestamp, runGlobalEffects, get()),
+      legacy: false,
       linear: false,
       flat: false,
       scene: prepare(new THREE__namespace.Scene()),
@@ -1232,7 +1251,7 @@ const createStore = (invalidate, advance) => {
       },
       setEvents: events => set(state => ({ ...state,
         events: { ...state.events,
-          events
+          ...events
         }
       })),
       setSize: (width, height) => {
@@ -1689,7 +1708,17 @@ function createRoot(canvas) {
       const outputEncoding = linear ? THREE__namespace.LinearEncoding : THREE__namespace.sRGBEncoding;
       const toneMapping = flat ? THREE__namespace.NoToneMapping : THREE__namespace.ACESFilmicToneMapping;
       if (gl.outputEncoding !== outputEncoding) gl.outputEncoding = outputEncoding;
-      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Set gl props
+      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Update color management state
+
+      if (state.legacy !== legacy) state.set(() => ({
+        legacy
+      }));
+      if (state.linear !== linear) state.set(() => ({
+        linear
+      }));
+      if (state.flat !== flat) state.set(() => ({
+        flat
+      })); // Set gl props
 
       if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, gl, shallowLoose)) applyProps(gl, glConfig); // Store events internally
 
@@ -1826,6 +1855,7 @@ function Portal({
   } = state;
   const previousRoot = useStore();
   const [raycaster] = React__namespace.useState(() => new THREE__namespace.Raycaster());
+  const [pointer] = React__namespace.useState(() => new THREE__namespace.Vector2());
   const inject = React__namespace.useCallback((state, injectState) => {
     const intersect = { ...state
     };
@@ -1844,6 +1874,9 @@ function Portal({
       previousRoot,
       raycaster,
       events: { ...state.events,
+        ...(injectState == null ? void 0 : injectState.events),
+        pointer,
+        mouse: pointer,
         ...events
       },
       ...rest
@@ -1852,7 +1885,12 @@ function Portal({
   const [useInjectStore] = React__namespace.useState(() => {
     const store = create__default['default']((set, get) => ({ ...inject(previousRoot.getState()),
       set,
-      get
+      get,
+      setEvents: events => set(state => ({ ...state,
+        events: { ...state.events,
+          ...events
+        }
+      }))
     }));
     previousRoot.subscribe(state => useInjectStore.setState(injectState => inject(state, injectState)));
     return store;

package/dist/{index-2d896758.cjs.dev.js → index-28a77253.cjs.dev.js}

@@ -334,10 +334,22 @@ function applyProps$1(instance, data) {
 
               if (!isColor && targetProp.setScalar) targetProp.setScalar(value); // Layers have no copy function, we must therefore copy the mask property
               else if (targetProp instanceof THREE__namespace.Layers && value instanceof THREE__namespace.Layers) targetProp.mask = value.mask; // Otherwise just set ...
-                else targetProp.set(value);
+                else targetProp.set(value); // For versions of three which don't support THREE.ColorManagement,
+              // Auto-convert sRGB colors
+              // https://github.com/pmndrs/react-three-fiber/issues/344
+
+              const supportsColorManagement = THREE__namespace.ColorManagement;
+              if (!supportsColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
             } // Else, just overwrite the value
 
-      } else currentInstance[key] = value;
+      } else {
+        currentInstance[key] = value; // Auto-convert sRGB textures, for now ...
+        // https://github.com/pmndrs/react-three-fiber/issues/344
+
+        if (!rootState.linear && currentInstance[key] instanceof THREE__namespace.Texture) {
+          currentInstance[key].encoding = THREE__namespace.sRGBEncoding;
+        }
+      }
 
     invalidateInstance(instance);
   });
@@ -468,7 +480,13 @@ function createEvents(store) {
       if (state) {
         state.raycaster.camera = undefined;
       }
-    }); // Collect events
+    });
+
+    if (!state.previousRoot) {
+      // Make sure root-level pointer and ray are set up
+      state.events.compute == null ? void 0 : state.events.compute(event, state);
+    } // Collect events
+
 
     let hits = eventsObjects // Intersect objects
     .flatMap(obj => {
@@ -1192,6 +1210,7 @@ const createStore = (invalidate, advance) => {
       xr: null,
       invalidate: () => invalidate(get()),
       advance: (timestamp, runGlobalEffects) => advance(timestamp, runGlobalEffects, get()),
+      legacy: false,
       linear: false,
       flat: false,
       scene: prepare(new THREE__namespace.Scene()),
@@ -1232,7 +1251,7 @@ const createStore = (invalidate, advance) => {
       },
       setEvents: events => set(state => ({ ...state,
         events: { ...state.events,
-          events
+          ...events
         }
       })),
       setSize: (width, height) => {
@@ -1689,7 +1708,17 @@ function createRoot(canvas) {
       const outputEncoding = linear ? THREE__namespace.LinearEncoding : THREE__namespace.sRGBEncoding;
       const toneMapping = flat ? THREE__namespace.NoToneMapping : THREE__namespace.ACESFilmicToneMapping;
       if (gl.outputEncoding !== outputEncoding) gl.outputEncoding = outputEncoding;
-      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Set gl props
+      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Update color management state
+
+      if (state.legacy !== legacy) state.set(() => ({
+        legacy
+      }));
+      if (state.linear !== linear) state.set(() => ({
+        linear
+      }));
+      if (state.flat !== flat) state.set(() => ({
+        flat
+      })); // Set gl props
 
       if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, gl, shallowLoose)) applyProps(gl, glConfig); // Store events internally
 
@@ -1826,6 +1855,7 @@ function Portal({
   } = state;
   const previousRoot = useStore();
   const [raycaster] = React__namespace.useState(() => new THREE__namespace.Raycaster());
+  const [pointer] = React__namespace.useState(() => new THREE__namespace.Vector2());
   const inject = React__namespace.useCallback((state, injectState) => {
     const intersect = { ...state
     };
@@ -1844,6 +1874,9 @@ function Portal({
       previousRoot,
       raycaster,
       events: { ...state.events,
+        ...(injectState == null ? void 0 : injectState.events),
+        pointer,
+        mouse: pointer,
         ...events
       },
       ...rest
@@ -1852,7 +1885,12 @@ function Portal({
   const [useInjectStore] = React__namespace.useState(() => {
     const store = create__default['default']((set, get) => ({ ...inject(previousRoot.getState()),
       set,
-      get
+      get,
+      setEvents: events => set(state => ({ ...state,
+        events: { ...state.events,
+          ...events
+        }
+      }))
     }));
     previousRoot.subscribe(state => useInjectStore.setState(injectState => inject(state, injectState)));
     return store;

package/dist/{index-634e3679.esm.js → index-635ddfb2.esm.js}

@@ -305,10 +305,22 @@ function applyProps$1(instance, data) {
 
               if (!isColor && targetProp.setScalar) targetProp.setScalar(value); // Layers have no copy function, we must therefore copy the mask property
               else if (targetProp instanceof THREE.Layers && value instanceof THREE.Layers) targetProp.mask = value.mask; // Otherwise just set ...
-                else targetProp.set(value);
+                else targetProp.set(value); // For versions of three which don't support THREE.ColorManagement,
+              // Auto-convert sRGB colors
+              // https://github.com/pmndrs/react-three-fiber/issues/344
+
+              const supportsColorManagement = THREE.ColorManagement;
+              if (!supportsColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
             } // Else, just overwrite the value
 
-      } else currentInstance[key] = value;
+      } else {
+        currentInstance[key] = value; // Auto-convert sRGB textures, for now ...
+        // https://github.com/pmndrs/react-three-fiber/issues/344
+
+        if (!rootState.linear && currentInstance[key] instanceof THREE.Texture) {
+          currentInstance[key].encoding = THREE.sRGBEncoding;
+        }
+      }
 
     invalidateInstance(instance);
   });
@@ -439,7 +451,13 @@ function createEvents(store) {
       if (state) {
         state.raycaster.camera = undefined;
       }
-    }); // Collect events
+    });
+
+    if (!state.previousRoot) {
+      // Make sure root-level pointer and ray are set up
+      state.events.compute == null ? void 0 : state.events.compute(event, state);
+    } // Collect events
+
 
     let hits = eventsObjects // Intersect objects
     .flatMap(obj => {
@@ -1163,6 +1181,7 @@ const createStore = (invalidate, advance) => {
       xr: null,
       invalidate: () => invalidate(get()),
       advance: (timestamp, runGlobalEffects) => advance(timestamp, runGlobalEffects, get()),
+      legacy: false,
       linear: false,
       flat: false,
       scene: prepare(new THREE.Scene()),
@@ -1203,7 +1222,7 @@ const createStore = (invalidate, advance) => {
       },
       setEvents: events => set(state => ({ ...state,
         events: { ...state.events,
-          events
+          ...events
         }
       })),
       setSize: (width, height) => {
@@ -1660,7 +1679,17 @@ function createRoot(canvas) {
       const outputEncoding = linear ? THREE.LinearEncoding : THREE.sRGBEncoding;
       const toneMapping = flat ? THREE.NoToneMapping : THREE.ACESFilmicToneMapping;
       if (gl.outputEncoding !== outputEncoding) gl.outputEncoding = outputEncoding;
-      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Set gl props
+      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Update color management state
+
+      if (state.legacy !== legacy) state.set(() => ({
+        legacy
+      }));
+      if (state.linear !== linear) state.set(() => ({
+        linear
+      }));
+      if (state.flat !== flat) state.set(() => ({
+        flat
+      })); // Set gl props
 
       if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, gl, shallowLoose)) applyProps(gl, glConfig); // Store events internally
 
@@ -1797,6 +1826,7 @@ function Portal({
   } = state;
   const previousRoot = useStore();
   const [raycaster] = React.useState(() => new THREE.Raycaster());
+  const [pointer] = React.useState(() => new THREE.Vector2());
   const inject = React.useCallback((state, injectState) => {
     const intersect = { ...state
     };
@@ -1815,6 +1845,9 @@ function Portal({
       previousRoot,
       raycaster,
       events: { ...state.events,
+        ...(injectState == null ? void 0 : injectState.events),
+        pointer,
+        mouse: pointer,
         ...events
       },
       ...rest
@@ -1823,7 +1856,12 @@ function Portal({
   const [useInjectStore] = React.useState(() => {
     const store = create((set, get) => ({ ...inject(previousRoot.getState()),
       set,
-      get
+      get,
+      setEvents: events => set(state => ({ ...state,
+        events: { ...state.events,
+          ...events
+        }
+      }))
     }));
     previousRoot.subscribe(state => useInjectStore.setState(injectState => inject(state, injectState)));
     return store;

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-2d896758.cjs.dev.js');
+var index = require('./index-28a77253.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -117,7 +117,7 @@ function createPointerEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-1a4e6043.cjs.prod.js');
+var index = require('./index-1ff856c3.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -117,7 +117,7 @@ function createPointerEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

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

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from './index-634e3679.esm.js';
-export { t as ReactThreeFiber, v as _roots, s as act, m as addAfterEffect, l as addEffect, n as addTail, k as advance, h as applyProps, d as context, f as createPortal, a as createRoot, i as dispose, e as extend, q as getRootState, j as invalidate, g as reconciler, r as render, b as unmountComponentAtNode, y as useFrame, z as useGraph, A as useLoader, u as useMemoizedFn, w as useStore, x as useThree } from './index-634e3679.esm.js';
+import { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from './index-635ddfb2.esm.js';
+export { t as ReactThreeFiber, v as _roots, s as act, m as addAfterEffect, l as addEffect, n as addTail, k as advance, h as applyProps, d as context, f as createPortal, a as createRoot, i as dispose, e as extend, q as getRootState, j as invalidate, g as reconciler, r as render, b as unmountComponentAtNode, y as useFrame, z as useGraph, A as useLoader, u as useMemoizedFn, w as useStore, x as useThree } from './index-635ddfb2.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
@@ -87,7 +87,7 @@ function createPointerEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var THREE = require('three');
 var expoAsset = require('expo-asset');
-var index = require('../../dist/index-2d896758.cjs.dev.js');
+var index = require('../../dist/index-28a77253.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var mergeRefs = require('react-merge-refs');
@@ -125,7 +125,7 @@ function createTouchEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var THREE = require('three');
 var expoAsset = require('expo-asset');
-var index = require('../../dist/index-1a4e6043.cjs.prod.js');
+var index = require('../../dist/index-1ff856c3.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var mergeRefs = require('react-merge-refs');
@@ -125,7 +125,7 @@ function createTouchEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

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

@@ -1,7 +1,7 @@
 import * as THREE from 'three';
 import { Asset } from 'expo-asset';
-import { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from '../../dist/index-634e3679.esm.js';
-export { t as ReactThreeFiber, v as _roots, s as act, m as addAfterEffect, l as addEffect, n as addTail, k as advance, h as applyProps, d as context, f as createPortal, a as createRoot, i as dispose, e as extend, q as getRootState, j as invalidate, g as reconciler, r as render, b as unmountComponentAtNode, y as useFrame, z as useGraph, A as useLoader, u as useMemoizedFn, w as useStore, x as useThree } from '../../dist/index-634e3679.esm.js';
+import { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from '../../dist/index-635ddfb2.esm.js';
+export { t as ReactThreeFiber, v as _roots, s as act, m as addAfterEffect, l as addEffect, n as addTail, k as advance, h as applyProps, d as context, f as createPortal, a as createRoot, i as dispose, e as extend, q as getRootState, j as invalidate, g as reconciler, r as render, b as unmountComponentAtNode, y as useFrame, z as useGraph, A as useLoader, u as useMemoizedFn, w as useStore, x as useThree } from '../../dist/index-635ddfb2.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import mergeRefs from 'react-merge-refs';
@@ -95,7 +95,7 @@ function createTouchEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.0.2",
+  "version": "8.0.5",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",
@@ -58,7 +58,7 @@
     "react": ">=18.0",
     "react-dom": ">=18.0",
     "react-native": ">=0.64",
-    "three": ">=0.139"
+    "three": ">=0.133"
   },
   "peerDependenciesMeta": {
     "react-dom": {