@react-three/fiber 8.14.5 → 8.14.7

package/dist/{index-886811f8.cjs.dev.js → index-d1f17345.cjs.dev.js}

@@ -374,12 +374,12 @@ function createRenderer(_roots, _getEventPriority) {
 }
 
 var _window$document, _window$navigator;
-/**
- * Returns `true` with correct TS type inference if an object has a configurable color space (since r152).
+/**
+ * Returns `true` with correct TS type inference if an object has a configurable color space (since r152).
  */
 const hasColorSpace = object => 'colorSpace' in object || 'outputColorSpace' in object;
-/**
- * The current THREE.ColorManagement instance, if present.
+/**
+ * The current THREE.ColorManagement instance, if present.
  */
 const getColorManagement = () => {
   var _ColorManagement;
@@ -388,14 +388,14 @@ const getColorManagement = () => {
 const isOrthographicCamera = def => def && def.isOrthographicCamera;
 const isRef = obj => obj && obj.hasOwnProperty('current');
 
-/**
- * An SSR-friendly useLayoutEffect.
- *
- * React currently throws a warning when using useLayoutEffect on the server.
- * To get around it, we can conditionally useEffect on the server (no-op) and
- * useLayoutEffect elsewhere.
- *
- * @see https://github.com/facebook/react/issues/14927
+/**
+ * An SSR-friendly useLayoutEffect.
+ *
+ * React currently throws a warning when using useLayoutEffect on the server.
+ * To get around it, we can conditionally useEffect on the server (no-op) and
+ * useLayoutEffect elsewhere.
+ *
+ * @see https://github.com/facebook/react/issues/14927
  */
 const useIsomorphicLayoutEffect = typeof window !== 'undefined' && ((_window$document = window.document) != null && _window$document.createElement || ((_window$navigator = window.navigator) == null ? void 0 : _window$navigator.product) === 'ReactNative') ? React__namespace.useLayoutEffect : React__namespace.useEffect;
 function useMutableCallback(fn) {
@@ -440,8 +440,8 @@ function calculateDpr(dpr) {
   return Array.isArray(dpr) ? Math.min(Math.max(dpr[0], target), dpr[1]) : dpr;
 }
 
-/**
- * Returns instance root state
+/**
+ * Returns instance root state
  */
 const getRootState = obj => {
   var _r3f;
@@ -836,9 +836,9 @@ function getEventPriority() {
   }
 }
 
-/**
- * Release pointer captures.
- * This is called by releasePointerCapture in the API, and when an object is removed.
+/**
+ * Release pointer captures.
+ * This is called by releasePointerCapture in the API, and when an object is removed.
  */
 function releaseInternalPointerCapture(capturedMap, obj, captures, pointerId) {
   const captureData = captures.get(obj);
@@ -1173,19 +1173,19 @@ function createEvents(store) {
         // Check presence of handlers
         if (!(instance != null && instance.eventCount)) return;
 
-        /*
-        MAYBE TODO, DELETE IF NOT: 
-          Check if the object is captured, captured events should not have intersects running in parallel
-          But wouldn't it be better to just replace capturedMap with a single entry?
-          Also, are we OK with straight up making picking up multiple objects impossible?
-          
-        const pointerId = (data as ThreeEvent<PointerEvent>).pointerId        
-        if (pointerId !== undefined) {
-          const capturedMeshSet = internal.capturedMap.get(pointerId)
-          if (capturedMeshSet) {
-            const captured = capturedMeshSet.get(eventObject)
-            if (captured && captured.localState.stopped) return
-          }
+        /*
+        MAYBE TODO, DELETE IF NOT: 
+          Check if the object is captured, captured events should not have intersects running in parallel
+          But wouldn't it be better to just replace capturedMap with a single entry?
+          Also, are we OK with straight up making picking up multiple objects impossible?
+          
+        const pointerId = (data as ThreeEvent<PointerEvent>).pointerId        
+        if (pointerId !== undefined) {
+          const capturedMeshSet = internal.capturedMap.get(pointerId)
+          if (capturedMeshSet) {
+            const captured = capturedMeshSet.get(eventObject)
+            if (captured && captured.localState.stopped) return
+          }
         }*/
 
         if (isPointerMove) {
@@ -1491,21 +1491,21 @@ let globalEffects = new Set();
 let globalAfterEffects = new Set();
 let globalTailEffects = new Set();
 
-/**
- * Adds a global render callback which is called each frame.
- * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addEffect
+/**
+ * Adds a global render callback which is called each frame.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addEffect
  */
 const addEffect = callback => createSubs(callback, globalEffects);
 
-/**
- * Adds a global after-render callback which is called each frame.
- * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addAfterEffect
+/**
+ * Adds a global after-render callback which is called each frame.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addAfterEffect
  */
 const addAfterEffect = callback => createSubs(callback, globalAfterEffects);
 
-/**
- * Adds a global callback which is called when rendering stops.
- * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addTail
+/**
+ * Adds a global callback which is called when rendering stops.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addTail
  */
 const addTail = callback => createSubs(callback, globalTailEffects);
 function run(effects, timestamp) {
@@ -1604,24 +1604,24 @@ function createLoop(roots) {
   }
   return {
     loop,
-    /**
-     * Invalidates the view, requesting a frame to be rendered. Will globally invalidate unless passed a root's state.
-     * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#invalidate
+    /**
+     * Invalidates the view, requesting a frame to be rendered. Will globally invalidate unless passed a root's state.
+     * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#invalidate
      */
     invalidate,
-    /**
-     * Advances the frameloop and runs render effects, useful for when manually rendering via `frameloop="never"`.
-     * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#advance
+    /**
+     * Advances the frameloop and runs render effects, useful for when manually rendering via `frameloop="never"`.
+     * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#advance
      */
     advance
   };
 }
 
-/**
- * Exposes an object's {@link LocalState}.
- * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#useInstanceHandle
- *
- * **Note**: this is an escape hatch to react-internal fields. Expect this to change significantly between versions.
+/**
+ * Exposes an object's {@link LocalState}.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#useInstanceHandle
+ *
+ * **Note**: this is an escape hatch to react-internal fields. Expect this to change significantly between versions.
  */
 function useInstanceHandle(ref) {
   const instance = React__namespace.useRef(null);
@@ -1634,18 +1634,18 @@ function useStore() {
   return store;
 }
 
-/**
- * Accesses R3F's internal state, containing renderer, canvas, scene, etc.
- * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#usethree
+/**
+ * Accesses R3F's internal state, containing renderer, canvas, scene, etc.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#usethree
  */
 function useThree(selector = state => state, equalityFn) {
   return useStore()(selector, equalityFn);
 }
 
-/**
- * Executes a callback before render in a shared frame loop.
- * Can order effects with render priority or manually render with a positive priority.
- * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe
+/**
+ * Executes a callback before render in a shared frame loop.
+ * Can order effects with render priority or manually render with a positive priority.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe
  */
 function useFrame(callback, renderPriority = 0) {
   const store = useStore();
@@ -1657,9 +1657,9 @@ function useFrame(callback, renderPriority = 0) {
   return null;
 }
 
-/**
- * Returns a node graph of an object with named nodes & materials.
- * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#usegraph
+/**
+ * Returns a node graph of an object with named nodes & materials.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#usegraph
  */
 function useGraph(object) {
   return React__namespace.useMemo(() => buildGraph(object), [object]);
@@ -1682,11 +1682,11 @@ function loadingFn(extensions, onProgress) {
   };
 }
 
-/**
- * Synchronously loads and caches assets with a three loader.
- *
- * Note: this hook's caller must be wrapped with `React.Suspense`
- * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#useloader
+/**
+ * Synchronously loads and caches assets with a three loader.
+ *
+ * Note: this hook's caller must be wrapped with `React.Suspense`
+ * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#useloader
  */
 function useLoader(Proto, input, extensions, onProgress) {
   // Use suspense to load async assets
@@ -1698,16 +1698,16 @@ function useLoader(Proto, input, extensions, onProgress) {
   return Array.isArray(input) ? results : results[0];
 }
 
-/**
- * Preloads an asset into cache as a side-effect.
+/**
+ * Preloads an asset into cache as a side-effect.
  */
 useLoader.preload = function (Proto, input, extensions) {
   const keys = Array.isArray(input) ? input : [input];
   return suspendReact.preload(loadingFn(extensions), [Proto, ...keys]);
 };
 
-/**
- * Removes a loaded asset from cache.
+/**
+ * Removes a loaded asset from cache.
  */
 useLoader.clear = function (Proto, input) {
   const keys = Array.isArray(input) ? input : [input];
@@ -2082,10 +2082,10 @@ function Portal({
   children,
   container
 }) {
-  /** This has to be a component because it would not be able to call useThree/useStore otherwise since
-   *  if this is our environment, then we are not in r3f's renderer but in react-dom, it would trigger
-   *  the "R3F hooks can only be used within the Canvas component!" warning:
-   *  <Canvas>
+  /** This has to be a component because it would not be able to call useThree/useStore otherwise since
+   *  if this is our environment, then we are not in r3f's renderer but in react-dom, it would trigger
+   *  the "R3F hooks can only be used within the Canvas component!" warning:
+   *  <Canvas>
    *    {createPortal(...)} */
   const {
     events,

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-886811f8.cjs.dev.js');
+var index = require('./index-d1f17345.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -251,9 +251,9 @@ const CanvasImpl = /*#__PURE__*/React__namespace.forwardRef(function Canvas({
   }, fallback)));
 });
 
-/**
- * A DOM canvas which accepts threejs elements as children.
- * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
+/**
+ * A DOM canvas which accepts threejs elements as children.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
  */
 const Canvas = /*#__PURE__*/React__namespace.forwardRef(function CanvasWrapper(props, ref) {
   return /*#__PURE__*/React__namespace.createElement(itsFine.FiberProvider, null, /*#__PURE__*/React__namespace.createElement(CanvasImpl, _extends({}, props, {

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-0ed4bbca.cjs.prod.js');
+var index = require('./index-ce1a9f04.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -251,9 +251,9 @@ const CanvasImpl = /*#__PURE__*/React__namespace.forwardRef(function Canvas({
   }, fallback)));
 });
 
-/**
- * A DOM canvas which accepts threejs elements as children.
- * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
+/**
+ * A DOM canvas which accepts threejs elements as children.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
  */
 const Canvas = /*#__PURE__*/React__namespace.forwardRef(function CanvasWrapper(props, ref) {
   return /*#__PURE__*/React__namespace.createElement(itsFine.FiberProvider, null, /*#__PURE__*/React__namespace.createElement(CanvasImpl, _extends({}, props, {

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-563322db.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, 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, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from './index-563322db.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-c4d1c86e.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, 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, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from './index-c4d1c86e.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
@@ -224,9 +224,9 @@ const CanvasImpl = /*#__PURE__*/React.forwardRef(function Canvas({
   }, fallback)));
 });
 
-/**
- * A DOM canvas which accepts threejs elements as children.
- * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
+/**
+ * A DOM canvas which accepts threejs elements as children.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
  */
 const Canvas = /*#__PURE__*/React.forwardRef(function CanvasWrapper(props, ref) {
   return /*#__PURE__*/React.createElement(FiberProvider, null, /*#__PURE__*/React.createElement(CanvasImpl, _extends({}, props, {

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-886811f8.cjs.dev.js');
+var index = require('../../dist/index-d1f17345.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -12,6 +12,7 @@ var itsFine = require('its-fine');
 var expoAsset = require('expo-asset');
 var fs = require('expo-file-system');
 var base64Js = require('base64-js');
+var buffer = require('buffer');
 require('react-reconciler/constants');
 require('zustand');
 require('react-reconciler');
@@ -122,9 +123,9 @@ function createTouchEvents(store) {
   };
 }
 
-/**
- * A native canvas which accepts threejs elements as children.
- * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
+/**
+ * A native canvas which accepts threejs elements as children.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
  */
 const CanvasImpl = /*#__PURE__*/React__namespace.forwardRef(({
   children,
@@ -271,9 +272,9 @@ const CanvasImpl = /*#__PURE__*/React__namespace.forwardRef(({
   }));
 });
 
-/**
- * A native canvas which accepts threejs elements as children.
- * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
+/**
+ * A native canvas which accepts threejs elements as children.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
  */
 const Canvas = /*#__PURE__*/React__namespace.forwardRef(function CanvasWrapper(props, ref) {
   return /*#__PURE__*/React__namespace.createElement(itsFine.FiberProvider, null, /*#__PURE__*/React__namespace.createElement(CanvasImpl, _extends({}, props, {
@@ -291,54 +292,52 @@ function polyfills() {
   }
 
   // Patch Blob for ArrayBuffer if unsupported
-  if (reactNative.Platform.OS !== 'web') {
-    try {
-      new Blob([new ArrayBuffer(4)]);
-    } catch (_) {
-      const BlobManager = require('react-native/Libraries/Blob/BlobManager.js');
-      BlobManager.createFromParts = function createFromParts(parts, options) {
-        const blobId = uuidv4();
-        const items = parts.map(part => {
-          if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
-            const data = base64Js.fromByteArray(new Uint8Array(part));
-            return {
-              data,
-              type: 'string'
-            };
-          } else if (part instanceof Blob) {
-            return {
-              data: part.data,
-              type: 'blob'
-            };
-          } else {
-            return {
-              data: String(part),
-              type: 'string'
-            };
-          }
-        });
-        const size = items.reduce((acc, curr) => {
-          if (curr.type === 'string') {
-            return acc + global.unescape(encodeURI(curr.data)).length;
-          } else {
-            return acc + curr.data.size;
-          }
-        }, 0);
-        reactNative.NativeModules.BlobModule.createFromParts(items, blobId);
-        return BlobManager.createFromOptions({
-          blobId,
-          offset: 0,
-          size,
-          type: options ? options.type : '',
-          lastModified: options ? options.lastModified : Date.now()
-        });
-      };
-    }
+  try {
+    new Blob([new ArrayBuffer(4)]);
+  } catch (_) {
+    const BlobManager = require('react-native/Libraries/Blob/BlobManager.js');
+    BlobManager.createFromParts = function createFromParts(parts, options) {
+      const blobId = uuidv4();
+      const items = parts.map(part => {
+        if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
+          const data = base64Js.fromByteArray(new Uint8Array(part));
+          return {
+            data,
+            type: 'string'
+          };
+        } else if (part instanceof Blob) {
+          return {
+            data: part.data,
+            type: 'blob'
+          };
+        } else {
+          return {
+            data: String(part),
+            type: 'string'
+          };
+        }
+      });
+      const size = items.reduce((acc, curr) => {
+        if (curr.type === 'string') {
+          return acc + global.unescape(encodeURI(curr.data)).length;
+        } else {
+          return acc + curr.data.size;
+        }
+      }, 0);
+      reactNative.NativeModules.BlobModule.createFromParts(items, blobId);
+      return BlobManager.createFromOptions({
+        blobId,
+        offset: 0,
+        size,
+        type: options ? options.type : '',
+        lastModified: options ? options.lastModified : Date.now()
+      });
+    };
   }
   async function getAsset(input) {
     if (typeof input === 'string') {
-      // Don't process storage or data uris
-      if (input.startsWith('file:') || input.startsWith('data:')) return input;
+      // Don't process storage
+      if (input.startsWith('file:')) return input;
 
       // Unpack Blobs from react-native BlobManager
       if (input.startsWith('blob:')) {
@@ -356,7 +355,18 @@ function polyfills() {
           reader.onerror = rej;
           reader.readAsText(blob);
         });
-        return `data:${blob.type};base64,${data}`;
+        input = `data:${blob.type};base64,${data}`;
+      }
+
+      // Create safe URI for JSI
+      if (input.startsWith('data:')) {
+        const [header, data] = input.split(',');
+        const [, type] = header.split('/');
+        const uri = fs__namespace.cacheDirectory + uuidv4() + `.${type}`;
+        await fs__namespace.writeAsStringAsync(uri, data, {
+          encoding: fs__namespace.EncodingType.Base64
+        });
+        return uri;
       }
     }
 
@@ -382,18 +392,10 @@ function polyfills() {
 
   // There's no Image in native, so create a data texture instead
   THREE__namespace.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
-    if (this.path) url = this.path + url;
+    if (this.path && typeof url === 'string') url = this.path + url;
+    this.manager.itemStart(url);
     const texture = new THREE__namespace.Texture();
     getAsset(url).then(async uri => {
-      // Create safe URI for JSI
-      if (uri.startsWith('data:')) {
-        const [header, data] = uri.split(',');
-        const [, type] = header.split('/');
-        uri = fs__namespace.cacheDirectory + uuidv4() + `.${type}`;
-        await fs__namespace.writeAsStringAsync(uri, data, {
-          encoding: fs__namespace.EncodingType.Base64
-        });
-      }
       const {
         width,
         height
@@ -416,59 +418,35 @@ function polyfills() {
       // @ts-ignore
       texture.isDataTexture = true;
       onLoad == null ? void 0 : onLoad(texture);
-    }).catch(onError);
+    }).catch(error => {
+      onError == null ? void 0 : onError(error);
+      this.manager.itemError(url);
+    }).finally(() => {
+      this.manager.itemEnd(url);
+    });
     return texture;
   };
 
   // Fetches assets via XMLHttpRequest
   THREE__namespace.FileLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
-    if (this.path) url = this.path + url;
-    const request = new XMLHttpRequest();
+    if (this.path && typeof url === 'string') url = this.path + url;
+    this.manager.itemStart(url);
     getAsset(url).then(async uri => {
-      // Make FS paths web-safe
-      if (uri.startsWith('file://')) {
-        const data = await fs__namespace.readAsStringAsync(uri, {
-          encoding: fs__namespace.EncodingType.Base64
-        });
-        uri = `data:application/octet-stream;base64,${data}`;
-      }
-      request.open('GET', uri, true);
-      request.addEventListener('load', event => {
-        if (request.status === 200) {
-          onLoad == null ? void 0 : onLoad(request.response);
-          this.manager.itemEnd(url);
-        } else {
-          onError == null ? void 0 : onError(event);
-          this.manager.itemError(url);
-          this.manager.itemEnd(url);
-        }
-      }, false);
-      request.addEventListener('progress', event => {
-        onProgress == null ? void 0 : onProgress(event);
-      }, false);
-      request.addEventListener('error', event => {
-        onError == null ? void 0 : onError(event);
-        this.manager.itemError(url);
-        this.manager.itemEnd(url);
-      }, false);
-      request.addEventListener('abort', event => {
-        onError == null ? void 0 : onError(event);
-        this.manager.itemError(url);
-        this.manager.itemEnd(url);
-      }, false);
-      if (this.responseType) request.responseType = this.responseType;
-      if (this.withCredentials) request.withCredentials = this.withCredentials;
-      for (const header in this.requestHeader) {
-        request.setRequestHeader(header, this.requestHeader[header]);
-      }
-      request.send(null);
-      this.manager.itemStart(url);
-    }).catch(onError);
-    return request;
+      const base64 = await fs__namespace.readAsStringAsync(uri, {
+        encoding: fs__namespace.EncodingType.Base64
+      });
+      const data = buffer.Buffer.from(base64, 'base64');
+      onLoad == null ? void 0 : onLoad(data.buffer);
+    }).catch(error => {
+      onError == null ? void 0 : onError(error);
+      this.manager.itemError(url);
+    }).finally(() => {
+      this.manager.itemEnd(url);
+    });
   };
 }
 
-polyfills();
+if (reactNative.Platform.OS !== 'web') polyfills();
 
 exports.ReactThreeFiber = index.threeTypes;
 exports._roots = index.roots;