@react-three/fiber 8.0.0-beta.3 → 8.0.0-beta.6

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

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-05ebefd3.cjs.dev.js');
+var index = require('./index-4782ba04.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
 var mergeRefs = require('react-merge-refs');
 var useMeasure = require('react-use-measure');
-require('suspend-react');
 require('react-reconciler/constants');
 require('zustand');
 require('react-reconciler');
 require('scheduler');
+require('suspend-react');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -58,7 +58,17 @@ function createPointerEvents(store) {
     handlePointer
   } = index.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)
     }), {}),
@@ -99,7 +109,7 @@ function createPointerEvents(store) {
         });
         set(state => ({
           events: { ...state.events,
-            connected: false
+            connected: undefined
           }
         }));
       }
@@ -153,6 +163,7 @@ const Canvas = /*#__PURE__*/React__namespace.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__namespace.useMemo(() => index.extend(THREE__namespace), []);
+  const onPointerMissed = index.useMemoizedFn(props.onPointerMissed);
   const [containerRef, {
     width,
     height
@@ -166,8 +177,12 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function Canvas({
   });
   const canvasRef = React__namespace.useRef(null);
   const [canvas, setCanvas] = React__namespace.useState(null);
-  const canvasProps = index.pick(props, CANVAS_PROPS);
-  const divProps = index.omit(props, CANVAS_PROPS);
+  const canvasProps = index.pick({ ...props,
+    onPointerMissed
+  }, CANVAS_PROPS);
+  const divProps = 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)
 
@@ -230,6 +245,7 @@ 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;
@@ -237,6 +253,7 @@ exports.unmountComponentAtNode = index.unmountComponentAtNode;
 exports.useFrame = index.useFrame;
 exports.useGraph = index.useGraph;
 exports.useLoader = index.useLoader;
+exports.useMemoizedFn = index.useMemoizedFn;
 exports.useStore = index.useStore;
 exports.useThree = index.useThree;
 exports.Canvas = Canvas;

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

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-85b2df17.cjs.prod.js');
+var index = require('./index-45f5b2a2.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
 var mergeRefs = require('react-merge-refs');
 var useMeasure = require('react-use-measure');
-require('suspend-react');
 require('react-reconciler/constants');
 require('zustand');
 require('react-reconciler');
 require('scheduler');
+require('suspend-react');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -58,7 +58,17 @@ function createPointerEvents(store) {
     handlePointer
   } = index.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)
     }), {}),
@@ -99,7 +109,7 @@ function createPointerEvents(store) {
         });
         set(state => ({
           events: { ...state.events,
-            connected: false
+            connected: undefined
           }
         }));
       }
@@ -153,6 +163,7 @@ const Canvas = /*#__PURE__*/React__namespace.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__namespace.useMemo(() => index.extend(THREE__namespace), []);
+  const onPointerMissed = index.useMemoizedFn(props.onPointerMissed);
   const [containerRef, {
     width,
     height
@@ -166,8 +177,12 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function Canvas({
   });
   const canvasRef = React__namespace.useRef(null);
   const [canvas, setCanvas] = React__namespace.useState(null);
-  const canvasProps = index.pick(props, CANVAS_PROPS);
-  const divProps = index.omit(props, CANVAS_PROPS);
+  const canvasProps = index.pick({ ...props,
+    onPointerMissed
+  }, CANVAS_PROPS);
+  const divProps = 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)
 
@@ -230,6 +245,7 @@ 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;
@@ -237,6 +253,7 @@ exports.unmountComponentAtNode = index.unmountComponentAtNode;
 exports.useFrame = index.useFrame;
 exports.useGraph = index.useGraph;
 exports.useLoader = index.useLoader;
+exports.useMemoizedFn = index.useMemoizedFn;
 exports.useStore = index.useStore;
 exports.useThree = index.useThree;
 exports.Canvas = Canvas;

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

@@ -1,15 +1,15 @@
-import { c as createEvents, e as extend, p as pick, o as omit, a as createRoot, u as unmountComponentAtNode } from './index-e78dd2f0.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 './index-e78dd2f0.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-74b1fd6b.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-74b1fd6b.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
 import mergeRefs from 'react-merge-refs';
 import useMeasure from 'react-use-measure';
-import 'suspend-react';
 import 'react-reconciler/constants';
 import 'zustand';
 import 'react-reconciler';
 import 'scheduler';
+import 'suspend-react';
 
 const DOM_EVENTS = {
   onClick: ['click', false],
@@ -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
@@ -136,8 +147,12 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
   });
   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)
 

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

@@ -4,17 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var THREE = require('three');
 var expoAsset = require('expo-asset');
-var index = require('../../dist/index-05ebefd3.cjs.dev.js');
+var index = require('../../dist/index-4782ba04.cjs.dev.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');
 require('scheduler');
+require('suspend-react');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -76,7 +76,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 +115,7 @@ function createTouchEvents(store) {
         events.connected.reset();
         set(state => ({
           events: { ...state.events,
-            connected: false
+            connected: undefined
           }
         }));
       }
@@ -158,6 +168,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,8 +178,12 @@ 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)
 
@@ -280,7 +295,7 @@ THREE__namespace.LoaderUtils.extractUrlBase = url => typeof url === 'string' ? e
 
 
 THREE__namespace.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
-  const texture = new THREE__namespace.Texture(); // @ts-expect-error
+  const texture = new THREE__namespace.Texture(); // @ts-ignore
 
   texture.isDataTexture = true;
   getAsset(url).downloadAsync().then(asset => {
@@ -350,6 +365,7 @@ 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;
@@ -357,6 +373,7 @@ exports.unmountComponentAtNode = index.unmountComponentAtNode;
 exports.useFrame = index.useFrame;
 exports.useGraph = index.useGraph;
 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,17 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var THREE = require('three');
 var expoAsset = require('expo-asset');
-var index = require('../../dist/index-85b2df17.cjs.prod.js');
+var index = require('../../dist/index-45f5b2a2.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');
 require('scheduler');
+require('suspend-react');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -76,7 +76,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 +115,7 @@ function createTouchEvents(store) {
         events.connected.reset();
         set(state => ({
           events: { ...state.events,
-            connected: false
+            connected: undefined
           }
         }));
       }
@@ -158,6 +168,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,8 +178,12 @@ 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)
 
@@ -280,7 +295,7 @@ THREE__namespace.LoaderUtils.extractUrlBase = url => typeof url === 'string' ? e
 
 
 THREE__namespace.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
-  const texture = new THREE__namespace.Texture(); // @ts-expect-error
+  const texture = new THREE__namespace.Texture(); // @ts-ignore
 
   texture.isDataTexture = true;
   getAsset(url).downloadAsync().then(asset => {
@@ -350,6 +365,7 @@ 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;
@@ -357,6 +373,7 @@ exports.unmountComponentAtNode = index.unmountComponentAtNode;
 exports.useFrame = index.useFrame;
 exports.useGraph = index.useGraph;
 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,17 +1,17 @@
 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-e78dd2f0.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-e78dd2f0.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-74b1fd6b.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-74b1fd6b.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';
+import 'suspend-react';
 
 const EVENTS = {
   PRESS: 'onPress',
@@ -47,7 +47,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 +86,7 @@ function createTouchEvents(store) {
         events.connected.reset();
         set(state => ({
           events: { ...state.events,
-            connected: false
+            connected: undefined
           }
         }));
       }
@@ -129,6 +139,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,8 +149,12 @@ 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)
 
@@ -251,7 +266,7 @@ THREE.LoaderUtils.extractUrlBase = url => typeof url === 'string' ? extractUrlBa
 
 
 THREE.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
-  const texture = new THREE.Texture(); // @ts-expect-error
+  const texture = new THREE.Texture(); // @ts-ignore
 
   texture.isDataTexture = true;
   getAsset(url).downloadAsync().then(asset => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.0.0-beta.3",
+  "version": "8.0.0-beta.6",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",
@@ -43,6 +43,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.2",
+    "@types/react-reconciler": "^0.26.4",
     "react-merge-refs": "^1.1.0",
     "react-reconciler": "^0.27.0-rc.2",
     "react-use-measure": "^2.1.1",
@@ -57,7 +58,7 @@
     "react": ">=18.0",
     "react-dom": ">=18.0",
     "react-native": ">=0.64",
-    "three": ">=0.133"
+    "three": ">=0.139"
   },
   "peerDependenciesMeta": {
     "react-dom": {