@react-three/fiber 7.0.12 → 7.0.13

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @react-three/fiber
 
+## 7.0.13
+
+### Patch Changes
+
+- f256558: fix(core): don't overwrite camera rotation
+- 51e6fc9: fix(core): safely handle external instances
+
 ## 7.0.12
 
 ### Patch Changes

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

@@ -133,7 +133,11 @@ function createEvents(store) {
 
 
   function filterPointerEvents(objects) {
-    return objects.filter(obj => ['Move', 'Over', 'Enter', 'Out', 'Leave'].some(name => obj.__r3f.handlers['onPointer' + name]));
+    return objects.filter(obj => ['Move', 'Over', 'Enter', 'Out', 'Leave'].some(name => {
+      var _r3f;
+
+      return (_r3f = obj.__r3f) == null ? void 0 : _r3f.handlers['onPointer' + name];
+    }));
   }
 
   function intersect(filter) {
@@ -163,7 +167,9 @@ function createEvents(store) {
       let eventObject = intersect.object; // Bubble event up
 
       while (eventObject) {
-        if (eventObject.__r3f.handlers.count) intersections.push({ ...intersect,
+        var _r3f2;
+
+        if ((_r3f2 = eventObject.__r3f) != null && _r3f2.handlers.count) intersections.push({ ...intersect,
           eventObject
         });
         eventObject = eventObject.parent;
@@ -300,11 +306,13 @@ function createEvents(store) {
       // When no objects were hit or the the hovered object wasn't found underneath the cursor
       // we call onPointerOut and delete the object from the hovered-elements map
       if (!hits.length || !hits.find(hit => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId)) {
+        var _r3f3;
+
         const eventObject = hoveredObj.eventObject;
-        const handlers = eventObject.__r3f.handlers;
+        const handlers = (_r3f3 = eventObject.__r3f) == null ? void 0 : _r3f3.handlers;
         internal.hovered.delete(makeId(hoveredObj));
 
-        if (handlers.count) {
+        if (handlers != null && handlers.count) {
           // Clear out intersects, they are outdated by now
           const data = { ...hoveredObj,
             intersections: hits || []
@@ -367,10 +375,12 @@ function createEvents(store) {
 
       if (isPointerMove) cancelPointer(hits);
       handleIntersects(hits, event, delta, data => {
+        var _r3f4;
+
         const eventObject = data.eventObject;
-        const handlers = eventObject.__r3f.handlers; // Check presence of handlers
+        const handlers = (_r3f4 = eventObject.__r3f) == null ? void 0 : _r3f4.handlers; // Check presence of handlers
 
-        if (!handlers.count) return;
+        if (!(handlers != null && handlers.count)) return;
 
         if (isPointerMove) {
           // Move event ...
@@ -413,9 +423,9 @@ function createEvents(store) {
 
   function pointerMissed(event, objects) {
     objects.forEach(object => {
-      var _r3f$handlers$onPoin, _r3f$handlers;
+      var _r3f5;
 
-      return (_r3f$handlers$onPoin = (_r3f$handlers = object.__r3f.handlers).onPointerMissed) == null ? void 0 : _r3f$handlers$onPoin.call(_r3f$handlers, event);
+      return (_r3f5 = object.__r3f) == null ? void 0 : _r3f5.handlers.onPointerMissed == null ? void 0 : _r3f5.handlers.onPointerMissed(event);
     });
   }
 
@@ -779,13 +789,13 @@ function createRenderer(roots) {
 
   function removeChild(parentInstance, child, dispose) {
     if (child) {
-      var _child$__r3f2;
+      var _parentInstance$__r3f, _child$__r3f2;
 
       if (child.__r3f) {
         child.__r3f.parent = null;
       }
 
-      if (parentInstance.__r3f.objects) {
+      if ((_parentInstance$__r3f = parentInstance.__r3f) != null && _parentInstance$__r3f.objects) {
         parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child);
       } // Remove attachment
 
@@ -1083,7 +1093,7 @@ const createStore = (applyProps, invalidate, advance, props) => {
       camera.position.z = 5;
       if (cameraOptions) applyProps(camera, cameraOptions); // Always look at center by default
 
-      camera.lookAt(0, 0, 0);
+      if (!(cameraOptions != null && cameraOptions.rotation)) camera.lookAt(0, 0, 0);
     }
 
     const initialDpr = calculateDpr(dpr);

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

@@ -133,7 +133,11 @@ function createEvents(store) {
 
 
   function filterPointerEvents(objects) {
-    return objects.filter(obj => ['Move', 'Over', 'Enter', 'Out', 'Leave'].some(name => obj.__r3f.handlers['onPointer' + name]));
+    return objects.filter(obj => ['Move', 'Over', 'Enter', 'Out', 'Leave'].some(name => {
+      var _r3f;
+
+      return (_r3f = obj.__r3f) == null ? void 0 : _r3f.handlers['onPointer' + name];
+    }));
   }
 
   function intersect(filter) {
@@ -163,7 +167,9 @@ function createEvents(store) {
       let eventObject = intersect.object; // Bubble event up
 
       while (eventObject) {
-        if (eventObject.__r3f.handlers.count) intersections.push({ ...intersect,
+        var _r3f2;
+
+        if ((_r3f2 = eventObject.__r3f) != null && _r3f2.handlers.count) intersections.push({ ...intersect,
           eventObject
         });
         eventObject = eventObject.parent;
@@ -300,11 +306,13 @@ function createEvents(store) {
       // When no objects were hit or the the hovered object wasn't found underneath the cursor
       // we call onPointerOut and delete the object from the hovered-elements map
       if (!hits.length || !hits.find(hit => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId)) {
+        var _r3f3;
+
         const eventObject = hoveredObj.eventObject;
-        const handlers = eventObject.__r3f.handlers;
+        const handlers = (_r3f3 = eventObject.__r3f) == null ? void 0 : _r3f3.handlers;
         internal.hovered.delete(makeId(hoveredObj));
 
-        if (handlers.count) {
+        if (handlers != null && handlers.count) {
           // Clear out intersects, they are outdated by now
           const data = { ...hoveredObj,
             intersections: hits || []
@@ -367,10 +375,12 @@ function createEvents(store) {
 
       if (isPointerMove) cancelPointer(hits);
       handleIntersects(hits, event, delta, data => {
+        var _r3f4;
+
         const eventObject = data.eventObject;
-        const handlers = eventObject.__r3f.handlers; // Check presence of handlers
+        const handlers = (_r3f4 = eventObject.__r3f) == null ? void 0 : _r3f4.handlers; // Check presence of handlers
 
-        if (!handlers.count) return;
+        if (!(handlers != null && handlers.count)) return;
 
         if (isPointerMove) {
           // Move event ...
@@ -413,9 +423,9 @@ function createEvents(store) {
 
   function pointerMissed(event, objects) {
     objects.forEach(object => {
-      var _r3f$handlers$onPoin, _r3f$handlers;
+      var _r3f5;
 
-      return (_r3f$handlers$onPoin = (_r3f$handlers = object.__r3f.handlers).onPointerMissed) == null ? void 0 : _r3f$handlers$onPoin.call(_r3f$handlers, event);
+      return (_r3f5 = object.__r3f) == null ? void 0 : _r3f5.handlers.onPointerMissed == null ? void 0 : _r3f5.handlers.onPointerMissed(event);
     });
   }
 
@@ -779,13 +789,13 @@ function createRenderer(roots) {
 
   function removeChild(parentInstance, child, dispose) {
     if (child) {
-      var _child$__r3f2;
+      var _parentInstance$__r3f, _child$__r3f2;
 
       if (child.__r3f) {
         child.__r3f.parent = null;
       }
 
-      if (parentInstance.__r3f.objects) {
+      if ((_parentInstance$__r3f = parentInstance.__r3f) != null && _parentInstance$__r3f.objects) {
         parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child);
       } // Remove attachment
 
@@ -1083,7 +1093,7 @@ const createStore = (applyProps, invalidate, advance, props) => {
       camera.position.z = 5;
       if (cameraOptions) applyProps(camera, cameraOptions); // Always look at center by default
 
-      camera.lookAt(0, 0, 0);
+      if (!(cameraOptions != null && cameraOptions.rotation)) camera.lookAt(0, 0, 0);
     }
 
     const initialDpr = calculateDpr(dpr);

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

@@ -99,7 +99,11 @@ function createEvents(store) {
 
 
   function filterPointerEvents(objects) {
-    return objects.filter(obj => ['Move', 'Over', 'Enter', 'Out', 'Leave'].some(name => obj.__r3f.handlers['onPointer' + name]));
+    return objects.filter(obj => ['Move', 'Over', 'Enter', 'Out', 'Leave'].some(name => {
+      var _r3f;
+
+      return (_r3f = obj.__r3f) == null ? void 0 : _r3f.handlers['onPointer' + name];
+    }));
   }
 
   function intersect(filter) {
@@ -129,7 +133,9 @@ function createEvents(store) {
       let eventObject = intersect.object; // Bubble event up
 
       while (eventObject) {
-        if (eventObject.__r3f.handlers.count) intersections.push({ ...intersect,
+        var _r3f2;
+
+        if ((_r3f2 = eventObject.__r3f) != null && _r3f2.handlers.count) intersections.push({ ...intersect,
           eventObject
         });
         eventObject = eventObject.parent;
@@ -266,11 +272,13 @@ function createEvents(store) {
       // When no objects were hit or the the hovered object wasn't found underneath the cursor
       // we call onPointerOut and delete the object from the hovered-elements map
       if (!hits.length || !hits.find(hit => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId)) {
+        var _r3f3;
+
         const eventObject = hoveredObj.eventObject;
-        const handlers = eventObject.__r3f.handlers;
+        const handlers = (_r3f3 = eventObject.__r3f) == null ? void 0 : _r3f3.handlers;
         internal.hovered.delete(makeId(hoveredObj));
 
-        if (handlers.count) {
+        if (handlers != null && handlers.count) {
           // Clear out intersects, they are outdated by now
           const data = { ...hoveredObj,
             intersections: hits || []
@@ -333,10 +341,12 @@ function createEvents(store) {
 
       if (isPointerMove) cancelPointer(hits);
       handleIntersects(hits, event, delta, data => {
+        var _r3f4;
+
         const eventObject = data.eventObject;
-        const handlers = eventObject.__r3f.handlers; // Check presence of handlers
+        const handlers = (_r3f4 = eventObject.__r3f) == null ? void 0 : _r3f4.handlers; // Check presence of handlers
 
-        if (!handlers.count) return;
+        if (!(handlers != null && handlers.count)) return;
 
         if (isPointerMove) {
           // Move event ...
@@ -379,9 +389,9 @@ function createEvents(store) {
 
   function pointerMissed(event, objects) {
     objects.forEach(object => {
-      var _r3f$handlers$onPoin, _r3f$handlers;
+      var _r3f5;
 
-      return (_r3f$handlers$onPoin = (_r3f$handlers = object.__r3f.handlers).onPointerMissed) == null ? void 0 : _r3f$handlers$onPoin.call(_r3f$handlers, event);
+      return (_r3f5 = object.__r3f) == null ? void 0 : _r3f5.handlers.onPointerMissed == null ? void 0 : _r3f5.handlers.onPointerMissed(event);
     });
   }
 
@@ -745,13 +755,13 @@ function createRenderer(roots) {
 
   function removeChild(parentInstance, child, dispose) {
     if (child) {
-      var _child$__r3f2;
+      var _parentInstance$__r3f, _child$__r3f2;
 
       if (child.__r3f) {
         child.__r3f.parent = null;
       }
 
-      if (parentInstance.__r3f.objects) {
+      if ((_parentInstance$__r3f = parentInstance.__r3f) != null && _parentInstance$__r3f.objects) {
         parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child);
       } // Remove attachment
 
@@ -1049,7 +1059,7 @@ const createStore = (applyProps, invalidate, advance, props) => {
       camera.position.z = 5;
       if (cameraOptions) applyProps(camera, cameraOptions); // Always look at center by default
 
-      camera.lookAt(0, 0, 0);
+      if (!(cameraOptions != null && cameraOptions.rotation)) camera.lookAt(0, 0, 0);
     }
 
     const initialDpr = calculateDpr(dpr);

package/package.json

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