@react-three/fiber 8.13.2 → 8.13.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @react-three/fiber
 
+## 8.13.3
+
+### Patch Changes
+
+- ffdb5fc4: revert nested portals, up suspend-react
+
 ## 8.13.2
 
 ### Patch Changes

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

@@ -4,7 +4,7 @@ import * as THREE from 'three';
 import * as React from 'react';
 import { UseBoundStore } from 'zustand';
 import * as ReactThreeFiber from '../three-types';
-import { Renderer, context, RootState, Size, Dpr, Performance } from './store';
+import { Renderer, context, RootState, Size, Dpr, Performance, PrivateKeys } from './store';
 import { extend, Root } from './renderer';
 import { addEffect, addAfterEffect, addTail, flushGlobalEffects } from './loop';
 import { EventManager, ComputeFunction } from './events';
@@ -43,13 +43,14 @@ export declare type ReconcilerRoot<TCanvas extends Canvas> = {
 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, 'events'> & {
+export declare type InjectState = Partial<Omit<RootState, PrivateKeys> & {
     events?: {
         enabled?: boolean;
         priority?: number;
         compute?: ComputeFunction;
         connected?: any;
     };
+    size?: Size;
 }>;
 declare function createPortal(children: React.ReactNode, container: THREE.Object3D, state?: InjectState): JSX.Element;
 declare const act: any;

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

@@ -4,6 +4,8 @@ import * as React from 'react';
 import { GetState, SetState, StoreApi, UseBoundStore } from 'zustand';
 import { DomEvent, EventManager, PointerCaptureTarget, ThreeEvent } from './events';
 import { Camera } from './utils';
+export declare const privateKeys: readonly ["set", "get", "setSize", "setFrameloop", "setDpr", "events", "invalidate", "advance", "size", "viewport"];
+export declare type PrivateKeys = typeof privateKeys[number];
 export interface Intersection extends THREE.Intersection {
     eventObject: THREE.Object3D;
 }

package/dist/{index-948f4806.cjs.prod.js → index-5195c1db.cjs.prod.js}

@@ -1227,6 +1227,8 @@ function createEvents(store) {
   };
 }
 
+// Keys that shouldn't be copied between R3F stores
+const privateKeys = ['set', 'get', 'setSize', 'setFrameloop', 'setDpr', 'events', 'invalidate', 'advance', 'size', 'viewport'];
 const isRenderer = def => !!(def != null && def.render);
 const context = /*#__PURE__*/React__namespace.createContext(null);
 const createStore = (invalidate, advance) => {
@@ -2056,6 +2058,7 @@ function unmountComponentAtNode(canvas, callback) {
 }
 function createPortal(children, container, state) {
   return /*#__PURE__*/React__namespace.createElement(Portal, {
+    key: container.uuid,
     children: children,
     container: container,
     state: state
@@ -2079,9 +2082,26 @@ function Portal({
   const previousRoot = useStore();
   const [raycaster] = React__namespace.useState(() => new THREE__namespace.Raycaster());
   const [pointer] = React__namespace.useState(() => new THREE__namespace.Vector2());
-  const inject = useMutableCallback((rootState, injectState) => {
-    let viewport;
-    if (injectState.camera && size) {
+  const inject = React__namespace.useCallback((rootState, injectState) => {
+    const intersect = {
+      ...rootState
+    }; // all prev state props
+
+    // Only the fields of "rootState" that do not differ from injectState
+    // Some props should be off-limits
+    // Otherwise filter out the props that are different and let the inject layer take precedence
+    Object.keys(rootState).forEach(key => {
+      if (
+      // Some props should be off-limits
+      privateKeys.includes(key) ||
+      // Otherwise filter out the props that are different and let the inject layer take precedence
+      // Unless the inject layer props is undefined, then we keep the root layer
+      rootState[key] !== injectState[key] && injectState[key]) {
+        delete intersect[key];
+      }
+    });
+    let viewport = undefined;
+    if (injectState && size) {
       const camera = injectState.camera;
       // Calculate the override viewport, if present
       viewport = rootState.viewport.getCurrentViewport(camera, new THREE__namespace.Vector3(), size);
@@ -2090,9 +2110,7 @@ function Portal({
     }
     return {
       // The intersect consists of the previous root state
-      ...rootState,
-      get: injectState.get,
-      set: injectState.set,
+      ...intersect,
       // Portals have their own scene, which forms the root, a raycaster and a pointer
       scene: container,
       raycaster,
@@ -2103,7 +2121,7 @@ function Portal({
       // Events, size and viewport can be overridden by the inject layer
       events: {
         ...rootState.events,
-        ...injectState.events,
+        ...(injectState == null ? void 0 : injectState.events),
         ...events
       },
       size: {
@@ -2114,33 +2132,53 @@ function Portal({
         ...rootState.viewport,
         ...viewport
       },
+      ...rest
+    };
+  }, [state]);
+  const [usePortalStore] = React__namespace.useState(() => {
+    // Create a mirrored store, based on the previous root with a few overrides ...
+    const previousState = previousRoot.getState();
+    const store = create__default["default"]((set, get) => ({
+      ...previousState,
+      scene: container,
+      raycaster,
+      pointer,
+      mouse: pointer,
+      previousRoot,
+      events: {
+        ...previousState.events,
+        ...events
+      },
+      size: {
+        ...previousState.size,
+        ...size
+      },
+      ...rest,
+      // Set and get refer to this root-state
+      set,
+      get,
       // Layers are allowed to override events
-      setEvents: events => injectState.set(state => ({
+      setEvents: events => set(state => ({
         ...state,
         events: {
           ...state.events,
           ...events
         }
       }))
-    };
-  });
-  const usePortalStore = React__namespace.useMemo(() => {
-    const store = create__default["default"]((set, get) => ({
-      ...rest,
-      set,
-      get
     }));
-
-    // Subscribe to previous root-state and copy changes over to the mirrored portal-state
-    const onMutate = prev => store.setState(state => inject.current(prev, state));
-    onMutate(previousRoot.getState());
-    previousRoot.subscribe(onMutate);
     return store;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [previousRoot, container]);
+  });
+  React__namespace.useEffect(() => {
+    // Subscribe to previous root-state and copy changes over to the mirrored portal-state
+    const unsub = previousRoot.subscribe(prev => usePortalStore.setState(state => inject(prev, state)));
+    return () => {
+      unsub();
+      usePortalStore.destroy();
+    };
+  }, []);
   React__namespace.useEffect(() => {
-    return () => usePortalStore.destroy();
-  }, [usePortalStore]);
+    usePortalStore.setState(injectState => inject(previousRoot.getState(), injectState));
+  }, [inject]);
   return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, reconciler.createPortal( /*#__PURE__*/React__namespace.createElement(context.Provider, {
     value: usePortalStore
   }, children), usePortalStore, null));

package/dist/{index-13b06ff5.esm.js → index-76c68185.esm.js}

@@ -1200,6 +1200,8 @@ function createEvents(store) {
   };
 }
 
+// Keys that shouldn't be copied between R3F stores
+const privateKeys = ['set', 'get', 'setSize', 'setFrameloop', 'setDpr', 'events', 'invalidate', 'advance', 'size', 'viewport'];
 const isRenderer = def => !!(def != null && def.render);
 const context = /*#__PURE__*/React.createContext(null);
 const createStore = (invalidate, advance) => {
@@ -2029,6 +2031,7 @@ function unmountComponentAtNode(canvas, callback) {
 }
 function createPortal(children, container, state) {
   return /*#__PURE__*/React.createElement(Portal, {
+    key: container.uuid,
     children: children,
     container: container,
     state: state
@@ -2052,9 +2055,26 @@ function Portal({
   const previousRoot = useStore();
   const [raycaster] = React.useState(() => new THREE.Raycaster());
   const [pointer] = React.useState(() => new THREE.Vector2());
-  const inject = useMutableCallback((rootState, injectState) => {
-    let viewport;
-    if (injectState.camera && size) {
+  const inject = React.useCallback((rootState, injectState) => {
+    const intersect = {
+      ...rootState
+    }; // all prev state props
+
+    // Only the fields of "rootState" that do not differ from injectState
+    // Some props should be off-limits
+    // Otherwise filter out the props that are different and let the inject layer take precedence
+    Object.keys(rootState).forEach(key => {
+      if (
+      // Some props should be off-limits
+      privateKeys.includes(key) ||
+      // Otherwise filter out the props that are different and let the inject layer take precedence
+      // Unless the inject layer props is undefined, then we keep the root layer
+      rootState[key] !== injectState[key] && injectState[key]) {
+        delete intersect[key];
+      }
+    });
+    let viewport = undefined;
+    if (injectState && size) {
       const camera = injectState.camera;
       // Calculate the override viewport, if present
       viewport = rootState.viewport.getCurrentViewport(camera, new THREE.Vector3(), size);
@@ -2063,9 +2083,7 @@ function Portal({
     }
     return {
       // The intersect consists of the previous root state
-      ...rootState,
-      get: injectState.get,
-      set: injectState.set,
+      ...intersect,
       // Portals have their own scene, which forms the root, a raycaster and a pointer
       scene: container,
       raycaster,
@@ -2076,7 +2094,7 @@ function Portal({
       // Events, size and viewport can be overridden by the inject layer
       events: {
         ...rootState.events,
-        ...injectState.events,
+        ...(injectState == null ? void 0 : injectState.events),
         ...events
       },
       size: {
@@ -2087,33 +2105,53 @@ function Portal({
         ...rootState.viewport,
         ...viewport
       },
+      ...rest
+    };
+  }, [state]);
+  const [usePortalStore] = React.useState(() => {
+    // Create a mirrored store, based on the previous root with a few overrides ...
+    const previousState = previousRoot.getState();
+    const store = create((set, get) => ({
+      ...previousState,
+      scene: container,
+      raycaster,
+      pointer,
+      mouse: pointer,
+      previousRoot,
+      events: {
+        ...previousState.events,
+        ...events
+      },
+      size: {
+        ...previousState.size,
+        ...size
+      },
+      ...rest,
+      // Set and get refer to this root-state
+      set,
+      get,
       // Layers are allowed to override events
-      setEvents: events => injectState.set(state => ({
+      setEvents: events => set(state => ({
         ...state,
         events: {
           ...state.events,
           ...events
         }
       }))
-    };
-  });
-  const usePortalStore = React.useMemo(() => {
-    const store = create((set, get) => ({
-      ...rest,
-      set,
-      get
     }));
-
-    // Subscribe to previous root-state and copy changes over to the mirrored portal-state
-    const onMutate = prev => store.setState(state => inject.current(prev, state));
-    onMutate(previousRoot.getState());
-    previousRoot.subscribe(onMutate);
     return store;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [previousRoot, container]);
+  });
+  React.useEffect(() => {
+    // Subscribe to previous root-state and copy changes over to the mirrored portal-state
+    const unsub = previousRoot.subscribe(prev => usePortalStore.setState(state => inject(prev, state)));
+    return () => {
+      unsub();
+      usePortalStore.destroy();
+    };
+  }, []);
   React.useEffect(() => {
-    return () => usePortalStore.destroy();
-  }, [usePortalStore]);
+    usePortalStore.setState(injectState => inject(previousRoot.getState(), injectState));
+  }, [inject]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, reconciler.createPortal( /*#__PURE__*/React.createElement(context.Provider, {
     value: usePortalStore
   }, children), usePortalStore, null));

package/dist/{index-a0deb08b.cjs.dev.js → index-c307a54a.cjs.dev.js}

@@ -1227,6 +1227,8 @@ function createEvents(store) {
   };
 }
 
+// Keys that shouldn't be copied between R3F stores
+const privateKeys = ['set', 'get', 'setSize', 'setFrameloop', 'setDpr', 'events', 'invalidate', 'advance', 'size', 'viewport'];
 const isRenderer = def => !!(def != null && def.render);
 const context = /*#__PURE__*/React__namespace.createContext(null);
 const createStore = (invalidate, advance) => {
@@ -2056,6 +2058,7 @@ function unmountComponentAtNode(canvas, callback) {
 }
 function createPortal(children, container, state) {
   return /*#__PURE__*/React__namespace.createElement(Portal, {
+    key: container.uuid,
     children: children,
     container: container,
     state: state
@@ -2079,9 +2082,26 @@ function Portal({
   const previousRoot = useStore();
   const [raycaster] = React__namespace.useState(() => new THREE__namespace.Raycaster());
   const [pointer] = React__namespace.useState(() => new THREE__namespace.Vector2());
-  const inject = useMutableCallback((rootState, injectState) => {
-    let viewport;
-    if (injectState.camera && size) {
+  const inject = React__namespace.useCallback((rootState, injectState) => {
+    const intersect = {
+      ...rootState
+    }; // all prev state props
+
+    // Only the fields of "rootState" that do not differ from injectState
+    // Some props should be off-limits
+    // Otherwise filter out the props that are different and let the inject layer take precedence
+    Object.keys(rootState).forEach(key => {
+      if (
+      // Some props should be off-limits
+      privateKeys.includes(key) ||
+      // Otherwise filter out the props that are different and let the inject layer take precedence
+      // Unless the inject layer props is undefined, then we keep the root layer
+      rootState[key] !== injectState[key] && injectState[key]) {
+        delete intersect[key];
+      }
+    });
+    let viewport = undefined;
+    if (injectState && size) {
       const camera = injectState.camera;
       // Calculate the override viewport, if present
       viewport = rootState.viewport.getCurrentViewport(camera, new THREE__namespace.Vector3(), size);
@@ -2090,9 +2110,7 @@ function Portal({
     }
     return {
       // The intersect consists of the previous root state
-      ...rootState,
-      get: injectState.get,
-      set: injectState.set,
+      ...intersect,
       // Portals have their own scene, which forms the root, a raycaster and a pointer
       scene: container,
       raycaster,
@@ -2103,7 +2121,7 @@ function Portal({
       // Events, size and viewport can be overridden by the inject layer
       events: {
         ...rootState.events,
-        ...injectState.events,
+        ...(injectState == null ? void 0 : injectState.events),
         ...events
       },
       size: {
@@ -2114,33 +2132,53 @@ function Portal({
         ...rootState.viewport,
         ...viewport
       },
+      ...rest
+    };
+  }, [state]);
+  const [usePortalStore] = React__namespace.useState(() => {
+    // Create a mirrored store, based on the previous root with a few overrides ...
+    const previousState = previousRoot.getState();
+    const store = create__default["default"]((set, get) => ({
+      ...previousState,
+      scene: container,
+      raycaster,
+      pointer,
+      mouse: pointer,
+      previousRoot,
+      events: {
+        ...previousState.events,
+        ...events
+      },
+      size: {
+        ...previousState.size,
+        ...size
+      },
+      ...rest,
+      // Set and get refer to this root-state
+      set,
+      get,
       // Layers are allowed to override events
-      setEvents: events => injectState.set(state => ({
+      setEvents: events => set(state => ({
         ...state,
         events: {
           ...state.events,
           ...events
         }
       }))
-    };
-  });
-  const usePortalStore = React__namespace.useMemo(() => {
-    const store = create__default["default"]((set, get) => ({
-      ...rest,
-      set,
-      get
     }));
-
-    // Subscribe to previous root-state and copy changes over to the mirrored portal-state
-    const onMutate = prev => store.setState(state => inject.current(prev, state));
-    onMutate(previousRoot.getState());
-    previousRoot.subscribe(onMutate);
     return store;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [previousRoot, container]);
+  });
+  React__namespace.useEffect(() => {
+    // Subscribe to previous root-state and copy changes over to the mirrored portal-state
+    const unsub = previousRoot.subscribe(prev => usePortalStore.setState(state => inject(prev, state)));
+    return () => {
+      unsub();
+      usePortalStore.destroy();
+    };
+  }, []);
   React__namespace.useEffect(() => {
-    return () => usePortalStore.destroy();
-  }, [usePortalStore]);
+    usePortalStore.setState(injectState => inject(previousRoot.getState(), injectState));
+  }, [inject]);
   return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, reconciler.createPortal( /*#__PURE__*/React__namespace.createElement(context.Provider, {
     value: usePortalStore
   }, children), usePortalStore, null));

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-a0deb08b.cjs.dev.js');
+var index = require('./index-c307a54a.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-948f4806.cjs.prod.js');
+var index = require('./index-5195c1db.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

package/dist/react-three-fiber.esm.js

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMutableCallback, a as useIsomorphicLayoutEffect, b as createRoot, i as isRef, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from './index-13b06ff5.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, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from './index-13b06ff5.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, a as useIsomorphicLayoutEffect, b as createRoot, i as isRef, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from './index-76c68185.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, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from './index-76c68185.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-a0deb08b.cjs.dev.js');
+var index = require('../../dist/index-c307a54a.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-948f4806.cjs.prod.js');
+var index = require('../../dist/index-5195c1db.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

package/native/dist/react-three-fiber-native.esm.js

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMutableCallback, b as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-13b06ff5.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, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from '../../dist/index-13b06ff5.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, b as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-76c68185.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, b as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from '../../dist/index-76c68185.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.13.2",
+  "version": "8.13.3",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",
@@ -48,7 +48,7 @@
     "react-reconciler": "^0.27.0",
     "react-use-measure": "^2.1.1",
     "scheduler": "^0.21.0",
-    "suspend-react": "^0.1.0",
+    "suspend-react": "^0.1.3",
     "zustand": "^3.7.1"
   },
   "peerDependencies": {