@react-three/fiber 8.9.0 → 8.9.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @react-three/fiber
 
+## 8.9.2
+
+### Patch Changes
+
+- 2aeb6500: fix: primitives are incorrectly swapped on key change in maps
+
+## 8.9.1
+
+### Patch Changes
+
+- 0cf11797: fix(events): type spread event props
+
 ## 8.9.0
 
 ### Minor Changes

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

@@ -1,6 +1,7 @@
 import * as THREE from 'three';
 import type { UseBoundStore } from 'zustand';
 import type { RootState } from './store';
+import type { Properties } from '../three-types';
 export interface Intersection extends THREE.Intersection {
     eventObject: THREE.Object3D;
 }
@@ -17,7 +18,7 @@ export interface IntersectionEvent<TSourceEvent> extends Intersection {
     stopped: boolean;
 }
 export declare type Camera = THREE.OrthographicCamera | THREE.PerspectiveCamera;
-export declare type ThreeEvent<TEvent> = IntersectionEvent<TEvent>;
+export declare type ThreeEvent<TEvent> = IntersectionEvent<TEvent> & Properties<TEvent>;
 export declare type DomEvent = PointerEvent | MouseEvent | WheelEvent;
 export declare type Events = {
     onClick: EventListener;

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

@@ -8,12 +8,10 @@ import { extend, Root } from './renderer';
 import { addEffect, addAfterEffect, addTail, flushGlobalEffects } from './loop';
 import { EventManager, ComputeFunction } from './events';
 import { dispose, getRootState, Camera } from './utils';
+import type { Properties } from '../three-types';
 declare const roots: Map<Element, Root>;
 declare const invalidate: (state?: RootState | undefined, frames?: number) => void, advance: (timestamp: number, runGlobalEffects?: boolean, state?: RootState | undefined, frame?: THREE.XRFrame | undefined) => void;
 declare const reconciler: import("react-reconciler").Reconciler<UseBoundStore<RootState, import("zustand").StoreApi<RootState>>, import("./renderer").Instance, void, import("./renderer").Instance, import("./renderer").Instance>, applyProps: typeof import("./utils").applyProps;
-declare type Properties<T> = Pick<T, {
-    [K in keyof T]: T[K] extends (_: any) => any ? never : K;
-}[keyof T]>;
 declare type GLProps = Renderer | ((canvas: HTMLCanvasElement) => Renderer) | Partial<Properties<THREE.WebGLRenderer> | THREE.WebGLRendererParameters> | undefined;
 export declare type RenderProps<TCanvas extends Element> = {
     gl?: GLProps;

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

@@ -21,6 +21,7 @@ export declare type LocalState = {
     memoizedProps: {
         [key: string]: any;
     };
+    autoRemovedBeforeAppend?: boolean;
 };
 export declare type AttachFnType = (parent: Instance, self: Instance) => () => void;
 export declare type AttachType = string | AttachFnType;

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

@@ -2,6 +2,9 @@
 import * as THREE from 'three';
 import { EventHandlers } from './core/events';
 import { AttachType } from './core/renderer';
+export declare type Properties<T> = Pick<T, {
+    [K in keyof T]: T[K] extends (_: any) => any ? never : K;
+}[keyof T]>;
 export declare type NonFunctionKeys<T> = {
     [K in keyof T]-?: T[K] extends Function ? never : K;
 }[keyof T];
@@ -123,7 +126,7 @@ export declare type MeshMatcapMaterialProps = MaterialNode<THREE.MeshMatcapMater
 export declare type LineDashedMaterialProps = MaterialNode<THREE.LineDashedMaterial, [THREE.LineDashedMaterialParameters]>;
 export declare type LineBasicMaterialProps = MaterialNode<THREE.LineBasicMaterial, [THREE.LineBasicMaterialParameters]>;
 export declare type PrimitiveProps = {
-    object: any;
+    object: object;
 } & {
     [properties: string]: any;
 };

package/dist/{index-57cb2f85.cjs.prod.js → index-25dfa84d.cjs.prod.js}

@@ -1077,7 +1077,15 @@ function createRenderer(_roots, _getEventPriority) {
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
 
     instance.__r3f.objects = [];
-    removeChild(parent, instance);
+
+    if (!instance.__r3f.autoRemovedBeforeAppend) {
+      removeChild(parent, instance);
+    }
+
+    if (newInstance.parent) {
+      newInstance.__r3f.autoRemovedBeforeAppend = true;
+    }
+
     appendChild(parent, newInstance); // Re-bind event handlers
 
     if (newInstance.raycast && newInstance.__r3f.eventCount) {

package/dist/{index-6f0019d1.esm.js → index-79f9c7e9.esm.js}

@@ -1050,7 +1050,15 @@ function createRenderer(_roots, _getEventPriority) {
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
 
     instance.__r3f.objects = [];
-    removeChild(parent, instance);
+
+    if (!instance.__r3f.autoRemovedBeforeAppend) {
+      removeChild(parent, instance);
+    }
+
+    if (newInstance.parent) {
+      newInstance.__r3f.autoRemovedBeforeAppend = true;
+    }
+
     appendChild(parent, newInstance); // Re-bind event handlers
 
     if (newInstance.raycast && newInstance.__r3f.eventCount) {

package/dist/{index-8539ced2.cjs.dev.js → index-efc69a1d.cjs.dev.js}

@@ -1077,7 +1077,15 @@ function createRenderer(_roots, _getEventPriority) {
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
 
     instance.__r3f.objects = [];
-    removeChild(parent, instance);
+
+    if (!instance.__r3f.autoRemovedBeforeAppend) {
+      removeChild(parent, instance);
+    }
+
+    if (newInstance.parent) {
+      newInstance.__r3f.autoRemovedBeforeAppend = true;
+    }
+
     appendChild(parent, newInstance); // Re-bind event handlers
 
     if (newInstance.raycast && newInstance.__r3f.eventCount) {

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-8539ced2.cjs.dev.js');
+var index = require('./index-efc69a1d.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-57cb2f85.cjs.prod.js');
+var index = require('./index-25dfa84d.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-6f0019d1.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-6f0019d1.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-79f9c7e9.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-79f9c7e9.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-8539ced2.cjs.dev.js');
+var index = require('../../dist/index-efc69a1d.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-57cb2f85.cjs.prod.js');
+var index = require('../../dist/index-25dfa84d.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-6f0019d1.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-6f0019d1.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-79f9c7e9.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-79f9c7e9.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.9.0",
+  "version": "8.9.2",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",

package/readme.md

@@ -55,7 +55,7 @@ function Box(props) {
   const [hovered, hover] = useState(false)
   const [clicked, click] = useState(false)
   // Subscribe this component to the render-loop, rotate the mesh every frame
-  useFrame((state, delta) => (ref.current.rotation.x += 0.01))
+  useFrame((state, delta) => (ref.current.rotation.x += delta))
   // Return the view, these are regular Threejs elements expressed in JSX
   return (
     <mesh
@@ -98,7 +98,7 @@ function Box(props: ThreeElements['mesh']) {
   const ref = useRef<THREE.Mesh>(null!)
   const [hovered, hover] = useState(false)
   const [clicked, click] = useState(false)
-  useFrame((state, delta) => (ref.current.rotation.x += 0.01))
+  useFrame((state, delta) => (ref.current.rotation.x += delta))
   return (
     <mesh
       {...props}
@@ -163,7 +163,7 @@ function Box(props) {
   const mesh = useRef(null)
   const [hovered, setHover] = useState(false)
   const [active, setActive] = useState(false)
-  useFrame((state, delta) => (mesh.current.rotation.x += 0.01))
+  useFrame((state, delta) => (mesh.current.rotation.x += delta))
   return (
     <mesh
       {...props}