@react-three/fiber 8.12.2 → 8.13.0

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

@@ -1,11 +1,13 @@
-import * as React from 'react';
-import type { Options as ResizeOptions } from 'react-use-measure';
-import { RenderProps } from '../core';
-export interface Props extends Omit<RenderProps<HTMLCanvasElement>, 'size'>, React.HTMLAttributes<HTMLDivElement> {
-    children: React.ReactNode;
-    fallback?: React.ReactNode;
-    resize?: ResizeOptions;
-    eventSource?: HTMLElement | React.MutableRefObject<HTMLElement>;
-    eventPrefix?: 'offset' | 'client' | 'page' | 'layer' | 'screen';
-}
-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 { RenderProps } from '../core';
+export interface CanvasProps extends Omit<RenderProps<HTMLCanvasElement>, 'size'>, React.HTMLAttributes<HTMLDivElement> {
+    children: React.ReactNode;
+    fallback?: React.ReactNode;
+    resize?: ResizeOptions;
+    eventSource?: HTMLElement | React.MutableRefObject<HTMLElement>;
+    eventPrefix?: 'offset' | 'client' | 'page' | 'layer' | 'screen';
+}
+export interface Props extends CanvasProps {
+}
+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-21bbaaf9.esm.js → index-22ee0173.esm.js}

@@ -350,6 +350,10 @@ function createRenderer(_roots, _getEventPriority) {
 }
 
 var _window$document, _window$navigator;
+/**
+ * Returns `true` with correct TS type inference if an object has a configurable color space (since r152).
+ */
+const hasColorSpace = object => 'colorSpace' in object || 'outputColorSpace' in object;
 /**
  * The current THREE.ColorManagement instance, if present.
  */
@@ -635,6 +639,21 @@ function applyProps$1(instance, data) {
   if (instance.__r3f) instance.__r3f.memoizedProps = memoized;
   for (let i = 0; i < changes.length; i++) {
     let [key, value, isEvent, keys] = changes[i];
+
+    // Alias (output)encoding => (output)colorSpace (since r152)
+    // https://github.com/pmndrs/react-three-fiber/pull/2829
+    if (hasColorSpace(instance)) {
+      const sRGBEncoding = 3001;
+      const SRGBColorSpace = 'srgb';
+      const LinearSRGBColorSpace = 'srgb-linear';
+      if (key === 'encoding') {
+        key = 'colorSpace';
+        value = value === sRGBEncoding ? SRGBColorSpace : LinearSRGBColorSpace;
+      } else if (key === 'outputEncoding') {
+        key = 'outputColorSpace';
+        value = value === sRGBEncoding ? SRGBColorSpace : LinearSRGBColorSpace;
+      }
+    }
     let currentInstance = instance;
     let targetProp = currentInstance[key];
 
@@ -703,12 +722,14 @@ function applyProps$1(instance, data) {
       // Else, just overwrite the 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 &&
+      if (currentInstance[key] instanceof THREE.Texture &&
       // sRGB textures must be RGBA8 since r137 https://github.com/mrdoob/three.js/pull/23129
       currentInstance[key].format === THREE.RGBAFormat && currentInstance[key].type === THREE.UnsignedByteType) {
-        currentInstance[key].encoding = THREE.sRGBEncoding;
+        const texture = currentInstance[key];
+        if (hasColorSpace(texture) && hasColorSpace(rootState.gl)) texture.colorSpace = rootState.gl.outputColorSpace;else texture.encoding = rootState.gl.outputEncoding;
       }
     }
     invalidateInstance(instance);
@@ -1888,10 +1909,14 @@ function createRoot(canvas) {
       if (ColorManagement) {
         if ('enabled' in ColorManagement) ColorManagement.enabled = !legacy;else if ('legacyMode' in ColorManagement) 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 color space and tonemapping preferences
+      const LinearEncoding = 3000;
+      const sRGBEncoding = 3001;
+      applyProps(gl, {
+        outputEncoding: linear ? LinearEncoding : sRGBEncoding,
+        toneMapping: flat ? THREE.NoToneMapping : THREE.ACESFilmicToneMapping
+      });
 
       // Update color management state
       if (state.legacy !== legacy) state.set(() => ({

package/dist/{index-1fcbd5a8.cjs.prod.js → index-ed22818c.cjs.prod.js}

@@ -377,6 +377,10 @@ function createRenderer(_roots, _getEventPriority) {
 }
 
 var _window$document, _window$navigator;
+/**
+ * Returns `true` with correct TS type inference if an object has a configurable color space (since r152).
+ */
+const hasColorSpace = object => 'colorSpace' in object || 'outputColorSpace' in object;
 /**
  * The current THREE.ColorManagement instance, if present.
  */
@@ -662,6 +666,21 @@ function applyProps$1(instance, data) {
   if (instance.__r3f) instance.__r3f.memoizedProps = memoized;
   for (let i = 0; i < changes.length; i++) {
     let [key, value, isEvent, keys] = changes[i];
+
+    // Alias (output)encoding => (output)colorSpace (since r152)
+    // https://github.com/pmndrs/react-three-fiber/pull/2829
+    if (hasColorSpace(instance)) {
+      const sRGBEncoding = 3001;
+      const SRGBColorSpace = 'srgb';
+      const LinearSRGBColorSpace = 'srgb-linear';
+      if (key === 'encoding') {
+        key = 'colorSpace';
+        value = value === sRGBEncoding ? SRGBColorSpace : LinearSRGBColorSpace;
+      } else if (key === 'outputEncoding') {
+        key = 'outputColorSpace';
+        value = value === sRGBEncoding ? SRGBColorSpace : LinearSRGBColorSpace;
+      }
+    }
     let currentInstance = instance;
     let targetProp = currentInstance[key];
 
@@ -730,12 +749,14 @@ function applyProps$1(instance, data) {
       // Else, just overwrite the 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 &&
+      if (currentInstance[key] instanceof THREE__namespace.Texture &&
       // sRGB textures must be RGBA8 since r137 https://github.com/mrdoob/three.js/pull/23129
       currentInstance[key].format === THREE__namespace.RGBAFormat && currentInstance[key].type === THREE__namespace.UnsignedByteType) {
-        currentInstance[key].encoding = THREE__namespace.sRGBEncoding;
+        const texture = currentInstance[key];
+        if (hasColorSpace(texture) && hasColorSpace(rootState.gl)) texture.colorSpace = rootState.gl.outputColorSpace;else texture.encoding = rootState.gl.outputEncoding;
       }
     }
     invalidateInstance(instance);
@@ -1915,10 +1936,14 @@ function createRoot(canvas) {
       if (ColorManagement) {
         if ('enabled' in ColorManagement) ColorManagement.enabled = !legacy;else if ('legacyMode' in ColorManagement) 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 color space and tonemapping preferences
+      const LinearEncoding = 3000;
+      const sRGBEncoding = 3001;
+      applyProps(gl, {
+        outputEncoding: linear ? LinearEncoding : sRGBEncoding,
+        toneMapping: flat ? THREE__namespace.NoToneMapping : THREE__namespace.ACESFilmicToneMapping
+      });
 
       // Update color management state
       if (state.legacy !== legacy) state.set(() => ({

package/dist/{index-ab4b9c97.cjs.dev.js → index-f4b96a62.cjs.dev.js}

@@ -377,6 +377,10 @@ function createRenderer(_roots, _getEventPriority) {
 }
 
 var _window$document, _window$navigator;
+/**
+ * Returns `true` with correct TS type inference if an object has a configurable color space (since r152).
+ */
+const hasColorSpace = object => 'colorSpace' in object || 'outputColorSpace' in object;
 /**
  * The current THREE.ColorManagement instance, if present.
  */
@@ -662,6 +666,21 @@ function applyProps$1(instance, data) {
   if (instance.__r3f) instance.__r3f.memoizedProps = memoized;
   for (let i = 0; i < changes.length; i++) {
     let [key, value, isEvent, keys] = changes[i];
+
+    // Alias (output)encoding => (output)colorSpace (since r152)
+    // https://github.com/pmndrs/react-three-fiber/pull/2829
+    if (hasColorSpace(instance)) {
+      const sRGBEncoding = 3001;
+      const SRGBColorSpace = 'srgb';
+      const LinearSRGBColorSpace = 'srgb-linear';
+      if (key === 'encoding') {
+        key = 'colorSpace';
+        value = value === sRGBEncoding ? SRGBColorSpace : LinearSRGBColorSpace;
+      } else if (key === 'outputEncoding') {
+        key = 'outputColorSpace';
+        value = value === sRGBEncoding ? SRGBColorSpace : LinearSRGBColorSpace;
+      }
+    }
     let currentInstance = instance;
     let targetProp = currentInstance[key];
 
@@ -730,12 +749,14 @@ function applyProps$1(instance, data) {
       // Else, just overwrite the 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 &&
+      if (currentInstance[key] instanceof THREE__namespace.Texture &&
       // sRGB textures must be RGBA8 since r137 https://github.com/mrdoob/three.js/pull/23129
       currentInstance[key].format === THREE__namespace.RGBAFormat && currentInstance[key].type === THREE__namespace.UnsignedByteType) {
-        currentInstance[key].encoding = THREE__namespace.sRGBEncoding;
+        const texture = currentInstance[key];
+        if (hasColorSpace(texture) && hasColorSpace(rootState.gl)) texture.colorSpace = rootState.gl.outputColorSpace;else texture.encoding = rootState.gl.outputEncoding;
       }
     }
     invalidateInstance(instance);
@@ -1915,10 +1936,14 @@ function createRoot(canvas) {
       if (ColorManagement) {
         if ('enabled' in ColorManagement) ColorManagement.enabled = !legacy;else if ('legacyMode' in ColorManagement) 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 color space and tonemapping preferences
+      const LinearEncoding = 3000;
+      const sRGBEncoding = 3001;
+      applyProps(gl, {
+        outputEncoding: linear ? LinearEncoding : sRGBEncoding,
+        toneMapping: flat ? THREE__namespace.NoToneMapping : THREE__namespace.ACESFilmicToneMapping
+      });
 
       // Update color management state
       if (state.legacy !== legacy) state.set(() => ({

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-ab4b9c97.cjs.dev.js');
+var index = require('./index-f4b96a62.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-1fcbd5a8.cjs.prod.js');
+var index = require('./index-ed22818c.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-21bbaaf9.esm.js';
-export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, 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, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from './index-21bbaaf9.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-22ee0173.esm.js';
+export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, 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, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from './index-22ee0173.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-ab4b9c97.cjs.dev.js');
+var index = require('../../dist/index-f4b96a62.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

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-1fcbd5a8.cjs.prod.js');
+var index = require('../../dist/index-ed22818c.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

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-21bbaaf9.esm.js';
-export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, 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, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from '../../dist/index-21bbaaf9.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-22ee0173.esm.js';
+export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, 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, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from '../../dist/index-22ee0173.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.12.2",
+  "version": "8.13.0",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",