@react-three/fiber 8.15.9 → 8.15.11

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @react-three/fiber
 
+## 8.15.11
+
+### Patch Changes
+
+- 3d9af04d: fix: update import from three examples
+
+## 8.15.10
+
+### Patch Changes
+
+- 49158164: fix: don't recursively dispose primitives
+
 ## 8.15.9
 
 ### 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/hooks.d.ts

@@ -1,7 +1,7 @@
 import * as THREE from 'three';
 import * as React from 'react';
 import { StateSelector, EqualityChecker } from 'zustand';
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { RootState, RenderCallback } from './store';
 import { ObjectMap } from './utils';
 import { LocalState } from './renderer';

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-d26c5c57.cjs.dev.js → index-b3e44f21.cjs.dev.js}

@@ -166,7 +166,7 @@ function createRenderer(_roots, _getEventPriority) {
       // Since disposal is recursive, we can check the optional dispose arg, which will be undefined
       // when the reconciler calls it, but then carry our own check recursively
       const isPrimitive = (_child$__r3f5 = child.__r3f) == null ? void 0 : _child$__r3f5.primitive;
-      const shouldDispose = dispose === undefined ? child.dispose !== null && !isPrimitive : dispose;
+      const shouldDispose = !isPrimitive && (dispose === undefined ? child.dispose !== null : dispose);
 
       // Remove nested child objects. Primitives should not have objects and children that are
       // attached to them declaratively ...
@@ -181,13 +181,20 @@ function createRenderer(_roots, _getEventPriority) {
 
       // Dispose item whenever the reconciler feels like it
       if (shouldDispose && child.dispose && child.type !== 'Scene') {
-        scheduler.unstable_scheduleCallback(scheduler.unstable_IdlePriority, () => {
+        const callback = () => {
           try {
             child.dispose();
           } catch (e) {
             /* ... */
           }
-        });
+        };
+
+        // Schedule async at runtime, flush sync in testing
+        if (typeof IS_REACT_ACT_ENVIRONMENT === 'undefined') {
+          scheduler.unstable_scheduleCallback(scheduler.unstable_IdlePriority, callback);
+        } else {
+          callback();
+        }
       }
       invalidateInstance(parentInstance);
     }
@@ -2170,7 +2177,9 @@ function Portal({
       },
       ...rest
     };
-  }, [state]);
+  },
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [state]);
   const [usePortalStore] = React__namespace.useState(() => {
     // Create a mirrored store, based on the previous root with a few overrides ...
     const previousState = previousRoot.getState();
@@ -2211,9 +2220,11 @@ function Portal({
       unsub();
       usePortalStore.destroy();
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   React__namespace.useEffect(() => {
     usePortalStore.setState(injectState => inject(previousRoot.getState(), injectState));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [inject]);
   return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, reconciler.createPortal( /*#__PURE__*/React__namespace.createElement(context.Provider, {
     value: usePortalStore

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

@@ -139,7 +139,7 @@ function createRenderer(_roots, _getEventPriority) {
       // Since disposal is recursive, we can check the optional dispose arg, which will be undefined
       // when the reconciler calls it, but then carry our own check recursively
       const isPrimitive = (_child$__r3f5 = child.__r3f) == null ? void 0 : _child$__r3f5.primitive;
-      const shouldDispose = dispose === undefined ? child.dispose !== null && !isPrimitive : dispose;
+      const shouldDispose = !isPrimitive && (dispose === undefined ? child.dispose !== null : dispose);
 
       // Remove nested child objects. Primitives should not have objects and children that are
       // attached to them declaratively ...
@@ -154,13 +154,20 @@ function createRenderer(_roots, _getEventPriority) {
 
       // Dispose item whenever the reconciler feels like it
       if (shouldDispose && child.dispose && child.type !== 'Scene') {
-        unstable_scheduleCallback(unstable_IdlePriority, () => {
+        const callback = () => {
           try {
             child.dispose();
           } catch (e) {
             /* ... */
           }
-        });
+        };
+
+        // Schedule async at runtime, flush sync in testing
+        if (typeof IS_REACT_ACT_ENVIRONMENT === 'undefined') {
+          unstable_scheduleCallback(unstable_IdlePriority, callback);
+        } else {
+          callback();
+        }
       }
       invalidateInstance(parentInstance);
     }
@@ -2143,7 +2150,9 @@ function Portal({
       },
       ...rest
     };
-  }, [state]);
+  },
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [state]);
   const [usePortalStore] = React.useState(() => {
     // Create a mirrored store, based on the previous root with a few overrides ...
     const previousState = previousRoot.getState();
@@ -2184,9 +2193,11 @@ function Portal({
       unsub();
       usePortalStore.destroy();
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   React.useEffect(() => {
     usePortalStore.setState(injectState => inject(previousRoot.getState(), injectState));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [inject]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, reconciler.createPortal( /*#__PURE__*/React.createElement(context.Provider, {
     value: usePortalStore

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

@@ -166,7 +166,7 @@ function createRenderer(_roots, _getEventPriority) {
       // Since disposal is recursive, we can check the optional dispose arg, which will be undefined
       // when the reconciler calls it, but then carry our own check recursively
       const isPrimitive = (_child$__r3f5 = child.__r3f) == null ? void 0 : _child$__r3f5.primitive;
-      const shouldDispose = dispose === undefined ? child.dispose !== null && !isPrimitive : dispose;
+      const shouldDispose = !isPrimitive && (dispose === undefined ? child.dispose !== null : dispose);
 
       // Remove nested child objects. Primitives should not have objects and children that are
       // attached to them declaratively ...
@@ -181,13 +181,20 @@ function createRenderer(_roots, _getEventPriority) {
 
       // Dispose item whenever the reconciler feels like it
       if (shouldDispose && child.dispose && child.type !== 'Scene') {
-        scheduler.unstable_scheduleCallback(scheduler.unstable_IdlePriority, () => {
+        const callback = () => {
           try {
             child.dispose();
           } catch (e) {
             /* ... */
           }
-        });
+        };
+
+        // Schedule async at runtime, flush sync in testing
+        if (typeof IS_REACT_ACT_ENVIRONMENT === 'undefined') {
+          scheduler.unstable_scheduleCallback(scheduler.unstable_IdlePriority, callback);
+        } else {
+          callback();
+        }
       }
       invalidateInstance(parentInstance);
     }
@@ -2170,7 +2177,9 @@ function Portal({
       },
       ...rest
     };
-  }, [state]);
+  },
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [state]);
   const [usePortalStore] = React__namespace.useState(() => {
     // Create a mirrored store, based on the previous root with a few overrides ...
     const previousState = previousRoot.getState();
@@ -2211,9 +2220,11 @@ function Portal({
       unsub();
       usePortalStore.destroy();
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   React__namespace.useEffect(() => {
     usePortalStore.setState(injectState => inject(previousRoot.getState(), injectState));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [inject]);
   return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, reconciler.createPortal( /*#__PURE__*/React__namespace.createElement(context.Provider, {
     value: usePortalStore

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-b3e44f21.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-e462a173.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-db8af450.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-db8af450.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-b3e44f21.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-e462a173.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-db8af450.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-db8af450.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.9",
+  "version": "8.15.11",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",