@react-three/fiber 8.11.1 → 8.11.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @react-three/fiber
 
+## 8.11.3
+
+### Patch Changes
+
+- 2bce569c: fix: progressively set colormanagement
+
+## 8.11.2
+
+### Patch Changes
+
+- 41d655cd: fix: hmr, srgb encode
+
 ## 8.11.1
 
 ### Patch Changes

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

@@ -2,6 +2,12 @@ import * as THREE from 'three';
 import * as React from 'react';
 import { AttachType, Instance, InstanceProps, LocalState } from './renderer';
 import { Dpr, RootState, Size } from './store';
+export declare type ColorManagementRepresentation = {
+    enabled: boolean | never;
+} | {
+    legacyMode: boolean | never;
+};
+export declare const ColorManagement: ColorManagementRepresentation | null;
 export declare type Camera = THREE.OrthographicCamera | THREE.PerspectiveCamera;
 export declare const isOrthographicCamera: (def: Camera) => def is THREE.OrthographicCamera;
 export declare const isRef: (obj: any) => obj is React.MutableRefObject<unknown>;
@@ -29,6 +35,7 @@ export declare class ErrorBoundary extends React.Component<{
     render(): React.ReactNode;
 }
 export declare const DEFAULT = "__default";
+export declare const DEFAULTS: Map<any, any>;
 export declare type DiffSet = {
     memoized: {
         [key: string]: any;
@@ -80,4 +87,3 @@ export declare function updateInstance(instance: Instance): void;
 export declare function updateCamera(camera: Camera & {
     manual?: boolean;
 }, size: Size): void;
-export declare function setDeep(obj: any, value: any, keys: string[]): any;

package/dist/{index-73d51a81.esm.js → index-606e613e.esm.js}

@@ -11,6 +11,14 @@ var threeTypes = /*#__PURE__*/Object.freeze({
 });
 
 var _window$document, _window$navigator;
+/**
+ * Safely accesses a deeply-nested value on an object to get around static bundler analysis.
+ */
+const getDeep = (obj, ...keys) => keys.reduce((acc, key) => acc == null ? void 0 : acc[key], obj);
+/**
+ * The current THREE.ColorManagement instance, if present.
+ */
+const ColorManagement = 'ColorManagement' in THREE && getDeep(THREE, 'ColorManagement') || null;
 const isOrthographicCamera = def => def && def.isOrthographicCamera;
 const isRef = obj => obj && obj.hasOwnProperty('current');
 
@@ -56,6 +64,7 @@ ErrorBoundary.getDerivedStateFromError = () => ({
   error: true
 });
 const DEFAULT = '__default';
+const DEFAULTS = new Map();
 const isDiffSet = def => def && !!def.memoized && !!def.changes;
 function calculateDpr(dpr) {
   const target = typeof window !== 'undefined' ? window.devicePixelRatio : 1;
@@ -293,13 +302,14 @@ function applyProps$1(instance, data) {
     // For removed props, try to set default values, if possible
     if (value === DEFAULT + 'remove') {
       if (currentInstance.constructor) {
-        var _currentInstance$__r;
         // create a blank slate of the instance and copy the particular parameter.
-        // @ts-ignore
-        const defaultClassCall = new currentInstance.constructor(...((_currentInstance$__r = currentInstance.__r3f.memoizedProps.args) != null ? _currentInstance$__r : []));
-        value = defaultClassCall[key];
-        // destroy the instance
-        if (defaultClassCall.dispose) defaultClassCall.dispose();
+        let ctor = DEFAULTS.get(currentInstance.constructor);
+        if (!ctor) {
+          // @ts-ignore
+          ctor = new currentInstance.constructor();
+          DEFAULTS.set(currentInstance.constructor, ctor);
+        }
+        value = ctor[key];
       } else {
         // instance does not have constructor, just set it to 0
         value = 0;
@@ -318,7 +328,7 @@ function applyProps$1(instance, data) {
         if (targetProp.fromArray) targetProp.fromArray(value);else targetProp.set(...value);
       }
       // Test again target.copy(class) next ...
-      else if (targetProp.copy && value && value.constructor && targetProp.constructor.name === value.constructor.name) {
+      else if (targetProp.copy && value && value.constructor && targetProp.constructor === value.constructor) {
         targetProp.copy(value);
       }
       // If nothing else fits, just set the single value, ignore undefined
@@ -334,15 +344,16 @@ function applyProps$1(instance, data) {
         // 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 = ('ColorManagement' in THREE);
-        if (!supportsColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
+        if (!ColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
       }
       // 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 (!rootState.linear && 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;
       }
     }
@@ -389,15 +400,6 @@ function updateCamera(camera, size) {
   }
 }
 
-/**
- * Safely sets a deeply-nested value on an object.
- */
-function setDeep(obj, value, keys) {
-  const key = keys.pop();
-  const target = keys.reduce((acc, key) => acc[key], obj);
-  return target[key] = value;
-}
-
 function makeId(event) {
   return (event.eventObject || event.object).uuid + '/' + event.index + event.instanceId;
 }
@@ -1826,8 +1828,8 @@ function createRoot(canvas) {
 
       // Safely set color management if available.
       // Avoid accessing THREE.ColorManagement to play nice with older versions
-      if ('ColorManagement' in THREE) {
-        setDeep(THREE, legacy, ['ColorManagement', 'legacyMode']);
+      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;

package/dist/{index-d9aa5cee.cjs.dev.js → index-e172420e.cjs.dev.js}

@@ -38,6 +38,14 @@ var threeTypes = /*#__PURE__*/Object.freeze({
 });
 
 var _window$document, _window$navigator;
+/**
+ * Safely accesses a deeply-nested value on an object to get around static bundler analysis.
+ */
+const getDeep = (obj, ...keys) => keys.reduce((acc, key) => acc == null ? void 0 : acc[key], obj);
+/**
+ * The current THREE.ColorManagement instance, if present.
+ */
+const ColorManagement = 'ColorManagement' in THREE__namespace && getDeep(THREE__namespace, 'ColorManagement') || null;
 const isOrthographicCamera = def => def && def.isOrthographicCamera;
 const isRef = obj => obj && obj.hasOwnProperty('current');
 
@@ -83,6 +91,7 @@ ErrorBoundary.getDerivedStateFromError = () => ({
   error: true
 });
 const DEFAULT = '__default';
+const DEFAULTS = new Map();
 const isDiffSet = def => def && !!def.memoized && !!def.changes;
 function calculateDpr(dpr) {
   const target = typeof window !== 'undefined' ? window.devicePixelRatio : 1;
@@ -320,13 +329,14 @@ function applyProps$1(instance, data) {
     // For removed props, try to set default values, if possible
     if (value === DEFAULT + 'remove') {
       if (currentInstance.constructor) {
-        var _currentInstance$__r;
         // create a blank slate of the instance and copy the particular parameter.
-        // @ts-ignore
-        const defaultClassCall = new currentInstance.constructor(...((_currentInstance$__r = currentInstance.__r3f.memoizedProps.args) != null ? _currentInstance$__r : []));
-        value = defaultClassCall[key];
-        // destroy the instance
-        if (defaultClassCall.dispose) defaultClassCall.dispose();
+        let ctor = DEFAULTS.get(currentInstance.constructor);
+        if (!ctor) {
+          // @ts-ignore
+          ctor = new currentInstance.constructor();
+          DEFAULTS.set(currentInstance.constructor, ctor);
+        }
+        value = ctor[key];
       } else {
         // instance does not have constructor, just set it to 0
         value = 0;
@@ -345,7 +355,7 @@ function applyProps$1(instance, data) {
         if (targetProp.fromArray) targetProp.fromArray(value);else targetProp.set(...value);
       }
       // Test again target.copy(class) next ...
-      else if (targetProp.copy && value && value.constructor && targetProp.constructor.name === value.constructor.name) {
+      else if (targetProp.copy && value && value.constructor && targetProp.constructor === value.constructor) {
         targetProp.copy(value);
       }
       // If nothing else fits, just set the single value, ignore undefined
@@ -361,15 +371,16 @@ function applyProps$1(instance, data) {
         // 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 = ('ColorManagement' in THREE__namespace);
-        if (!supportsColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
+        if (!ColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
       }
       // 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 (!rootState.linear && 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;
       }
     }
@@ -416,15 +427,6 @@ function updateCamera(camera, size) {
   }
 }
 
-/**
- * Safely sets a deeply-nested value on an object.
- */
-function setDeep(obj, value, keys) {
-  const key = keys.pop();
-  const target = keys.reduce((acc, key) => acc[key], obj);
-  return target[key] = value;
-}
-
 function makeId(event) {
   return (event.eventObject || event.object).uuid + '/' + event.index + event.instanceId;
 }
@@ -1853,8 +1855,8 @@ function createRoot(canvas) {
 
       // Safely set color management if available.
       // Avoid accessing THREE.ColorManagement to play nice with older versions
-      if ('ColorManagement' in THREE__namespace) {
-        setDeep(THREE__namespace, legacy, ['ColorManagement', 'legacyMode']);
+      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;

package/dist/{index-2929b2e6.cjs.prod.js → index-e8867c70.cjs.prod.js}

@@ -38,6 +38,14 @@ var threeTypes = /*#__PURE__*/Object.freeze({
 });
 
 var _window$document, _window$navigator;
+/**
+ * Safely accesses a deeply-nested value on an object to get around static bundler analysis.
+ */
+const getDeep = (obj, ...keys) => keys.reduce((acc, key) => acc == null ? void 0 : acc[key], obj);
+/**
+ * The current THREE.ColorManagement instance, if present.
+ */
+const ColorManagement = 'ColorManagement' in THREE__namespace && getDeep(THREE__namespace, 'ColorManagement') || null;
 const isOrthographicCamera = def => def && def.isOrthographicCamera;
 const isRef = obj => obj && obj.hasOwnProperty('current');
 
@@ -83,6 +91,7 @@ ErrorBoundary.getDerivedStateFromError = () => ({
   error: true
 });
 const DEFAULT = '__default';
+const DEFAULTS = new Map();
 const isDiffSet = def => def && !!def.memoized && !!def.changes;
 function calculateDpr(dpr) {
   const target = typeof window !== 'undefined' ? window.devicePixelRatio : 1;
@@ -320,13 +329,14 @@ function applyProps$1(instance, data) {
     // For removed props, try to set default values, if possible
     if (value === DEFAULT + 'remove') {
       if (currentInstance.constructor) {
-        var _currentInstance$__r;
         // create a blank slate of the instance and copy the particular parameter.
-        // @ts-ignore
-        const defaultClassCall = new currentInstance.constructor(...((_currentInstance$__r = currentInstance.__r3f.memoizedProps.args) != null ? _currentInstance$__r : []));
-        value = defaultClassCall[key];
-        // destroy the instance
-        if (defaultClassCall.dispose) defaultClassCall.dispose();
+        let ctor = DEFAULTS.get(currentInstance.constructor);
+        if (!ctor) {
+          // @ts-ignore
+          ctor = new currentInstance.constructor();
+          DEFAULTS.set(currentInstance.constructor, ctor);
+        }
+        value = ctor[key];
       } else {
         // instance does not have constructor, just set it to 0
         value = 0;
@@ -345,7 +355,7 @@ function applyProps$1(instance, data) {
         if (targetProp.fromArray) targetProp.fromArray(value);else targetProp.set(...value);
       }
       // Test again target.copy(class) next ...
-      else if (targetProp.copy && value && value.constructor && targetProp.constructor.name === value.constructor.name) {
+      else if (targetProp.copy && value && value.constructor && targetProp.constructor === value.constructor) {
         targetProp.copy(value);
       }
       // If nothing else fits, just set the single value, ignore undefined
@@ -361,15 +371,16 @@ function applyProps$1(instance, data) {
         // 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 = ('ColorManagement' in THREE__namespace);
-        if (!supportsColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
+        if (!ColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
       }
       // 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 (!rootState.linear && 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;
       }
     }
@@ -416,15 +427,6 @@ function updateCamera(camera, size) {
   }
 }
 
-/**
- * Safely sets a deeply-nested value on an object.
- */
-function setDeep(obj, value, keys) {
-  const key = keys.pop();
-  const target = keys.reduce((acc, key) => acc[key], obj);
-  return target[key] = value;
-}
-
 function makeId(event) {
   return (event.eventObject || event.object).uuid + '/' + event.index + event.instanceId;
 }
@@ -1853,8 +1855,8 @@ function createRoot(canvas) {
 
       // Safely set color management if available.
       // Avoid accessing THREE.ColorManagement to play nice with older versions
-      if ('ColorManagement' in THREE__namespace) {
-        setDeep(THREE__namespace, legacy, ['ColorManagement', 'legacyMode']);
+      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;

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-d9aa5cee.cjs.dev.js');
+var index = require('./index-e172420e.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-2929b2e6.cjs.prod.js');
+var index = require('./index-e8867c70.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 createRoot, i as isRef, E as ErrorBoundary, B as Block, b as useIsomorphicLayoutEffect, d as unmountComponentAtNode } from './index-73d51a81.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, a 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-73d51a81.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, a as createRoot, i as isRef, E as ErrorBoundary, B as Block, b as useIsomorphicLayoutEffect, d as unmountComponentAtNode } from './index-606e613e.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, a 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-606e613e.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-d9aa5cee.cjs.dev.js');
+var index = require('../../dist/index-e172420e.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-2929b2e6.cjs.prod.js');
+var index = require('../../dist/index-e8867c70.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, a as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-73d51a81.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, a 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-73d51a81.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, a as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-606e613e.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, a 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-606e613e.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.11.1",
+  "version": "8.11.3",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",