@react-three/fiber 8.0.3 → 8.0.6

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @react-three/fiber
 
+## 8.0.6
+
+### Patch Changes
+
+- d4bafb9: fix re-parenting, useframe not working properly in portals, attach crash
+
+## 8.0.5
+
+### Patch Changes
+
+- 227c328: fix pointer for root and portals
+
+## 8.0.4
+
+### Patch Changes
+
+- e981a72: fix: mock three color management, loosen peer dep
+
 ## 8.0.3
 
 ### Patch Changes

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

@@ -9,6 +9,7 @@ export interface Intersection extends THREE.Intersection {
 export declare type Subscription = {
     ref: React.MutableRefObject<RenderCallback>;
     priority: number;
+    store: UseBoundStore<RootState, StoreApi<RootState>>;
 };
 export declare type Dpr = number | [min: number, max: number];
 export declare type Size = {
@@ -47,7 +48,7 @@ export declare type InternalState = {
     capturedMap: Map<number, Map<THREE.Object3D, PointerCaptureTarget>>;
     initialClick: [x: number, y: number];
     initialHits: THREE.Object3D[];
-    subscribe: (callback: React.MutableRefObject<RenderCallback>, priority?: number) => () => void;
+    subscribe: (callback: React.MutableRefObject<RenderCallback>, priority: number, store: UseBoundStore<RootState, StoreApi<RootState>>) => () => void;
 };
 export declare type RootState = {
     set: SetState<RootState>;
@@ -67,6 +68,7 @@ export declare type RootState = {
     controls: THREE.EventDispatcher | null;
     pointer: THREE.Vector2;
     mouse: THREE.Vector2;
+    legacy: boolean;
     linear: boolean;
     flat: boolean;
     frameloop: 'always' | 'demand' | 'never';
@@ -89,9 +91,9 @@ export declare type StoreProps = {
     gl: THREE.WebGLRenderer;
     size: Size;
     shadows?: boolean | Partial<THREE.WebGLShadowMap>;
+    legacy?: boolean;
     linear?: boolean;
     flat?: boolean;
-    legacy?: boolean;
     orthographic?: boolean;
     frameloop?: 'always' | 'demand' | 'never';
     performance?: Partial<Omit<Performance, 'regress'>>;

package/dist/{index-77a5f42b.cjs.dev.js → index-0076cbd6.cjs.dev.js}

@@ -334,10 +334,22 @@ function applyProps$1(instance, data) {
 
               if (!isColor && targetProp.setScalar) targetProp.setScalar(value); // Layers have no copy function, we must therefore copy the mask property
               else if (targetProp instanceof THREE__namespace.Layers && value instanceof THREE__namespace.Layers) targetProp.mask = value.mask; // Otherwise just set ...
-                else targetProp.set(value);
+                else targetProp.set(value); // For versions of three which don't support THREE.ColorManagement,
+              // Auto-convert sRGB colors
+              // https://github.com/pmndrs/react-three-fiber/issues/344
+
+              const supportsColorManagement = THREE__namespace.ColorManagement;
+              if (!supportsColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
             } // Else, just overwrite the value
 
-      } else currentInstance[key] = value;
+      } else {
+        currentInstance[key] = value; // Auto-convert sRGB textures, for now ...
+        // https://github.com/pmndrs/react-three-fiber/issues/344
+
+        if (!rootState.linear && currentInstance[key] instanceof THREE__namespace.Texture) {
+          currentInstance[key].encoding = THREE__namespace.sRGBEncoding;
+        }
+      }
 
     invalidateInstance(instance);
   });
@@ -468,7 +480,13 @@ function createEvents(store) {
       if (state) {
         state.raycaster.camera = undefined;
       }
-    }); // Collect events
+    });
+
+    if (!state.previousRoot) {
+      // Make sure root-level pointer and ray are set up
+      state.events.compute == null ? void 0 : state.events.compute(event, state);
+    } // Collect events
+
 
     let hits = eventsObjects // Intersect objects
     .flatMap(obj => {
@@ -842,8 +860,10 @@ function createRenderer(roots, getEventPriority) {
     let added = false;
 
     if (child) {
+      var _child$__r3f, _parentInstance$__r3f;
+
       // The attach attribute implies that the object attaches itself on the parent
-      if (child.__r3f.attach) {
+      if ((_child$__r3f = child.__r3f) != null && _child$__r3f.attach) {
         attach(parentInstance, child, child.__r3f.attach);
       } else if (child.isObject3D && parentInstance.isObject3D) {
         // add in the usual parent-child way
@@ -853,7 +873,7 @@ function createRenderer(roots, getEventPriority) {
       // that is, anything that's a child in React but not a child in the scenegraph.
 
 
-      if (!added) parentInstance.__r3f.objects.push(child);
+      if (!added) (_parentInstance$__r3f = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f.objects.push(child);
       if (!child.__r3f) prepare(child, {});
       child.__r3f.parent = parentInstance;
       updateInstance(child);
@@ -865,7 +885,9 @@ function createRenderer(roots, getEventPriority) {
     let added = false;
 
     if (child) {
-      if (child.__r3f.attach) {
+      var _child$__r3f2, _parentInstance$__r3f2;
+
+      if ((_child$__r3f2 = child.__r3f) != null && _child$__r3f2.attach) {
         attach(parentInstance, child, child.__r3f.attach);
       } else if (child.isObject3D && parentInstance.isObject3D) {
         child.parent = parentInstance;
@@ -878,7 +900,7 @@ function createRenderer(roots, getEventPriority) {
         added = true;
       }
 
-      if (!added) parentInstance.__r3f.objects.push(child);
+      if (!added) (_parentInstance$__r3f2 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f2.objects.push(child);
       if (!child.__r3f) prepare(child, {});
       child.__r3f.parent = parentInstance;
       updateInstance(child);
@@ -892,21 +914,21 @@ function createRenderer(roots, getEventPriority) {
 
   function removeChild(parentInstance, child, dispose) {
     if (child) {
-      var _parentInstance$__r3f, _child$__r3f2;
+      var _parentInstance$__r3f3, _child$__r3f3, _child$__r3f5;
 
       // Clear the parent reference
       if (child.__r3f) child.__r3f.parent = null; // Remove child from the parents objects
 
-      if ((_parentInstance$__r3f = parentInstance.__r3f) != null && _parentInstance$__r3f.objects) parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child); // Remove attachment
+      if ((_parentInstance$__r3f3 = parentInstance.__r3f) != null && _parentInstance$__r3f3.objects) parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child); // Remove attachment
 
-      if (child.__r3f.attach) {
+      if ((_child$__r3f3 = child.__r3f) != null && _child$__r3f3.attach) {
         detach(parentInstance, child, child.__r3f.attach);
       } else if (child.isObject3D && parentInstance.isObject3D) {
-        var _child$__r3f;
+        var _child$__r3f4;
 
         parentInstance.remove(child); // Remove interactivity
 
-        if ((_child$__r3f = child.__r3f) != null && _child$__r3f.root) {
+        if ((_child$__r3f4 = child.__r3f) != null && _child$__r3f4.root) {
           removeInteractivity(child.__r3f.root, child);
         }
       } // Allow objects to bail out of recursive dispose alltogether by passing dispose={null}
@@ -920,14 +942,14 @@ function createRenderer(roots, getEventPriority) {
       // when the reconciler calls it, but then carry our own check recursively
 
 
-      const isPrimitive = (_child$__r3f2 = child.__r3f) == null ? void 0 : _child$__r3f2.primitive;
+      const isPrimitive = (_child$__r3f5 = child.__r3f) == null ? void 0 : _child$__r3f5.primitive;
       const shouldDispose = dispose === undefined ? child.dispose !== null && !isPrimitive : dispose; // Remove nested child objects. Primitives should not have objects and children that are
       // attached to them declaratively ...
 
       if (!isPrimitive) {
-        var _child$__r3f3;
+        var _child$__r3f6;
 
-        removeRecursive((_child$__r3f3 = child.__r3f) == null ? void 0 : _child$__r3f3.objects, child, shouldDispose);
+        removeRecursive((_child$__r3f6 = child.__r3f) == null ? void 0 : _child$__r3f6.objects, child, shouldDispose);
         removeRecursive(child.children, child, shouldDispose);
       } // Remove references
 
@@ -1192,6 +1214,7 @@ const createStore = (invalidate, advance) => {
       xr: null,
       invalidate: () => invalidate(get()),
       advance: (timestamp, runGlobalEffects) => advance(timestamp, runGlobalEffects, get()),
+      legacy: false,
       linear: false,
       flat: false,
       scene: prepare(new THREE__namespace.Scene()),
@@ -1284,7 +1307,7 @@ const createStore = (invalidate, advance) => {
         initialClick: [0, 0],
         initialHits: [],
         capturedMap: new Map(),
-        subscribe: (ref, priority = 0) => {
+        subscribe: (ref, priority, store) => {
           set(({
             internal
           }) => ({
@@ -1298,7 +1321,8 @@ const createStore = (invalidate, advance) => {
               // highest priority renders last (on top of the other frames)
               subscribers: [...internal.subscribers, {
                 ref,
-                priority
+                priority,
+                store
               }].sort((a, b) => a.priority - b.priority)
             }
           }));
@@ -1381,6 +1405,7 @@ function run(effects, timestamp) {
 }
 
 let subscribers;
+let subscription;
 
 function render$1(timestamp, state, frame) {
   // Run local effects
@@ -1395,7 +1420,10 @@ function render$1(timestamp, state, frame) {
 
   subscribers = state.internal.subscribers;
 
-  for (i = 0; i < subscribers.length; i++) subscribers[i].ref.current(state, delta, frame); // Render content
+  for (i = 0; i < subscribers.length; i++) {
+    subscription = subscribers[i];
+    subscription.ref.current(subscription.store.getState(), delta, frame);
+  } // Render content
 
 
   if (!state.internal.priority && state.gl.render) state.gl.render(state.scene, state.camera); // Decrease frame count
@@ -1474,12 +1502,13 @@ function useThree(selector = state => state, equalityFn) {
   return useStore()(selector, equalityFn);
 }
 function useFrame(callback, renderPriority = 0) {
-  const subscribe = useStore().getState().internal.subscribe; // Update ref
+  const store = useStore();
+  const subscribe = store.getState().internal.subscribe; // Update ref
 
   const ref = React__namespace.useRef(callback);
   React__namespace.useLayoutEffect(() => void (ref.current = callback), [callback]); // Subscribe on mount, unsubscribe on unmount
 
-  React__namespace.useLayoutEffect(() => subscribe(ref, renderPriority), [renderPriority, subscribe]);
+  React__namespace.useLayoutEffect(() => subscribe(ref, renderPriority, store), [renderPriority, subscribe, store]);
   return null;
 }
 function useGraph(object) {
@@ -1689,7 +1718,17 @@ function createRoot(canvas) {
       const outputEncoding = linear ? THREE__namespace.LinearEncoding : THREE__namespace.sRGBEncoding;
       const toneMapping = flat ? THREE__namespace.NoToneMapping : THREE__namespace.ACESFilmicToneMapping;
       if (gl.outputEncoding !== outputEncoding) gl.outputEncoding = outputEncoding;
-      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Set gl props
+      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Update color management state
+
+      if (state.legacy !== legacy) state.set(() => ({
+        legacy
+      }));
+      if (state.linear !== linear) state.set(() => ({
+        linear
+      }));
+      if (state.flat !== flat) state.set(() => ({
+        flat
+      })); // Set gl props
 
       if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, gl, shallowLoose)) applyProps(gl, glConfig); // Store events internally
 
@@ -1804,6 +1843,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
@@ -1826,6 +1866,7 @@ function Portal({
   } = state;
   const previousRoot = useStore();
   const [raycaster] = React__namespace.useState(() => new THREE__namespace.Raycaster());
+  const [pointer] = React__namespace.useState(() => new THREE__namespace.Vector2());
   const inject = React__namespace.useCallback((state, injectState) => {
     const intersect = { ...state
     };
@@ -1845,6 +1886,8 @@ function Portal({
       raycaster,
       events: { ...state.events,
         ...(injectState == null ? void 0 : injectState.events),
+        pointer,
+        mouse: pointer,
         ...events
       },
       ...rest

package/dist/{index-4557e6e6.cjs.prod.js → index-0e758026.cjs.prod.js}

@@ -334,10 +334,22 @@ function applyProps$1(instance, data) {
 
               if (!isColor && targetProp.setScalar) targetProp.setScalar(value); // Layers have no copy function, we must therefore copy the mask property
               else if (targetProp instanceof THREE__namespace.Layers && value instanceof THREE__namespace.Layers) targetProp.mask = value.mask; // Otherwise just set ...
-                else targetProp.set(value);
+                else targetProp.set(value); // For versions of three which don't support THREE.ColorManagement,
+              // Auto-convert sRGB colors
+              // https://github.com/pmndrs/react-three-fiber/issues/344
+
+              const supportsColorManagement = THREE__namespace.ColorManagement;
+              if (!supportsColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
             } // Else, just overwrite the value
 
-      } else currentInstance[key] = value;
+      } else {
+        currentInstance[key] = value; // Auto-convert sRGB textures, for now ...
+        // https://github.com/pmndrs/react-three-fiber/issues/344
+
+        if (!rootState.linear && currentInstance[key] instanceof THREE__namespace.Texture) {
+          currentInstance[key].encoding = THREE__namespace.sRGBEncoding;
+        }
+      }
 
     invalidateInstance(instance);
   });
@@ -468,7 +480,13 @@ function createEvents(store) {
       if (state) {
         state.raycaster.camera = undefined;
       }
-    }); // Collect events
+    });
+
+    if (!state.previousRoot) {
+      // Make sure root-level pointer and ray are set up
+      state.events.compute == null ? void 0 : state.events.compute(event, state);
+    } // Collect events
+
 
     let hits = eventsObjects // Intersect objects
     .flatMap(obj => {
@@ -842,8 +860,10 @@ function createRenderer(roots, getEventPriority) {
     let added = false;
 
     if (child) {
+      var _child$__r3f, _parentInstance$__r3f;
+
       // The attach attribute implies that the object attaches itself on the parent
-      if (child.__r3f.attach) {
+      if ((_child$__r3f = child.__r3f) != null && _child$__r3f.attach) {
         attach(parentInstance, child, child.__r3f.attach);
       } else if (child.isObject3D && parentInstance.isObject3D) {
         // add in the usual parent-child way
@@ -853,7 +873,7 @@ function createRenderer(roots, getEventPriority) {
       // that is, anything that's a child in React but not a child in the scenegraph.
 
 
-      if (!added) parentInstance.__r3f.objects.push(child);
+      if (!added) (_parentInstance$__r3f = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f.objects.push(child);
       if (!child.__r3f) prepare(child, {});
       child.__r3f.parent = parentInstance;
       updateInstance(child);
@@ -865,7 +885,9 @@ function createRenderer(roots, getEventPriority) {
     let added = false;
 
     if (child) {
-      if (child.__r3f.attach) {
+      var _child$__r3f2, _parentInstance$__r3f2;
+
+      if ((_child$__r3f2 = child.__r3f) != null && _child$__r3f2.attach) {
         attach(parentInstance, child, child.__r3f.attach);
       } else if (child.isObject3D && parentInstance.isObject3D) {
         child.parent = parentInstance;
@@ -878,7 +900,7 @@ function createRenderer(roots, getEventPriority) {
         added = true;
       }
 
-      if (!added) parentInstance.__r3f.objects.push(child);
+      if (!added) (_parentInstance$__r3f2 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f2.objects.push(child);
       if (!child.__r3f) prepare(child, {});
       child.__r3f.parent = parentInstance;
       updateInstance(child);
@@ -892,21 +914,21 @@ function createRenderer(roots, getEventPriority) {
 
   function removeChild(parentInstance, child, dispose) {
     if (child) {
-      var _parentInstance$__r3f, _child$__r3f2;
+      var _parentInstance$__r3f3, _child$__r3f3, _child$__r3f5;
 
       // Clear the parent reference
       if (child.__r3f) child.__r3f.parent = null; // Remove child from the parents objects
 
-      if ((_parentInstance$__r3f = parentInstance.__r3f) != null && _parentInstance$__r3f.objects) parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child); // Remove attachment
+      if ((_parentInstance$__r3f3 = parentInstance.__r3f) != null && _parentInstance$__r3f3.objects) parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child); // Remove attachment
 
-      if (child.__r3f.attach) {
+      if ((_child$__r3f3 = child.__r3f) != null && _child$__r3f3.attach) {
         detach(parentInstance, child, child.__r3f.attach);
       } else if (child.isObject3D && parentInstance.isObject3D) {
-        var _child$__r3f;
+        var _child$__r3f4;
 
         parentInstance.remove(child); // Remove interactivity
 
-        if ((_child$__r3f = child.__r3f) != null && _child$__r3f.root) {
+        if ((_child$__r3f4 = child.__r3f) != null && _child$__r3f4.root) {
           removeInteractivity(child.__r3f.root, child);
         }
       } // Allow objects to bail out of recursive dispose alltogether by passing dispose={null}
@@ -920,14 +942,14 @@ function createRenderer(roots, getEventPriority) {
       // when the reconciler calls it, but then carry our own check recursively
 
 
-      const isPrimitive = (_child$__r3f2 = child.__r3f) == null ? void 0 : _child$__r3f2.primitive;
+      const isPrimitive = (_child$__r3f5 = child.__r3f) == null ? void 0 : _child$__r3f5.primitive;
       const shouldDispose = dispose === undefined ? child.dispose !== null && !isPrimitive : dispose; // Remove nested child objects. Primitives should not have objects and children that are
       // attached to them declaratively ...
 
       if (!isPrimitive) {
-        var _child$__r3f3;
+        var _child$__r3f6;
 
-        removeRecursive((_child$__r3f3 = child.__r3f) == null ? void 0 : _child$__r3f3.objects, child, shouldDispose);
+        removeRecursive((_child$__r3f6 = child.__r3f) == null ? void 0 : _child$__r3f6.objects, child, shouldDispose);
         removeRecursive(child.children, child, shouldDispose);
       } // Remove references
 
@@ -1192,6 +1214,7 @@ const createStore = (invalidate, advance) => {
       xr: null,
       invalidate: () => invalidate(get()),
       advance: (timestamp, runGlobalEffects) => advance(timestamp, runGlobalEffects, get()),
+      legacy: false,
       linear: false,
       flat: false,
       scene: prepare(new THREE__namespace.Scene()),
@@ -1284,7 +1307,7 @@ const createStore = (invalidate, advance) => {
         initialClick: [0, 0],
         initialHits: [],
         capturedMap: new Map(),
-        subscribe: (ref, priority = 0) => {
+        subscribe: (ref, priority, store) => {
           set(({
             internal
           }) => ({
@@ -1298,7 +1321,8 @@ const createStore = (invalidate, advance) => {
               // highest priority renders last (on top of the other frames)
               subscribers: [...internal.subscribers, {
                 ref,
-                priority
+                priority,
+                store
               }].sort((a, b) => a.priority - b.priority)
             }
           }));
@@ -1381,6 +1405,7 @@ function run(effects, timestamp) {
 }
 
 let subscribers;
+let subscription;
 
 function render$1(timestamp, state, frame) {
   // Run local effects
@@ -1395,7 +1420,10 @@ function render$1(timestamp, state, frame) {
 
   subscribers = state.internal.subscribers;
 
-  for (i = 0; i < subscribers.length; i++) subscribers[i].ref.current(state, delta, frame); // Render content
+  for (i = 0; i < subscribers.length; i++) {
+    subscription = subscribers[i];
+    subscription.ref.current(subscription.store.getState(), delta, frame);
+  } // Render content
 
 
   if (!state.internal.priority && state.gl.render) state.gl.render(state.scene, state.camera); // Decrease frame count
@@ -1474,12 +1502,13 @@ function useThree(selector = state => state, equalityFn) {
   return useStore()(selector, equalityFn);
 }
 function useFrame(callback, renderPriority = 0) {
-  const subscribe = useStore().getState().internal.subscribe; // Update ref
+  const store = useStore();
+  const subscribe = store.getState().internal.subscribe; // Update ref
 
   const ref = React__namespace.useRef(callback);
   React__namespace.useLayoutEffect(() => void (ref.current = callback), [callback]); // Subscribe on mount, unsubscribe on unmount
 
-  React__namespace.useLayoutEffect(() => subscribe(ref, renderPriority), [renderPriority, subscribe]);
+  React__namespace.useLayoutEffect(() => subscribe(ref, renderPriority, store), [renderPriority, subscribe, store]);
   return null;
 }
 function useGraph(object) {
@@ -1689,7 +1718,17 @@ function createRoot(canvas) {
       const outputEncoding = linear ? THREE__namespace.LinearEncoding : THREE__namespace.sRGBEncoding;
       const toneMapping = flat ? THREE__namespace.NoToneMapping : THREE__namespace.ACESFilmicToneMapping;
       if (gl.outputEncoding !== outputEncoding) gl.outputEncoding = outputEncoding;
-      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Set gl props
+      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Update color management state
+
+      if (state.legacy !== legacy) state.set(() => ({
+        legacy
+      }));
+      if (state.linear !== linear) state.set(() => ({
+        linear
+      }));
+      if (state.flat !== flat) state.set(() => ({
+        flat
+      })); // Set gl props
 
       if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, gl, shallowLoose)) applyProps(gl, glConfig); // Store events internally
 
@@ -1804,6 +1843,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
@@ -1826,6 +1866,7 @@ function Portal({
   } = state;
   const previousRoot = useStore();
   const [raycaster] = React__namespace.useState(() => new THREE__namespace.Raycaster());
+  const [pointer] = React__namespace.useState(() => new THREE__namespace.Vector2());
   const inject = React__namespace.useCallback((state, injectState) => {
     const intersect = { ...state
     };
@@ -1845,6 +1886,8 @@ function Portal({
       raycaster,
       events: { ...state.events,
         ...(injectState == null ? void 0 : injectState.events),
+        pointer,
+        mouse: pointer,
         ...events
       },
       ...rest

package/dist/{index-1155e5bd.esm.js → index-91900b41.esm.js}

@@ -305,10 +305,22 @@ function applyProps$1(instance, data) {
 
               if (!isColor && targetProp.setScalar) targetProp.setScalar(value); // Layers have no copy function, we must therefore copy the mask property
               else if (targetProp instanceof THREE.Layers && value instanceof THREE.Layers) targetProp.mask = value.mask; // Otherwise just set ...
-                else targetProp.set(value);
+                else targetProp.set(value); // For versions of three which don't support THREE.ColorManagement,
+              // Auto-convert sRGB colors
+              // https://github.com/pmndrs/react-three-fiber/issues/344
+
+              const supportsColorManagement = THREE.ColorManagement;
+              if (!supportsColorManagement && !rootState.linear && isColor) targetProp.convertSRGBToLinear();
             } // Else, just overwrite the value
 
-      } else currentInstance[key] = value;
+      } else {
+        currentInstance[key] = value; // Auto-convert sRGB textures, for now ...
+        // https://github.com/pmndrs/react-three-fiber/issues/344
+
+        if (!rootState.linear && currentInstance[key] instanceof THREE.Texture) {
+          currentInstance[key].encoding = THREE.sRGBEncoding;
+        }
+      }
 
     invalidateInstance(instance);
   });
@@ -439,7 +451,13 @@ function createEvents(store) {
       if (state) {
         state.raycaster.camera = undefined;
       }
-    }); // Collect events
+    });
+
+    if (!state.previousRoot) {
+      // Make sure root-level pointer and ray are set up
+      state.events.compute == null ? void 0 : state.events.compute(event, state);
+    } // Collect events
+
 
     let hits = eventsObjects // Intersect objects
     .flatMap(obj => {
@@ -813,8 +831,10 @@ function createRenderer(roots, getEventPriority) {
     let added = false;
 
     if (child) {
+      var _child$__r3f, _parentInstance$__r3f;
+
       // The attach attribute implies that the object attaches itself on the parent
-      if (child.__r3f.attach) {
+      if ((_child$__r3f = child.__r3f) != null && _child$__r3f.attach) {
         attach(parentInstance, child, child.__r3f.attach);
       } else if (child.isObject3D && parentInstance.isObject3D) {
         // add in the usual parent-child way
@@ -824,7 +844,7 @@ function createRenderer(roots, getEventPriority) {
       // that is, anything that's a child in React but not a child in the scenegraph.
 
 
-      if (!added) parentInstance.__r3f.objects.push(child);
+      if (!added) (_parentInstance$__r3f = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f.objects.push(child);
       if (!child.__r3f) prepare(child, {});
       child.__r3f.parent = parentInstance;
       updateInstance(child);
@@ -836,7 +856,9 @@ function createRenderer(roots, getEventPriority) {
     let added = false;
 
     if (child) {
-      if (child.__r3f.attach) {
+      var _child$__r3f2, _parentInstance$__r3f2;
+
+      if ((_child$__r3f2 = child.__r3f) != null && _child$__r3f2.attach) {
         attach(parentInstance, child, child.__r3f.attach);
       } else if (child.isObject3D && parentInstance.isObject3D) {
         child.parent = parentInstance;
@@ -849,7 +871,7 @@ function createRenderer(roots, getEventPriority) {
         added = true;
       }
 
-      if (!added) parentInstance.__r3f.objects.push(child);
+      if (!added) (_parentInstance$__r3f2 = parentInstance.__r3f) == null ? void 0 : _parentInstance$__r3f2.objects.push(child);
       if (!child.__r3f) prepare(child, {});
       child.__r3f.parent = parentInstance;
       updateInstance(child);
@@ -863,21 +885,21 @@ function createRenderer(roots, getEventPriority) {
 
   function removeChild(parentInstance, child, dispose) {
     if (child) {
-      var _parentInstance$__r3f, _child$__r3f2;
+      var _parentInstance$__r3f3, _child$__r3f3, _child$__r3f5;
 
       // Clear the parent reference
       if (child.__r3f) child.__r3f.parent = null; // Remove child from the parents objects
 
-      if ((_parentInstance$__r3f = parentInstance.__r3f) != null && _parentInstance$__r3f.objects) parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child); // Remove attachment
+      if ((_parentInstance$__r3f3 = parentInstance.__r3f) != null && _parentInstance$__r3f3.objects) parentInstance.__r3f.objects = parentInstance.__r3f.objects.filter(x => x !== child); // Remove attachment
 
-      if (child.__r3f.attach) {
+      if ((_child$__r3f3 = child.__r3f) != null && _child$__r3f3.attach) {
         detach(parentInstance, child, child.__r3f.attach);
       } else if (child.isObject3D && parentInstance.isObject3D) {
-        var _child$__r3f;
+        var _child$__r3f4;
 
         parentInstance.remove(child); // Remove interactivity
 
-        if ((_child$__r3f = child.__r3f) != null && _child$__r3f.root) {
+        if ((_child$__r3f4 = child.__r3f) != null && _child$__r3f4.root) {
           removeInteractivity(child.__r3f.root, child);
         }
       } // Allow objects to bail out of recursive dispose alltogether by passing dispose={null}
@@ -891,14 +913,14 @@ function createRenderer(roots, getEventPriority) {
       // when the reconciler calls it, but then carry our own check recursively
 
 
-      const isPrimitive = (_child$__r3f2 = child.__r3f) == null ? void 0 : _child$__r3f2.primitive;
+      const isPrimitive = (_child$__r3f5 = child.__r3f) == null ? void 0 : _child$__r3f5.primitive;
       const shouldDispose = dispose === undefined ? child.dispose !== null && !isPrimitive : dispose; // Remove nested child objects. Primitives should not have objects and children that are
       // attached to them declaratively ...
 
       if (!isPrimitive) {
-        var _child$__r3f3;
+        var _child$__r3f6;
 
-        removeRecursive((_child$__r3f3 = child.__r3f) == null ? void 0 : _child$__r3f3.objects, child, shouldDispose);
+        removeRecursive((_child$__r3f6 = child.__r3f) == null ? void 0 : _child$__r3f6.objects, child, shouldDispose);
         removeRecursive(child.children, child, shouldDispose);
       } // Remove references
 
@@ -1163,6 +1185,7 @@ const createStore = (invalidate, advance) => {
       xr: null,
       invalidate: () => invalidate(get()),
       advance: (timestamp, runGlobalEffects) => advance(timestamp, runGlobalEffects, get()),
+      legacy: false,
       linear: false,
       flat: false,
       scene: prepare(new THREE.Scene()),
@@ -1255,7 +1278,7 @@ const createStore = (invalidate, advance) => {
         initialClick: [0, 0],
         initialHits: [],
         capturedMap: new Map(),
-        subscribe: (ref, priority = 0) => {
+        subscribe: (ref, priority, store) => {
           set(({
             internal
           }) => ({
@@ -1269,7 +1292,8 @@ const createStore = (invalidate, advance) => {
               // highest priority renders last (on top of the other frames)
               subscribers: [...internal.subscribers, {
                 ref,
-                priority
+                priority,
+                store
               }].sort((a, b) => a.priority - b.priority)
             }
           }));
@@ -1352,6 +1376,7 @@ function run(effects, timestamp) {
 }
 
 let subscribers;
+let subscription;
 
 function render$1(timestamp, state, frame) {
   // Run local effects
@@ -1366,7 +1391,10 @@ function render$1(timestamp, state, frame) {
 
   subscribers = state.internal.subscribers;
 
-  for (i = 0; i < subscribers.length; i++) subscribers[i].ref.current(state, delta, frame); // Render content
+  for (i = 0; i < subscribers.length; i++) {
+    subscription = subscribers[i];
+    subscription.ref.current(subscription.store.getState(), delta, frame);
+  } // Render content
 
 
   if (!state.internal.priority && state.gl.render) state.gl.render(state.scene, state.camera); // Decrease frame count
@@ -1445,12 +1473,13 @@ function useThree(selector = state => state, equalityFn) {
   return useStore()(selector, equalityFn);
 }
 function useFrame(callback, renderPriority = 0) {
-  const subscribe = useStore().getState().internal.subscribe; // Update ref
+  const store = useStore();
+  const subscribe = store.getState().internal.subscribe; // Update ref
 
   const ref = React.useRef(callback);
   React.useLayoutEffect(() => void (ref.current = callback), [callback]); // Subscribe on mount, unsubscribe on unmount
 
-  React.useLayoutEffect(() => subscribe(ref, renderPriority), [renderPriority, subscribe]);
+  React.useLayoutEffect(() => subscribe(ref, renderPriority, store), [renderPriority, subscribe, store]);
   return null;
 }
 function useGraph(object) {
@@ -1660,7 +1689,17 @@ function createRoot(canvas) {
       const outputEncoding = linear ? THREE.LinearEncoding : THREE.sRGBEncoding;
       const toneMapping = flat ? THREE.NoToneMapping : THREE.ACESFilmicToneMapping;
       if (gl.outputEncoding !== outputEncoding) gl.outputEncoding = outputEncoding;
-      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Set gl props
+      if (gl.toneMapping !== toneMapping) gl.toneMapping = toneMapping; // Update color management state
+
+      if (state.legacy !== legacy) state.set(() => ({
+        legacy
+      }));
+      if (state.linear !== linear) state.set(() => ({
+        linear
+      }));
+      if (state.flat !== flat) state.set(() => ({
+        flat
+      })); // Set gl props
 
       if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, gl, shallowLoose)) applyProps(gl, glConfig); // Store events internally
 
@@ -1775,6 +1814,7 @@ function unmountComponentAtNode(canvas, callback) {
 
 function createPortal(children, container, state) {
   return /*#__PURE__*/React.createElement(Portal, {
+    key: container.uuid,
     children: children,
     container: container,
     state: state
@@ -1797,6 +1837,7 @@ function Portal({
   } = state;
   const previousRoot = useStore();
   const [raycaster] = React.useState(() => new THREE.Raycaster());
+  const [pointer] = React.useState(() => new THREE.Vector2());
   const inject = React.useCallback((state, injectState) => {
     const intersect = { ...state
     };
@@ -1816,6 +1857,8 @@ function Portal({
       raycaster,
       events: { ...state.events,
         ...(injectState == null ? void 0 : injectState.events),
+        pointer,
+        mouse: pointer,
         ...events
       },
       ...rest

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-77a5f42b.cjs.dev.js');
+var index = require('./index-0076cbd6.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -117,7 +117,7 @@ function createPointerEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-4557e6e6.cjs.prod.js');
+var index = require('./index-0e758026.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -117,7 +117,7 @@ function createPointerEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

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

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from './index-1155e5bd.esm.js';
-export { t as ReactThreeFiber, v as _roots, s as act, m as addAfterEffect, l as addEffect, n as addTail, k as advance, h as applyProps, d as context, f as createPortal, a as createRoot, i as dispose, e as extend, q as getRootState, j as invalidate, g as reconciler, r as render, b as unmountComponentAtNode, y as useFrame, z as useGraph, A as useLoader, u as useMemoizedFn, w as useStore, x as useThree } from './index-1155e5bd.esm.js';
+import { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from './index-91900b41.esm.js';
+export { t as ReactThreeFiber, v as _roots, s as act, m as addAfterEffect, l as addEffect, n as addTail, k as advance, h as applyProps, d as context, f as createPortal, a as createRoot, i as dispose, e as extend, q as getRootState, j as invalidate, g as reconciler, r as render, b as unmountComponentAtNode, y as useFrame, z as useGraph, A as useLoader, u as useMemoizedFn, w as useStore, x as useThree } from './index-91900b41.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
@@ -87,7 +87,7 @@ function createPointerEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'dpr', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var THREE = require('three');
 var expoAsset = require('expo-asset');
-var index = require('../../dist/index-77a5f42b.cjs.dev.js');
+var index = require('../../dist/index-0076cbd6.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var mergeRefs = require('react-merge-refs');
@@ -125,7 +125,7 @@ function createTouchEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

package/native/dist/react-three-fiber-native.cjs.prod.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var THREE = require('three');
 var expoAsset = require('expo-asset');
-var index = require('../../dist/index-4557e6e6.cjs.prod.js');
+var index = require('../../dist/index-0e758026.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var mergeRefs = require('react-merge-refs');
@@ -125,7 +125,7 @@ function createTouchEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

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

@@ -1,7 +1,7 @@
 import * as THREE from 'three';
 import { Asset } from 'expo-asset';
-import { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from '../../dist/index-1155e5bd.esm.js';
-export { t as ReactThreeFiber, v as _roots, s as act, m as addAfterEffect, l as addEffect, n as addTail, k as advance, h as applyProps, d as context, f as createPortal, a as createRoot, i as dispose, e as extend, q as getRootState, j as invalidate, g as reconciler, r as render, b as unmountComponentAtNode, y as useFrame, z as useGraph, A as useLoader, u as useMemoizedFn, w as useStore, x as useThree } from '../../dist/index-1155e5bd.esm.js';
+import { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from '../../dist/index-91900b41.esm.js';
+export { t as ReactThreeFiber, v as _roots, s as act, m as addAfterEffect, l as addEffect, n as addTail, k as advance, h as applyProps, d as context, f as createPortal, a as createRoot, i as dispose, e as extend, q as getRootState, j as invalidate, g as reconciler, r as render, b as unmountComponentAtNode, y as useFrame, z as useGraph, A as useLoader, u as useMemoizedFn, w as useStore, x as useThree } from '../../dist/index-91900b41.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import mergeRefs from 'react-merge-refs';
@@ -95,7 +95,7 @@ function createTouchEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'legacy', 'orthographic', 'frameloop', 'performance', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
   set

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.0.3",
+  "version": "8.0.6",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",
@@ -58,7 +58,7 @@
     "react": ">=18.0",
     "react-dom": ">=18.0",
     "react-native": ">=0.64",
-    "three": ">=0.139"
+    "three": ">=0.133"
   },
   "peerDependenciesMeta": {
     "react-dom": {