@react-three/fiber 8.5.0 → 8.6.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @react-three/fiber
 
+## 8.6.1
+
+### Patch Changes
+
+- 7a0b5670: fix(core): don't append to unmounted containers
+
+## 8.6.0
+
+### Minor Changes
+
+- 85c80e70: eventsource and eventprefix on the canvas component
+
+## 8.5.1
+
+### Patch Changes
+
+- 87821d9: fix: null-check instance.children on reconstruct
+
 ## 8.5.0
 
 ### Minor Changes

package/dist/declarations/src/web/Canvas.d.ts

@@ -5,5 +5,7 @@ export interface Props extends Omit<RenderProps<HTMLCanvasElement>, 'size'>, Rea
     children: React.ReactNode;
     fallback?: React.ReactNode;
     resize?: ResizeOptions;
+    eventSource?: HTMLElement;
+    eventPrefix?: 'offset' | 'client' | 'page' | 'layer' | 'screen';
 }
 export declare const Canvas: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLCanvasElement>>;

package/dist/{index-2bf2b90e.cjs.dev.js → index-9a338808.cjs.dev.js}

@@ -1045,11 +1045,13 @@ function createRenderer(_roots, _getEventPriority) {
     // When args change the instance has to be re-constructed, which then
     // forces r3f to re-parent the children and non-scene objects
 
-    for (const child of instance.children) {
-      if (child.__r3f) appendChild(newInstance, child);
-    }
+    if (instance.children) {
+      for (const child of instance.children) {
+        if (child.__r3f) appendChild(newInstance, child);
+      }
 
-    instance.children = instance.children.filter(child => !child.__r3f);
+      instance.children = instance.children.filter(child => !child.__r3f);
+    }
 
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
 
@@ -1088,8 +1090,10 @@ function createRenderer(_roots, _getEventPriority) {
     supportsHydration: false,
     noTimeout: -1,
     appendChildToContainer: (container, child) => {
-      if (!child) return;
-      const scene = container.getState().scene; // Link current root to the default scene
+      if (!child) return; // Don't append to unmounted container
+
+      const scene = container.getState().scene;
+      if (!scene.__r3f) return; // Link current root to the default scene
 
       scene.__r3f.root = container;
       appendChild(scene, child);
@@ -1099,8 +1103,11 @@ function createRenderer(_roots, _getEventPriority) {
       removeChild(container.getState().scene, child);
     },
     insertInContainerBefore: (container, child, beforeChild) => {
-      if (!child || !beforeChild) return;
-      insertBefore(container.getState().scene, child, beforeChild);
+      if (!child || !beforeChild) return; // Don't append to unmounted container
+
+      const scene = container.getState().scene;
+      if (!scene.__r3f) return;
+      insertBefore(scene, child, beforeChild);
     },
     getRootHostContext: () => null,
     getChildHostContext: parentHostContext => parentHostContext,

package/dist/{index-ea463076.esm.js → index-cecf55e8.esm.js}

@@ -1018,11 +1018,13 @@ function createRenderer(_roots, _getEventPriority) {
     // When args change the instance has to be re-constructed, which then
     // forces r3f to re-parent the children and non-scene objects
 
-    for (const child of instance.children) {
-      if (child.__r3f) appendChild(newInstance, child);
-    }
+    if (instance.children) {
+      for (const child of instance.children) {
+        if (child.__r3f) appendChild(newInstance, child);
+      }
 
-    instance.children = instance.children.filter(child => !child.__r3f);
+      instance.children = instance.children.filter(child => !child.__r3f);
+    }
 
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
 
@@ -1061,8 +1063,10 @@ function createRenderer(_roots, _getEventPriority) {
     supportsHydration: false,
     noTimeout: -1,
     appendChildToContainer: (container, child) => {
-      if (!child) return;
-      const scene = container.getState().scene; // Link current root to the default scene
+      if (!child) return; // Don't append to unmounted container
+
+      const scene = container.getState().scene;
+      if (!scene.__r3f) return; // Link current root to the default scene
 
       scene.__r3f.root = container;
       appendChild(scene, child);
@@ -1072,8 +1076,11 @@ function createRenderer(_roots, _getEventPriority) {
       removeChild(container.getState().scene, child);
     },
     insertInContainerBefore: (container, child, beforeChild) => {
-      if (!child || !beforeChild) return;
-      insertBefore(container.getState().scene, child, beforeChild);
+      if (!child || !beforeChild) return; // Don't append to unmounted container
+
+      const scene = container.getState().scene;
+      if (!scene.__r3f) return;
+      insertBefore(scene, child, beforeChild);
     },
     getRootHostContext: () => null,
     getChildHostContext: parentHostContext => parentHostContext,

package/dist/{index-aea5c5ce.cjs.prod.js → index-f368ca4a.cjs.prod.js}

@@ -1045,11 +1045,13 @@ function createRenderer(_roots, _getEventPriority) {
     // When args change the instance has to be re-constructed, which then
     // forces r3f to re-parent the children and non-scene objects
 
-    for (const child of instance.children) {
-      if (child.__r3f) appendChild(newInstance, child);
-    }
+    if (instance.children) {
+      for (const child of instance.children) {
+        if (child.__r3f) appendChild(newInstance, child);
+      }
 
-    instance.children = instance.children.filter(child => !child.__r3f);
+      instance.children = instance.children.filter(child => !child.__r3f);
+    }
 
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
 
@@ -1088,8 +1090,10 @@ function createRenderer(_roots, _getEventPriority) {
     supportsHydration: false,
     noTimeout: -1,
     appendChildToContainer: (container, child) => {
-      if (!child) return;
-      const scene = container.getState().scene; // Link current root to the default scene
+      if (!child) return; // Don't append to unmounted container
+
+      const scene = container.getState().scene;
+      if (!scene.__r3f) return; // Link current root to the default scene
 
       scene.__r3f.root = container;
       appendChild(scene, child);
@@ -1099,8 +1103,11 @@ function createRenderer(_roots, _getEventPriority) {
       removeChild(container.getState().scene, child);
     },
     insertInContainerBefore: (container, child, beforeChild) => {
-      if (!child || !beforeChild) return;
-      insertBefore(container.getState().scene, child, beforeChild);
+      if (!child || !beforeChild) return; // Don't append to unmounted container
+
+      const scene = container.getState().scene;
+      if (!scene.__r3f) return;
+      insertBefore(scene, child, beforeChild);
     },
     getRootHostContext: () => null,
     getChildHostContext: parentHostContext => parentHostContext,

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-2bf2b90e.cjs.dev.js');
+var index = require('./index-9a338808.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -126,6 +126,8 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function Canvas({
   style,
   gl,
   events = createPointerEvents,
+  eventSource,
+  eventPrefix,
   shadows,
   linear,
   flat,
@@ -184,7 +186,21 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function Canvas({
       // Pass mutable reference to onPointerMissed so it's free to update
       onPointerMissed: (...args) => handlePointerMissed.current == null ? void 0 : handlePointerMissed.current(...args),
       onCreated: state => {
-        state.events.connect == null ? void 0 : state.events.connect(divRef.current);
+        // Connect to event source
+        state.events.connect == null ? void 0 : state.events.connect(eventSource ? eventSource : divRef.current); // Set up compute function
+
+        if (eventPrefix) {
+          state.setEvents({
+            compute: (event, state) => {
+              const x = event[eventPrefix + 'X'];
+              const y = event[eventPrefix + 'Y'];
+              state.pointer.set(x / state.size.width * 2 - 1, -(y / state.size.height) * 2 + 1);
+              state.raycaster.setFromCamera(state.pointer, state.camera);
+            }
+          });
+        } // Call onCreated callback
+
+
         onCreated == null ? void 0 : onCreated(state);
       }
     });

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-aea5c5ce.cjs.prod.js');
+var index = require('./index-f368ca4a.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -126,6 +126,8 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function Canvas({
   style,
   gl,
   events = createPointerEvents,
+  eventSource,
+  eventPrefix,
   shadows,
   linear,
   flat,
@@ -184,7 +186,21 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function Canvas({
       // Pass mutable reference to onPointerMissed so it's free to update
       onPointerMissed: (...args) => handlePointerMissed.current == null ? void 0 : handlePointerMissed.current(...args),
       onCreated: state => {
-        state.events.connect == null ? void 0 : state.events.connect(divRef.current);
+        // Connect to event source
+        state.events.connect == null ? void 0 : state.events.connect(eventSource ? eventSource : divRef.current); // Set up compute function
+
+        if (eventPrefix) {
+          state.setEvents({
+            compute: (event, state) => {
+              const x = event[eventPrefix + 'X'];
+              const y = event[eventPrefix + 'Y'];
+              state.pointer.set(x / state.size.width * 2 - 1, -(y / state.size.height) * 2 + 1);
+              state.raycaster.setFromCamera(state.pointer, state.camera);
+            }
+          });
+        } // Call onCreated callback
+
+
         onCreated == null ? void 0 : onCreated(state);
       }
     });

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

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMutableCallback, a as createRoot, E as ErrorBoundary, B as Block, b as useIsomorphicLayoutEffect, d as unmountComponentAtNode } from './index-ea463076.esm.js';
-export { t as ReactThreeFiber, s as _roots, q as act, n as addAfterEffect, m as addEffect, o as addTail, l as advance, i as applyProps, f as context, c as createEvents, g as createPortal, a as createRoot, j as dispose, e as extend, p as getRootState, k as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, x as useFrame, y as useGraph, z as useLoader, v as useStore, w as useThree } from './index-ea463076.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, a as createRoot, E as ErrorBoundary, B as Block, b as useIsomorphicLayoutEffect, d as unmountComponentAtNode } from './index-cecf55e8.esm.js';
+export { t as ReactThreeFiber, s as _roots, q as act, n as addAfterEffect, m as addEffect, o as addTail, l as advance, i as applyProps, f as context, c as createEvents, g as createPortal, a as createRoot, j as dispose, e as extend, p as getRootState, k as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, x as useFrame, y as useGraph, z as useLoader, v as useStore, w as useThree } from './index-cecf55e8.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
@@ -99,6 +99,8 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
   style,
   gl,
   events = createPointerEvents,
+  eventSource,
+  eventPrefix,
   shadows,
   linear,
   flat,
@@ -157,7 +159,21 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
       // Pass mutable reference to onPointerMissed so it's free to update
       onPointerMissed: (...args) => handlePointerMissed.current == null ? void 0 : handlePointerMissed.current(...args),
       onCreated: state => {
-        state.events.connect == null ? void 0 : state.events.connect(divRef.current);
+        // Connect to event source
+        state.events.connect == null ? void 0 : state.events.connect(eventSource ? eventSource : divRef.current); // Set up compute function
+
+        if (eventPrefix) {
+          state.setEvents({
+            compute: (event, state) => {
+              const x = event[eventPrefix + 'X'];
+              const y = event[eventPrefix + 'Y'];
+              state.pointer.set(x / state.size.width * 2 - 1, -(y / state.size.height) * 2 + 1);
+              state.raycaster.setFromCamera(state.pointer, state.camera);
+            }
+          });
+        } // Call onCreated callback
+
+
         onCreated == null ? void 0 : onCreated(state);
       }
     });

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-2bf2b90e.cjs.dev.js');
+var index = require('../../dist/index-9a338808.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-aea5c5ce.cjs.prod.js');
+var index = require('../../dist/index-f368ca4a.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

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

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMutableCallback, a as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-ea463076.esm.js';
-export { t as ReactThreeFiber, s as _roots, q as act, n as addAfterEffect, m as addEffect, o as addTail, l as advance, i as applyProps, f as context, g as createPortal, a as createRoot, j as dispose, e as extend, p as getRootState, k as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, x as useFrame, y as useGraph, z as useLoader, v as useStore, w as useThree } from '../../dist/index-ea463076.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, a as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-cecf55e8.esm.js';
+export { t as ReactThreeFiber, s as _roots, q as act, n as addAfterEffect, m as addEffect, o as addTail, l as advance, i as applyProps, f as context, g as createPortal, a as createRoot, j as dispose, e as extend, p as getRootState, k as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, x as useFrame, y as useGraph, z as useLoader, v as useStore, w as useThree } from '../../dist/index-cecf55e8.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';

package/package.json

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