@react-three/fiber 8.2.2 → 8.2.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @react-three/fiber
 
+## 8.2.3
+
+### Patch Changes
+
+- b8d2eab: fix: improve useLoader signature, initial size on createRoot
+
 ## 8.2.2
 
 ### Patch Changes

package/dist/declarations/src/core/hooks.d.ts

@@ -3,6 +3,7 @@ import { StateSelector, EqualityChecker } from 'zustand';
 import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
 import { RootState, RenderCallback } from './store';
 import { ObjectMap } from './utils';
+import { LoadingManager } from 'three';
 export interface Loader<T> extends THREE.Loader {
     load(url: string, onLoad?: (result: T) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): unknown;
 }
@@ -14,7 +15,7 @@ export declare function useStore(): import("zustand").UseBoundStore<RootState, i
 export declare function useThree<T = RootState>(selector?: StateSelector<RootState, T>, equalityFn?: EqualityChecker<T>): T;
 export declare function useFrame(callback: RenderCallback, renderPriority?: number): null;
 export declare function useGraph(object: THREE.Object3D): ObjectMap;
-export declare function useLoader<T, U extends string | string[]>(Proto: new () => LoaderResult<T>, input: U, extensions?: Extensions, onProgress?: (event: ProgressEvent<EventTarget>) => void): U extends any[] ? BranchingReturn<T, GLTF, GLTF & ObjectMap>[] : BranchingReturn<T, GLTF, GLTF & ObjectMap>;
+export declare function useLoader<T, U extends string | string[]>(Proto: new (manager?: LoadingManager) => LoaderResult<T>, input: U, extensions?: Extensions, onProgress?: (event: ProgressEvent<EventTarget>) => void): U extends any[] ? BranchingReturn<T, GLTF, GLTF & ObjectMap>[] : BranchingReturn<T, GLTF, GLTF & ObjectMap>;
 export declare namespace useLoader {
     var preload: <T, U extends string | string[]>(Proto: new () => LoaderResult<T>, input: U, extensions?: Extensions | undefined) => undefined;
     var clear: <T, U extends string | string[]>(Proto: new () => LoaderResult<T>, input: U) => void;

package/dist/{index-876a6569.cjs.prod.js → index-1be7d4d7.cjs.prod.js}

@@ -1700,11 +1700,43 @@ const createRendererInstance = (gl, canvas) => {
   });
 };
 
+function isCanvas(maybeCanvas) {
+  return maybeCanvas instanceof HTMLCanvasElement;
+}
+
+function computeInitialSize(canvas, defaultSize) {
+  if (defaultSize) {
+    return defaultSize;
+  }
+
+  if (isCanvas(canvas) && canvas.parentElement) {
+    const {
+      width,
+      height,
+      top,
+      left
+    } = canvas.parentElement.getBoundingClientRect();
+    return {
+      width,
+      height,
+      top,
+      left
+    };
+  }
+
+  return {
+    width: 0,
+    height: 0,
+    top: 0,
+    left: 0
+  };
+}
+
 function createRoot(canvas) {
   // Check against mistaken use of createRoot
-  let prevRoot = roots.get(canvas);
-  let prevFiber = prevRoot == null ? void 0 : prevRoot.fiber;
-  let prevStore = prevRoot == null ? void 0 : prevRoot.store;
+  const prevRoot = roots.get(canvas);
+  const prevFiber = prevRoot == null ? void 0 : prevRoot.fiber;
+  const prevStore = prevRoot == null ? void 0 : prevRoot.store;
   if (prevRoot) console.warn('R3F.createRoot should only be called once!'); // Report when an error was detected in a previous render
   // https://github.com/pmndrs/react-three-fiber/pull/2261
 
@@ -1728,7 +1760,7 @@ function createRoot(canvas) {
     configure(props = {}) {
       let {
         gl: glConfig,
-        size,
+        size: propsSize,
         events,
         onCreated: onCreatedCallback,
         shadows = false,
@@ -1863,17 +1895,7 @@ function createRoot(canvas) {
 
       if (dpr && state.viewport.dpr !== calculateDpr(dpr)) state.setDpr(dpr); // Check size, allow it to take on container bounds initially
 
-      size = size || (canvas.parentElement ? {
-        width: canvas.parentElement.clientWidth,
-        height: canvas.parentElement.clientHeight,
-        top: canvas.parentElement.clientTop,
-        left: canvas.parentElement.clientLeft
-      } : {
-        width: 0,
-        height: 0,
-        top: 0,
-        left: 0
-      });
+      const size = computeInitialSize(canvas, propsSize);
 
       if (!is.equ(size, state.size, shallowLoose)) {
         state.setSize(size.width, size.height, size.updateStyle, size.top, size.left);

package/dist/{index-af244448.esm.js → index-201bf0bf.esm.js}

@@ -1673,11 +1673,43 @@ const createRendererInstance = (gl, canvas) => {
   });
 };
 
+function isCanvas(maybeCanvas) {
+  return maybeCanvas instanceof HTMLCanvasElement;
+}
+
+function computeInitialSize(canvas, defaultSize) {
+  if (defaultSize) {
+    return defaultSize;
+  }
+
+  if (isCanvas(canvas) && canvas.parentElement) {
+    const {
+      width,
+      height,
+      top,
+      left
+    } = canvas.parentElement.getBoundingClientRect();
+    return {
+      width,
+      height,
+      top,
+      left
+    };
+  }
+
+  return {
+    width: 0,
+    height: 0,
+    top: 0,
+    left: 0
+  };
+}
+
 function createRoot(canvas) {
   // Check against mistaken use of createRoot
-  let prevRoot = roots.get(canvas);
-  let prevFiber = prevRoot == null ? void 0 : prevRoot.fiber;
-  let prevStore = prevRoot == null ? void 0 : prevRoot.store;
+  const prevRoot = roots.get(canvas);
+  const prevFiber = prevRoot == null ? void 0 : prevRoot.fiber;
+  const prevStore = prevRoot == null ? void 0 : prevRoot.store;
   if (prevRoot) console.warn('R3F.createRoot should only be called once!'); // Report when an error was detected in a previous render
   // https://github.com/pmndrs/react-three-fiber/pull/2261
 
@@ -1701,7 +1733,7 @@ function createRoot(canvas) {
     configure(props = {}) {
       let {
         gl: glConfig,
-        size,
+        size: propsSize,
         events,
         onCreated: onCreatedCallback,
         shadows = false,
@@ -1836,17 +1868,7 @@ function createRoot(canvas) {
 
       if (dpr && state.viewport.dpr !== calculateDpr(dpr)) state.setDpr(dpr); // Check size, allow it to take on container bounds initially
 
-      size = size || (canvas.parentElement ? {
-        width: canvas.parentElement.clientWidth,
-        height: canvas.parentElement.clientHeight,
-        top: canvas.parentElement.clientTop,
-        left: canvas.parentElement.clientLeft
-      } : {
-        width: 0,
-        height: 0,
-        top: 0,
-        left: 0
-      });
+      const size = computeInitialSize(canvas, propsSize);
 
       if (!is.equ(size, state.size, shallowLoose)) {
         state.setSize(size.width, size.height, size.updateStyle, size.top, size.left);

package/dist/{index-2a5b06d3.cjs.dev.js → index-942a305b.cjs.dev.js}

@@ -1700,11 +1700,43 @@ const createRendererInstance = (gl, canvas) => {
   });
 };
 
+function isCanvas(maybeCanvas) {
+  return maybeCanvas instanceof HTMLCanvasElement;
+}
+
+function computeInitialSize(canvas, defaultSize) {
+  if (defaultSize) {
+    return defaultSize;
+  }
+
+  if (isCanvas(canvas) && canvas.parentElement) {
+    const {
+      width,
+      height,
+      top,
+      left
+    } = canvas.parentElement.getBoundingClientRect();
+    return {
+      width,
+      height,
+      top,
+      left
+    };
+  }
+
+  return {
+    width: 0,
+    height: 0,
+    top: 0,
+    left: 0
+  };
+}
+
 function createRoot(canvas) {
   // Check against mistaken use of createRoot
-  let prevRoot = roots.get(canvas);
-  let prevFiber = prevRoot == null ? void 0 : prevRoot.fiber;
-  let prevStore = prevRoot == null ? void 0 : prevRoot.store;
+  const prevRoot = roots.get(canvas);
+  const prevFiber = prevRoot == null ? void 0 : prevRoot.fiber;
+  const prevStore = prevRoot == null ? void 0 : prevRoot.store;
   if (prevRoot) console.warn('R3F.createRoot should only be called once!'); // Report when an error was detected in a previous render
   // https://github.com/pmndrs/react-three-fiber/pull/2261
 
@@ -1728,7 +1760,7 @@ function createRoot(canvas) {
     configure(props = {}) {
       let {
         gl: glConfig,
-        size,
+        size: propsSize,
         events,
         onCreated: onCreatedCallback,
         shadows = false,
@@ -1863,17 +1895,7 @@ function createRoot(canvas) {
 
       if (dpr && state.viewport.dpr !== calculateDpr(dpr)) state.setDpr(dpr); // Check size, allow it to take on container bounds initially
 
-      size = size || (canvas.parentElement ? {
-        width: canvas.parentElement.clientWidth,
-        height: canvas.parentElement.clientHeight,
-        top: canvas.parentElement.clientTop,
-        left: canvas.parentElement.clientLeft
-      } : {
-        width: 0,
-        height: 0,
-        top: 0,
-        left: 0
-      });
+      const size = computeInitialSize(canvas, propsSize);
 
       if (!is.equ(size, state.size, shallowLoose)) {
         state.setSize(size.width, size.height, size.updateStyle, size.top, size.left);

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-2a5b06d3.cjs.dev.js');
+var index = require('./index-942a305b.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-876a6569.cjs.prod.js');
+var index = require('./index-1be7d4d7.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, E as ErrorBoundary, B as Block, b as useIsomorphicLayoutEffect, d as unmountComponentAtNode } from './index-af244448.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-af244448.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-201bf0bf.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-201bf0bf.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-2a5b06d3.cjs.dev.js');
+var index = require('../../dist/index-942a305b.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -39,6 +39,8 @@ var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
 var Pressability__default = /*#__PURE__*/_interopDefault(Pressability);
 
+/* eslint-enable import/default, import/no-named-as-default, import/no-named-as-default-member */
+
 const EVENTS = {
   PRESS: 'onPress',
   PRESSIN: 'onPressIn',

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-876a6569.cjs.prod.js');
+var index = require('../../dist/index-1be7d4d7.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -39,6 +39,8 @@ var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
 var Pressability__default = /*#__PURE__*/_interopDefault(Pressability);
 
+/* eslint-enable import/default, import/no-named-as-default, import/no-named-as-default-member */
+
 const EVENTS = {
   PRESS: 'onPress',
   PRESSIN: 'onPressIn',

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-af244448.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-af244448.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-201bf0bf.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-201bf0bf.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
@@ -12,6 +12,8 @@ import 'react-reconciler';
 import 'scheduler';
 import 'suspend-react';
 
+/* eslint-enable import/default, import/no-named-as-default, import/no-named-as-default-member */
+
 const EVENTS = {
   PRESS: 'onPress',
   PRESSIN: 'onPressIn',

package/package.json

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