@react-three/fiber 8.16.0 → 8.16.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @react-three/fiber
 
+## 8.16.2
+
+### Patch Changes
+
+- e0900489: fix(useLoader): don't dispose of memoized loader
+
+## 8.16.1
+
+### Patch Changes
+
+- 503efc2e: fix: prevent invalidate from piling up frames
+
 ## 8.16.0
 
 ### Minor Changes

package/dist/{index-a75b61c3.cjs.dev.js → index-2d64b670.cjs.dev.js}

@@ -1576,6 +1576,7 @@ function render$1(timestamp, state, frame) {
 }
 function createLoop(roots) {
   let running = false;
+  let useFrameInProgress = false;
   let repeat;
   let frame;
   let state;
@@ -1588,6 +1589,7 @@ function createLoop(roots) {
     flushGlobalEffects('before', timestamp);
 
     // Render all roots
+    useFrameInProgress = true;
     for (const root of roots.values()) {
       var _state$gl$xr;
       state = root.store.getState();
@@ -1596,6 +1598,7 @@ function createLoop(roots) {
         repeat += render$1(timestamp, state);
       }
     }
+    useFrameInProgress = false;
 
     // Run after-effects
     flushGlobalEffects('after', timestamp);
@@ -1614,8 +1617,20 @@ function createLoop(roots) {
     var _state$gl$xr2;
     if (!state) return roots.forEach(root => invalidate(root.store.getState(), frames));
     if ((_state$gl$xr2 = state.gl.xr) != null && _state$gl$xr2.isPresenting || !state.internal.active || state.frameloop === 'never') return;
-    // Increase frames, do not go higher than 60
-    state.internal.frames = Math.min(60, state.internal.frames + frames);
+    if (frames > 1) {
+      // legacy support for people using frames parameters
+      // Increase frames, do not go higher than 60
+      state.internal.frames = Math.min(60, state.internal.frames + frames);
+    } else {
+      if (useFrameInProgress) {
+        //called from within a useFrame, it means the user wants an additional frame
+        state.internal.frames = 2;
+      } else {
+        //the user need a new frame, no need to increment further than 1
+        state.internal.frames = 1;
+      }
+    }
+
     // If the render-loop isn't active, start it
     if (!running) {
       running = true;
@@ -1695,7 +1710,7 @@ function loadingFn(extensions, onProgress) {
     return Promise.all(input.map(input => new Promise((res, reject) => loader.load(input, data => {
       if (data.scene) Object.assign(data, buildGraph(data.scene));
       res(data);
-    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error == null ? void 0 : error.message}`)))))).finally(() => loader.dispose == null ? void 0 : loader.dispose());
+    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error == null ? void 0 : error.message}`))))));
   };
 }
 /**

package/dist/{index-76e11619.cjs.prod.js → index-b61f7365.cjs.prod.js}

@@ -1576,6 +1576,7 @@ function render$1(timestamp, state, frame) {
 }
 function createLoop(roots) {
   let running = false;
+  let useFrameInProgress = false;
   let repeat;
   let frame;
   let state;
@@ -1588,6 +1589,7 @@ function createLoop(roots) {
     flushGlobalEffects('before', timestamp);
 
     // Render all roots
+    useFrameInProgress = true;
     for (const root of roots.values()) {
       var _state$gl$xr;
       state = root.store.getState();
@@ -1596,6 +1598,7 @@ function createLoop(roots) {
         repeat += render$1(timestamp, state);
       }
     }
+    useFrameInProgress = false;
 
     // Run after-effects
     flushGlobalEffects('after', timestamp);
@@ -1614,8 +1617,20 @@ function createLoop(roots) {
     var _state$gl$xr2;
     if (!state) return roots.forEach(root => invalidate(root.store.getState(), frames));
     if ((_state$gl$xr2 = state.gl.xr) != null && _state$gl$xr2.isPresenting || !state.internal.active || state.frameloop === 'never') return;
-    // Increase frames, do not go higher than 60
-    state.internal.frames = Math.min(60, state.internal.frames + frames);
+    if (frames > 1) {
+      // legacy support for people using frames parameters
+      // Increase frames, do not go higher than 60
+      state.internal.frames = Math.min(60, state.internal.frames + frames);
+    } else {
+      if (useFrameInProgress) {
+        //called from within a useFrame, it means the user wants an additional frame
+        state.internal.frames = 2;
+      } else {
+        //the user need a new frame, no need to increment further than 1
+        state.internal.frames = 1;
+      }
+    }
+
     // If the render-loop isn't active, start it
     if (!running) {
       running = true;
@@ -1695,7 +1710,7 @@ function loadingFn(extensions, onProgress) {
     return Promise.all(input.map(input => new Promise((res, reject) => loader.load(input, data => {
       if (data.scene) Object.assign(data, buildGraph(data.scene));
       res(data);
-    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error == null ? void 0 : error.message}`)))))).finally(() => loader.dispose == null ? void 0 : loader.dispose());
+    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error == null ? void 0 : error.message}`))))));
   };
 }
 /**

package/dist/{index-5712f892.esm.js → index-c636ef6d.esm.js}

@@ -1549,6 +1549,7 @@ function render$1(timestamp, state, frame) {
 }
 function createLoop(roots) {
   let running = false;
+  let useFrameInProgress = false;
   let repeat;
   let frame;
   let state;
@@ -1561,6 +1562,7 @@ function createLoop(roots) {
     flushGlobalEffects('before', timestamp);
 
     // Render all roots
+    useFrameInProgress = true;
     for (const root of roots.values()) {
       var _state$gl$xr;
       state = root.store.getState();
@@ -1569,6 +1571,7 @@ function createLoop(roots) {
         repeat += render$1(timestamp, state);
       }
     }
+    useFrameInProgress = false;
 
     // Run after-effects
     flushGlobalEffects('after', timestamp);
@@ -1587,8 +1590,20 @@ function createLoop(roots) {
     var _state$gl$xr2;
     if (!state) return roots.forEach(root => invalidate(root.store.getState(), frames));
     if ((_state$gl$xr2 = state.gl.xr) != null && _state$gl$xr2.isPresenting || !state.internal.active || state.frameloop === 'never') return;
-    // Increase frames, do not go higher than 60
-    state.internal.frames = Math.min(60, state.internal.frames + frames);
+    if (frames > 1) {
+      // legacy support for people using frames parameters
+      // Increase frames, do not go higher than 60
+      state.internal.frames = Math.min(60, state.internal.frames + frames);
+    } else {
+      if (useFrameInProgress) {
+        //called from within a useFrame, it means the user wants an additional frame
+        state.internal.frames = 2;
+      } else {
+        //the user need a new frame, no need to increment further than 1
+        state.internal.frames = 1;
+      }
+    }
+
     // If the render-loop isn't active, start it
     if (!running) {
       running = true;
@@ -1668,7 +1683,7 @@ function loadingFn(extensions, onProgress) {
     return Promise.all(input.map(input => new Promise((res, reject) => loader.load(input, data => {
       if (data.scene) Object.assign(data, buildGraph(data.scene));
       res(data);
-    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error == null ? void 0 : error.message}`)))))).finally(() => loader.dispose == null ? void 0 : loader.dispose());
+    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error == null ? void 0 : error.message}`))))));
   };
 }
 /**

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-a75b61c3.cjs.dev.js');
+var index = require('./index-2d64b670.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-76e11619.cjs.prod.js');
+var index = require('./index-b61f7365.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 useIsomorphicLayoutEffect, b as createRoot, i as isRef, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from './index-5712f892.esm.js';
-export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, f as context, c as createEvents, g as createPortal, b 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, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from './index-5712f892.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, a as useIsomorphicLayoutEffect, b as createRoot, i as isRef, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from './index-c636ef6d.esm.js';
+export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, f as context, c as createEvents, g as createPortal, b 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, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from './index-c636ef6d.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-a75b61c3.cjs.dev.js');
+var index = require('../../dist/index-2d64b670.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-76e11619.cjs.prod.js');
+var index = require('../../dist/index-b61f7365.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, b as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-5712f892.esm.js';
-export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, f as context, c as createEvents, g as createPortal, b 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, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from '../../dist/index-5712f892.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, b as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-c636ef6d.esm.js';
+export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, w as buildGraph, f as context, c as createEvents, g as createPortal, b 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, C as useFrame, D as useGraph, y as useInstanceHandle, F as useLoader, z as useStore, A as useThree } from '../../dist/index-c636ef6d.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.16.0",
+  "version": "8.16.2",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",