@react-three/fiber 7.0.24 → 7.0.25

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @react-three/fiber
 
+## 7.0.25
+
+### Patch Changes
+
+- 8698734: Release latest patches
+
 ## 7.0.24
 
 ### Patch Changes

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

@@ -27,7 +27,10 @@ export interface NodeProps<T, P> {
     key?: React.Key;
     onUpdate?: (self: T) => void;
 }
-export declare type Node<T, P> = Overwrite<Partial<T>, NodeProps<T, P>>;
+export declare type ExtendedColors<T> = {
+    [K in keyof T]: T[K] extends THREE.Color | undefined ? Color : T[K];
+};
+export declare type Node<T, P> = ExtendedColors<Overwrite<Partial<T>, NodeProps<T, P>>>;
 export declare type Object3DNode<T, P> = Overwrite<Node<T, P>, {
     position?: Vector3;
     up?: Vector3;
@@ -38,13 +41,9 @@ export declare type Object3DNode<T, P> = Overwrite<Node<T, P>, {
     layers?: Layers;
     dispose?: (() => void) | null;
 }> & EventHandlers;
-export declare type BufferGeometryNode<T extends THREE.BufferGeometry, P> = Overwrite<Node<T, P>, {}>;
-export declare type MaterialNode<T extends THREE.Material, P> = Overwrite<Node<T, P>, {
-    color?: Color;
-}>;
-export declare type LightNode<T extends THREE.Light, P> = Overwrite<Object3DNode<T, P>, {
-    color?: Color;
-}>;
+export declare type BufferGeometryNode<T extends THREE.BufferGeometry, P> = Node<T, P>;
+export declare type MaterialNode<T extends THREE.Material, P> = Node<T, P>;
+export declare type LightNode<T extends THREE.Light, P> = Object3DNode<T, P>;
 export declare type AudioListenerProps = Object3DNode<THREE.AudioListener, typeof THREE.AudioListener>;
 export declare type PositionalAudioProps = Object3DNode<THREE.PositionalAudio, typeof THREE.PositionalAudio>;
 export declare type MeshProps = Object3DNode<THREE.Mesh, typeof THREE.Mesh>;
@@ -75,19 +74,16 @@ export declare type ExtrudeBufferGeometryProps = BufferGeometryNode<THREE.Extrud
 export declare type IcosahedronBufferGeometryProps = BufferGeometryNode<THREE.IcosahedronBufferGeometry, typeof THREE.IcosahedronBufferGeometry>;
 export declare type LatheBufferGeometryProps = BufferGeometryNode<THREE.LatheBufferGeometry, typeof THREE.LatheBufferGeometry>;
 export declare type OctahedronBufferGeometryProps = BufferGeometryNode<THREE.OctahedronBufferGeometry, typeof THREE.OctahedronBufferGeometry>;
-export declare type ParametricBufferGeometryProps = BufferGeometryNode<THREE.ParametricBufferGeometry, typeof THREE.ParametricBufferGeometry>;
 export declare type PlaneBufferGeometryProps = BufferGeometryNode<THREE.PlaneBufferGeometry, typeof THREE.PlaneBufferGeometry>;
 export declare type PolyhedronBufferGeometryProps = BufferGeometryNode<THREE.PolyhedronBufferGeometry, typeof THREE.PolyhedronBufferGeometry>;
 export declare type RingBufferGeometryProps = BufferGeometryNode<THREE.RingBufferGeometry, typeof THREE.RingBufferGeometry>;
 export declare type ShapeBufferGeometryProps = BufferGeometryNode<THREE.ShapeBufferGeometry, typeof THREE.ShapeBufferGeometry>;
 export declare type SphereBufferGeometryProps = BufferGeometryNode<THREE.SphereBufferGeometry, typeof THREE.SphereBufferGeometry>;
 export declare type TetrahedronBufferGeometryProps = BufferGeometryNode<THREE.TetrahedronBufferGeometry, typeof THREE.TetrahedronBufferGeometry>;
-export declare type TextBufferGeometryProps = BufferGeometryNode<THREE.TextBufferGeometry, typeof THREE.TextBufferGeometry>;
 export declare type TorusBufferGeometryProps = BufferGeometryNode<THREE.TorusBufferGeometry, typeof THREE.TorusBufferGeometry>;
 export declare type TorusKnotBufferGeometryProps = BufferGeometryNode<THREE.TorusKnotBufferGeometry, typeof THREE.TorusKnotBufferGeometry>;
 export declare type TubeBufferGeometryProps = BufferGeometryNode<THREE.TubeBufferGeometry, typeof THREE.TubeBufferGeometry>;
 export declare type WireframeGeometryProps = BufferGeometryNode<THREE.WireframeGeometry, typeof THREE.WireframeGeometry>;
-export declare type ParametricGeometryProps = BufferGeometryNode<THREE.ParametricGeometry, typeof THREE.ParametricGeometry>;
 export declare type TetrahedronGeometryProps = BufferGeometryNode<THREE.TetrahedronGeometry, typeof THREE.TetrahedronGeometry>;
 export declare type OctahedronGeometryProps = BufferGeometryNode<THREE.OctahedronGeometry, typeof THREE.OctahedronGeometry>;
 export declare type IcosahedronGeometryProps = BufferGeometryNode<THREE.IcosahedronGeometry, typeof THREE.IcosahedronGeometry>;
@@ -96,7 +92,6 @@ export declare type PolyhedronGeometryProps = BufferGeometryNode<THREE.Polyhedro
 export declare type TubeGeometryProps = BufferGeometryNode<THREE.TubeGeometry, typeof THREE.TubeGeometry>;
 export declare type TorusKnotGeometryProps = BufferGeometryNode<THREE.TorusKnotGeometry, typeof THREE.TorusKnotGeometry>;
 export declare type TorusGeometryProps = BufferGeometryNode<THREE.TorusGeometry, typeof THREE.TorusGeometry>;
-export declare type TextGeometryProps = BufferGeometryNode<THREE.TextGeometry, typeof THREE.TextGeometry>;
 export declare type SphereGeometryProps = BufferGeometryNode<THREE.SphereGeometry, typeof THREE.SphereGeometry>;
 export declare type RingGeometryProps = BufferGeometryNode<THREE.RingGeometry, typeof THREE.RingGeometry>;
 export declare type PlaneGeometryProps = BufferGeometryNode<THREE.PlaneGeometry, typeof THREE.PlaneGeometry>;
@@ -213,19 +208,16 @@ declare global {
             icosahedronBufferGeometry: IcosahedronBufferGeometryProps;
             latheBufferGeometry: LatheBufferGeometryProps;
             octahedronBufferGeometry: OctahedronBufferGeometryProps;
-            parametricBufferGeometry: ParametricBufferGeometryProps;
             planeBufferGeometry: PlaneBufferGeometryProps;
             polyhedronBufferGeometry: PolyhedronBufferGeometryProps;
             ringBufferGeometry: RingBufferGeometryProps;
             shapeBufferGeometry: ShapeBufferGeometryProps;
             sphereBufferGeometry: SphereBufferGeometryProps;
             tetrahedronBufferGeometry: TetrahedronBufferGeometryProps;
-            textBufferGeometry: TextBufferGeometryProps;
             torusBufferGeometry: TorusBufferGeometryProps;
             torusKnotBufferGeometry: TorusKnotBufferGeometryProps;
             tubeBufferGeometry: TubeBufferGeometryProps;
             wireframeGeometry: WireframeGeometryProps;
-            parametricGeometry: ParametricGeometryProps;
             tetrahedronGeometry: TetrahedronGeometryProps;
             octahedronGeometry: OctahedronGeometryProps;
             icosahedronGeometry: IcosahedronGeometryProps;
@@ -234,7 +226,6 @@ declare global {
             tubeGeometry: TubeGeometryProps;
             torusKnotGeometry: TorusKnotGeometryProps;
             torusGeometry: TorusGeometryProps;
-            textGeometry: TextGeometryProps;
             sphereGeometry: SphereGeometryProps;
             ringGeometry: RingGeometryProps;
             planeGeometry: PlaneGeometryProps;

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

@@ -588,6 +588,8 @@ function createRenderer(roots) {
 
     if (instance.__r3f) instance.__r3f.memoizedProps = memoized;
     changes.forEach(([key, value, isEvent, keys]) => {
+      var _rootState$gl;
+
       let currentInstance = instance;
       let targetProp = currentInstance[key]; // Revolve dashed props
 
@@ -618,8 +620,9 @@ function createRenderer(roots) {
 
           if (defaultClassCall.dispose) defaultClassCall.dispose(); // instance does not have constructor, just set it to 0
         } else value = 0;
-      } // Deal with pointer events ...
+      }
 
+      const isLinear = (rootState == null ? void 0 : (_rootState$gl = rootState.gl) == null ? void 0 : _rootState$gl.outputEncoding) === THREE__namespace.LinearEncoding; // Deal with pointer events ...
 
       if (isEvent) {
         if (value) localState.handlers[key] = value;else delete localState.handlers[key];
@@ -640,14 +643,14 @@ function createRenderer(roots) {
                   else targetProp.set(value); // Auto-convert sRGB colors, for now ...
                 // https://github.com/pmndrs/react-three-fiber/issues/344
 
-                if (!rootState.linear && isColor) targetProp.convertSRGBToLinear();
+                if (!isLinear && 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) currentInstance[key].encoding = THREE__namespace.sRGBEncoding;
+          if (!isLinear && currentInstance[key] instanceof THREE__namespace.Texture) currentInstance[key].encoding = THREE__namespace.sRGBEncoding;
         }
 
       invalidateInstance(instance);
@@ -924,10 +927,13 @@ function createRenderer(roots) {
 
     instance.__r3f.objects = [];
     removeChild(parent, instance);
-    appendChild(parent, newInstance) // This evil hack switches the react-internal fiber node
-    // https://github.com/facebook/react/issues/14983
-    // https://github.com/facebook/react/pull/15021
-    ;
+    appendChild(parent, newInstance); // Re-bind event handlers
+
+    if (newInstance.raycast && newInstance.__r3f.eventCount) {
+      const rootState = newInstance.__r3f.root.getState();
+
+      rootState.internal.interaction.push(newInstance);
+    } // This evil hack switches the react-internal fiber node
     [fiber, fiber.alternate].forEach(fiber => {
       if (fiber !== null) {
         fiber.stateNode = newInstance;

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

@@ -588,6 +588,8 @@ function createRenderer(roots) {
 
     if (instance.__r3f) instance.__r3f.memoizedProps = memoized;
     changes.forEach(([key, value, isEvent, keys]) => {
+      var _rootState$gl;
+
       let currentInstance = instance;
       let targetProp = currentInstance[key]; // Revolve dashed props
 
@@ -618,8 +620,9 @@ function createRenderer(roots) {
 
           if (defaultClassCall.dispose) defaultClassCall.dispose(); // instance does not have constructor, just set it to 0
         } else value = 0;
-      } // Deal with pointer events ...
+      }
 
+      const isLinear = (rootState == null ? void 0 : (_rootState$gl = rootState.gl) == null ? void 0 : _rootState$gl.outputEncoding) === THREE__namespace.LinearEncoding; // Deal with pointer events ...
 
       if (isEvent) {
         if (value) localState.handlers[key] = value;else delete localState.handlers[key];
@@ -640,14 +643,14 @@ function createRenderer(roots) {
                   else targetProp.set(value); // Auto-convert sRGB colors, for now ...
                 // https://github.com/pmndrs/react-three-fiber/issues/344
 
-                if (!rootState.linear && isColor) targetProp.convertSRGBToLinear();
+                if (!isLinear && 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) currentInstance[key].encoding = THREE__namespace.sRGBEncoding;
+          if (!isLinear && currentInstance[key] instanceof THREE__namespace.Texture) currentInstance[key].encoding = THREE__namespace.sRGBEncoding;
         }
 
       invalidateInstance(instance);
@@ -924,10 +927,13 @@ function createRenderer(roots) {
 
     instance.__r3f.objects = [];
     removeChild(parent, instance);
-    appendChild(parent, newInstance) // This evil hack switches the react-internal fiber node
-    // https://github.com/facebook/react/issues/14983
-    // https://github.com/facebook/react/pull/15021
-    ;
+    appendChild(parent, newInstance); // Re-bind event handlers
+
+    if (newInstance.raycast && newInstance.__r3f.eventCount) {
+      const rootState = newInstance.__r3f.root.getState();
+
+      rootState.internal.interaction.push(newInstance);
+    } // This evil hack switches the react-internal fiber node
     [fiber, fiber.alternate].forEach(fiber => {
       if (fiber !== null) {
         fiber.stateNode = newInstance;

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

@@ -555,6 +555,8 @@ function createRenderer(roots) {
 
     if (instance.__r3f) instance.__r3f.memoizedProps = memoized;
     changes.forEach(([key, value, isEvent, keys]) => {
+      var _rootState$gl;
+
       let currentInstance = instance;
       let targetProp = currentInstance[key]; // Revolve dashed props
 
@@ -585,8 +587,9 @@ function createRenderer(roots) {
 
           if (defaultClassCall.dispose) defaultClassCall.dispose(); // instance does not have constructor, just set it to 0
         } else value = 0;
-      } // Deal with pointer events ...
+      }
 
+      const isLinear = (rootState == null ? void 0 : (_rootState$gl = rootState.gl) == null ? void 0 : _rootState$gl.outputEncoding) === THREE.LinearEncoding; // Deal with pointer events ...
 
       if (isEvent) {
         if (value) localState.handlers[key] = value;else delete localState.handlers[key];
@@ -607,14 +610,14 @@ function createRenderer(roots) {
                   else targetProp.set(value); // Auto-convert sRGB colors, for now ...
                 // https://github.com/pmndrs/react-three-fiber/issues/344
 
-                if (!rootState.linear && isColor) targetProp.convertSRGBToLinear();
+                if (!isLinear && 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) currentInstance[key].encoding = THREE.sRGBEncoding;
+          if (!isLinear && currentInstance[key] instanceof THREE.Texture) currentInstance[key].encoding = THREE.sRGBEncoding;
         }
 
       invalidateInstance(instance);
@@ -891,10 +894,13 @@ function createRenderer(roots) {
 
     instance.__r3f.objects = [];
     removeChild(parent, instance);
-    appendChild(parent, newInstance) // This evil hack switches the react-internal fiber node
-    // https://github.com/facebook/react/issues/14983
-    // https://github.com/facebook/react/pull/15021
-    ;
+    appendChild(parent, newInstance); // Re-bind event handlers
+
+    if (newInstance.raycast && newInstance.__r3f.eventCount) {
+      const rootState = newInstance.__r3f.root.getState();
+
+      rootState.internal.interaction.push(newInstance);
+    } // This evil hack switches the react-internal fiber node
     [fiber, fiber.alternate].forEach(fiber => {
       if (fiber !== null) {
         fiber.stateNode = newInstance;

package/native/dist/react-three-fiber-native.cjs.d.ts

@@ -1 +1,11 @@
-export * from "../../dist/declarations/src/native";
+// are you seeing an error that a default export doesn't exist but your source file has a default export?
+// you should run `yarn` or `yarn preconstruct dev` if preconstruct dev isn't in your postinstall hook
+
+// curious why you need to?
+// this file exists so that you can import from the entrypoint normally
+// except that it points to your source file and you don't need to run build constantly
+// which means we need to re-export all of the modules from your source file
+// and since export * doesn't include default exports, we need to read your source file
+// to check for a default export and re-export it if it exists
+// it's not ideal, but it works pretty well ¯\_(ツ)_/¯
+export * from "../../src/native";

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

@@ -1,7 +1,16 @@
-'use strict';
+"use strict";
+// this file might look strange and you might be wondering what it's for
+// it's lets you import your source files by importing this entrypoint
+// as you would import it if it was built with preconstruct build
+// this file is slightly different to some others though
+// it has a require hook which compiles your code with Babel
+// this means that you don't have to set up @babel/register or anything like that
+// but you can still require this module and it'll be compiled
 
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./react-three-fiber-native.cjs.prod.js");
-} else {
-  module.exports = require("./react-three-fiber-native.cjs.dev.js");
-}
+// this bit of code imports the require hook and registers it
+let unregister = require("../../../../node_modules/@preconstruct/hook").___internalHook(typeof __dirname === 'undefined' ? undefined : __dirname, "../../../..", "../..");
+
+// this re-exports the source file
+module.exports = require("../../src/native.tsx");
+
+unregister();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "7.0.24",
+  "version": "7.0.25",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",
@@ -55,7 +55,7 @@
   "peerDependencies": {
     "react": ">=17.0",
     "react-dom": ">=17.0",
-    "three": ">=0.126"
+    "three": ">=0.133"
   },
   "peerDependenciesMeta": {
     "react-dom": {