@react-three/fiber 8.4.1 → 8.5.0

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

@@ -1,11 +1,9 @@
-import * as React from 'react';
-import type { Options as ResizeOptions } from 'react-use-measure';
-import { RenderProps } from '../core';
-export interface Props extends Omit<RenderProps<HTMLCanvasElement>, 'size'>, React.HTMLAttributes<HTMLDivElement> {
-    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>>;
+import * as React from 'react';
+import type { Options as ResizeOptions } from 'react-use-measure';
+import { RenderProps } from '../core';
+export interface Props extends Omit<RenderProps<HTMLCanvasElement>, 'size'>, React.HTMLAttributes<HTMLDivElement> {
+    children: React.ReactNode;
+    fallback?: React.ReactNode;
+    resize?: ResizeOptions;
+}
+export declare const Canvas: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLCanvasElement>>;

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

@@ -1,4 +1,4 @@
-import { UseBoundStore } from 'zustand';
-import { RootState } from '../core/store';
-import { EventManager } from '../core/events';
-export declare function createPointerEvents(store: UseBoundStore<RootState>): EventManager<HTMLElement>;
+import { UseBoundStore } from 'zustand';
+import { RootState } from '../core/store';
+import { EventManager } from '../core/events';
+export declare function createPointerEvents(store: UseBoundStore<RootState>): EventManager<HTMLElement>;

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

@@ -869,11 +869,7 @@ function createRenderer(_roots, _getEventPriority) {
     ...props
   }, root) {
     let name = `${type[0].toUpperCase()}${type.slice(1)}`;
-    let instance; // Auto-attach geometries and materials
-
-    if (attach === undefined) {
-      if (name.endsWith('Geometry')) attach = 'geometry';else if (name.endsWith('Material')) attach = 'material';
-    }
+    let instance;
 
     if (type === 'primitive') {
       if (props.object === undefined) throw new Error("R3F: Primitives without 'object' are invalid!");
@@ -904,6 +900,11 @@ function createRenderer(_roots, _getEventPriority) {
           args
         }
       });
+    } // Auto-attach geometries and materials
+
+
+    if (instance.__r3f.attach === undefined) {
+      if (instance instanceof THREE__namespace.BufferGeometry) instance.__r3f.attach = 'geometry';else if (instance instanceof THREE__namespace.Material) instance.__r3f.attach = 'material';
     } // It should NOT call onUpdate on object instanciation, because it hasn't been added to the
     // view yet. If the callback relies on references for instance, they won't be ready yet, this is
     // why it passes "true" here
@@ -1043,13 +1044,13 @@ function createRenderer(_roots, _getEventPriority) {
     const newInstance = createInstance(type, newProps, instance.__r3f.root); // https://github.com/pmndrs/react-three-fiber/issues/1348
     // When args change the instance has to be re-constructed, which then
     // forces r3f to re-parent the children and non-scene objects
-    // This can not include primitives, which should not have declarative children
 
-    if (type !== 'primitive' && instance.children) {
-      instance.children.forEach(child => appendChild(newInstance, child));
-      instance.children = [];
+    for (const child of instance.children) {
+      if (child.__r3f) appendChild(newInstance, child);
     }
 
+    instance.children = instance.children.filter(child => !child.__r3f);
+
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
 
     instance.__r3f.objects = [];
@@ -1169,11 +1170,11 @@ function createRenderer(_roots, _getEventPriority) {
     hideInstance(instance) {
       var _instance$__r3f4;
 
-      // Deatch while the instance is hidden
+      // Detach while the instance is hidden
       const {
         attach: type,
         parent
-      } = (_instance$__r3f4 = instance == null ? void 0 : instance.__r3f) != null ? _instance$__r3f4 : {};
+      } = (_instance$__r3f4 = instance.__r3f) != null ? _instance$__r3f4 : {};
       if (type && parent) detach(parent, instance, type);
       if (instance.isObject3D) instance.visible = false;
       invalidateInstance(instance);
@@ -1186,7 +1187,7 @@ function createRenderer(_roots, _getEventPriority) {
       const {
         attach: type,
         parent
-      } = (_instance$__r3f5 = instance == null ? void 0 : instance.__r3f) != null ? _instance$__r3f5 : {};
+      } = (_instance$__r3f5 = instance.__r3f) != null ? _instance$__r3f5 : {};
       if (type && parent) attach(parent, instance, type);
       if (instance.isObject3D && props.visible == null || props.visible) instance.visible = true;
       invalidateInstance(instance);

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

@@ -869,11 +869,7 @@ function createRenderer(_roots, _getEventPriority) {
     ...props
   }, root) {
     let name = `${type[0].toUpperCase()}${type.slice(1)}`;
-    let instance; // Auto-attach geometries and materials
-
-    if (attach === undefined) {
-      if (name.endsWith('Geometry')) attach = 'geometry';else if (name.endsWith('Material')) attach = 'material';
-    }
+    let instance;
 
     if (type === 'primitive') {
       if (props.object === undefined) throw new Error("R3F: Primitives without 'object' are invalid!");
@@ -904,6 +900,11 @@ function createRenderer(_roots, _getEventPriority) {
           args
         }
       });
+    } // Auto-attach geometries and materials
+
+
+    if (instance.__r3f.attach === undefined) {
+      if (instance instanceof THREE__namespace.BufferGeometry) instance.__r3f.attach = 'geometry';else if (instance instanceof THREE__namespace.Material) instance.__r3f.attach = 'material';
     } // It should NOT call onUpdate on object instanciation, because it hasn't been added to the
     // view yet. If the callback relies on references for instance, they won't be ready yet, this is
     // why it passes "true" here
@@ -1043,13 +1044,13 @@ function createRenderer(_roots, _getEventPriority) {
     const newInstance = createInstance(type, newProps, instance.__r3f.root); // https://github.com/pmndrs/react-three-fiber/issues/1348
     // When args change the instance has to be re-constructed, which then
     // forces r3f to re-parent the children and non-scene objects
-    // This can not include primitives, which should not have declarative children
 
-    if (type !== 'primitive' && instance.children) {
-      instance.children.forEach(child => appendChild(newInstance, child));
-      instance.children = [];
+    for (const child of instance.children) {
+      if (child.__r3f) appendChild(newInstance, child);
     }
 
+    instance.children = instance.children.filter(child => !child.__r3f);
+
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
 
     instance.__r3f.objects = [];
@@ -1169,11 +1170,11 @@ function createRenderer(_roots, _getEventPriority) {
     hideInstance(instance) {
       var _instance$__r3f4;
 
-      // Deatch while the instance is hidden
+      // Detach while the instance is hidden
       const {
         attach: type,
         parent
-      } = (_instance$__r3f4 = instance == null ? void 0 : instance.__r3f) != null ? _instance$__r3f4 : {};
+      } = (_instance$__r3f4 = instance.__r3f) != null ? _instance$__r3f4 : {};
       if (type && parent) detach(parent, instance, type);
       if (instance.isObject3D) instance.visible = false;
       invalidateInstance(instance);
@@ -1186,7 +1187,7 @@ function createRenderer(_roots, _getEventPriority) {
       const {
         attach: type,
         parent
-      } = (_instance$__r3f5 = instance == null ? void 0 : instance.__r3f) != null ? _instance$__r3f5 : {};
+      } = (_instance$__r3f5 = instance.__r3f) != null ? _instance$__r3f5 : {};
       if (type && parent) attach(parent, instance, type);
       if (instance.isObject3D && props.visible == null || props.visible) instance.visible = true;
       invalidateInstance(instance);

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

@@ -842,11 +842,7 @@ function createRenderer(_roots, _getEventPriority) {
     ...props
   }, root) {
     let name = `${type[0].toUpperCase()}${type.slice(1)}`;
-    let instance; // Auto-attach geometries and materials
-
-    if (attach === undefined) {
-      if (name.endsWith('Geometry')) attach = 'geometry';else if (name.endsWith('Material')) attach = 'material';
-    }
+    let instance;
 
     if (type === 'primitive') {
       if (props.object === undefined) throw new Error("R3F: Primitives without 'object' are invalid!");
@@ -877,6 +873,11 @@ function createRenderer(_roots, _getEventPriority) {
           args
         }
       });
+    } // Auto-attach geometries and materials
+
+
+    if (instance.__r3f.attach === undefined) {
+      if (instance instanceof THREE.BufferGeometry) instance.__r3f.attach = 'geometry';else if (instance instanceof THREE.Material) instance.__r3f.attach = 'material';
     } // It should NOT call onUpdate on object instanciation, because it hasn't been added to the
     // view yet. If the callback relies on references for instance, they won't be ready yet, this is
     // why it passes "true" here
@@ -1016,13 +1017,13 @@ function createRenderer(_roots, _getEventPriority) {
     const newInstance = createInstance(type, newProps, instance.__r3f.root); // https://github.com/pmndrs/react-three-fiber/issues/1348
     // When args change the instance has to be re-constructed, which then
     // forces r3f to re-parent the children and non-scene objects
-    // This can not include primitives, which should not have declarative children
 
-    if (type !== 'primitive' && instance.children) {
-      instance.children.forEach(child => appendChild(newInstance, child));
-      instance.children = [];
+    for (const child of instance.children) {
+      if (child.__r3f) appendChild(newInstance, child);
     }
 
+    instance.children = instance.children.filter(child => !child.__r3f);
+
     instance.__r3f.objects.forEach(child => appendChild(newInstance, child));
 
     instance.__r3f.objects = [];
@@ -1142,11 +1143,11 @@ function createRenderer(_roots, _getEventPriority) {
     hideInstance(instance) {
       var _instance$__r3f4;
 
-      // Deatch while the instance is hidden
+      // Detach while the instance is hidden
       const {
         attach: type,
         parent
-      } = (_instance$__r3f4 = instance == null ? void 0 : instance.__r3f) != null ? _instance$__r3f4 : {};
+      } = (_instance$__r3f4 = instance.__r3f) != null ? _instance$__r3f4 : {};
       if (type && parent) detach(parent, instance, type);
       if (instance.isObject3D) instance.visible = false;
       invalidateInstance(instance);
@@ -1159,7 +1160,7 @@ function createRenderer(_roots, _getEventPriority) {
       const {
         attach: type,
         parent
-      } = (_instance$__r3f5 = instance == null ? void 0 : instance.__r3f) != null ? _instance$__r3f5 : {};
+      } = (_instance$__r3f5 = instance.__r3f) != null ? _instance$__r3f5 : {};
       if (type && parent) attach(parent, instance, type);
       if (instance.isObject3D && props.visible == null || props.visible) instance.visible = true;
       invalidateInstance(instance);

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-bcd3e47c.cjs.dev.js');
+var index = require('./index-2bf2b90e.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -126,8 +126,6 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function Canvas({
   style,
   gl,
   events = createPointerEvents,
-  eventSource,
-  eventPrefix,
   shadows,
   linear,
   flat,
@@ -186,21 +184,7 @@ 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 => {
-        // 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
-
-
+        state.events.connect == null ? void 0 : state.events.connect(divRef.current);
         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-e086bd20.cjs.prod.js');
+var index = require('./index-aea5c5ce.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -126,8 +126,6 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function Canvas({
   style,
   gl,
   events = createPointerEvents,
-  eventSource,
-  eventPrefix,
   shadows,
   linear,
   flat,
@@ -186,21 +184,7 @@ 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 => {
-        // 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
-
-
+        state.events.connect == null ? void 0 : state.events.connect(divRef.current);
         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-212b30d8.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-212b30d8.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-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 _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
@@ -99,8 +99,6 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
   style,
   gl,
   events = createPointerEvents,
-  eventSource,
-  eventPrefix,
   shadows,
   linear,
   flat,
@@ -159,21 +157,7 @@ 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 => {
-        // 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
-
-
+        state.events.connect == null ? void 0 : state.events.connect(divRef.current);
         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-bcd3e47c.cjs.dev.js');
+var index = require('../../dist/index-2bf2b90e.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-e086bd20.cjs.prod.js');
+var index = require('../../dist/index-aea5c5ce.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-212b30d8.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-212b30d8.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-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 _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.4.1",
+  "version": "8.5.0",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",