@react-three/fiber 8.2.1 → 8.3.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @react-three/fiber
 
+## 8.3.0
+
+### Minor Changes
+
+- 9c450ec: feat: improve errors
+
+## 8.2.3
+
+### Patch Changes
+
+- b8d2eab: fix: improve useLoader signature, initial size on createRoot
+
+## 8.2.2
+
+### Patch Changes
+
+- acd6f04: fix: warn on stray text
+
 ## 8.2.1
 
 ### 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/declarations/src/core/index.d.ts

@@ -10,7 +10,7 @@ import { EventManager, ComputeFunction } from './events';
 import { dispose, getRootState, Camera } from './utils';
 declare const roots: Map<Element, Root>;
 declare const invalidate: (state?: RootState | undefined, frames?: number) => void, advance: (timestamp: number, runGlobalEffects?: boolean, state?: RootState | undefined, frame?: THREE.XRFrame | undefined) => void;
-declare const reconciler: import("react-reconciler").Reconciler<UseBoundStore<RootState, import("zustand").StoreApi<RootState>>, import("./renderer").Instance, never, import("./renderer").Instance, import("./renderer").Instance>, applyProps: typeof import("./utils").applyProps;
+declare const reconciler: import("react-reconciler").Reconciler<UseBoundStore<RootState, import("zustand").StoreApi<RootState>>, import("./renderer").Instance, void, import("./renderer").Instance, import("./renderer").Instance>, applyProps: typeof import("./utils").applyProps;
 declare type Properties<T> = Pick<T, {
     [K in keyof T]: T[K] extends (_: any) => any ? never : K;
 }[keyof T]>;

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

@@ -45,7 +45,7 @@ export declare type InstanceProps = {
 };
 declare let extend: (objects: object) => void;
 declare function createRenderer<TCanvas>(_roots: Map<TCanvas, Root>, _getEventPriority?: () => any): {
-    reconciler: Reconciler.Reconciler<UseBoundStore<RootState, import("zustand").StoreApi<RootState>>, Instance, never, Instance, Instance>;
+    reconciler: Reconciler.Reconciler<UseBoundStore<RootState, import("zustand").StoreApi<RootState>>, Instance, void, Instance, Instance>;
     applyProps: typeof applyProps;
 };
 export { prepare, createRenderer, extend };

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

@@ -13,7 +13,7 @@ export declare type UnblockProps = {
 };
 export declare function Block({ set }: Omit<UnblockProps, 'children'>): null;
 export declare class ErrorBoundary extends React.Component<{
-    set: React.Dispatch<any>;
+    set: React.Dispatch<Error | undefined>;
     children: React.ReactNode;
 }, {
     error: boolean;
@@ -24,7 +24,7 @@ export declare class ErrorBoundary extends React.Component<{
     static getDerivedStateFromError: () => {
         error: boolean;
     };
-    componentDidCatch(error: any): void;
+    componentDidCatch(err: Error): void;
     render(): React.ReactNode;
 }
 export declare const DEFAULT = "__default";

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

@@ -45,8 +45,8 @@ class ErrorBoundary extends React.Component {
     };
   }
 
-  componentDidCatch(error) {
-    this.props.set(error);
+  componentDidCatch(err) {
+    this.props.set(err);
   }
 
   render() {
@@ -849,7 +849,7 @@ function createRenderer(_roots, _getEventPriority) {
     }
 
     if (type === 'primitive') {
-      if (props.object === undefined) throw `Primitives without 'object' are invalid!`;
+      if (props.object === undefined) throw new Error("R3F: Primitives without 'object' are invalid!");
       const object = props.object;
       instance = prepare(object, {
         type,
@@ -861,11 +861,11 @@ function createRenderer(_roots, _getEventPriority) {
       const target = catalogue[name];
 
       if (!target) {
-        throw `${name} is not part of the THREE namespace! Did you forget to extend? See: https://docs.pmnd.rs/react-three-fiber/api/objects#using-3rd-party-objects-declaratively`;
+        throw new Error(`R3F: ${name} is not part of the THREE namespace! Did you forget to extend? See: https://docs.pmnd.rs/react-three-fiber/api/objects#using-3rd-party-objects-declaratively`);
       } // Throw if an object or literal was passed for args
 
 
-      if (!Array.isArray(args)) throw 'The args prop must be an array!'; // Instanciate new object, link it to the root
+      if (!Array.isArray(args)) throw new Error('R3F: The args prop must be an array!'); // Instanciate new object, link it to the root
       // Append memoized props with args so it's not forgotten
 
       instance = prepare(new target(...args), {
@@ -1043,7 +1043,10 @@ function createRenderer(_roots, _getEventPriority) {
         }
       }
     });
-  }
+  } // Don't handle text instances, warn on undefined behavior
+
+
+  const handleTextInstance = () => console.warn('Text is not allowed in the R3F tree! This could be stray whitespace or characters.');
 
   const reconciler = Reconciler({
     createInstance,
@@ -1057,13 +1060,20 @@ function createRenderer(_roots, _getEventPriority) {
     supportsHydration: false,
     noTimeout: -1,
     appendChildToContainer: (container, child) => {
+      if (!child) return;
       const scene = container.getState().scene; // Link current root to the default scene
 
       scene.__r3f.root = container;
       appendChild(scene, child);
     },
-    removeChildFromContainer: (container, child) => removeChild(container.getState().scene, child),
-    insertInContainerBefore: (container, child, beforeChild) => insertBefore(container.getState().scene, child, beforeChild),
+    removeChildFromContainer: (container, child) => {
+      if (!child) return;
+      removeChild(container.getState().scene, child);
+    },
+    insertInContainerBefore: (container, child, beforeChild) => {
+      if (!child || !beforeChild) return;
+      insertBefore(container.getState().scene, child, beforeChild);
+    },
     getRootHostContext: () => null,
     getChildHostContext: parentHostContext => parentHostContext,
 
@@ -1093,7 +1103,7 @@ function createRenderer(_roots, _getEventPriority) {
           ...restOld
         } = oldProps; // Throw if an object or literal was passed for args
 
-        if (!Array.isArray(argsNew)) throw 'The args prop must be an array!'; // If it has new props or arguments, then it needs to be re-instantiated
+        if (!Array.isArray(argsNew)) throw new Error('R3F: the args prop must be an array!'); // If it has new props or arguments, then it needs to be re-instantiated
 
         if (argsNew.some((value, index) => value !== argsOld[index])) return [true]; // Create a diff-set, flag if there are any changes
 
@@ -1155,13 +1165,9 @@ function createRenderer(_roots, _getEventPriority) {
       invalidateInstance(instance);
     },
 
-    createTextInstance: () => {
-      throw new Error('Text is not allowed in the R3F tree! This could be stray whitespace or characters.');
-    },
-    hideTextInstance: () => {
-      throw new Error('Text is not allowed in the R3F tree! This could be stray whitespace or characters.');
-    },
-    unhideTextInstance: () => {},
+    createTextInstance: handleTextInstance,
+    hideTextInstance: handleTextInstance,
+    unhideTextInstance: handleTextInstance,
     // https://github.com/pmndrs/react-three-fiber/pull/2360#discussion_r916356874
     // @ts-ignore
     getCurrentEventPriority: () => _getEventPriority ? _getEventPriority() : DefaultEventPriority,
@@ -1560,7 +1566,7 @@ function createLoop(roots) {
 
 function useStore() {
   const store = React.useContext(context);
-  if (!store) throw `R3F hooks can only be used within the Canvas component!`;
+  if (!store) throw new Error('R3F: Hooks can only be used within the Canvas component!');
   return store;
 }
 /**
@@ -1604,7 +1610,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(`Could not load ${input}: ${error.message}`)))));
+    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error.message})`))))));
   };
 }
 /**
@@ -1667,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
 
@@ -1695,7 +1733,7 @@ function createRoot(canvas) {
     configure(props = {}) {
       let {
         gl: glConfig,
-        size,
+        size: propsSize,
         events,
         onCreated: onCreatedCallback,
         shadows = false,
@@ -1830,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-6716e497.cjs.dev.js → index-bcd3e47c.cjs.dev.js}

@@ -72,8 +72,8 @@ class ErrorBoundary extends React__namespace.Component {
     };
   }
 
-  componentDidCatch(error) {
-    this.props.set(error);
+  componentDidCatch(err) {
+    this.props.set(err);
   }
 
   render() {
@@ -876,7 +876,7 @@ function createRenderer(_roots, _getEventPriority) {
     }
 
     if (type === 'primitive') {
-      if (props.object === undefined) throw `Primitives without 'object' are invalid!`;
+      if (props.object === undefined) throw new Error("R3F: Primitives without 'object' are invalid!");
       const object = props.object;
       instance = prepare(object, {
         type,
@@ -888,11 +888,11 @@ function createRenderer(_roots, _getEventPriority) {
       const target = catalogue[name];
 
       if (!target) {
-        throw `${name} is not part of the THREE namespace! Did you forget to extend? See: https://docs.pmnd.rs/react-three-fiber/api/objects#using-3rd-party-objects-declaratively`;
+        throw new Error(`R3F: ${name} is not part of the THREE namespace! Did you forget to extend? See: https://docs.pmnd.rs/react-three-fiber/api/objects#using-3rd-party-objects-declaratively`);
       } // Throw if an object or literal was passed for args
 
 
-      if (!Array.isArray(args)) throw 'The args prop must be an array!'; // Instanciate new object, link it to the root
+      if (!Array.isArray(args)) throw new Error('R3F: The args prop must be an array!'); // Instanciate new object, link it to the root
       // Append memoized props with args so it's not forgotten
 
       instance = prepare(new target(...args), {
@@ -1070,7 +1070,10 @@ function createRenderer(_roots, _getEventPriority) {
         }
       }
     });
-  }
+  } // Don't handle text instances, warn on undefined behavior
+
+
+  const handleTextInstance = () => console.warn('Text is not allowed in the R3F tree! This could be stray whitespace or characters.');
 
   const reconciler = Reconciler__default["default"]({
     createInstance,
@@ -1084,13 +1087,20 @@ function createRenderer(_roots, _getEventPriority) {
     supportsHydration: false,
     noTimeout: -1,
     appendChildToContainer: (container, child) => {
+      if (!child) return;
       const scene = container.getState().scene; // Link current root to the default scene
 
       scene.__r3f.root = container;
       appendChild(scene, child);
     },
-    removeChildFromContainer: (container, child) => removeChild(container.getState().scene, child),
-    insertInContainerBefore: (container, child, beforeChild) => insertBefore(container.getState().scene, child, beforeChild),
+    removeChildFromContainer: (container, child) => {
+      if (!child) return;
+      removeChild(container.getState().scene, child);
+    },
+    insertInContainerBefore: (container, child, beforeChild) => {
+      if (!child || !beforeChild) return;
+      insertBefore(container.getState().scene, child, beforeChild);
+    },
     getRootHostContext: () => null,
     getChildHostContext: parentHostContext => parentHostContext,
 
@@ -1120,7 +1130,7 @@ function createRenderer(_roots, _getEventPriority) {
           ...restOld
         } = oldProps; // Throw if an object or literal was passed for args
 
-        if (!Array.isArray(argsNew)) throw 'The args prop must be an array!'; // If it has new props or arguments, then it needs to be re-instantiated
+        if (!Array.isArray(argsNew)) throw new Error('R3F: the args prop must be an array!'); // If it has new props or arguments, then it needs to be re-instantiated
 
         if (argsNew.some((value, index) => value !== argsOld[index])) return [true]; // Create a diff-set, flag if there are any changes
 
@@ -1182,13 +1192,9 @@ function createRenderer(_roots, _getEventPriority) {
       invalidateInstance(instance);
     },
 
-    createTextInstance: () => {
-      throw new Error('Text is not allowed in the R3F tree! This could be stray whitespace or characters.');
-    },
-    hideTextInstance: () => {
-      throw new Error('Text is not allowed in the R3F tree! This could be stray whitespace or characters.');
-    },
-    unhideTextInstance: () => {},
+    createTextInstance: handleTextInstance,
+    hideTextInstance: handleTextInstance,
+    unhideTextInstance: handleTextInstance,
     // https://github.com/pmndrs/react-three-fiber/pull/2360#discussion_r916356874
     // @ts-ignore
     getCurrentEventPriority: () => _getEventPriority ? _getEventPriority() : constants.DefaultEventPriority,
@@ -1587,7 +1593,7 @@ function createLoop(roots) {
 
 function useStore() {
   const store = React__namespace.useContext(context);
-  if (!store) throw `R3F hooks can only be used within the Canvas component!`;
+  if (!store) throw new Error('R3F: Hooks can only be used within the Canvas component!');
   return store;
 }
 /**
@@ -1631,7 +1637,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(`Could not load ${input}: ${error.message}`)))));
+    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error.message})`))))));
   };
 }
 /**
@@ -1694,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
 
@@ -1722,7 +1760,7 @@ function createRoot(canvas) {
     configure(props = {}) {
       let {
         gl: glConfig,
-        size,
+        size: propsSize,
         events,
         onCreated: onCreatedCallback,
         shadows = false,
@@ -1857,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-8296e46a.cjs.prod.js → index-e086bd20.cjs.prod.js}

@@ -72,8 +72,8 @@ class ErrorBoundary extends React__namespace.Component {
     };
   }
 
-  componentDidCatch(error) {
-    this.props.set(error);
+  componentDidCatch(err) {
+    this.props.set(err);
   }
 
   render() {
@@ -876,7 +876,7 @@ function createRenderer(_roots, _getEventPriority) {
     }
 
     if (type === 'primitive') {
-      if (props.object === undefined) throw `Primitives without 'object' are invalid!`;
+      if (props.object === undefined) throw new Error("R3F: Primitives without 'object' are invalid!");
       const object = props.object;
       instance = prepare(object, {
         type,
@@ -888,11 +888,11 @@ function createRenderer(_roots, _getEventPriority) {
       const target = catalogue[name];
 
       if (!target) {
-        throw `${name} is not part of the THREE namespace! Did you forget to extend? See: https://docs.pmnd.rs/react-three-fiber/api/objects#using-3rd-party-objects-declaratively`;
+        throw new Error(`R3F: ${name} is not part of the THREE namespace! Did you forget to extend? See: https://docs.pmnd.rs/react-three-fiber/api/objects#using-3rd-party-objects-declaratively`);
       } // Throw if an object or literal was passed for args
 
 
-      if (!Array.isArray(args)) throw 'The args prop must be an array!'; // Instanciate new object, link it to the root
+      if (!Array.isArray(args)) throw new Error('R3F: The args prop must be an array!'); // Instanciate new object, link it to the root
       // Append memoized props with args so it's not forgotten
 
       instance = prepare(new target(...args), {
@@ -1070,7 +1070,10 @@ function createRenderer(_roots, _getEventPriority) {
         }
       }
     });
-  }
+  } // Don't handle text instances, warn on undefined behavior
+
+
+  const handleTextInstance = () => console.warn('Text is not allowed in the R3F tree! This could be stray whitespace or characters.');
 
   const reconciler = Reconciler__default["default"]({
     createInstance,
@@ -1084,13 +1087,20 @@ function createRenderer(_roots, _getEventPriority) {
     supportsHydration: false,
     noTimeout: -1,
     appendChildToContainer: (container, child) => {
+      if (!child) return;
       const scene = container.getState().scene; // Link current root to the default scene
 
       scene.__r3f.root = container;
       appendChild(scene, child);
     },
-    removeChildFromContainer: (container, child) => removeChild(container.getState().scene, child),
-    insertInContainerBefore: (container, child, beforeChild) => insertBefore(container.getState().scene, child, beforeChild),
+    removeChildFromContainer: (container, child) => {
+      if (!child) return;
+      removeChild(container.getState().scene, child);
+    },
+    insertInContainerBefore: (container, child, beforeChild) => {
+      if (!child || !beforeChild) return;
+      insertBefore(container.getState().scene, child, beforeChild);
+    },
     getRootHostContext: () => null,
     getChildHostContext: parentHostContext => parentHostContext,
 
@@ -1120,7 +1130,7 @@ function createRenderer(_roots, _getEventPriority) {
           ...restOld
         } = oldProps; // Throw if an object or literal was passed for args
 
-        if (!Array.isArray(argsNew)) throw 'The args prop must be an array!'; // If it has new props or arguments, then it needs to be re-instantiated
+        if (!Array.isArray(argsNew)) throw new Error('R3F: the args prop must be an array!'); // If it has new props or arguments, then it needs to be re-instantiated
 
         if (argsNew.some((value, index) => value !== argsOld[index])) return [true]; // Create a diff-set, flag if there are any changes
 
@@ -1182,13 +1192,9 @@ function createRenderer(_roots, _getEventPriority) {
       invalidateInstance(instance);
     },
 
-    createTextInstance: () => {
-      throw new Error('Text is not allowed in the R3F tree! This could be stray whitespace or characters.');
-    },
-    hideTextInstance: () => {
-      throw new Error('Text is not allowed in the R3F tree! This could be stray whitespace or characters.');
-    },
-    unhideTextInstance: () => {},
+    createTextInstance: handleTextInstance,
+    hideTextInstance: handleTextInstance,
+    unhideTextInstance: handleTextInstance,
     // https://github.com/pmndrs/react-three-fiber/pull/2360#discussion_r916356874
     // @ts-ignore
     getCurrentEventPriority: () => _getEventPriority ? _getEventPriority() : constants.DefaultEventPriority,
@@ -1587,7 +1593,7 @@ function createLoop(roots) {
 
 function useStore() {
   const store = React__namespace.useContext(context);
-  if (!store) throw `R3F hooks can only be used within the Canvas component!`;
+  if (!store) throw new Error('R3F: Hooks can only be used within the Canvas component!');
   return store;
 }
 /**
@@ -1631,7 +1637,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(`Could not load ${input}: ${error.message}`)))));
+    }, onProgress, error => reject(new Error(`Could not load ${input}: ${error.message})`))))));
   };
 }
 /**
@@ -1694,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
 
@@ -1722,7 +1760,7 @@ function createRoot(canvas) {
     configure(props = {}) {
       let {
         gl: glConfig,
-        size,
+        size: propsSize,
         events,
         onCreated: onCreatedCallback,
         shadows = false,
@@ -1857,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-6716e497.cjs.dev.js');
+var index = require('./index-bcd3e47c.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-8296e46a.cjs.prod.js');
+var index = require('./index-e086bd20.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-2e68c2a1.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-2e68c2a1.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-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 _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-6716e497.cjs.dev.js');
+var index = require('../../dist/index-bcd3e47c.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',
@@ -144,7 +146,7 @@ function getAsset(input) {
       return expAsset.fromModule(input);
 
     default:
-      throw 'Invalid asset! Must be a URI or module.';
+      throw new Error('R3F: Invalid asset! Must be a URI or module.');
   }
 }
 
@@ -272,7 +274,7 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
   React__namespace.useImperativeHandle(forwardedRef, () => viewRef.current);
   const handlePointerMissed = index.useMutableCallback(onPointerMissed);
   const [block, setBlock] = React__namespace.useState(false);
-  const [error, setError] = React__namespace.useState(false); // Suspend this component if block is a promise (2nd run)
+  const [error, setError] = React__namespace.useState(undefined); // Suspend this component if block is a promise (2nd run)
 
   if (block) throw block; // Throw exception outwards if anything within canvas throws
 

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-8296e46a.cjs.prod.js');
+var index = require('../../dist/index-e086bd20.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',
@@ -144,7 +146,7 @@ function getAsset(input) {
       return expAsset.fromModule(input);
 
     default:
-      throw 'Invalid asset! Must be a URI or module.';
+      throw new Error('R3F: Invalid asset! Must be a URI or module.');
   }
 }
 
@@ -272,7 +274,7 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
   React__namespace.useImperativeHandle(forwardedRef, () => viewRef.current);
   const handlePointerMissed = index.useMutableCallback(onPointerMissed);
   const [block, setBlock] = React__namespace.useState(false);
-  const [error, setError] = React__namespace.useState(false); // Suspend this component if block is a promise (2nd run)
+  const [error, setError] = React__namespace.useState(undefined); // Suspend this component if block is a promise (2nd run)
 
   if (block) throw block; // Throw exception outwards if anything within canvas throws
 

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-2e68c2a1.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-2e68c2a1.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-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 _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',
@@ -117,7 +119,7 @@ function getAsset(input) {
       return expAsset.fromModule(input);
 
     default:
-      throw 'Invalid asset! Must be a URI or module.';
+      throw new Error('R3F: Invalid asset! Must be a URI or module.');
   }
 }
 
@@ -245,7 +247,7 @@ const Canvas = /*#__PURE__*/React.forwardRef(({
   React.useImperativeHandle(forwardedRef, () => viewRef.current);
   const handlePointerMissed = useMutableCallback(onPointerMissed);
   const [block, setBlock] = React.useState(false);
-  const [error, setError] = React.useState(false); // Suspend this component if block is a promise (2nd run)
+  const [error, setError] = React.useState(undefined); // Suspend this component if block is a promise (2nd run)
 
   if (block) throw block; // Throw exception outwards if anything within canvas throws
 

package/package.json

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