@react-three/fiber 7.0.25 → 7.0.28

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

@@ -81,7 +81,7 @@ function createEvents(store) {
   /** Sets up defaultRaycaster */
 
   function prepareRay(event) {
-    var _raycaster$computeOff;
+    var _customOffsets$offset, _customOffsets$offset2, _customOffsets$width, _customOffsets$height;
 
     const state = store.getState();
     const {
@@ -92,14 +92,11 @@ function createEvents(store) {
     } = state; // https://github.com/pmndrs/react-three-fiber/pull/782
     // Events trigger outside of canvas when moved
 
-    const {
-      offsetX,
-      offsetY
-    } = (_raycaster$computeOff = raycaster.computeOffsets == null ? void 0 : raycaster.computeOffsets(event, state)) != null ? _raycaster$computeOff : event;
-    const {
-      width,
-      height
-    } = size;
+    const customOffsets = raycaster.computeOffsets == null ? void 0 : raycaster.computeOffsets(event, state);
+    const offsetX = (_customOffsets$offset = customOffsets == null ? void 0 : customOffsets.offsetX) != null ? _customOffsets$offset : event.offsetX;
+    const offsetY = (_customOffsets$offset2 = customOffsets == null ? void 0 : customOffsets.offsetY) != null ? _customOffsets$offset2 : event.offsetY;
+    const width = (_customOffsets$width = customOffsets == null ? void 0 : customOffsets.width) != null ? _customOffsets$width : size.width;
+    const height = (_customOffsets$height = customOffsets == null ? void 0 : customOffsets.height) != null ? _customOffsets$height : size.height;
     mouse.set(offsetX / width * 2 - 1, -(offsetY / height) * 2 + 1);
     raycaster.setFromCamera(mouse, camera);
   }
@@ -596,29 +593,29 @@ function createRenderer(roots) {
         localState.eventCount = Object.keys(localState.handlers).length;
       } // Special treatment for objects with support for set/copy, and layers
       else if (targetProp && targetProp.set && (targetProp.copy || targetProp instanceof THREE.Layers)) {
-          // If value is an array
-          if (Array.isArray(value)) {
-            if (targetProp.fromArray) targetProp.fromArray(value);else targetProp.set(...value);
-          } // Test again target.copy(class) next ...
-          else if (targetProp.copy && value && value.constructor && targetProp.constructor.name === value.constructor.name) targetProp.copy(value); // If nothing else fits, just set the single value, ignore undefined
-            // https://github.com/pmndrs/react-three-fiber/issues/274
-            else if (value !== undefined) {
-                const isColor = targetProp instanceof THREE.Color; // Allow setting array scalars
-
-                if (!isColor && targetProp.setScalar) targetProp.setScalar(value); // Layers have no copy function, we must therefore copy the mask property
-                else if (targetProp instanceof THREE.Layers && value instanceof THREE.Layers) targetProp.mask = value.mask; // Otherwise just set ...
-                  else targetProp.set(value); // Auto-convert sRGB colors, for now ...
-                // https://github.com/pmndrs/react-three-fiber/issues/344
-
-                if (!isLinear && isColor) targetProp.convertSRGBToLinear();
-              } // Else, just overwrite the value
-
-        } else {
-          currentInstance[key] = value; // Auto-convert sRGB textures, for now ...
+        // If value is an array
+        if (Array.isArray(value)) {
+          if (targetProp.fromArray) targetProp.fromArray(value);else targetProp.set(...value);
+        } // Test again target.copy(class) next ...
+        else if (targetProp.copy && value && value.constructor && targetProp.constructor.name === value.constructor.name) targetProp.copy(value); // If nothing else fits, just set the single value, ignore undefined
+        // https://github.com/pmndrs/react-three-fiber/issues/274
+        else if (value !== undefined) {
+          const isColor = targetProp instanceof THREE.Color; // Allow setting array scalars
+
+          if (!isColor && targetProp.setScalar) targetProp.setScalar(value); // Layers have no copy function, we must therefore copy the mask property
+          else if (targetProp instanceof THREE.Layers && value instanceof THREE.Layers) targetProp.mask = value.mask; // Otherwise just set ...
+          else targetProp.set(value); // Auto-convert sRGB colors, for now ...
           // https://github.com/pmndrs/react-three-fiber/issues/344
 
-          if (!isLinear && currentInstance[key] instanceof THREE.Texture) currentInstance[key].encoding = THREE.sRGBEncoding;
-        }
+          if (!isLinear && isColor) targetProp.convertSRGBToLinear();
+        } // Else, just overwrite the value
+
+      } else {
+        currentInstance[key] = value; // Auto-convert sRGB textures, for now ...
+        // https://github.com/pmndrs/react-three-fiber/issues/344
+
+        if (!isLinear && currentInstance[key] instanceof THREE.Texture) currentInstance[key].encoding = THREE.sRGBEncoding;
+      }
 
       invalidateInstance(instance);
     });
@@ -759,8 +756,13 @@ function createRenderer(roots) {
 
     if (child) {
       if (child.attachArray) {
-        const array = parentInstance[child.attachArray];
-        if (!is.arr(array)) parentInstance[child.attachArray] = [];
+        let array = parentInstance[child.attachArray];
+
+        if (!is.arr(array)) {
+          parentInstance[child.attachArray] = [];
+          array = parentInstance[child.attachArray];
+        }
+
         array.splice(array.indexOf(beforeChild), 0, child);
       } else if (child.attachObject || child.attach && !is.fun(child.attach)) {
         // attach and attachObject don't have an order anyway, so just append
@@ -1026,9 +1028,7 @@ function createRenderer(roots) {
       return !!localState.handlers;
     },
 
-    commitMount(instance)
-    /*, type, props*/
-    {
+    commitMount(instance) {
       var _instance$__r3f8;
 
       // https://github.com/facebook/react/issues/20271
@@ -1540,6 +1540,7 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
   events,
   ...props
 }, forwardedRef) {
+  const onPointerMissed = useMemoizedFn(props.onPointerMissed);
   const [containerRef, {
     width,
     height
@@ -1572,10 +1573,11 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
           width,
           height
         },
+        onPointerMissed,
         events: events || createPointerEvents
       });
     }
-  }, [width, height, children]);
+  }, [width, height, children, onPointerMissed]);
   useIsomorphicLayoutEffect(() => {
     const container = canvasRef.current;
     return () => unmountComponentAtNode(container);
@@ -1656,6 +1658,11 @@ function loadingFn(extensions, onProgress) {
   };
 }
 
+function useMemoizedFn(fn) {
+  const fnRef = React.useRef(fn);
+  React.useLayoutEffect(() => void (fnRef.current = fn), [fn]);
+  return (...args) => fnRef.current == null ? void 0 : fnRef.current(...args);
+}
 function useLoader(Proto, input, extensions, onProgress) {
   // Use suspense to load async assets
   const keys = Array.isArray(input) ? input : [input];
@@ -1841,8 +1848,7 @@ function dispose(obj) {
   if (obj.dispose && obj.type !== 'Scene') obj.dispose();
 
   for (const p in obj) {
-    var _dispose, _ref;
-    (_dispose = (_ref = p).dispose) == null ? void 0 : _dispose.call(_ref);
+    p.dispose == null ? void 0 : p.dispose();
     delete obj[p];
   }
 }
@@ -1859,4 +1865,4 @@ reconciler.injectIntoDevTools({
   version: '17.0.2'
 });
 
-export { Canvas, threeTypes as ReactThreeFiber, roots as _roots, act, addAfterEffect, addEffect, addTail, advance, applyProps, context, createPortal, dispose, createPointerEvents as events, extend, invalidate, reconciler, render, unmountComponentAtNode, useFrame, useGraph, useLoader, useStore, useThree };
+export { Canvas, threeTypes as ReactThreeFiber, roots as _roots, act, addAfterEffect, addEffect, addTail, advance, applyProps, context, createPortal, dispose, createPointerEvents as events, extend, invalidate, reconciler, render, unmountComponentAtNode, useFrame, useGraph, useLoader, useMemoizedFn, useStore, useThree };

package/native/dist/react-three-fiber-native.cjs.d.ts

@@ -1,11 +1 @@
-// are you seeing an error that a default export doesn't exist but your source file has a default export?
-// you should run `yarn` or `yarn preconstruct dev` if preconstruct dev isn't in your postinstall hook
-
-// curious why you need to?
-// this file exists so that you can import from the entrypoint normally
-// except that it points to your source file and you don't need to run build constantly
-// which means we need to re-export all of the modules from your source file
-// and since export * doesn't include default exports, we need to read your source file
-// to check for a default export and re-export it if it exists
-// it's not ideal, but it works pretty well ¯\_(ツ)_/¯
-export * from "../../src/native";
+export * from "../../dist/declarations/src/native";

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

@@ -0,0 +1,369 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var THREE = require('three');
+var expoAsset = require('expo-asset');
+var index = require('../../dist/index-9ced08b3.cjs.dev.js');
+var _extends = require('@babel/runtime/helpers/extends');
+var React = require('react');
+var mergeRefs = require('react-merge-refs');
+var reactNative = require('react-native');
+var expoGl = require('expo-gl');
+var Pressability = require('react-native/Libraries/Pressability/Pressability');
+require('react-reconciler/constants');
+require('zustand');
+require('react-reconciler');
+require('scheduler');
+require('suspend-react');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
+var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
+var React__namespace = /*#__PURE__*/_interopNamespace(React);
+var mergeRefs__default = /*#__PURE__*/_interopDefault(mergeRefs);
+var Pressability__default = /*#__PURE__*/_interopDefault(Pressability);
+
+const EVENTS = {
+  PRESS: 'onPress',
+  PRESSIN: 'onPressIn',
+  PRESSOUT: 'onPressOut',
+  LONGPRESS: 'onLongPress',
+  HOVERIN: 'onHoverIn',
+  HOVEROUT: 'onHoverOut',
+  PRESSMOVE: 'onPressMove'
+};
+const DOM_EVENTS = {
+  [EVENTS.PRESS]: 'onClick',
+  [EVENTS.PRESSIN]: 'onPointerDown',
+  [EVENTS.PRESSOUT]: 'onPointerUp',
+  [EVENTS.LONGPRESS]: 'onDoubleClick',
+  [EVENTS.HOVERIN]: 'onPointerOver',
+  [EVENTS.HOVEROUT]: 'onPointerOut',
+  [EVENTS.PRESSMOVE]: 'onPointerMove'
+};
+/** Default R3F event manager for react-native */
+
+function createTouchEvents(store) {
+  const {
+    handlePointer
+  } = index.createEvents(store);
+
+  const handleTouch = (event, name) => {
+    event.persist() // Apply offset
+    ;
+    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);
+  };
+
+  return {
+    priority: 1,
+    enabled: true,
+
+    compute(event, state, previous) {
+      // https://github.com/pmndrs/react-three-fiber/pull/782
+      // Events trigger outside of canvas when moved, use offsetX/Y by default and allow overrides
+      state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
+      state.raycaster.setFromCamera(state.pointer, state.camera);
+    },
+
+    connected: undefined,
+    handlers: Object.values(EVENTS).reduce((acc, name) => ({ ...acc,
+      [name]: event => handleTouch(event, name)
+    }), {}),
+    connect: () => {
+      const {
+        set,
+        events
+      } = store.getState();
+      events.disconnect == null ? void 0 : events.disconnect();
+      const connected = new Pressability__default["default"](events == null ? void 0 : events.handlers);
+      set(state => ({
+        events: { ...state.events,
+          connected
+        }
+      }));
+      const handlers = connected.getEventHandlers();
+      return handlers;
+    },
+    disconnect: () => {
+      const {
+        set,
+        events
+      } = store.getState();
+
+      if (events.connected) {
+        events.connected.reset();
+        set(state => ({
+          events: { ...state.events,
+            connected: undefined
+          }
+        }));
+      }
+    }
+  };
+}
+
+/**
+ * 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(({
+  children,
+  style,
+  gl,
+  events = createTouchEvents,
+  shadows,
+  linear,
+  flat,
+  legacy,
+  orthographic,
+  frameloop,
+  performance,
+  raycaster,
+  camera,
+  onPointerMissed,
+  onCreated,
+  ...props
+}, forwardedRef) => {
+  // Create a known catalogue of Threejs-native elements
+  // This will include the entire THREE namespace by default, users can extend
+  // their own elements by using the createRoot API instead
+  React__namespace.useMemo(() => index.extend(THREE__namespace), []);
+  const [{
+    width,
+    height
+  }, setSize] = React__namespace.useState({
+    width: 0,
+    height: 0
+  });
+  const [canvas, setCanvas] = React__namespace.useState(null);
+  const [bind, setBind] = React__namespace.useState();
+  const handlePointerMissed = index.useMutableCallback(onPointerMissed);
+  const [block, setBlock] = React__namespace.useState(false);
+  const [error, setError] = React__namespace.useState(false); // Suspend this component if block is a promise (2nd run)
+
+  if (block) throw block; // Throw exception outwards if anything within canvas throws
+
+  if (error) throw error;
+  const viewRef = React__namespace.useRef(null);
+  const root = React__namespace.useRef(null);
+  const onLayout = React__namespace.useCallback(e => {
+    const {
+      width,
+      height
+    } = e.nativeEvent.layout;
+    setSize({
+      width,
+      height
+    });
+  }, []);
+  const onContextCreate = React__namespace.useCallback(context => {
+    const canvasShim = {
+      width: context.drawingBufferWidth,
+      height: context.drawingBufferHeight,
+      style: {},
+      addEventListener: () => {},
+      removeEventListener: () => {},
+      clientHeight: context.drawingBufferHeight,
+      getContext: () => context
+    };
+    setCanvas(canvasShim);
+  }, []);
+
+  if (width > 0 && height > 0 && canvas) {
+    if (!root.current) root.current = index.createRoot(canvas);
+    root.current.configure({
+      gl,
+      events,
+      shadows,
+      linear,
+      flat,
+      legacy,
+      orthographic,
+      frameloop,
+      performance,
+      raycaster,
+      camera,
+      // expo-gl can only render at native dpr/resolution
+      // https://github.com/expo/expo-three/issues/39
+      dpr: reactNative.PixelRatio.get(),
+      size: {
+        width,
+        height
+      },
+      // Pass mutable reference to onPointerMissed so it's free to update
+      onPointerMissed: (...args) => handlePointerMissed.current == null ? void 0 : handlePointerMissed.current(...args),
+      // Overwrite onCreated to apply RN bindings
+      onCreated: state => {
+        // Bind events after creation
+        const handlers = state.events.connect == null ? void 0 : state.events.connect(viewRef.current);
+        setBind(handlers); // Bind render to RN bridge
+
+        const context = state.gl.getContext();
+        const renderFrame = state.gl.render.bind(state.gl);
+
+        state.gl.render = (scene, camera) => {
+          renderFrame(scene, camera);
+          context.endFrameEXP();
+        };
+
+        return onCreated == null ? void 0 : onCreated(state);
+      }
+    });
+    root.current.render( /*#__PURE__*/React__namespace.createElement(index.ErrorBoundary, {
+      set: setError
+    }, /*#__PURE__*/React__namespace.createElement(React__namespace.Suspense, {
+      fallback: /*#__PURE__*/React__namespace.createElement(index.Block, {
+        set: setBlock
+      })
+    }, children)));
+  }
+
+  React__namespace.useEffect(() => {
+    if (canvas) {
+      return () => index.unmountComponentAtNode(canvas);
+    }
+  }, [canvas]);
+  return /*#__PURE__*/React__namespace.createElement(reactNative.View, _extends({}, props, {
+    ref: mergeRefs__default["default"]([viewRef, forwardedRef]),
+    onLayout: onLayout,
+    style: {
+      flex: 1,
+      ...style
+    }
+  }, bind), width > 0 && /*#__PURE__*/React__namespace.createElement(expoGl.GLView, {
+    onContextCreate: onContextCreate,
+    style: reactNative.StyleSheet.absoluteFill
+  }));
+});
+
+/**
+ * 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
+
+
+const extractUrlBase = THREE__namespace.LoaderUtils.extractUrlBase.bind(THREE__namespace.LoaderUtils);
+
+THREE__namespace.LoaderUtils.extractUrlBase = url => typeof url === 'string' ? extractUrlBase(url) : './'; // 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-ignore
+
+  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;
+exports.addAfterEffect = index.addAfterEffect;
+exports.addEffect = index.addEffect;
+exports.addTail = index.addTail;
+exports.advance = index.advance;
+exports.applyProps = index.applyProps;
+exports.context = index.context;
+exports.createPortal = index.createPortal;
+exports.createRoot = index.createRoot;
+exports.dispose = index.dispose;
+exports.extend = index.extend;
+exports.getRootState = index.getRootState;
+exports.invalidate = index.invalidate;
+exports.reconciler = index.reconciler;
+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;

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

@@ -1,16 +1,7 @@
-"use strict";
-// this file might look strange and you might be wondering what it's for
-// it's lets you import your source files by importing this entrypoint
-// as you would import it if it was built with preconstruct build
-// this file is slightly different to some others though
-// it has a require hook which compiles your code with Babel
-// this means that you don't have to set up @babel/register or anything like that
-// but you can still require this module and it'll be compiled
+'use strict';
 
-// this bit of code imports the require hook and registers it
-let unregister = require("../../../../node_modules/@preconstruct/hook").___internalHook(typeof __dirname === 'undefined' ? undefined : __dirname, "../../../..", "../..");
-
-// this re-exports the source file
-module.exports = require("../../src/native.tsx");
-
-unregister();
+if (process.env.NODE_ENV === "production") {
+  module.exports = require("./react-three-fiber-native.cjs.prod.js");
+} else {
+  module.exports = require("./react-three-fiber-native.cjs.dev.js");
+}