@react-three/fiber 8.0.0-beta-04 → 8.0.0-beta-05

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

@@ -2,17 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-eb414398.cjs.prod.js');
 var THREE = require('three');
 var expoAsset = require('expo-asset');
-var expoFileSystem = require('expo-file-system');
-var base64Arraybuffer = require('base64-arraybuffer');
-var suspendReact = require('suspend-react');
+var index = require('../../dist/index-ff8b5912.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var reactNative = require('react-native');
 var expoGl = require('expo-gl');
 var Pressability = require('react-native/Libraries/Pressability/Pressability');
+require('suspend-react');
 require('react-reconciler/constants');
 require('zustand');
 require('react-reconciler');
@@ -44,116 +42,6 @@ var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var Pressability__default = /*#__PURE__*/_interopDefault(Pressability);
 
-/**
- * Generates an asset based on input type.
- */
-
-const getAsset = input => {
-  if (input instanceof expoAsset.Asset) return input;
-
-  switch (typeof input) {
-    case 'string':
-      return expoAsset.Asset.fromURI(input);
-
-    case 'number':
-      return expoAsset.Asset.fromModule(input);
-
-    default:
-      throw 'Invalid asset! Must be a URI or module.';
-  }
-};
-/**
- * Downloads from a local URI and decodes into an ArrayBuffer.
- */
-
-
-const toBuffer = async localUri => expoFileSystem.readAsStringAsync(localUri, {
-  encoding: 'base64'
-}).then(base64Arraybuffer.decode);
-
-function loadingFn(extensions, onProgress) {
-  return function (Proto, ...input) {
-    // Construct new loader and run extensions
-    const loader = new Proto();
-    if (extensions) extensions(loader); // Go through the urls and load them
-
-    return Promise.all(input.map(entry => new Promise(async (res, reject) => {
-      // Construct URL
-      const url = typeof entry === 'string' ? loader.path + entry : entry; // There's no Image in native, so we create & pass a data texture instead
-
-      if (loader instanceof THREE__namespace.TextureLoader) {
-        const asset = await getAsset(url).downloadAsync();
-        const texture = new THREE__namespace.Texture();
-        texture.isDataTexture = true;
-        texture.image = {
-          data: asset,
-          width: asset.width,
-          height: asset.height
-        };
-        texture.needsUpdate = true;
-        return res(texture);
-      } // Do similar for CubeTextures
-
-
-      if (loader instanceof THREE__namespace.CubeTextureLoader) {
-        const texture = new THREE__namespace.CubeTexture();
-        texture.isDataTexture = true;
-        texture.images = await Promise.all(url.map(async src => {
-          const asset = await getAsset(src).downloadAsync();
-          return {
-            data: asset,
-            width: asset.width,
-            height: asset.height
-          };
-        }));
-        texture.needsUpdate = true;
-        return res(texture);
-      } // If asset is external and not an Image, load it
-
-
-      if (url.startsWith != null && url.startsWith('http') && Proto.prototype.hasOwnProperty('load')) {
-        return loader.load(entry, data => {
-          if (data.scene) Object.assign(data, index.buildGraph(data.scene));
-          res(data);
-        }, onProgress, error => reject(`Could not load ${url}: ${error.message}`));
-      } // Otherwise, create a localUri and a file buffer
-
-
-      const {
-        localUri
-      } = await getAsset(url).downloadAsync();
-      const arrayBuffer = await toBuffer(localUri); // Parse it
-
-      const parsed = loader.parse == null ? void 0 : loader.parse(arrayBuffer, undefined, data => {
-        if (data.scene) Object.assign(data, index.buildGraph(data.scene));
-        res(data);
-      }, error => reject(`Could not load ${url}: ${error.message}`)); // Respect synchronous parsers which don't have callbacks
-
-      if (parsed) return res(parsed);
-    })));
-  };
-}
-
-function useLoader(Proto, input, extensions, onProgress) {
-  // Use suspense to load async assets
-  const keys = Array.isArray(input) ? input : [input];
-  const results = suspendReact.suspend(loadingFn(extensions, onProgress), [Proto, ...keys], {
-    equal: index.is.equ
-  }); // Return the object/s
-
-  return Array.isArray(input) ? results : results[0];
-}
-
-useLoader.preload = function (Proto, input, extensions) {
-  const keys = Array.isArray(input) ? input : [input];
-  return suspendReact.preload(loadingFn(extensions), [Proto, ...keys]);
-};
-
-useLoader.clear = function (Proto, input) {
-  const keys = Array.isArray(input) ? input : [input];
-  return suspendReact.clear([Proto, ...keys]);
-};
-
 const EVENTS = {
   PRESS: 'onPress',
   PRESSIN: 'onPressIn',
@@ -180,8 +68,8 @@ function createTouchEvents(store) {
   const handleTouch = (event, name) => {
     event.persist() // Apply offset
     ;
-    event.nativeEvent.offsetX = event.nativeEvent.pageX;
-    event.nativeEvent.offsetY = event.nativeEvent.pageY; // Emulate DOM event
+    event.nativeEvent.offsetX = event.nativeEvent.locationX;
+    event.nativeEvent.offsetY = event.nativeEvent.locationY; // Emulate DOM event
 
     const callback = handlePointer(DOM_EVENTS[name]);
     return callback(event.nativeEvent);
@@ -199,13 +87,13 @@ function createTouchEvents(store) {
       } = store.getState();
       events.disconnect == null ? void 0 : events.disconnect();
       const connected = new Pressability__default['default'](events == null ? void 0 : events.handlers);
-      const handlers = connected.getEventHandlers();
       set(state => ({
         events: { ...state.events,
-          connected,
-          handlers
+          connected
         }
       }));
+      const handlers = connected.getEventHandlers();
+      return handlers;
     },
     disconnect: () => {
       const {
@@ -314,7 +202,8 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
     // Overwrite onCreated to apply RN bindings
     const onCreated = state => {
       // Bind events after creation
-      setBind(state.events.handlers); // Bind render to RN bridge
+      const handlers = state.events.connect == null ? void 0 : state.events.connect(canvas);
+      setBind(handlers); // Bind render to RN bridge
 
       const context = state.gl.getContext();
       const renderFrame = state.gl.render.bind(state.gl);
@@ -362,6 +251,87 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
   }));
 });
 
+/**
+ * Generates an asset based on input type.
+ */
+
+const getAsset = input => {
+  if (input instanceof expoAsset.Asset) return input;
+
+  switch (typeof input) {
+    case 'string':
+      return expoAsset.Asset.fromURI(input);
+
+    case 'number':
+      return expoAsset.Asset.fromModule(input);
+
+    default:
+      throw 'Invalid asset! Must be a URI or module.';
+  }
+}; // Don't pre-process urls, let expo-asset generate an absolute URL
+
+
+THREE__namespace.LoaderUtils.extractUrlBase = () => './'; // There's no Image in native, so create a data texture instead
+
+
+THREE__namespace.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
+  const texture = new THREE__namespace.Texture(); // @ts-expect-error
+
+  texture.isDataTexture = true;
+  getAsset(url).downloadAsync().then(asset => {
+    texture.image = {
+      data: asset,
+      width: asset.width,
+      height: asset.height
+    };
+    texture.needsUpdate = true;
+    onLoad == null ? void 0 : onLoad(texture);
+  }).catch(onError);
+  return texture;
+}; // Fetches assets via XMLHttpRequest
+
+
+THREE__namespace.FileLoader.prototype.load = function (url, onLoad, onProgress, onError) {
+  if (this.path) url = this.path + url;
+  const request = new XMLHttpRequest();
+  getAsset(url).downloadAsync().then(asset => {
+    request.open('GET', asset.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);
+  });
+  return request;
+};
+
 exports.ReactThreeFiber = index.threeTypes;
 exports._roots = index.roots;
 exports.act = index.act;
@@ -381,8 +351,8 @@ exports.render = index.render;
 exports.unmountComponentAtNode = index.unmountComponentAtNode;
 exports.useFrame = index.useFrame;
 exports.useGraph = index.useGraph;
+exports.useLoader = index.useLoader;
 exports.useStore = index.useStore;
 exports.useThree = index.useThree;
 exports.Canvas = Canvas;
 exports.events = createTouchEvents;
-exports.useLoader = useLoader;

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

@@ -1,130 +1,18 @@
-import { z as buildGraph, A as is, c as createEvents, e as extend, p as pick, o as omit, a as createRoot, u as unmountComponentAtNode } from '../../dist/index-fccd77b0.esm.js';
-export { t as ReactThreeFiber, y as _roots, x as act, v as addAfterEffect, s as addEffect, w as addTail, q as advance, l as applyProps, i as context, j as createPortal, a as createRoot, m as dispose, e as extend, n as invalidate, k as reconciler, r as render, u as unmountComponentAtNode, f as useFrame, g as useGraph, b as useStore, d as useThree } from '../../dist/index-fccd77b0.esm.js';
 import * as THREE from 'three';
 import { Asset } from 'expo-asset';
-import { readAsStringAsync } from 'expo-file-system';
-import { decode } from 'base64-arraybuffer';
-import { suspend, preload, clear } from 'suspend-react';
+import { c as createEvents, e as extend, p as pick, o as omit, a as createRoot, u as unmountComponentAtNode } from '../../dist/index-3f4e5f46.esm.js';
+export { t as ReactThreeFiber, q as _roots, n as act, l as addAfterEffect, k as addEffect, m as addTail, j as advance, g as applyProps, b as context, d as createPortal, a as createRoot, h as dispose, e as extend, i as invalidate, f as reconciler, r as render, u as unmountComponentAtNode, w as useFrame, x as useGraph, y as useLoader, s as useStore, v as useThree } from '../../dist/index-3f4e5f46.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import { PixelRatio, View, StyleSheet } from 'react-native';
 import { GLView } from 'expo-gl';
 import Pressability from 'react-native/Libraries/Pressability/Pressability';
+import 'suspend-react';
 import 'react-reconciler/constants';
 import 'zustand';
 import 'react-reconciler';
 import 'scheduler';
 
-/**
- * Generates an asset based on input type.
- */
-
-const getAsset = input => {
-  if (input instanceof Asset) return input;
-
-  switch (typeof input) {
-    case 'string':
-      return Asset.fromURI(input);
-
-    case 'number':
-      return Asset.fromModule(input);
-
-    default:
-      throw 'Invalid asset! Must be a URI or module.';
-  }
-};
-/**
- * Downloads from a local URI and decodes into an ArrayBuffer.
- */
-
-
-const toBuffer = async localUri => readAsStringAsync(localUri, {
-  encoding: 'base64'
-}).then(decode);
-
-function loadingFn(extensions, onProgress) {
-  return function (Proto, ...input) {
-    // Construct new loader and run extensions
-    const loader = new Proto();
-    if (extensions) extensions(loader); // Go through the urls and load them
-
-    return Promise.all(input.map(entry => new Promise(async (res, reject) => {
-      // Construct URL
-      const url = typeof entry === 'string' ? loader.path + entry : entry; // There's no Image in native, so we create & pass a data texture instead
-
-      if (loader instanceof THREE.TextureLoader) {
-        const asset = await getAsset(url).downloadAsync();
-        const texture = new THREE.Texture();
-        texture.isDataTexture = true;
-        texture.image = {
-          data: asset,
-          width: asset.width,
-          height: asset.height
-        };
-        texture.needsUpdate = true;
-        return res(texture);
-      } // Do similar for CubeTextures
-
-
-      if (loader instanceof THREE.CubeTextureLoader) {
-        const texture = new THREE.CubeTexture();
-        texture.isDataTexture = true;
-        texture.images = await Promise.all(url.map(async src => {
-          const asset = await getAsset(src).downloadAsync();
-          return {
-            data: asset,
-            width: asset.width,
-            height: asset.height
-          };
-        }));
-        texture.needsUpdate = true;
-        return res(texture);
-      } // If asset is external and not an Image, load it
-
-
-      if (url.startsWith != null && url.startsWith('http') && Proto.prototype.hasOwnProperty('load')) {
-        return loader.load(entry, data => {
-          if (data.scene) Object.assign(data, buildGraph(data.scene));
-          res(data);
-        }, onProgress, error => reject(`Could not load ${url}: ${error.message}`));
-      } // Otherwise, create a localUri and a file buffer
-
-
-      const {
-        localUri
-      } = await getAsset(url).downloadAsync();
-      const arrayBuffer = await toBuffer(localUri); // Parse it
-
-      const parsed = loader.parse == null ? void 0 : loader.parse(arrayBuffer, undefined, data => {
-        if (data.scene) Object.assign(data, buildGraph(data.scene));
-        res(data);
-      }, error => reject(`Could not load ${url}: ${error.message}`)); // Respect synchronous parsers which don't have callbacks
-
-      if (parsed) return res(parsed);
-    })));
-  };
-}
-
-function useLoader(Proto, input, extensions, onProgress) {
-  // Use suspense to load async assets
-  const keys = Array.isArray(input) ? input : [input];
-  const results = suspend(loadingFn(extensions, onProgress), [Proto, ...keys], {
-    equal: is.equ
-  }); // Return the object/s
-
-  return Array.isArray(input) ? results : results[0];
-}
-
-useLoader.preload = function (Proto, input, extensions) {
-  const keys = Array.isArray(input) ? input : [input];
-  return preload(loadingFn(extensions), [Proto, ...keys]);
-};
-
-useLoader.clear = function (Proto, input) {
-  const keys = Array.isArray(input) ? input : [input];
-  return clear([Proto, ...keys]);
-};
-
 const EVENTS = {
   PRESS: 'onPress',
   PRESSIN: 'onPressIn',
@@ -151,8 +39,8 @@ function createTouchEvents(store) {
   const handleTouch = (event, name) => {
     event.persist() // Apply offset
     ;
-    event.nativeEvent.offsetX = event.nativeEvent.pageX;
-    event.nativeEvent.offsetY = event.nativeEvent.pageY; // Emulate DOM event
+    event.nativeEvent.offsetX = event.nativeEvent.locationX;
+    event.nativeEvent.offsetY = event.nativeEvent.locationY; // Emulate DOM event
 
     const callback = handlePointer(DOM_EVENTS[name]);
     return callback(event.nativeEvent);
@@ -170,13 +58,13 @@ function createTouchEvents(store) {
       } = store.getState();
       events.disconnect == null ? void 0 : events.disconnect();
       const connected = new Pressability(events == null ? void 0 : events.handlers);
-      const handlers = connected.getEventHandlers();
       set(state => ({
         events: { ...state.events,
-          connected,
-          handlers
+          connected
         }
       }));
+      const handlers = connected.getEventHandlers();
+      return handlers;
     },
     disconnect: () => {
       const {
@@ -285,7 +173,8 @@ const Canvas = /*#__PURE__*/React.forwardRef(({
     // Overwrite onCreated to apply RN bindings
     const onCreated = state => {
       // Bind events after creation
-      setBind(state.events.handlers); // Bind render to RN bridge
+      const handlers = state.events.connect == null ? void 0 : state.events.connect(canvas);
+      setBind(handlers); // Bind render to RN bridge
 
       const context = state.gl.getContext();
       const renderFrame = state.gl.render.bind(state.gl);
@@ -333,4 +222,85 @@ const Canvas = /*#__PURE__*/React.forwardRef(({
   }));
 });
 
-export { Canvas, createTouchEvents as events, useLoader };
+/**
+ * Generates an asset based on input type.
+ */
+
+const getAsset = input => {
+  if (input instanceof Asset) return input;
+
+  switch (typeof input) {
+    case 'string':
+      return Asset.fromURI(input);
+
+    case 'number':
+      return Asset.fromModule(input);
+
+    default:
+      throw 'Invalid asset! Must be a URI or module.';
+  }
+}; // Don't pre-process urls, let expo-asset generate an absolute URL
+
+
+THREE.LoaderUtils.extractUrlBase = () => './'; // There's no Image in native, so create a data texture instead
+
+
+THREE.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
+  const texture = new THREE.Texture(); // @ts-expect-error
+
+  texture.isDataTexture = true;
+  getAsset(url).downloadAsync().then(asset => {
+    texture.image = {
+      data: asset,
+      width: asset.width,
+      height: asset.height
+    };
+    texture.needsUpdate = true;
+    onLoad == null ? void 0 : onLoad(texture);
+  }).catch(onError);
+  return texture;
+}; // Fetches assets via XMLHttpRequest
+
+
+THREE.FileLoader.prototype.load = function (url, onLoad, onProgress, onError) {
+  if (this.path) url = this.path + url;
+  const request = new XMLHttpRequest();
+  getAsset(url).downloadAsync().then(asset => {
+    request.open('GET', asset.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);
+  });
+  return request;
+};
+
+export { Canvas, createTouchEvents as events };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.0.0-beta-04",
+  "version": "8.0.0-beta-05",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",
@@ -43,11 +43,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "base64-arraybuffer": "^1.0.1",
-    "expo-asset": "^8.4.3",
-    "expo-file-system": "^13.0.3",
-    "expo-gl": "^11.0.3",
-    "expo": "^43.0.1",
     "react-merge-refs": "^1.1.0",
     "react-reconciler": "^0.27.0-rc.0",
     "react-use-measure": "^2.1.1",
@@ -61,7 +56,10 @@
     "react": ">=18.0",
     "react-dom": ">=18.0",
     "react-native": ">=0.64",
-    "three": ">=0.132"
+    "expo": ">=43.0",
+    "expo-asset": ">=8.4",
+    "expo-gl": ">=11.0",
+    "three": ">=0.133"
   },
   "peerDependenciesMeta": {
     "react-dom": {
@@ -69,6 +67,15 @@
     },
     "react-native": {
       "optional": true
+    },
+    "expo": {
+      "optional": true
+    },
+    "expo-asset": {
+      "optional": true
+    },
+    "expo-gl": {
+      "optional": true
     }
   }
 }

package/dist/declarations/src/native/hooks.d.ts

@@ -1,9 +0,0 @@
-import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
-import { ObjectMap } from '../core/utils';
-import { Extensions, LoaderResult, BranchingReturn, useStore, useThree, useFrame, useGraph } from '../core/hooks';
-declare function useLoader<T, U extends string | string[]>(Proto: new () => LoaderResult<T>, input: U, extensions?: Extensions, onProgress?: (event: ProgressEvent<EventTarget>) => void): U extends any[] ? BranchingReturn<T, GLTF, GLTF & ObjectMap>[] : BranchingReturn<T, GLTF, GLTF & ObjectMap>;
-declare namespace useLoader {
-    var preload: <T, U extends string | string[]>(Proto: new () => LoaderResult<T>, input: U, extensions?: Extensions | undefined) => undefined;
-    var clear: <T, U extends string | string[]>(Proto: new () => LoaderResult<T>, input: U) => void;
-}
-export { useStore, useThree, useFrame, useGraph, useLoader };