@react-three/fiber 8.0.1 → 8.0.4

package/dist/declarations/src/web/Canvas.d.ts

@@ -1,13 +1,13 @@
-import * as React from 'react';
-import type { Options as ResizeOptions } from 'react-use-measure';
-import { UseBoundStore } from 'zustand';
-import { RenderProps } from '../core';
-import { RootState } from '../core/store';
-import { EventManager } from '../core/events';
-export interface Props extends Omit<RenderProps<HTMLCanvasElement>, 'size' | 'events'>, React.HTMLAttributes<HTMLDivElement> {
-    children: React.ReactNode;
-    fallback?: React.ReactNode;
-    resize?: ResizeOptions;
-    events?: (store: UseBoundStore<RootState>) => EventManager<any>;
-}
-export declare const Canvas: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLCanvasElement>>;
+import * as React from 'react';
+import type { Options as ResizeOptions } from 'react-use-measure';
+import { UseBoundStore } from 'zustand';
+import { RenderProps } from '../core';
+import { RootState } from '../core/store';
+import { EventManager } from '../core/events';
+export interface Props extends Omit<RenderProps<HTMLCanvasElement>, 'size' | 'events'>, React.HTMLAttributes<HTMLDivElement> {
+    children: React.ReactNode;
+    fallback?: React.ReactNode;
+    resize?: ResizeOptions;
+    events?: (store: UseBoundStore<RootState>) => EventManager<any>;
+}
+export declare const Canvas: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLCanvasElement>>;

package/dist/declarations/src/web/events.d.ts

@@ -1,4 +1,4 @@
-import { UseBoundStore } from 'zustand';
-import { RootState } from '../core/store';
-import { EventManager } from '../core/events';
-export declare function createPointerEvents(store: UseBoundStore<RootState>): EventManager<HTMLElement>;
+import { UseBoundStore } from 'zustand';
+import { RootState } from '../core/store';
+import { EventManager } from '../core/events';
+export declare function createPointerEvents(store: UseBoundStore<RootState>): EventManager<HTMLElement>;

package/dist/{index-a8a84b79.cjs.prod.js → index-227921b7.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);
   });
@@ -1192,6 +1204,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 +1245,7 @@ const createStore = (invalidate, advance) => {
       },
       setEvents: events => set(state => ({ ...state,
         events: { ...state.events,
-          events
+          ...events
         }
       })),
       setSize: (width, height) => {
@@ -1683,13 +1696,23 @@ function createRoot(canvas) {
 
 
       if (THREE__namespace.ColorManagement) {
-        THREE__namespace.ColorManagement.legacyMode = !legacy;
+        THREE__namespace.ColorManagement.legacyMode = legacy;
       }
 
       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
 
@@ -1844,6 +1867,7 @@ function Portal({
       previousRoot,
       raycaster,
       events: { ...state.events,
+        ...(injectState == null ? void 0 : injectState.events),
         ...events
       },
       ...rest
@@ -1852,7 +1876,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-56f220df.cjs.dev.js → index-6cf8dd4b.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);
   });
@@ -1192,6 +1204,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 +1245,7 @@ const createStore = (invalidate, advance) => {
       },
       setEvents: events => set(state => ({ ...state,
         events: { ...state.events,
-          events
+          ...events
         }
       })),
       setSize: (width, height) => {
@@ -1683,13 +1696,23 @@ function createRoot(canvas) {
 
 
       if (THREE__namespace.ColorManagement) {
-        THREE__namespace.ColorManagement.legacyMode = !legacy;
+        THREE__namespace.ColorManagement.legacyMode = legacy;
       }
 
       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
 
@@ -1844,6 +1867,7 @@ function Portal({
       previousRoot,
       raycaster,
       events: { ...state.events,
+        ...(injectState == null ? void 0 : injectState.events),
         ...events
       },
       ...rest
@@ -1852,7 +1876,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-2de459e5.esm.js → index-de9e845e.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);
   });
@@ -1163,6 +1175,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 +1216,7 @@ const createStore = (invalidate, advance) => {
       },
       setEvents: events => set(state => ({ ...state,
         events: { ...state.events,
-          events
+          ...events
         }
       })),
       setSize: (width, height) => {
@@ -1654,13 +1667,23 @@ function createRoot(canvas) {
 
 
       if (THREE.ColorManagement) {
-        THREE.ColorManagement.legacyMode = !legacy;
+        THREE.ColorManagement.legacyMode = legacy;
       }
 
       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
 
@@ -1815,6 +1838,7 @@ function Portal({
       previousRoot,
       raycaster,
       events: { ...state.events,
+        ...(injectState == null ? void 0 : injectState.events),
         ...events
       },
       ...rest
@@ -1823,7 +1847,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-56f220df.cjs.dev.js');
+var index = require('./index-6cf8dd4b.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-a8a84b79.cjs.prod.js');
+var index = require('./index-227921b7.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-2de459e5.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-2de459e5.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-de9e845e.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-de9e845e.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-56f220df.cjs.dev.js');
+var index = require('../../dist/index-6cf8dd4b.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-a8a84b79.cjs.prod.js');
+var index = require('../../dist/index-227921b7.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-2de459e5.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-2de459e5.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-de9e845e.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-de9e845e.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.1",
+  "version": "8.0.4",
   "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": {