@react-three/fiber 8.15.5 → 8.15.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @react-three/fiber
 
+## 8.15.7
+
+### Patch Changes
+
+- 07e39e2e: fix(types): remove use of Object3D generic
+
+## 8.15.6
+
+### Patch Changes
+
+- 7bb2950b: experiment: stable object sort
+
 ## 8.15.5
 
 ### Patch Changes

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

@@ -86,7 +86,7 @@ export interface PointerCaptureTarget {
     intersection: Intersection;
     target: Element;
 }
-export declare function getEventPriority(): 1 | 16 | 4;
+export declare function getEventPriority(): 1 | 4 | 16;
 export declare function removeInteractivity(store: UseBoundStore<RootState>, object: THREE.Object3D): void;
 export declare function createEvents(store: UseBoundStore<RootState>): {
     handlePointer: (name: string) => (event: DomEvent) => void;

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

@@ -10,7 +10,7 @@ export declare type _XRFrame = THREE.WebGLRenderTargetOptions extends {
 /**
  * Returns `true` with correct TS type inference if an object has a configurable color space (since r152).
  */
-export declare const hasColorSpace: <T extends object | Renderer | THREE.Texture, P = T extends Renderer ? {
+export declare const hasColorSpace: <T extends object | THREE.Texture | Renderer, P = T extends Renderer ? {
     outputColorSpace: string;
 } : {
     colorSpace: string;

package/dist/{index-e6d64601.cjs.prod.js → index-66b6e976.cjs.prod.js}

@@ -127,7 +127,11 @@ function createRenderer(_roots, _getEventPriority) {
         parentInstance.children = [...restSiblings.slice(0, index), child, ...restSiblings.slice(index)];
         added = true;
       }
-      if (!added) (_parentInstance$__r3f2 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f2.objects.push(child);
+      const objects = (_parentInstance$__r3f2 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f2.objects;
+      if (!added && objects) {
+        const index = objects.indexOf(beforeChild);
+        if (index !== -1) objects.splice(index, 0, child);else objects.push(child);
+      }
       if (!child.__r3f) prepare(child, {});
       child.__r3f.parent = parentInstance;
       updateInstance(child);
@@ -143,7 +147,11 @@ function createRenderer(_roots, _getEventPriority) {
       // Clear the parent reference
       if (child.__r3f) child.__r3f.parent = null;
       // Remove child from the parents objects
-      if ((_parentInstance$__r3f3 = parentInstance.__r3f) != null && _parentInstance$__r3f3.objects) parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child);
+      const objects = (_parentInstance$__r3f3 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f3.objects;
+      if (objects) {
+        const index = objects.indexOf(child);
+        if (index !== -1) objects.splice(index, 1);
+      }
       // Remove attachment
       if ((_child$__r3f3 = child.__r3f) != null && _child$__r3f3.attach) {
         detach(parentInstance, child, child.__r3f.attach);
@@ -209,13 +217,14 @@ function createRenderer(_roots, _getEventPriority) {
     }
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
     instance.__r3f.objects = [];
+    const autoRemovedBeforeAppend = !!newInstance.parent;
     if (!instance.__r3f.autoRemovedBeforeAppend) {
+      insertBefore(parent, newInstance, instance);
       removeChild(parent, instance);
+    } else {
+      appendChild(parent, newInstance);
     }
-    if (newInstance.parent) {
-      newInstance.__r3f.autoRemovedBeforeAppend = true;
-    }
-    appendChild(parent, newInstance);
+    newInstance.__r3f.autoRemovedBeforeAppend = autoRemovedBeforeAppend;
 
     // Re-bind event handlers
     if (newInstance.raycast && newInstance.__r3f.eventCount) {

package/dist/{index-d26c5c57.cjs.dev.js → index-9bf2e8aa.cjs.dev.js}

@@ -127,7 +127,11 @@ function createRenderer(_roots, _getEventPriority) {
         parentInstance.children = [...restSiblings.slice(0, index), child, ...restSiblings.slice(index)];
         added = true;
       }
-      if (!added) (_parentInstance$__r3f2 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f2.objects.push(child);
+      const objects = (_parentInstance$__r3f2 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f2.objects;
+      if (!added && objects) {
+        const index = objects.indexOf(beforeChild);
+        if (index !== -1) objects.splice(index, 0, child);else objects.push(child);
+      }
       if (!child.__r3f) prepare(child, {});
       child.__r3f.parent = parentInstance;
       updateInstance(child);
@@ -143,7 +147,11 @@ function createRenderer(_roots, _getEventPriority) {
       // Clear the parent reference
       if (child.__r3f) child.__r3f.parent = null;
       // Remove child from the parents objects
-      if ((_parentInstance$__r3f3 = parentInstance.__r3f) != null && _parentInstance$__r3f3.objects) parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child);
+      const objects = (_parentInstance$__r3f3 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f3.objects;
+      if (objects) {
+        const index = objects.indexOf(child);
+        if (index !== -1) objects.splice(index, 1);
+      }
       // Remove attachment
       if ((_child$__r3f3 = child.__r3f) != null && _child$__r3f3.attach) {
         detach(parentInstance, child, child.__r3f.attach);
@@ -209,13 +217,14 @@ function createRenderer(_roots, _getEventPriority) {
     }
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
     instance.__r3f.objects = [];
+    const autoRemovedBeforeAppend = !!newInstance.parent;
     if (!instance.__r3f.autoRemovedBeforeAppend) {
+      insertBefore(parent, newInstance, instance);
       removeChild(parent, instance);
+    } else {
+      appendChild(parent, newInstance);
     }
-    if (newInstance.parent) {
-      newInstance.__r3f.autoRemovedBeforeAppend = true;
-    }
-    appendChild(parent, newInstance);
+    newInstance.__r3f.autoRemovedBeforeAppend = autoRemovedBeforeAppend;
 
     // Re-bind event handlers
     if (newInstance.raycast && newInstance.__r3f.eventCount) {

package/dist/{index-594193f5.esm.js → index-a2103d81.esm.js}

@@ -100,7 +100,11 @@ function createRenderer(_roots, _getEventPriority) {
         parentInstance.children = [...restSiblings.slice(0, index), child, ...restSiblings.slice(index)];
         added = true;
       }
-      if (!added) (_parentInstance$__r3f2 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f2.objects.push(child);
+      const objects = (_parentInstance$__r3f2 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f2.objects;
+      if (!added && objects) {
+        const index = objects.indexOf(beforeChild);
+        if (index !== -1) objects.splice(index, 0, child);else objects.push(child);
+      }
       if (!child.__r3f) prepare(child, {});
       child.__r3f.parent = parentInstance;
       updateInstance(child);
@@ -116,7 +120,11 @@ function createRenderer(_roots, _getEventPriority) {
       // Clear the parent reference
       if (child.__r3f) child.__r3f.parent = null;
       // Remove child from the parents objects
-      if ((_parentInstance$__r3f3 = parentInstance.__r3f) != null && _parentInstance$__r3f3.objects) parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child);
+      const objects = (_parentInstance$__r3f3 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f3.objects;
+      if (objects) {
+        const index = objects.indexOf(child);
+        if (index !== -1) objects.splice(index, 1);
+      }
       // Remove attachment
       if ((_child$__r3f3 = child.__r3f) != null && _child$__r3f3.attach) {
         detach(parentInstance, child, child.__r3f.attach);
@@ -182,13 +190,14 @@ function createRenderer(_roots, _getEventPriority) {
     }
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
     instance.__r3f.objects = [];
+    const autoRemovedBeforeAppend = !!newInstance.parent;
     if (!instance.__r3f.autoRemovedBeforeAppend) {
+      insertBefore(parent, newInstance, instance);
       removeChild(parent, instance);
+    } else {
+      appendChild(parent, newInstance);
     }
-    if (newInstance.parent) {
-      newInstance.__r3f.autoRemovedBeforeAppend = true;
-    }
-    appendChild(parent, newInstance);
+    newInstance.__r3f.autoRemovedBeforeAppend = autoRemovedBeforeAppend;
 
     // 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-d26c5c57.cjs.dev.js');
+var index = require('./index-9bf2e8aa.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-e6d64601.cjs.prod.js');
+var index = require('./index-66b6e976.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-594193f5.esm.js';
-export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, 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, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from './index-594193f5.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-a2103d81.esm.js';
+export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, 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, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from './index-a2103d81.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-d26c5c57.cjs.dev.js');
+var index = require('../../dist/index-9bf2e8aa.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-e6d64601.cjs.prod.js');
+var index = require('../../dist/index-66b6e976.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-594193f5.esm.js';
-export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, 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, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from '../../dist/index-594193f5.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-a2103d81.esm.js';
+export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, 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, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from '../../dist/index-a2103d81.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.15.5",
+  "version": "8.15.7",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",