@react-three/fiber 8.11.3 → 8.11.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @react-three/fiber
 
+## 8.11.5
+
+### Patch Changes
+
+- c658f763: fix: update canvas prop types
+
+## 8.11.4
+
+### Patch Changes
+
+- 970aa58b: fix: play nice with offscreencanvas
+
 ## 8.11.3
 
 ### Patch Changes

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

@@ -1,4 +1,5 @@
 /// <reference types="react-reconciler" />
+/// <reference types="offscreencanvas" />
 import * as THREE from 'three';
 import * as React from 'react';
 import { UseBoundStore } from 'zustand';
@@ -9,11 +10,12 @@ import { addEffect, addAfterEffect, addTail, flushGlobalEffects } from './loop';
 import { EventManager, ComputeFunction } from './events';
 import { dispose, getRootState, Camera } from './utils';
 import type { Properties } from '../three-types';
-declare const roots: Map<Element, Root>;
+declare type Canvas = HTMLCanvasElement | OffscreenCanvas;
+declare const roots: Map<Canvas, 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, void, import("./renderer").Instance, import("./renderer").Instance>, applyProps: typeof import("./utils").applyProps;
-declare type GLProps = Renderer | ((canvas: HTMLCanvasElement) => Renderer) | Partial<Properties<THREE.WebGLRenderer> | THREE.WebGLRendererParameters> | undefined;
-export declare type RenderProps<TCanvas extends Element> = {
+declare type GLProps = Renderer | ((canvas: Canvas) => Renderer) | Partial<Properties<THREE.WebGLRenderer> | THREE.WebGLRendererParameters> | undefined;
+export declare type RenderProps<TCanvas extends Canvas> = {
     gl?: GLProps;
     size?: Size;
     shadows?: boolean | 'basic' | 'percentage' | 'soft' | 'variance' | Partial<THREE.WebGLShadowMap>;
@@ -32,14 +34,14 @@ export declare type RenderProps<TCanvas extends Element> = {
     onCreated?: (state: RootState) => void;
     onPointerMissed?: (event: MouseEvent) => void;
 };
-export declare type ReconcilerRoot<TCanvas extends Element> = {
+export declare type ReconcilerRoot<TCanvas extends Canvas> = {
     configure: (config?: RenderProps<TCanvas>) => ReconcilerRoot<TCanvas>;
     render: (element: React.ReactNode) => UseBoundStore<RootState>;
     unmount: () => void;
 };
-declare function createRoot<TCanvas extends Element>(canvas: TCanvas): ReconcilerRoot<TCanvas>;
-declare function render<TCanvas extends Element>(children: React.ReactNode, canvas: TCanvas, config: RenderProps<TCanvas>): UseBoundStore<RootState>;
-declare function unmountComponentAtNode<TElement extends Element>(canvas: TElement, callback?: (canvas: TElement) => void): void;
+declare function createRoot<TCanvas extends Canvas>(canvas: TCanvas): ReconcilerRoot<TCanvas>;
+declare function render<TCanvas extends Canvas>(children: React.ReactNode, canvas: TCanvas, config: RenderProps<TCanvas>): UseBoundStore<RootState>;
+declare function unmountComponentAtNode<TCanvas extends Canvas>(canvas: TCanvas, callback?: (canvas: TCanvas) => void): void;
 export declare type InjectState = Partial<Omit<RootState, PrivateKeys> & {
     events?: {
         enabled?: boolean;

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

@@ -1392,12 +1392,14 @@ const createStore = (invalidate, advance) => {
 
     // Resize camera and renderer on changes to size and pixelratio
     if (size !== oldSize || viewport.dpr !== oldDpr) {
+      var _size$updateStyle;
       oldSize = size;
       oldDpr = viewport.dpr;
       // Update camera & renderer
       updateCamera(camera, size);
       gl.setPixelRatio(viewport.dpr);
-      gl.setSize(size.width, size.height, size.updateStyle);
+      const updateStyle = (_size$updateStyle = size.updateStyle) != null ? _size$updateStyle : typeof HTMLCanvasElement !== 'undefined' && gl.domElement instanceof HTMLCanvasElement;
+      gl.setSize(size.width, size.height, updateStyle);
     }
 
     // Update viewport once the camera changes
@@ -1673,14 +1675,9 @@ const createRendererInstance = (gl, canvas) => {
     ...gl
   });
 };
-function isCanvas(maybeCanvas) {
-  return maybeCanvas instanceof HTMLCanvasElement;
-}
 function computeInitialSize(canvas, defaultSize) {
-  if (defaultSize) {
-    return defaultSize;
-  }
-  if (isCanvas(canvas) && canvas.parentElement) {
+  if (defaultSize) return defaultSize;
+  if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement && canvas.parentElement) {
     const {
       width,
       height,
@@ -1693,6 +1690,13 @@ function computeInitialSize(canvas, defaultSize) {
       top,
       left
     };
+  } else if (typeof OffscreenCanvas !== 'undefined' && canvas instanceof OffscreenCanvas) {
+    return {
+      width: canvas.width,
+      height: canvas.height,
+      top: 0,
+      left: 0
+    };
   }
   return {
     width: 0,
@@ -1880,13 +1884,13 @@ function createRoot(canvas) {
       if (events && !state.events.handlers) state.set({
         events: events(store)
       });
-      // Check pixelratio
-      if (dpr && state.viewport.dpr !== calculateDpr(dpr)) state.setDpr(dpr);
       // Check size, allow it to take on container bounds initially
       const size = computeInitialSize(canvas, propsSize);
       if (!is.equ(size, state.size, shallowLoose)) {
         state.setSize(size.width, size.height, size.updateStyle, size.top, size.left);
       }
+      // Check pixelratio
+      if (dpr && state.viewport.dpr !== calculateDpr(dpr)) state.setDpr(dpr);
       // Check frameloop
       if (state.frameloop !== frameloop) state.setFrameloop(frameloop);
       // Check pointer missed

package/dist/{index-606e613e.esm.js → index-37bd4d5c.esm.js}

@@ -1365,12 +1365,14 @@ const createStore = (invalidate, advance) => {
 
     // Resize camera and renderer on changes to size and pixelratio
     if (size !== oldSize || viewport.dpr !== oldDpr) {
+      var _size$updateStyle;
       oldSize = size;
       oldDpr = viewport.dpr;
       // Update camera & renderer
       updateCamera(camera, size);
       gl.setPixelRatio(viewport.dpr);
-      gl.setSize(size.width, size.height, size.updateStyle);
+      const updateStyle = (_size$updateStyle = size.updateStyle) != null ? _size$updateStyle : typeof HTMLCanvasElement !== 'undefined' && gl.domElement instanceof HTMLCanvasElement;
+      gl.setSize(size.width, size.height, updateStyle);
     }
 
     // Update viewport once the camera changes
@@ -1646,14 +1648,9 @@ const createRendererInstance = (gl, canvas) => {
     ...gl
   });
 };
-function isCanvas(maybeCanvas) {
-  return maybeCanvas instanceof HTMLCanvasElement;
-}
 function computeInitialSize(canvas, defaultSize) {
-  if (defaultSize) {
-    return defaultSize;
-  }
-  if (isCanvas(canvas) && canvas.parentElement) {
+  if (defaultSize) return defaultSize;
+  if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement && canvas.parentElement) {
     const {
       width,
       height,
@@ -1666,6 +1663,13 @@ function computeInitialSize(canvas, defaultSize) {
       top,
       left
     };
+  } else if (typeof OffscreenCanvas !== 'undefined' && canvas instanceof OffscreenCanvas) {
+    return {
+      width: canvas.width,
+      height: canvas.height,
+      top: 0,
+      left: 0
+    };
   }
   return {
     width: 0,
@@ -1853,13 +1857,13 @@ function createRoot(canvas) {
       if (events && !state.events.handlers) state.set({
         events: events(store)
       });
-      // Check pixelratio
-      if (dpr && state.viewport.dpr !== calculateDpr(dpr)) state.setDpr(dpr);
       // Check size, allow it to take on container bounds initially
       const size = computeInitialSize(canvas, propsSize);
       if (!is.equ(size, state.size, shallowLoose)) {
         state.setSize(size.width, size.height, size.updateStyle, size.top, size.left);
       }
+      // Check pixelratio
+      if (dpr && state.viewport.dpr !== calculateDpr(dpr)) state.setDpr(dpr);
       // Check frameloop
       if (state.frameloop !== frameloop) state.setFrameloop(frameloop);
       // Check pointer missed

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

@@ -1392,12 +1392,14 @@ const createStore = (invalidate, advance) => {
 
     // Resize camera and renderer on changes to size and pixelratio
     if (size !== oldSize || viewport.dpr !== oldDpr) {
+      var _size$updateStyle;
       oldSize = size;
       oldDpr = viewport.dpr;
       // Update camera & renderer
       updateCamera(camera, size);
       gl.setPixelRatio(viewport.dpr);
-      gl.setSize(size.width, size.height, size.updateStyle);
+      const updateStyle = (_size$updateStyle = size.updateStyle) != null ? _size$updateStyle : typeof HTMLCanvasElement !== 'undefined' && gl.domElement instanceof HTMLCanvasElement;
+      gl.setSize(size.width, size.height, updateStyle);
     }
 
     // Update viewport once the camera changes
@@ -1673,14 +1675,9 @@ const createRendererInstance = (gl, canvas) => {
     ...gl
   });
 };
-function isCanvas(maybeCanvas) {
-  return maybeCanvas instanceof HTMLCanvasElement;
-}
 function computeInitialSize(canvas, defaultSize) {
-  if (defaultSize) {
-    return defaultSize;
-  }
-  if (isCanvas(canvas) && canvas.parentElement) {
+  if (defaultSize) return defaultSize;
+  if (typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement && canvas.parentElement) {
     const {
       width,
       height,
@@ -1693,6 +1690,13 @@ function computeInitialSize(canvas, defaultSize) {
       top,
       left
     };
+  } else if (typeof OffscreenCanvas !== 'undefined' && canvas instanceof OffscreenCanvas) {
+    return {
+      width: canvas.width,
+      height: canvas.height,
+      top: 0,
+      left: 0
+    };
   }
   return {
     width: 0,
@@ -1880,13 +1884,13 @@ function createRoot(canvas) {
       if (events && !state.events.handlers) state.set({
         events: events(store)
       });
-      // Check pixelratio
-      if (dpr && state.viewport.dpr !== calculateDpr(dpr)) state.setDpr(dpr);
       // Check size, allow it to take on container bounds initially
       const size = computeInitialSize(canvas, propsSize);
       if (!is.equ(size, state.size, shallowLoose)) {
         state.setSize(size.width, size.height, size.updateStyle, size.top, size.left);
       }
+      // Check pixelratio
+      if (dpr && state.viewport.dpr !== calculateDpr(dpr)) state.setDpr(dpr);
       // Check frameloop
       if (state.frameloop !== frameloop) state.setFrameloop(frameloop);
       // Check pointer missed

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-e172420e.cjs.dev.js');
+var index = require('./index-d1fc6689.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-e8867c70.cjs.prod.js');
+var index = require('./index-17c44482.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-606e613e.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-606e613e.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-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 _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-e172420e.cjs.dev.js');
+var index = require('../../dist/index-d1fc6689.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-e8867c70.cjs.prod.js');
+var index = require('../../dist/index-17c44482.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-606e613e.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-606e613e.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-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 _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.3",
+  "version": "8.11.5",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",