@react-three/fiber 8.14.5 → 8.14.7

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-0ed4bbca.cjs.prod.js');
+var index = require('../../dist/index-ce1a9f04.cjs.prod.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;

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

@@ -1,14 +1,15 @@
-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-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 '../../dist/index-563322db.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-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 '../../dist/index-c4d1c86e.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, NativeModules, Image, Platform } from 'react-native';
 import { GLView } from 'expo-gl';
 import { FiberProvider, useContextBridge } from 'its-fine';
 import { Asset } from 'expo-asset';
 import * as fs from 'expo-file-system';
 import { fromByteArray } from 'base64-js';
+import { Buffer } from 'buffer';
 import 'react-reconciler/constants';
 import 'zustand';
 import 'react-reconciler';
@@ -97,9 +98,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.forwardRef(({
   children,
@@ -246,9 +247,9 @@ const CanvasImpl = /*#__PURE__*/React.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.forwardRef(function CanvasWrapper(props, ref) {
   return /*#__PURE__*/React.createElement(FiberProvider, null, /*#__PURE__*/React.createElement(CanvasImpl, _extends({}, props, {
@@ -266,54 +267,52 @@ function polyfills() {
   }
 
   // Patch Blob for ArrayBuffer if unsupported
-  if (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 = 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);
-        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 = 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);
+      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:')) {
@@ -331,7 +330,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.cacheDirectory + uuidv4() + `.${type}`;
+        await fs.writeAsStringAsync(uri, data, {
+          encoding: fs.EncodingType.Base64
+        });
+        return uri;
       }
     }
 
@@ -357,18 +367,10 @@ function polyfills() {
 
   // There's no Image in native, so create a data texture instead
   THREE.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.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.cacheDirectory + uuidv4() + `.${type}`;
-        await fs.writeAsStringAsync(uri, data, {
-          encoding: fs.EncodingType.Base64
-        });
-      }
       const {
         width,
         height
@@ -391,58 +393,34 @@ 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.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.readAsStringAsync(uri, {
-          encoding: fs.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.readAsStringAsync(uri, {
+        encoding: fs.EncodingType.Base64
+      });
+      const data = 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 (Platform.OS !== 'web') polyfills();
 
 export { Canvas, createTouchEvents as events };

package/native/package.json

@@ -1,5 +1,5 @@
-{
-  "main": "dist/react-three-fiber-native.cjs.js",
-  "module": "dist/react-three-fiber-native.esm.js",
-  "types": "dist/react-three-fiber-native.cjs.d.ts"
-}
+{
+  "main": "dist/react-three-fiber-native.cjs.js",
+  "module": "dist/react-three-fiber-native.esm.js",
+  "types": "dist/react-three-fiber-native.cjs.d.ts"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.14.5",
+  "version": "8.14.7",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",
@@ -45,6 +45,7 @@
     "@babel/runtime": "^7.17.8",
     "@types/react-reconciler": "^0.26.7",
     "base64-js": "^1.5.1",
+    "buffer": "^6.0.3",
     "its-fine": "^1.0.6",
     "react-reconciler": "^0.27.0",
     "react-use-measure": "^2.1.1",