@react-three/fiber 8.11.5 → 8.11.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @react-three/fiber
 
+## 8.11.7
+
+### Patch Changes
+
+- 96af62d5: fix: don't overwrite public cameras
+
+## 8.11.6
+
+### Patch Changes
+
+- 7d319c18: Fix is.equ obj:shallow, allow it to test arrays 1 level deep, fix canvas.camera prop being stale
+
 ## 8.11.5
 
 ### Patch Changes

package/dist/{index-37bd4d5c.esm.js → index-947d20f1.esm.js}

@@ -104,11 +104,24 @@ const is = {
     if ((isArr || isObj) && a === b) return true;
     // Last resort, go through keys
     let i;
+    // Check if a has all the keys of b
     for (i in a) if (!(i in b)) return false;
-    for (i in strict ? b : a) if (a[i] !== b[i]) return false;
+    // Check if values between keys match
+    if (isObj && arrays === 'shallow' && objects === 'shallow') {
+      for (i in strict ? b : a) if (!is.equ(a[i], b[i], {
+        strict,
+        objects: 'reference'
+      })) return false;
+    } else {
+      for (i in strict ? b : a) if (a[i] !== b[i]) return false;
+    }
+    // If i is undefined
     if (is.und(i)) {
+      // If both arrays are empty we consider them equal
       if (isArr && a.length === 0 && b.length === 0) return true;
+      // If both objects are empty we consider them equal
       if (isObj && Object.keys(a).length === 0 && Object.keys(b).length === 0) return true;
+      // Otherwise match them by value
       if (a !== b) return false;
     }
     return true;
@@ -1707,6 +1720,7 @@ function createRoot(canvas) {
   // Locals
   let onCreated;
   let configured = false;
+  let lastCamera;
   return {
     configure(props = {}) {
       let {
@@ -1755,15 +1769,16 @@ function createRoot(canvas) {
         }
       });
 
-      // Create default camera (one time only!)
-      if (!state.camera) {
+      // Create default camera, don't overwrite any user-set state
+      if (!state.camera || state.camera === lastCamera && !is.equ(lastCamera, cameraOptions, shallowLoose)) {
+        lastCamera = cameraOptions;
         const isCamera = cameraOptions instanceof THREE.Camera;
         const camera = isCamera ? cameraOptions : orthographic ? new THREE.OrthographicCamera(0, 0, 0, 0, 0.1, 1000) : new THREE.PerspectiveCamera(75, 0, 0.1, 1000);
         if (!isCamera) {
           camera.position.z = 5;
           if (cameraOptions) applyProps(camera, cameraOptions);
           // Always look at center by default
-          if (!(cameraOptions != null && cameraOptions.rotation)) camera.lookAt(0, 0, 0);
+          if (!state.camera && !(cameraOptions != null && cameraOptions.rotation)) camera.lookAt(0, 0, 0);
         }
         state.set({
           camera

package/dist/{index-17c44482.cjs.prod.js → index-ae10f2b1.cjs.prod.js}

@@ -131,11 +131,24 @@ const is = {
     if ((isArr || isObj) && a === b) return true;
     // Last resort, go through keys
     let i;
+    // Check if a has all the keys of b
     for (i in a) if (!(i in b)) return false;
-    for (i in strict ? b : a) if (a[i] !== b[i]) return false;
+    // Check if values between keys match
+    if (isObj && arrays === 'shallow' && objects === 'shallow') {
+      for (i in strict ? b : a) if (!is.equ(a[i], b[i], {
+        strict,
+        objects: 'reference'
+      })) return false;
+    } else {
+      for (i in strict ? b : a) if (a[i] !== b[i]) return false;
+    }
+    // If i is undefined
     if (is.und(i)) {
+      // If both arrays are empty we consider them equal
       if (isArr && a.length === 0 && b.length === 0) return true;
+      // If both objects are empty we consider them equal
       if (isObj && Object.keys(a).length === 0 && Object.keys(b).length === 0) return true;
+      // Otherwise match them by value
       if (a !== b) return false;
     }
     return true;
@@ -1734,6 +1747,7 @@ function createRoot(canvas) {
   // Locals
   let onCreated;
   let configured = false;
+  let lastCamera;
   return {
     configure(props = {}) {
       let {
@@ -1782,15 +1796,16 @@ function createRoot(canvas) {
         }
       });
 
-      // Create default camera (one time only!)
-      if (!state.camera) {
+      // Create default camera, don't overwrite any user-set state
+      if (!state.camera || state.camera === lastCamera && !is.equ(lastCamera, cameraOptions, shallowLoose)) {
+        lastCamera = cameraOptions;
         const isCamera = cameraOptions instanceof THREE__namespace.Camera;
         const camera = isCamera ? cameraOptions : orthographic ? new THREE__namespace.OrthographicCamera(0, 0, 0, 0, 0.1, 1000) : new THREE__namespace.PerspectiveCamera(75, 0, 0.1, 1000);
         if (!isCamera) {
           camera.position.z = 5;
           if (cameraOptions) applyProps(camera, cameraOptions);
           // Always look at center by default
-          if (!(cameraOptions != null && cameraOptions.rotation)) camera.lookAt(0, 0, 0);
+          if (!state.camera && !(cameraOptions != null && cameraOptions.rotation)) camera.lookAt(0, 0, 0);
         }
         state.set({
           camera

package/dist/{index-d1fc6689.cjs.dev.js → index-baacab10.cjs.dev.js}

@@ -131,11 +131,24 @@ const is = {
     if ((isArr || isObj) && a === b) return true;
     // Last resort, go through keys
     let i;
+    // Check if a has all the keys of b
     for (i in a) if (!(i in b)) return false;
-    for (i in strict ? b : a) if (a[i] !== b[i]) return false;
+    // Check if values between keys match
+    if (isObj && arrays === 'shallow' && objects === 'shallow') {
+      for (i in strict ? b : a) if (!is.equ(a[i], b[i], {
+        strict,
+        objects: 'reference'
+      })) return false;
+    } else {
+      for (i in strict ? b : a) if (a[i] !== b[i]) return false;
+    }
+    // If i is undefined
     if (is.und(i)) {
+      // If both arrays are empty we consider them equal
       if (isArr && a.length === 0 && b.length === 0) return true;
+      // If both objects are empty we consider them equal
       if (isObj && Object.keys(a).length === 0 && Object.keys(b).length === 0) return true;
+      // Otherwise match them by value
       if (a !== b) return false;
     }
     return true;
@@ -1734,6 +1747,7 @@ function createRoot(canvas) {
   // Locals
   let onCreated;
   let configured = false;
+  let lastCamera;
   return {
     configure(props = {}) {
       let {
@@ -1782,15 +1796,16 @@ function createRoot(canvas) {
         }
       });
 
-      // Create default camera (one time only!)
-      if (!state.camera) {
+      // Create default camera, don't overwrite any user-set state
+      if (!state.camera || state.camera === lastCamera && !is.equ(lastCamera, cameraOptions, shallowLoose)) {
+        lastCamera = cameraOptions;
         const isCamera = cameraOptions instanceof THREE__namespace.Camera;
         const camera = isCamera ? cameraOptions : orthographic ? new THREE__namespace.OrthographicCamera(0, 0, 0, 0, 0.1, 1000) : new THREE__namespace.PerspectiveCamera(75, 0, 0.1, 1000);
         if (!isCamera) {
           camera.position.z = 5;
           if (cameraOptions) applyProps(camera, cameraOptions);
           // Always look at center by default
-          if (!(cameraOptions != null && cameraOptions.rotation)) camera.lookAt(0, 0, 0);
+          if (!state.camera && !(cameraOptions != null && cameraOptions.rotation)) camera.lookAt(0, 0, 0);
         }
         state.set({
           camera

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

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

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

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

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

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

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-d1fc6689.cjs.dev.js');
+var index = require('../../dist/index-baacab10.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-17c44482.cjs.prod.js');
+var index = require('../../dist/index-ae10f2b1.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-37bd4d5c.esm.js';
-export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, f as context, c as createEvents, g as createPortal, a as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from '../../dist/index-37bd4d5c.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-947d20f1.esm.js';
+export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, f as context, c as createEvents, g as createPortal, a as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from '../../dist/index-947d20f1.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.11.5",
+  "version": "8.11.7",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",