@react-three/fiber 10.0.0-canary.87166dc → 10.0.0-canary.932f901

package/dist/extension.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const textureStaging = require('./shared/fiber.CsZ092z_.cjs');
+const textureStaging = require('./shared/fiber.DfiCufha.cjs');
 
 
 

package/dist/extension.mjs

@@ -1 +1 @@
-export { c as context, g as getTextureView, r as registerRootExtension, s as setRenderOverride, b as useFrame, u as useStore, a as useThree } from './shared/fiber.DlH05gco.mjs';
+export { c as context, g as getTextureView, r as registerRootExtension, s as setRenderOverride, b as useFrame, u as useStore, a as useThree } from './shared/fiber.Biz9olEe.mjs';

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const Canvas$1 = require('./shared/fiber.BybcfIwy.cjs');
-const textureStaging = require('./shared/fiber.CsZ092z_.cjs');
+const Canvas$1 = require('./shared/fiber.Cd8-yZqM.cjs');
+const textureStaging = require('./shared/fiber.DfiCufha.cjs');
 const scheduler = require('@pmndrs/scheduler');
 
 const R3F_BUILD_LEGACY = false;

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { jsx } from 'react/jsx-runtime';
-import { c as createRoot$1, C as Canvas$1 } from './shared/fiber.BC5FRLu-.mjs';
-export { s as Environment, p as EnvironmentCube, E as EnvironmentMap, q as EnvironmentPortal, ai as FROM_REF, I as IsObject, al as ONCE, P as Portal, U as REACT_INTERNAL_PROPS, a1 as RESERVED_PROPS, T as Texture, _ as _roots, d as addAfterEffect, b as addEffect, e as addTail, f as advance, a6 as applyProps, a3 as attach, X as buildGraph, O as calculateDpr, y as createEvents, a as createPointerEvents, N as createPortal, l as createStore, a4 as detach, a5 as diffProps, Y as dispose, a as events, J as extend, V as findInitialRoot, L as flushSync, aj as fromRef, Z as getInstanceProps, h as getPrimary, k as getPrimaryIds, W as getRootState, m as getThree, Q as getUuidPrefix, ah as hasConstructor, j as hasPrimary, n as hasThree, i as invalidate, a0 as invalidateInstance, a7 as is, aa as isColorRepresentation, ag as isCopyable, ak as isFromRef, ad as isLayers, ab as isObject3D, an as isOnce, a8 as isOrthographicCamera, a9 as isRef, g as isRenderer, ac as isTexture, ae as isUniform, af as isVectorLike, am as once, $ as prepare, t as presetsObj, K as reconciler, r as registerPrimary, x as removeInteractivity, a2 as resolve, v as swapInteractivity, M as unmountComponentAtNode, u as unregisterPrimary, R as updateCamera, S as updateFrustum, H as useEnvironment, A as useGraph, z as useInstanceHandle, B as useLoader, G as useRenderTarget, D as useTexture, F as useTextures, w as waitForPrimary, o as whenThree } from './shared/fiber.BC5FRLu-.mjs';
-export { B as Block, E as ErrorBoundary, c as context, r as registerRootExtension, s as setRenderOverride, f as useBridge, b as useFrame, d as useIsomorphicLayoutEffect, e as useMutableCallback, u as useStore, a as useThree } from './shared/fiber.DlH05gco.mjs';
+import { c as createRoot$1, C as Canvas$1 } from './shared/fiber.BLt8Cx7Z.mjs';
+export { s as Environment, p as EnvironmentCube, E as EnvironmentMap, q as EnvironmentPortal, ai as FROM_REF, I as IsObject, al as ONCE, P as Portal, U as REACT_INTERNAL_PROPS, a1 as RESERVED_PROPS, T as Texture, _ as _roots, d as addAfterEffect, b as addEffect, e as addTail, f as advance, a6 as applyProps, a3 as attach, X as buildGraph, O as calculateDpr, y as createEvents, a as createPointerEvents, N as createPortal, l as createStore, a4 as detach, a5 as diffProps, Y as dispose, a as events, J as extend, V as findInitialRoot, L as flushSync, aj as fromRef, Z as getInstanceProps, h as getPrimary, k as getPrimaryIds, W as getRootState, m as getThree, Q as getUuidPrefix, ah as hasConstructor, j as hasPrimary, n as hasThree, i as invalidate, a0 as invalidateInstance, a7 as is, aa as isColorRepresentation, ag as isCopyable, ak as isFromRef, ad as isLayers, ab as isObject3D, an as isOnce, a8 as isOrthographicCamera, a9 as isRef, g as isRenderer, ac as isTexture, ae as isUniform, af as isVectorLike, am as once, $ as prepare, t as presetsObj, K as reconciler, r as registerPrimary, x as removeInteractivity, a2 as resolve, v as swapInteractivity, M as unmountComponentAtNode, u as unregisterPrimary, R as updateCamera, S as updateFrustum, H as useEnvironment, A as useGraph, z as useInstanceHandle, B as useLoader, G as useRenderTarget, D as useTexture, F as useTextures, w as waitForPrimary, o as whenThree } from './shared/fiber.BLt8Cx7Z.mjs';
+export { B as Block, E as ErrorBoundary, c as context, r as registerRootExtension, s as setRenderOverride, f as useBridge, b as useFrame, d as useIsomorphicLayoutEffect, e as useMutableCallback, u as useStore, a as useThree } from './shared/fiber.Biz9olEe.mjs';
 export { Scheduler, getScheduler } from '@pmndrs/scheduler';
 
 const R3F_BUILD_LEGACY = false;

package/dist/legacy.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const Canvas$1 = require('./shared/fiber.BybcfIwy.cjs');
+const Canvas$1 = require('./shared/fiber.Cd8-yZqM.cjs');
 const THREE = require('three');
-const textureStaging = require('./shared/fiber.CsZ092z_.cjs');
+const textureStaging = require('./shared/fiber.DfiCufha.cjs');
 const scheduler = require('@pmndrs/scheduler');
 
 function _interopNamespaceCompat(e) {

package/dist/legacy.mjs

@@ -1,9 +1,9 @@
 import { jsx } from 'react/jsx-runtime';
-import { G as useRenderTarget$1, c as createRoot$1, C as Canvas$1 } from './shared/fiber.BC5FRLu-.mjs';
-export { s as Environment, p as EnvironmentCube, E as EnvironmentMap, q as EnvironmentPortal, ai as FROM_REF, I as IsObject, al as ONCE, P as Portal, U as REACT_INTERNAL_PROPS, a1 as RESERVED_PROPS, T as Texture, _ as _roots, d as addAfterEffect, b as addEffect, e as addTail, f as advance, a6 as applyProps, a3 as attach, X as buildGraph, O as calculateDpr, y as createEvents, a as createPointerEvents, N as createPortal, l as createStore, a4 as detach, a5 as diffProps, Y as dispose, a as events, J as extend, V as findInitialRoot, L as flushSync, aj as fromRef, Z as getInstanceProps, h as getPrimary, k as getPrimaryIds, W as getRootState, m as getThree, Q as getUuidPrefix, ah as hasConstructor, j as hasPrimary, n as hasThree, i as invalidate, a0 as invalidateInstance, a7 as is, aa as isColorRepresentation, ag as isCopyable, ak as isFromRef, ad as isLayers, ab as isObject3D, an as isOnce, a8 as isOrthographicCamera, a9 as isRef, g as isRenderer, ac as isTexture, ae as isUniform, af as isVectorLike, am as once, $ as prepare, t as presetsObj, K as reconciler, r as registerPrimary, x as removeInteractivity, a2 as resolve, v as swapInteractivity, M as unmountComponentAtNode, u as unregisterPrimary, R as updateCamera, S as updateFrustum, H as useEnvironment, A as useGraph, z as useInstanceHandle, B as useLoader, D as useTexture, F as useTextures, w as waitForPrimary, o as whenThree } from './shared/fiber.BC5FRLu-.mjs';
+import { G as useRenderTarget$1, c as createRoot$1, C as Canvas$1 } from './shared/fiber.BLt8Cx7Z.mjs';
+export { s as Environment, p as EnvironmentCube, E as EnvironmentMap, q as EnvironmentPortal, ai as FROM_REF, I as IsObject, al as ONCE, P as Portal, U as REACT_INTERNAL_PROPS, a1 as RESERVED_PROPS, T as Texture, _ as _roots, d as addAfterEffect, b as addEffect, e as addTail, f as advance, a6 as applyProps, a3 as attach, X as buildGraph, O as calculateDpr, y as createEvents, a as createPointerEvents, N as createPortal, l as createStore, a4 as detach, a5 as diffProps, Y as dispose, a as events, J as extend, V as findInitialRoot, L as flushSync, aj as fromRef, Z as getInstanceProps, h as getPrimary, k as getPrimaryIds, W as getRootState, m as getThree, Q as getUuidPrefix, ah as hasConstructor, j as hasPrimary, n as hasThree, i as invalidate, a0 as invalidateInstance, a7 as is, aa as isColorRepresentation, ag as isCopyable, ak as isFromRef, ad as isLayers, ab as isObject3D, an as isOnce, a8 as isOrthographicCamera, a9 as isRef, g as isRenderer, ac as isTexture, ae as isUniform, af as isVectorLike, am as once, $ as prepare, t as presetsObj, K as reconciler, r as registerPrimary, x as removeInteractivity, a2 as resolve, v as swapInteractivity, M as unmountComponentAtNode, u as unregisterPrimary, R as updateCamera, S as updateFrustum, H as useEnvironment, A as useGraph, z as useInstanceHandle, B as useLoader, D as useTexture, F as useTextures, w as waitForPrimary, o as whenThree } from './shared/fiber.BLt8Cx7Z.mjs';
 import * as THREE from 'three';
-import { a as useThree$1, b as useFrame$1 } from './shared/fiber.DlH05gco.mjs';
-export { B as Block, E as ErrorBoundary, c as context, r as registerRootExtension, s as setRenderOverride, f as useBridge, d as useIsomorphicLayoutEffect, e as useMutableCallback, u as useStore } from './shared/fiber.DlH05gco.mjs';
+import { a as useThree$1, b as useFrame$1 } from './shared/fiber.Biz9olEe.mjs';
+export { B as Block, E as ErrorBoundary, c as context, r as registerRootExtension, s as setRenderOverride, f as useBridge, d as useIsomorphicLayoutEffect, e as useMutableCallback, u as useStore } from './shared/fiber.Biz9olEe.mjs';
 export { Scheduler, getScheduler } from '@pmndrs/scheduler';
 
 const webglSupport = {

package/dist/shared/{fiber.BC5FRLu-.mjs → fiber.BLt8Cx7Z.mjs}

@@ -1,5 +1,5 @@
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
-import { i as isDevelopment, n as notifyDepreciated, h as detachRootExtensions, j as attachRootExtensions, d as useIsomorphicLayoutEffect, c as context, a as useThree, u as useStore, k as unstageTextures, l as stageTextures, e as useMutableCallback, b as useFrame, f as useBridge, m as useGate, o as notifyAlpha, E as ErrorBoundary, B as Block, p as notifyRootExtensionsHmr } from './fiber.DlH05gco.mjs';
+import { i as isDevelopment, n as notifyDepreciated, p as preserveAccessors, h as defineRendererAccessors, j as detachRootExtensions, k as attachRootExtensions, d as useIsomorphicLayoutEffect, c as context, a as useThree, u as useStore, l as unstageTextures, m as stageTextures, e as useMutableCallback, o as isAccessor, q as cloneState, t as keepAccessors, b as useFrame, f as useBridge, v as useGate, w as notifyAlpha, E as ErrorBoundary, B as Block, x as notifyRootExtensionsHmr } from './fiber.Biz9olEe.mjs';
 import * as React from 'react';
 import React__default, { useRef, useMemo, useLayoutEffect, useEffect, useImperativeHandle, useCallback, useState } from 'react';
 import useMeasure from 'react-use-measure';
@@ -680,13 +680,6 @@ function applyProps(object, props) {
   return object;
 }
 
-const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
-function isInternalRendererAccess(stack, callerDepth = 2) {
-  if (!stack) return false;
-  const caller = stack.split("\n")[callerDepth] ?? "";
-  return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
-}
-
 function updateSize(state, size, imperative) {
   state.set((current) => ({
     size,
@@ -701,7 +694,8 @@ function configureSize(store, size) {
   updateSize(state, size, false);
 }
 const createStore = (invalidate, advance) => {
-  const rootStore = createWithEqualityFn((set, get) => {
+  const rootStore = createWithEqualityFn((rawSet, get, api) => {
+    const set = api.setState = preserveAccessors(rawSet, get);
     let position;
     let defaultTarget;
     let tempTarget;
@@ -794,7 +788,7 @@ const createStore = (invalidate, advance) => {
         factor: 0,
         getCurrentViewport
       },
-      setEvents: (events) => set((state2) => ({ ...state2, events: { ...state2.events, ...events } })),
+      setEvents: (events) => set((state2) => ({ events: { ...state2.events, ...events } })),
       setSize: (width, height, top, left) => {
         const state2 = get();
         if (width === void 0) {
@@ -890,37 +884,7 @@ const createStore = (invalidate, advance) => {
     return rootState;
   });
   const state = rootStore.getState();
-  Object.defineProperty(state, "gl", {
-    get() {
-      const currentState = rootStore.getState();
-      if (!currentState.isLegacy && currentState.internal.actualRenderer) {
-        const stack = new Error().stack || "";
-        if (!isInternalRendererAccess(stack)) {
-          const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
-          notifyDepreciated({
-            heading: "Accessing state.gl in WebGPU mode",
-            body: "Please use state.renderer instead. state.gl is deprecated and will be removed in future versions.\n\nFor backwards compatibility, state.gl currently maps to state.renderer, but this may cause issues with libraries expecting WebGLRenderer.\n\nAccessed from:\n" + cleanedStack
-          });
-        }
-      }
-      return currentState.internal.actualRenderer;
-    },
-    set(value) {
-      rootStore.getState().internal.actualRenderer = value;
-    },
-    enumerable: true,
-    configurable: true
-  });
-  Object.defineProperty(state, "renderer", {
-    get() {
-      return rootStore.getState().internal.actualRenderer;
-    },
-    set(value) {
-      rootStore.getState().internal.actualRenderer = value;
-    },
-    enumerable: true,
-    configurable: true
-  });
+  defineRendererAccessors(state);
   let oldScene = state.scene;
   rootStore.subscribe(() => {
     const currentState = rootStore.getState();
@@ -1370,7 +1334,6 @@ function initializeRenderer(canvas, provider, store, props) {
           state.set((prev) => ({
             webGPUSupported: primaryEntry.store.getState().webGPUSupported,
             renderer,
-            gl: renderer,
             primaryStore: primaryEntry.store,
             internal: {
               ...prev.internal,
@@ -1401,7 +1364,6 @@ function initializeRenderer(canvas, provider, store, props) {
               state.set((prev) => ({
                 webGPUSupported: isWebGPUBackend,
                 renderer,
-                gl: renderer,
                 primaryStore: store,
                 internal: {
                   ...prev.internal,
@@ -1421,12 +1383,7 @@ function initializeRenderer(canvas, provider, store, props) {
             const isWebGPUBackend = backend && "isWebGPUBackend" in backend;
             state.internal.actualRenderer = renderer;
             state.internal.releaseRenderer = leaseRenderer(renderer, resolved.owned);
-            state.set({
-              webGPUSupported: isWebGPUBackend,
-              renderer,
-              gl: renderer,
-              primaryStore: store
-            });
+            state.set({ webGPUSupported: isWebGPUBackend, renderer, primaryStore: store });
             if (primary) {
               const canvasTarget = renderer.getCanvasTarget?.();
               (_a = state.internal).pendingRootId ?? (_a.pendingRootId = canvasId || getScheduler().generateRootId());
@@ -1858,14 +1815,12 @@ function createRootConfiguration(store, canvas) {
       };
       const xr = {
         connect() {
-          const { gl, renderer: renderer2 } = store.getState();
-          const xrManager = (renderer2 || gl).xr;
+          const xrManager = store.getState().renderer.xr;
           xrManager.addEventListener("sessionstart", handleSessionChange);
           xrManager.addEventListener("sessionend", handleSessionChange);
         },
         disconnect() {
-          const { gl, renderer: renderer2 } = store.getState();
-          const xrManager = (renderer2 || gl).xr;
+          const xrManager = store.getState().renderer.xr;
           xrManager.removeEventListener("sessionstart", handleSessionChange);
           xrManager.removeEventListener("sessionend", handleSessionChange);
         }
@@ -15972,6 +15927,7 @@ function PortalInner({ state = {}, children, container }) {
     const lastRoot = lastRootState.current;
     if (lastRoot) {
       for (const key in rootState) {
+        if (isAccessor(rootState, key)) continue;
         const field = key;
         const changed = rootState[field] !== lastRoot[field];
         const inherited = !(key in rest) && injectState[field] === lastRoot[field];
@@ -15988,11 +15944,7 @@ function PortalInner({ state = {}, children, container }) {
       if (camera !== rootState.camera) updateCamera(camera, resolvedSize);
     }
     const set = injectState.set;
-    return {
-      // The intersect consists of the previous root state
-      ...rootState,
-      ...injectState,
-      ...followed,
+    return Object.assign(cloneState(rootState, injectState, followed), {
       // Portals have their own scene - always a real THREE.Scene (injected if needed)
       scene: portalScene,
       // rootScene always points to the actual THREE.Scene, even inside portals
@@ -16007,13 +15959,19 @@ function PortalInner({ state = {}, children, container }) {
       size: resolvedSize,
       viewport: { ...rootState.viewport, ...viewport },
       // Layers are allowed to override events
-      setEvents: (events2) => set((state2) => ({ ...state2, events: { ...state2.events, ...events2 } })),
-      // Container for child attachment - the portalScene (injected or container itself)
-      internal: { ...rootState.internal, ...injectState.internal, container: portalScene }
-    };
+      setEvents: (events2) => set((state2) => ({ events: { ...state2.events, ...events2 } })),
+      // Container for child attachment - the portalScene (injected or container itself). A portal
+      // renders with its parent's renderer, which `renderer` / `gl` read from `actualRenderer`
+      internal: {
+        ...rootState.internal,
+        ...injectState.internal,
+        actualRenderer: rootState.internal.actualRenderer,
+        container: portalScene
+      }
+    });
   });
   const usePortalStore = useMemo(() => {
-    const store = createWithEqualityFn((set, get) => ({ ...rest, set, get }));
+    const store = createWithEqualityFn(keepAccessors((set, get) => ({ ...rest, set, get })));
     const onMutate = (prev) => store.setState((state2) => inject.current(prev, state2));
     onMutate(previousRoot.getState());
     return store;

package/dist/shared/{fiber.DlH05gco.mjs → fiber.Biz9olEe.mjs}

@@ -131,6 +131,99 @@ function isDevelopment() {
   }
 }
 
+const INTERNAL_LIB_MARKERS = [
+  "zustand",
+  "setState",
+  "Object.assign",
+  "@pmndrs/scheduler",
+  "Scheduler.tickRoot",
+  "Scheduler.stepJob"
+];
+function isInternalRendererAccess(stack, callerDepth = 2) {
+  if (!stack) return false;
+  const caller = stack.split("\n")[callerDepth] ?? "";
+  return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
+}
+
+const isAccessorDescriptor = (descriptor) => !!descriptor && (descriptor.get !== void 0 || descriptor.set !== void 0);
+const isAccessor = (object, key) => isAccessorDescriptor(Object.getOwnPropertyDescriptor(object, key));
+function cloneState(...sources) {
+  const target = {};
+  for (const source of sources) {
+    if (source) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+  }
+  return target;
+}
+function preserveAccessors(rawSet, get) {
+  return ((partial, replace) => {
+    const previous = get();
+    const patch = typeof partial === "function" ? partial(previous) : partial;
+    if (replace || !previous || patch == null || Object.is(patch, previous)) {
+      return rawSet(patch, replace);
+    }
+    const next = cloneState(previous);
+    const viaSetter = [];
+    for (const key of Reflect.ownKeys(patch)) {
+      const descriptor = Object.getOwnPropertyDescriptor(patch, key);
+      if (!descriptor.enumerable) continue;
+      if (isAccessorDescriptor(descriptor)) {
+        Object.defineProperty(next, key, descriptor);
+      } else if (isAccessor(next, key)) {
+        viaSetter.push(key);
+      } else {
+        Object.defineProperty(next, key, {
+          value: descriptor.value,
+          writable: true,
+          enumerable: true,
+          configurable: true
+        });
+      }
+    }
+    for (const key of viaSetter) next[key] = patch[key];
+    rawSet(next, true);
+  });
+}
+const keepAccessors = (initializer) => (rawSet, get, api) => {
+  const set = preserveAccessors(rawSet, get);
+  api.setState = set;
+  return initializer(set, get, api);
+};
+let glNoticeShown = false;
+function defineRendererAccessors(state) {
+  Object.defineProperty(state, "gl", {
+    get() {
+      const renderer = this.internal?.actualRenderer;
+      if (!glNoticeShown && renderer && !this.isLegacy) {
+        const stack = new Error().stack || "";
+        if (!isInternalRendererAccess(stack)) {
+          glNoticeShown = true;
+          const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
+          notifyDepreciated({
+            heading: "Accessing state.gl in WebGPU mode",
+            body: "Please use state.renderer instead. state.gl is deprecated and will be removed in future versions.\n\nFor backwards compatibility, state.gl currently maps to state.renderer, but this may cause issues with libraries expecting WebGLRenderer.\n\nAccessed from:\n" + cleanedStack
+          });
+        }
+      }
+      return renderer;
+    },
+    set(value) {
+      this.internal.actualRenderer = value;
+    },
+    enumerable: true,
+    configurable: true
+  });
+  Object.defineProperty(state, "renderer", {
+    get() {
+      return this.internal?.actualRenderer;
+    },
+    set(value) {
+      this.internal.actualRenderer = value;
+    },
+    enumerable: true,
+    configurable: true
+  });
+}
+
 const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
 const context = globalThis[R3F_CONTEXT] ?? (globalThis[R3F_CONTEXT] = React.createContext(null));
 
@@ -242,15 +335,12 @@ function useFrame(callback, priorityOrOptions) {
         });
       }
       const wrappedCallback = (frameState, delta) => {
-        const localState = store.getState();
-        const mergedState = {
-          ...localState,
-          time: frameState.time,
-          delta: frameState.delta,
-          elapsed: frameState.elapsed,
-          frame: frameState.frame,
-          overstep: frameState.overstep
-        };
+        const mergedState = cloneState(store.getState());
+        mergedState.time = frameState.time;
+        mergedState.delta = frameState.delta;
+        mergedState.elapsed = frameState.elapsed;
+        mergedState.frame = frameState.frame;
+        mergedState.overstep = frameState.overstep;
         callbackRef.current?.(mergedState, delta);
       };
       const unregister = scheduler.register(wrappedCallback, {
@@ -388,4 +478,4 @@ function getTextureView(store) {
   return view;
 }
 
-export { Block as B, ErrorBoundary as E, useThree as a, useFrame as b, context as c, useIsomorphicLayoutEffect as d, useMutableCallback as e, useBridge as f, getTextureView as g, detachRootExtensions as h, isDevelopment as i, attachRootExtensions as j, unstageTextures as k, stageTextures as l, useGate as m, notifyDepreciated as n, notifyAlpha as o, notifyRootExtensionsHmr as p, registerRootExtension as r, setRenderOverride as s, useStore as u };
+export { Block as B, ErrorBoundary as E, useThree as a, useFrame as b, context as c, useIsomorphicLayoutEffect as d, useMutableCallback as e, useBridge as f, getTextureView as g, defineRendererAccessors as h, isDevelopment as i, detachRootExtensions as j, attachRootExtensions as k, unstageTextures as l, stageTextures as m, notifyDepreciated as n, isAccessor as o, preserveAccessors as p, cloneState as q, registerRootExtension as r, setRenderOverride as s, keepAccessors as t, useStore as u, useGate as v, notifyAlpha as w, notifyRootExtensionsHmr as x };

package/dist/shared/{fiber.BybcfIwy.cjs → fiber.Cd8-yZqM.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const textureStaging = require('./fiber.CsZ092z_.cjs');
+const textureStaging = require('./fiber.DfiCufha.cjs');
 const React = require('react');
 const useMeasure = require('react-use-measure');
 const itsFine = require('its-fine');
@@ -701,13 +701,6 @@ function applyProps(object, props) {
   return object;
 }
 
-const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
-function isInternalRendererAccess(stack, callerDepth = 2) {
-  if (!stack) return false;
-  const caller = stack.split("\n")[callerDepth] ?? "";
-  return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
-}
-
 function updateSize(state, size, imperative) {
   state.set((current) => ({
     size,
@@ -722,7 +715,8 @@ function configureSize(store, size) {
   updateSize(state, size, false);
 }
 const createStore = (invalidate, advance) => {
-  const rootStore = traditional.createWithEqualityFn((set, get) => {
+  const rootStore = traditional.createWithEqualityFn((rawSet, get, api) => {
+    const set = api.setState = textureStaging.preserveAccessors(rawSet, get);
     let position;
     let defaultTarget;
     let tempTarget;
@@ -815,7 +809,7 @@ const createStore = (invalidate, advance) => {
         factor: 0,
         getCurrentViewport
       },
-      setEvents: (events) => set((state2) => ({ ...state2, events: { ...state2.events, ...events } })),
+      setEvents: (events) => set((state2) => ({ events: { ...state2.events, ...events } })),
       setSize: (width, height, top, left) => {
         const state2 = get();
         if (width === void 0) {
@@ -911,37 +905,7 @@ const createStore = (invalidate, advance) => {
     return rootState;
   });
   const state = rootStore.getState();
-  Object.defineProperty(state, "gl", {
-    get() {
-      const currentState = rootStore.getState();
-      if (!currentState.isLegacy && currentState.internal.actualRenderer) {
-        const stack = new Error().stack || "";
-        if (!isInternalRendererAccess(stack)) {
-          const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
-          textureStaging.notifyDepreciated({
-            heading: "Accessing state.gl in WebGPU mode",
-            body: "Please use state.renderer instead. state.gl is deprecated and will be removed in future versions.\n\nFor backwards compatibility, state.gl currently maps to state.renderer, but this may cause issues with libraries expecting WebGLRenderer.\n\nAccessed from:\n" + cleanedStack
-          });
-        }
-      }
-      return currentState.internal.actualRenderer;
-    },
-    set(value) {
-      rootStore.getState().internal.actualRenderer = value;
-    },
-    enumerable: true,
-    configurable: true
-  });
-  Object.defineProperty(state, "renderer", {
-    get() {
-      return rootStore.getState().internal.actualRenderer;
-    },
-    set(value) {
-      rootStore.getState().internal.actualRenderer = value;
-    },
-    enumerable: true,
-    configurable: true
-  });
+  textureStaging.defineRendererAccessors(state);
   let oldScene = state.scene;
   rootStore.subscribe(() => {
     const currentState = rootStore.getState();
@@ -1391,7 +1355,6 @@ function initializeRenderer(canvas, provider, store, props) {
           state.set((prev) => ({
             webGPUSupported: primaryEntry.store.getState().webGPUSupported,
             renderer,
-            gl: renderer,
             primaryStore: primaryEntry.store,
             internal: {
               ...prev.internal,
@@ -1422,7 +1385,6 @@ function initializeRenderer(canvas, provider, store, props) {
               state.set((prev) => ({
                 webGPUSupported: isWebGPUBackend,
                 renderer,
-                gl: renderer,
                 primaryStore: store,
                 internal: {
                   ...prev.internal,
@@ -1442,12 +1404,7 @@ function initializeRenderer(canvas, provider, store, props) {
             const isWebGPUBackend = backend && "isWebGPUBackend" in backend;
             state.internal.actualRenderer = renderer;
             state.internal.releaseRenderer = leaseRenderer(renderer, resolved.owned);
-            state.set({
-              webGPUSupported: isWebGPUBackend,
-              renderer,
-              gl: renderer,
-              primaryStore: store
-            });
+            state.set({ webGPUSupported: isWebGPUBackend, renderer, primaryStore: store });
             if (primary) {
               const canvasTarget = renderer.getCanvasTarget?.();
               (_a = state.internal).pendingRootId ?? (_a.pendingRootId = canvasId || scheduler.getScheduler().generateRootId());
@@ -1879,14 +1836,12 @@ function createRootConfiguration(store, canvas) {
       };
       const xr = {
         connect() {
-          const { gl, renderer: renderer2 } = store.getState();
-          const xrManager = (renderer2 || gl).xr;
+          const xrManager = store.getState().renderer.xr;
           xrManager.addEventListener("sessionstart", handleSessionChange);
           xrManager.addEventListener("sessionend", handleSessionChange);
         },
         disconnect() {
-          const { gl, renderer: renderer2 } = store.getState();
-          const xrManager = (renderer2 || gl).xr;
+          const xrManager = store.getState().renderer.xr;
           xrManager.removeEventListener("sessionstart", handleSessionChange);
           xrManager.removeEventListener("sessionend", handleSessionChange);
         }
@@ -15993,6 +15948,7 @@ function PortalInner({ state = {}, children, container }) {
     const lastRoot = lastRootState.current;
     if (lastRoot) {
       for (const key in rootState) {
+        if (textureStaging.isAccessor(rootState, key)) continue;
         const field = key;
         const changed = rootState[field] !== lastRoot[field];
         const inherited = !(key in rest) && injectState[field] === lastRoot[field];
@@ -16009,11 +15965,7 @@ function PortalInner({ state = {}, children, container }) {
       if (camera !== rootState.camera) updateCamera(camera, resolvedSize);
     }
     const set = injectState.set;
-    return {
-      // The intersect consists of the previous root state
-      ...rootState,
-      ...injectState,
-      ...followed,
+    return Object.assign(textureStaging.cloneState(rootState, injectState, followed), {
       // Portals have their own scene - always a real THREE.Scene (injected if needed)
       scene: portalScene,
       // rootScene always points to the actual THREE.Scene, even inside portals
@@ -16028,13 +15980,19 @@ function PortalInner({ state = {}, children, container }) {
       size: resolvedSize,
       viewport: { ...rootState.viewport, ...viewport },
       // Layers are allowed to override events
-      setEvents: (events2) => set((state2) => ({ ...state2, events: { ...state2.events, ...events2 } })),
-      // Container for child attachment - the portalScene (injected or container itself)
-      internal: { ...rootState.internal, ...injectState.internal, container: portalScene }
-    };
+      setEvents: (events2) => set((state2) => ({ events: { ...state2.events, ...events2 } })),
+      // Container for child attachment - the portalScene (injected or container itself). A portal
+      // renders with its parent's renderer, which `renderer` / `gl` read from `actualRenderer`
+      internal: {
+        ...rootState.internal,
+        ...injectState.internal,
+        actualRenderer: rootState.internal.actualRenderer,
+        container: portalScene
+      }
+    });
   });
   const usePortalStore = React.useMemo(() => {
-    const store = traditional.createWithEqualityFn((set, get) => ({ ...rest, set, get }));
+    const store = traditional.createWithEqualityFn(textureStaging.keepAccessors((set, get) => ({ ...rest, set, get })));
     const onMutate = (prev) => store.setState((state2) => inject.current(prev, state2));
     onMutate(previousRoot.getState());
     return store;
@@ -16517,7 +16475,7 @@ function CanvasImpl({
         if (rootEntry?.store) textureStaging.notifyRootExtensionsHmr(rootEntry.store);
       });
     };
-    if (typeof ({ url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/fiber.BybcfIwy.cjs', document.baseURI).href)) }) !== "undefined" && undefined) {
+    if (typeof ({ url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/fiber.Cd8-yZqM.cjs', document.baseURI).href)) }) !== "undefined" && undefined) {
       const hot = undefined;
       hot.on("vite:afterUpdate", handleHMR);
       return () => hot.off?.("vite:afterUpdate", handleHMR);

package/dist/shared/{fiber.CsZ092z_.cjs → fiber.DfiCufha.cjs}

@@ -146,6 +146,99 @@ function isDevelopment() {
   }
 }
 
+const INTERNAL_LIB_MARKERS = [
+  "zustand",
+  "setState",
+  "Object.assign",
+  "@pmndrs/scheduler",
+  "Scheduler.tickRoot",
+  "Scheduler.stepJob"
+];
+function isInternalRendererAccess(stack, callerDepth = 2) {
+  if (!stack) return false;
+  const caller = stack.split("\n")[callerDepth] ?? "";
+  return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
+}
+
+const isAccessorDescriptor = (descriptor) => !!descriptor && (descriptor.get !== void 0 || descriptor.set !== void 0);
+const isAccessor = (object, key) => isAccessorDescriptor(Object.getOwnPropertyDescriptor(object, key));
+function cloneState(...sources) {
+  const target = {};
+  for (const source of sources) {
+    if (source) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+  }
+  return target;
+}
+function preserveAccessors(rawSet, get) {
+  return ((partial, replace) => {
+    const previous = get();
+    const patch = typeof partial === "function" ? partial(previous) : partial;
+    if (replace || !previous || patch == null || Object.is(patch, previous)) {
+      return rawSet(patch, replace);
+    }
+    const next = cloneState(previous);
+    const viaSetter = [];
+    for (const key of Reflect.ownKeys(patch)) {
+      const descriptor = Object.getOwnPropertyDescriptor(patch, key);
+      if (!descriptor.enumerable) continue;
+      if (isAccessorDescriptor(descriptor)) {
+        Object.defineProperty(next, key, descriptor);
+      } else if (isAccessor(next, key)) {
+        viaSetter.push(key);
+      } else {
+        Object.defineProperty(next, key, {
+          value: descriptor.value,
+          writable: true,
+          enumerable: true,
+          configurable: true
+        });
+      }
+    }
+    for (const key of viaSetter) next[key] = patch[key];
+    rawSet(next, true);
+  });
+}
+const keepAccessors = (initializer) => (rawSet, get, api) => {
+  const set = preserveAccessors(rawSet, get);
+  api.setState = set;
+  return initializer(set, get, api);
+};
+let glNoticeShown = false;
+function defineRendererAccessors(state) {
+  Object.defineProperty(state, "gl", {
+    get() {
+      const renderer = this.internal?.actualRenderer;
+      if (!glNoticeShown && renderer && !this.isLegacy) {
+        const stack = new Error().stack || "";
+        if (!isInternalRendererAccess(stack)) {
+          glNoticeShown = true;
+          const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
+          notifyDepreciated({
+            heading: "Accessing state.gl in WebGPU mode",
+            body: "Please use state.renderer instead. state.gl is deprecated and will be removed in future versions.\n\nFor backwards compatibility, state.gl currently maps to state.renderer, but this may cause issues with libraries expecting WebGLRenderer.\n\nAccessed from:\n" + cleanedStack
+          });
+        }
+      }
+      return renderer;
+    },
+    set(value) {
+      this.internal.actualRenderer = value;
+    },
+    enumerable: true,
+    configurable: true
+  });
+  Object.defineProperty(state, "renderer", {
+    get() {
+      return this.internal?.actualRenderer;
+    },
+    set(value) {
+      this.internal.actualRenderer = value;
+    },
+    enumerable: true,
+    configurable: true
+  });
+}
+
 const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
 const context = globalThis[R3F_CONTEXT] ?? (globalThis[R3F_CONTEXT] = React__namespace.createContext(null));
 
@@ -257,15 +350,12 @@ function useFrame(callback, priorityOrOptions) {
         });
       }
       const wrappedCallback = (frameState, delta) => {
-        const localState = store.getState();
-        const mergedState = {
-          ...localState,
-          time: frameState.time,
-          delta: frameState.delta,
-          elapsed: frameState.elapsed,
-          frame: frameState.frame,
-          overstep: frameState.overstep
-        };
+        const mergedState = cloneState(store.getState());
+        mergedState.time = frameState.time;
+        mergedState.delta = frameState.delta;
+        mergedState.elapsed = frameState.elapsed;
+        mergedState.frame = frameState.frame;
+        mergedState.overstep = frameState.overstep;
         callbackRef.current?.(mergedState, delta);
       };
       const unregister = scheduler$1.register(wrappedCallback, {
@@ -406,13 +496,18 @@ function getTextureView(store) {
 exports.Block = Block;
 exports.ErrorBoundary = ErrorBoundary;
 exports.attachRootExtensions = attachRootExtensions;
+exports.cloneState = cloneState;
 exports.context = context;
+exports.defineRendererAccessors = defineRendererAccessors;
 exports.detachRootExtensions = detachRootExtensions;
 exports.getTextureView = getTextureView;
+exports.isAccessor = isAccessor;
 exports.isDevelopment = isDevelopment;
+exports.keepAccessors = keepAccessors;
 exports.notifyAlpha = notifyAlpha;
 exports.notifyDepreciated = notifyDepreciated;
 exports.notifyRootExtensionsHmr = notifyRootExtensionsHmr;
+exports.preserveAccessors = preserveAccessors;
 exports.registerRootExtension = registerRootExtension;
 exports.setRenderOverride = setRenderOverride;
 exports.stageTextures = stageTextures;

package/dist/webgpu/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
 const jsxRuntime = require('react/jsx-runtime');
-const Canvas$1 = require('../shared/fiber.BybcfIwy.cjs');
+const Canvas$1 = require('../shared/fiber.Cd8-yZqM.cjs');
 const webgpu = require('../chunks/webgpu.cjs');
-const textureStaging = require('../shared/fiber.CsZ092z_.cjs');
+const textureStaging = require('../shared/fiber.DfiCufha.cjs');
 const scheduler = require('@pmndrs/scheduler');
 
 function addTexture(set, key, value) {

package/dist/webgpu/index.mjs

@@ -1,9 +1,9 @@
 import { jsx } from 'react/jsx-runtime';
-import { G as useRenderTarget$1, c as createRoot$1, C as Canvas$1 } from '../shared/fiber.BC5FRLu-.mjs';
-export { s as Environment, p as EnvironmentCube, E as EnvironmentMap, q as EnvironmentPortal, ai as FROM_REF, I as IsObject, al as ONCE, P as Portal, U as REACT_INTERNAL_PROPS, a1 as RESERVED_PROPS, T as Texture, _ as _roots, d as addAfterEffect, b as addEffect, e as addTail, f as advance, a6 as applyProps, a3 as attach, X as buildGraph, O as calculateDpr, y as createEvents, a as createPointerEvents, N as createPortal, l as createStore, a4 as detach, a5 as diffProps, Y as dispose, a as events, J as extend, V as findInitialRoot, L as flushSync, aj as fromRef, Z as getInstanceProps, h as getPrimary, k as getPrimaryIds, W as getRootState, m as getThree, Q as getUuidPrefix, ah as hasConstructor, j as hasPrimary, n as hasThree, i as invalidate, a0 as invalidateInstance, a7 as is, aa as isColorRepresentation, ag as isCopyable, ak as isFromRef, ad as isLayers, ab as isObject3D, an as isOnce, a8 as isOrthographicCamera, a9 as isRef, g as isRenderer, ac as isTexture, ae as isUniform, af as isVectorLike, am as once, $ as prepare, t as presetsObj, K as reconciler, r as registerPrimary, x as removeInteractivity, a2 as resolve, v as swapInteractivity, M as unmountComponentAtNode, u as unregisterPrimary, R as updateCamera, S as updateFrustum, H as useEnvironment, A as useGraph, z as useInstanceHandle, B as useLoader, D as useTexture, F as useTextures, w as waitForPrimary, o as whenThree } from '../shared/fiber.BC5FRLu-.mjs';
+import { G as useRenderTarget$1, c as createRoot$1, C as Canvas$1 } from '../shared/fiber.BLt8Cx7Z.mjs';
+export { s as Environment, p as EnvironmentCube, E as EnvironmentMap, q as EnvironmentPortal, ai as FROM_REF, I as IsObject, al as ONCE, P as Portal, U as REACT_INTERNAL_PROPS, a1 as RESERVED_PROPS, T as Texture, _ as _roots, d as addAfterEffect, b as addEffect, e as addTail, f as advance, a6 as applyProps, a3 as attach, X as buildGraph, O as calculateDpr, y as createEvents, a as createPointerEvents, N as createPortal, l as createStore, a4 as detach, a5 as diffProps, Y as dispose, a as events, J as extend, V as findInitialRoot, L as flushSync, aj as fromRef, Z as getInstanceProps, h as getPrimary, k as getPrimaryIds, W as getRootState, m as getThree, Q as getUuidPrefix, ah as hasConstructor, j as hasPrimary, n as hasThree, i as invalidate, a0 as invalidateInstance, a7 as is, aa as isColorRepresentation, ag as isCopyable, ak as isFromRef, ad as isLayers, ab as isObject3D, an as isOnce, a8 as isOrthographicCamera, a9 as isRef, g as isRenderer, ac as isTexture, ae as isUniform, af as isVectorLike, am as once, $ as prepare, t as presetsObj, K as reconciler, r as registerPrimary, x as removeInteractivity, a2 as resolve, v as swapInteractivity, M as unmountComponentAtNode, u as unregisterPrimary, R as updateCamera, S as updateFrustum, H as useEnvironment, A as useGraph, z as useInstanceHandle, B as useLoader, D as useTexture, F as useTextures, w as waitForPrimary, o as whenThree } from '../shared/fiber.BLt8Cx7Z.mjs';
 import { webgpuSupport } from '../chunks/webgpu.mjs';
-import { a as useThree$1, b as useFrame$1 } from '../shared/fiber.DlH05gco.mjs';
-export { B as Block, E as ErrorBoundary, c as context, r as registerRootExtension, s as setRenderOverride, f as useBridge, d as useIsomorphicLayoutEffect, e as useMutableCallback, u as useStore } from '../shared/fiber.DlH05gco.mjs';
+import { a as useThree$1, b as useFrame$1 } from '../shared/fiber.Biz9olEe.mjs';
+export { B as Block, E as ErrorBoundary, c as context, r as registerRootExtension, s as setRenderOverride, f as useBridge, d as useIsomorphicLayoutEffect, e as useMutableCallback, u as useStore } from '../shared/fiber.Biz9olEe.mjs';
 export { Scheduler, getScheduler } from '@pmndrs/scheduler';
 
 function addTexture(set, key, value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "10.0.0-canary.87166dc",
+  "version": "10.0.0-canary.932f901",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",