@react-three/fiber 8.0.7 → 8.0.10

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

@@ -1,7 +1,7 @@
 import * as THREE from 'three';
 import { Asset } from 'expo-asset';
-import { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from '../../dist/index-e42f8ac9.esm.js';
-export { t as ReactThreeFiber, v as _roots, s as act, m as addAfterEffect, l as addEffect, n as addTail, k as advance, h as applyProps, d as context, f as createPortal, a as createRoot, i as dispose, e as extend, q as getRootState, j as invalidate, g as reconciler, r as render, b as unmountComponentAtNode, y as useFrame, z as useGraph, A as useLoader, u as useMemoizedFn, w as useStore, x as useThree } from '../../dist/index-e42f8ac9.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, p as pick, o as omit, a as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-91152509.esm.js';
+export { t as ReactThreeFiber, w as _roots, v as act, n as addAfterEffect, m as addEffect, q as addTail, l as advance, i as applyProps, f as context, g as createPortal, a as createRoot, j as dispose, e as extend, s as getRootState, k as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, z as useFrame, A as useGraph, C as useLoader, x as useStore, y as useThree } from '../../dist/index-91152509.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import mergeRefs from 'react-merge-refs';
@@ -32,6 +32,8 @@ const DOM_EVENTS = {
   [EVENTS.HOVEROUT]: 'onPointerOut',
   [EVENTS.PRESSMOVE]: 'onPointerMove'
 };
+/** Default R3F event manager for react-native */
+
 function createTouchEvents(store) {
   const {
     handlePointer
@@ -64,79 +66,54 @@ function createTouchEvents(store) {
     }), {}),
     connect: () => {
       const {
-        setEvents,
+        set,
         events
       } = store.getState();
       events.disconnect == null ? void 0 : events.disconnect();
       const connected = new Pressability(events == null ? void 0 : events.handlers);
-      setEvents({
-        connected
-      });
+      set(state => ({
+        events: { ...state.events,
+          connected
+        }
+      }));
       const handlers = connected.getEventHandlers();
       return handlers;
     },
     disconnect: () => {
       const {
-        setEvents,
+        set,
         events
       } = store.getState();
 
       if (events.connected) {
         events.connected.reset();
-        setEvents({
-          connected: undefined
-        });
+        set(state => ({
+          events: { ...state.events,
+            connected: undefined
+          }
+        }));
       }
     }
   };
 }
 
 const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
-
-function Block({
-  set
-}) {
-  React.useLayoutEffect(() => {
-    set(new Promise(() => null));
-    return () => set(false);
-  }, [set]);
-  return null;
-}
-
-class ErrorBoundary extends React.Component {
-  constructor(...args) {
-    super(...args);
-    this.state = {
-      error: false
-    };
-  }
-
-  componentDidCatch(error) {
-    this.props.set(error);
-  }
-
-  render() {
-    return this.state.error ? null : this.props.children;
-  }
-
-}
-
-ErrorBoundary.getDerivedStateFromError = () => ({
-  error: true
-});
+/**
+ * A native canvas which accepts threejs elements as children.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
+ */
 
 const Canvas = /*#__PURE__*/React.forwardRef(({
   children,
-  fallback,
   style,
   events,
+  onPointerMissed,
   ...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.useMemo(() => extend(THREE), []);
-  const onPointerMissed = useMemoizedFn(props.onPointerMissed);
   const [{
     width,
     height
@@ -146,12 +123,9 @@ const Canvas = /*#__PURE__*/React.forwardRef(({
   });
   const [canvas, setCanvas] = React.useState(null);
   const [bind, setBind] = React.useState();
-  const canvasProps = pick({ ...props,
-    onPointerMissed
-  }, CANVAS_PROPS);
-  const viewProps = omit({ ...props,
-    onPointerMissed
-  }, CANVAS_PROPS);
+  const handlePointerMissed = useMutableCallback(onPointerMissed);
+  const canvasProps = pick(props, CANVAS_PROPS);
+  const viewProps = omit(props, CANVAS_PROPS);
   const [block, setBlock] = React.useState(false);
   const [error, setError] = React.useState(false); // Suspend this component if block is a promise (2nd run)
 
@@ -203,6 +177,8 @@ const Canvas = /*#__PURE__*/React.forwardRef(({
     };
 
     root.current.configure({ ...canvasProps,
+      // Pass mutable reference to onPointerMissed so it's free to update
+      onPointerMissed: (...args) => handlePointerMissed.current == null ? void 0 : handlePointerMissed.current(...args),
       // expo-gl can only render at native dpr/resolution
       // https://github.com/expo/expo-three/issues/39
       dpr: PixelRatio.get(),
@@ -223,7 +199,9 @@ const Canvas = /*#__PURE__*/React.forwardRef(({
   }
 
   React.useEffect(() => {
-    return () => unmountComponentAtNode(canvas);
+    if (canvas) {
+      return () => unmountComponentAtNode(canvas);
+    }
   }, [canvas]);
   return /*#__PURE__*/React.createElement(View, _extends({}, viewProps, {
     ref: mergeRefs([viewRef, forwardedRef]),

package/package.json

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