@react-three/fiber 8.15.8 → 8.15.10

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @react-three/fiber
 
+## 8.15.10
+
+### Patch Changes
+
+- 49158164: fix: don't recursively dispose primitives
+
+## 8.15.9
+
+### Patch Changes
+
+- 4cbc5530: fix(native): deopt iOS blob URI path
+
 ## 8.15.8
 
 ### Patch Changes

package/dist/{index-594193f5.esm.js → index-0c28a0fd.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 ...
@@ -2143,7 +2143,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 +2186,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-d26c5c57.cjs.dev.js → index-28e9146f.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 ...
@@ -2170,7 +2170,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 +2213,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-e6d64601.cjs.prod.js → index-ae8ad041.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 ...
@@ -2170,7 +2170,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 +2213,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-28e9146f.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-ae8ad041.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-0c28a0fd.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-0c28a0fd.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-28e9146f.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -363,7 +363,6 @@ function polyfills() {
       };
       const createFromParts = BlobManager.createFromParts;
       BlobManager.createFromParts = function (parts, options) {
-        var _NativeModules$BlobMo2;
         parts = parts.map(part => {
           if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
             part = base64Js.fromByteArray(new Uint8Array(part));
@@ -371,13 +370,17 @@ function polyfills() {
           return part;
         });
         const blob = createFromParts(parts, options);
-        if (!((_NativeModules$BlobMo2 = reactNative.NativeModules.BlobModule) != null && _NativeModules$BlobMo2.BLOB_URI_SCHEME)) {
-          blob.data._base64 = '';
-          for (const part of parts) {
-            var _data$_base, _data;
-            blob.data._base64 += (_data$_base = (_data = part.data) == null ? void 0 : _data._base64) != null ? _data$_base : part;
-          }
+
+        // Always enable slow but safe path for iOS (previously for Android unauth)
+        // https://github.com/pmndrs/react-three-fiber/issues/3075
+        // if (!NativeModules.BlobModule?.BLOB_URI_SCHEME) {
+        blob.data._base64 = '';
+        for (const part of parts) {
+          var _data$_base, _data;
+          blob.data._base64 += (_data$_base = (_data = part.data) == null ? void 0 : _data._base64) != null ? _data$_base : part;
         }
+        // }
+
         return blob;
       };
     }

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-ae8ad041.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -363,7 +363,6 @@ function polyfills() {
       };
       const createFromParts = BlobManager.createFromParts;
       BlobManager.createFromParts = function (parts, options) {
-        var _NativeModules$BlobMo2;
         parts = parts.map(part => {
           if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
             part = base64Js.fromByteArray(new Uint8Array(part));
@@ -371,13 +370,17 @@ function polyfills() {
           return part;
         });
         const blob = createFromParts(parts, options);
-        if (!((_NativeModules$BlobMo2 = reactNative.NativeModules.BlobModule) != null && _NativeModules$BlobMo2.BLOB_URI_SCHEME)) {
-          blob.data._base64 = '';
-          for (const part of parts) {
-            var _data$_base, _data;
-            blob.data._base64 += (_data$_base = (_data = part.data) == null ? void 0 : _data._base64) != null ? _data$_base : part;
-          }
+
+        // Always enable slow but safe path for iOS (previously for Android unauth)
+        // https://github.com/pmndrs/react-three-fiber/issues/3075
+        // if (!NativeModules.BlobModule?.BLOB_URI_SCHEME) {
+        blob.data._base64 = '';
+        for (const part of parts) {
+          var _data$_base, _data;
+          blob.data._base64 += (_data$_base = (_data = part.data) == null ? void 0 : _data._base64) != null ? _data$_base : part;
         }
+        // }
+
         return blob;
       };
     }

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

@@ -1,9 +1,9 @@
-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-0c28a0fd.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-0c28a0fd.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
-import { PanResponder, PixelRatio, View, StyleSheet, Platform, NativeModules, Image } from 'react-native';
+import { PanResponder, PixelRatio, View, StyleSheet, Platform, Image, NativeModules } from 'react-native';
 import { GLView } from 'expo-gl';
 import { FiberProvider, useContextBridge } from 'its-fine';
 import { Asset } from 'expo-asset';
@@ -338,7 +338,6 @@ function polyfills() {
       };
       const createFromParts = BlobManager.createFromParts;
       BlobManager.createFromParts = function (parts, options) {
-        var _NativeModules$BlobMo2;
         parts = parts.map(part => {
           if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
             part = fromByteArray(new Uint8Array(part));
@@ -346,13 +345,17 @@ function polyfills() {
           return part;
         });
         const blob = createFromParts(parts, options);
-        if (!((_NativeModules$BlobMo2 = NativeModules.BlobModule) != null && _NativeModules$BlobMo2.BLOB_URI_SCHEME)) {
-          blob.data._base64 = '';
-          for (const part of parts) {
-            var _data$_base, _data;
-            blob.data._base64 += (_data$_base = (_data = part.data) == null ? void 0 : _data._base64) != null ? _data$_base : part;
-          }
+
+        // Always enable slow but safe path for iOS (previously for Android unauth)
+        // https://github.com/pmndrs/react-three-fiber/issues/3075
+        // if (!NativeModules.BlobModule?.BLOB_URI_SCHEME) {
+        blob.data._base64 = '';
+        for (const part of parts) {
+          var _data$_base, _data;
+          blob.data._base64 += (_data$_base = (_data = part.data) == null ? void 0 : _data._base64) != null ? _data$_base : part;
         }
+        // }
+
         return blob;
       };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.15.8",
+  "version": "8.15.10",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",