@react-three/fiber 8.13.2 → 8.13.4

package/dist/declarations/src/web/Canvas.d.ts

@@ -1,13 +1,13 @@
-import * as React from 'react';
-import type { Options as ResizeOptions } from 'react-use-measure';
-import { RenderProps } from '../core';
-export interface CanvasProps extends Omit<RenderProps<HTMLCanvasElement>, 'size'>, React.HTMLAttributes<HTMLDivElement> {
-    children: React.ReactNode;
-    fallback?: React.ReactNode;
-    resize?: ResizeOptions;
-    eventSource?: HTMLElement | React.MutableRefObject<HTMLElement>;
-    eventPrefix?: 'offset' | 'client' | 'page' | 'layer' | 'screen';
-}
-export interface Props extends CanvasProps {
-}
-export declare const Canvas: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLCanvasElement>>;
+import * as React from 'react';
+import type { Options as ResizeOptions } from 'react-use-measure';
+import { RenderProps } from '../core';
+export interface CanvasProps extends Omit<RenderProps<HTMLCanvasElement>, 'size'>, React.HTMLAttributes<HTMLDivElement> {
+    children: React.ReactNode;
+    fallback?: React.ReactNode;
+    resize?: ResizeOptions;
+    eventSource?: HTMLElement | React.MutableRefObject<HTMLElement>;
+    eventPrefix?: 'offset' | 'client' | 'page' | 'layer' | 'screen';
+}
+export interface Props extends CanvasProps {
+}
+export declare const Canvas: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLCanvasElement>>;

package/dist/declarations/src/web/events.d.ts

@@ -1,4 +1,4 @@
-import { UseBoundStore } from 'zustand';
-import { RootState } from '../core/store';
-import { EventManager } from '../core/events';
-export declare function createPointerEvents(store: UseBoundStore<RootState>): EventManager<HTMLElement>;
+import { UseBoundStore } from 'zustand';
+import { RootState } from '../core/store';
+import { EventManager } from '../core/events';
+export declare function createPointerEvents(store: UseBoundStore<RootState>): EventManager<HTMLElement>;

package/dist/{index-13b06ff5.esm.js → index-27578f8f.esm.js}

@@ -251,8 +251,11 @@ function createRenderer(_roots, _getEventPriority) {
       return Boolean(localState.handlers);
     },
     prepareUpdate(instance, _type, oldProps, newProps) {
+      var _instance$__r3f3;
+      const localState = (_instance$__r3f3 = instance == null ? void 0 : instance.__r3f) != null ? _instance$__r3f3 : {};
+
       // Create diff-sets
-      if (instance.__r3f.primitive && newProps.object && newProps.object !== instance) {
+      if (localState.primitive && newProps.object && newProps.object !== instance) {
         return [true];
       } else {
         // This is a data object, let's extract critical information about it
@@ -287,10 +290,10 @@ function createRenderer(_roots, _getEventPriority) {
       else applyProps$1(instance, diff);
     },
     commitMount(instance, _type, _props, _int) {
-      var _instance$__r3f3;
+      var _instance$__r3f4;
       // https://github.com/facebook/react/issues/20271
       // This will make sure events are only added once to the central container
-      const localState = (_instance$__r3f3 = instance.__r3f) != null ? _instance$__r3f3 : {};
+      const localState = (_instance$__r3f4 = instance.__r3f) != null ? _instance$__r3f4 : {};
       if (instance.raycast && localState.handlers && localState.eventCount) {
         instance.__r3f.root.getState().internal.interaction.push(instance);
       }
@@ -302,23 +305,23 @@ function createRenderer(_roots, _getEventPriority) {
     shouldSetTextContent: () => false,
     clearContainer: () => false,
     hideInstance(instance) {
-      var _instance$__r3f4;
+      var _instance$__r3f5;
       // Detach while the instance is hidden
       const {
         attach: type,
         parent
-      } = (_instance$__r3f4 = instance.__r3f) != null ? _instance$__r3f4 : {};
+      } = (_instance$__r3f5 = instance.__r3f) != null ? _instance$__r3f5 : {};
       if (type && parent) detach(parent, instance, type);
       if (instance.isObject3D) instance.visible = false;
       invalidateInstance(instance);
     },
     unhideInstance(instance, props) {
-      var _instance$__r3f5;
+      var _instance$__r3f6;
       // Re-attach when the instance is unhidden
       const {
         attach: type,
         parent
-      } = (_instance$__r3f5 = instance.__r3f) != null ? _instance$__r3f5 : {};
+      } = (_instance$__r3f6 = instance.__r3f) != null ? _instance$__r3f6 : {};
       if (type && parent) attach(parent, instance, type);
       if (instance.isObject3D && props.visible == null || props.visible) instance.visible = true;
       invalidateInstance(instance);
@@ -494,19 +497,17 @@ function dispose(obj) {
 // Each object in the scene carries a small LocalState descriptor
 function prepare(object, state) {
   const instance = object;
-  if (state != null && state.primitive || !instance.__r3f) {
-    instance.__r3f = {
-      type: '',
-      root: null,
-      previousAttach: null,
-      memoizedProps: {},
-      eventCount: 0,
-      handlers: {},
-      objects: [],
-      parent: null,
-      ...state
-    };
-  }
+  instance.__r3f = {
+    type: '',
+    root: null,
+    previousAttach: null,
+    memoizedProps: {},
+    eventCount: 0,
+    handlers: {},
+    objects: [],
+    parent: null,
+    ...state
+  };
   return object;
 }
 function resolve(instance, key) {
@@ -1200,6 +1201,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 +2032,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 +2056,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 +2084,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 +2095,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 +2106,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-c4a77a3a.cjs.dev.js}

@@ -278,8 +278,11 @@ function createRenderer(_roots, _getEventPriority) {
       return Boolean(localState.handlers);
     },
     prepareUpdate(instance, _type, oldProps, newProps) {
+      var _instance$__r3f3;
+      const localState = (_instance$__r3f3 = instance == null ? void 0 : instance.__r3f) != null ? _instance$__r3f3 : {};
+
       // Create diff-sets
-      if (instance.__r3f.primitive && newProps.object && newProps.object !== instance) {
+      if (localState.primitive && newProps.object && newProps.object !== instance) {
         return [true];
       } else {
         // This is a data object, let's extract critical information about it
@@ -314,10 +317,10 @@ function createRenderer(_roots, _getEventPriority) {
       else applyProps$1(instance, diff);
     },
     commitMount(instance, _type, _props, _int) {
-      var _instance$__r3f3;
+      var _instance$__r3f4;
       // https://github.com/facebook/react/issues/20271
       // This will make sure events are only added once to the central container
-      const localState = (_instance$__r3f3 = instance.__r3f) != null ? _instance$__r3f3 : {};
+      const localState = (_instance$__r3f4 = instance.__r3f) != null ? _instance$__r3f4 : {};
       if (instance.raycast && localState.handlers && localState.eventCount) {
         instance.__r3f.root.getState().internal.interaction.push(instance);
       }
@@ -329,23 +332,23 @@ function createRenderer(_roots, _getEventPriority) {
     shouldSetTextContent: () => false,
     clearContainer: () => false,
     hideInstance(instance) {
-      var _instance$__r3f4;
+      var _instance$__r3f5;
       // Detach while the instance is hidden
       const {
         attach: type,
         parent
-      } = (_instance$__r3f4 = instance.__r3f) != null ? _instance$__r3f4 : {};
+      } = (_instance$__r3f5 = instance.__r3f) != null ? _instance$__r3f5 : {};
       if (type && parent) detach(parent, instance, type);
       if (instance.isObject3D) instance.visible = false;
       invalidateInstance(instance);
     },
     unhideInstance(instance, props) {
-      var _instance$__r3f5;
+      var _instance$__r3f6;
       // Re-attach when the instance is unhidden
       const {
         attach: type,
         parent
-      } = (_instance$__r3f5 = instance.__r3f) != null ? _instance$__r3f5 : {};
+      } = (_instance$__r3f6 = instance.__r3f) != null ? _instance$__r3f6 : {};
       if (type && parent) attach(parent, instance, type);
       if (instance.isObject3D && props.visible == null || props.visible) instance.visible = true;
       invalidateInstance(instance);
@@ -521,19 +524,17 @@ function dispose(obj) {
 // Each object in the scene carries a small LocalState descriptor
 function prepare(object, state) {
   const instance = object;
-  if (state != null && state.primitive || !instance.__r3f) {
-    instance.__r3f = {
-      type: '',
-      root: null,
-      previousAttach: null,
-      memoizedProps: {},
-      eventCount: 0,
-      handlers: {},
-      objects: [],
-      parent: null,
-      ...state
-    };
-  }
+  instance.__r3f = {
+    type: '',
+    root: null,
+    previousAttach: null,
+    memoizedProps: {},
+    eventCount: 0,
+    handlers: {},
+    objects: [],
+    parent: null,
+    ...state
+  };
   return object;
 }
 function resolve(instance, key) {
@@ -1227,6 +1228,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 +2059,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 +2083,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 +2111,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 +2122,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 +2133,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));