@react-three/fiber 8.0.0-beta.5 → 8.0.0-beta.8

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

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, p as pick, o as omit, a as createRoot, u as unmountComponentAtNode } from './index-32069e53.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, x as useFrame, y as useGraph, w as useInject, z as useLoader, s as useStore, v as useThree } from './index-32069e53.esm.js';
+import { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from './index-3238fd12.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 './index-3238fd12.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
@@ -28,7 +28,17 @@ function createPointerEvents(store) {
     handlePointer
   } = createEvents(store);
   return {
-    connected: false,
+    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.keys(DOM_EVENTS).reduce((acc, key) => ({ ...acc,
       [key]: handlePointer(key)
     }), {}),
@@ -69,7 +79,7 @@ function createPointerEvents(store) {
         });
         set(state => ({
           events: { ...state.events,
-            connected: false
+            connected: undefined
           }
         }));
       }
@@ -123,6 +133,7 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
   // 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 [containerRef, {
     width,
     height
@@ -134,10 +145,15 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
     },
     ...resize
   });
+  const meshRef = React.useRef(null);
   const canvasRef = React.useRef(null);
   const [canvas, setCanvas] = React.useState(null);
-  const canvasProps = pick(props, CANVAS_PROPS);
-  const divProps = omit(props, CANVAS_PROPS);
+  const canvasProps = pick({ ...props,
+    onPointerMissed
+  }, CANVAS_PROPS);
+  const divProps = omit({ ...props,
+    onPointerMissed
+  }, CANVAS_PROPS);
   const [block, setBlock] = React.useState(false);
   const [error, setError] = React.useState(false); // Suspend this component if block is a promise (2nd run)
 
@@ -149,6 +165,10 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
   if (width > 0 && height > 0 && canvas) {
     if (!root.current) root.current = createRoot(canvas);
     root.current.configure({ ...canvasProps,
+      onCreated: state => {
+        state.events.connect == null ? void 0 : state.events.connect(meshRef.current);
+        canvasProps.onCreated == null ? void 0 : canvasProps.onCreated(state);
+      },
       size: {
         width,
         height
@@ -171,7 +191,7 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
     return () => unmountComponentAtNode(canvas);
   }, [canvas]);
   return /*#__PURE__*/React.createElement("div", _extends({
-    ref: containerRef,
+    ref: mergeRefs([meshRef, containerRef]),
     style: {
       position: 'relative',
       width: '100%',

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

@@ -4,9 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var THREE = require('three');
 var expoAsset = require('expo-asset');
-var index = require('../../dist/index-5dc2de40.cjs.dev.js');
+var index = require('../../dist/index-2056f0b6.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');
@@ -40,6 +41,7 @@ function _interopNamespace(e) {
 
 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 = {
@@ -76,7 +78,17 @@ function createTouchEvents(store) {
   };
 
   return {
-    connected: false,
+    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)
     }), {}),
@@ -105,7 +117,7 @@ function createTouchEvents(store) {
         events.connected.reset();
         set(state => ({
           events: { ...state.events,
-            connected: false
+            connected: undefined
           }
         }));
       }
@@ -158,6 +170,7 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
   // 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 onPointerMissed = index.useMemoizedFn(props.onPointerMissed);
   const [{
     width,
     height
@@ -167,14 +180,19 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
   });
   const [canvas, setCanvas] = React__namespace.useState(null);
   const [bind, setBind] = React__namespace.useState();
-  const canvasProps = index.pick(props, CANVAS_PROPS);
-  const viewProps = index.omit(props, CANVAS_PROPS);
+  const canvasProps = index.pick({ ...props,
+    onPointerMissed
+  }, CANVAS_PROPS);
+  const viewProps = index.omit({ ...props,
+    onPointerMissed
+  }, CANVAS_PROPS);
   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 {
@@ -204,7 +222,7 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
 
     const onCreated = state => {
       // Bind events after creation
-      const handlers = state.events.connect == null ? void 0 : state.events.connect(canvas);
+      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();
@@ -242,7 +260,7 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
     return () => index.unmountComponentAtNode(canvas);
   }, [canvas]);
   return /*#__PURE__*/React__namespace.createElement(reactNative.View, _extends({}, viewProps, {
-    ref: forwardedRef,
+    ref: mergeRefs__default['default']([viewRef, forwardedRef]),
     onLayout: onLayout,
     style: {
       flex: 1,
@@ -350,14 +368,15 @@ 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.useInject = index.useInject;
 exports.useLoader = index.useLoader;
+exports.useMemoizedFn = index.useMemoizedFn;
 exports.useStore = index.useStore;
 exports.useThree = index.useThree;
 exports.Canvas = Canvas;

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

@@ -4,9 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var THREE = require('three');
 var expoAsset = require('expo-asset');
-var index = require('../../dist/index-e2a317e2.cjs.prod.js');
+var index = require('../../dist/index-f5108bb9.cjs.prod.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');
@@ -40,6 +41,7 @@ function _interopNamespace(e) {
 
 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 = {
@@ -76,7 +78,17 @@ function createTouchEvents(store) {
   };
 
   return {
-    connected: false,
+    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)
     }), {}),
@@ -105,7 +117,7 @@ function createTouchEvents(store) {
         events.connected.reset();
         set(state => ({
           events: { ...state.events,
-            connected: false
+            connected: undefined
           }
         }));
       }
@@ -158,6 +170,7 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
   // 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 onPointerMissed = index.useMemoizedFn(props.onPointerMissed);
   const [{
     width,
     height
@@ -167,14 +180,19 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
   });
   const [canvas, setCanvas] = React__namespace.useState(null);
   const [bind, setBind] = React__namespace.useState();
-  const canvasProps = index.pick(props, CANVAS_PROPS);
-  const viewProps = index.omit(props, CANVAS_PROPS);
+  const canvasProps = index.pick({ ...props,
+    onPointerMissed
+  }, CANVAS_PROPS);
+  const viewProps = index.omit({ ...props,
+    onPointerMissed
+  }, CANVAS_PROPS);
   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 {
@@ -204,7 +222,7 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
 
     const onCreated = state => {
       // Bind events after creation
-      const handlers = state.events.connect == null ? void 0 : state.events.connect(canvas);
+      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();
@@ -242,7 +260,7 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
     return () => index.unmountComponentAtNode(canvas);
   }, [canvas]);
   return /*#__PURE__*/React__namespace.createElement(reactNative.View, _extends({}, viewProps, {
-    ref: forwardedRef,
+    ref: mergeRefs__default['default']([viewRef, forwardedRef]),
     onLayout: onLayout,
     style: {
       flex: 1,
@@ -350,14 +368,15 @@ 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.useInject = index.useInject;
 exports.useLoader = index.useLoader;
+exports.useMemoizedFn = index.useMemoizedFn;
 exports.useStore = index.useStore;
 exports.useThree = index.useThree;
 exports.Canvas = Canvas;

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

@@ -1,9 +1,10 @@
 import * as THREE from 'three';
 import { Asset } from 'expo-asset';
-import { c as createEvents, e as extend, p as pick, o as omit, a as createRoot, u as unmountComponentAtNode } from '../../dist/index-32069e53.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, x as useFrame, y as useGraph, w as useInject, z as useLoader, s as useStore, v as useThree } from '../../dist/index-32069e53.esm.js';
+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-3238fd12.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-3238fd12.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
+import mergeRefs from 'react-merge-refs';
 import { PixelRatio, View, StyleSheet } from 'react-native';
 import { GLView } from 'expo-gl';
 import Pressability from 'react-native/Libraries/Pressability/Pressability';
@@ -47,7 +48,17 @@ function createTouchEvents(store) {
   };
 
   return {
-    connected: false,
+    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)
     }), {}),
@@ -76,7 +87,7 @@ function createTouchEvents(store) {
         events.connected.reset();
         set(state => ({
           events: { ...state.events,
-            connected: false
+            connected: undefined
           }
         }));
       }
@@ -129,6 +140,7 @@ const Canvas = /*#__PURE__*/React.forwardRef(({
   // 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
@@ -138,14 +150,19 @@ const Canvas = /*#__PURE__*/React.forwardRef(({
   });
   const [canvas, setCanvas] = React.useState(null);
   const [bind, setBind] = React.useState();
-  const canvasProps = pick(props, CANVAS_PROPS);
-  const viewProps = omit(props, CANVAS_PROPS);
+  const canvasProps = pick({ ...props,
+    onPointerMissed
+  }, CANVAS_PROPS);
+  const viewProps = omit({ ...props,
+    onPointerMissed
+  }, CANVAS_PROPS);
   const [block, setBlock] = React.useState(false);
   const [error, setError] = React.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.useRef(null);
   const root = React.useRef(null);
   const onLayout = React.useCallback(e => {
     const {
@@ -175,7 +192,7 @@ const Canvas = /*#__PURE__*/React.forwardRef(({
 
     const onCreated = state => {
       // Bind events after creation
-      const handlers = state.events.connect == null ? void 0 : state.events.connect(canvas);
+      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();
@@ -213,7 +230,7 @@ const Canvas = /*#__PURE__*/React.forwardRef(({
     return () => unmountComponentAtNode(canvas);
   }, [canvas]);
   return /*#__PURE__*/React.createElement(View, _extends({}, viewProps, {
-    ref: forwardedRef,
+    ref: mergeRefs([viewRef, forwardedRef]),
     onLayout: onLayout,
     style: {
       flex: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.0.0-beta.5",
+  "version": "8.0.0-beta.8",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",