@react-three/fiber 7.0.16 → 7.0.20

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

@@ -1,7 +1,6 @@
 import * as THREE from 'three';
 import * as React from 'react';
 import create from 'zustand';
-import shallow from 'zustand/shallow';
 import Reconciler from 'react-reconciler';
 import { unstable_now, unstable_runWithPriority, unstable_IdlePriority } from 'scheduler';
 import { useAsset } from 'use-asset';
@@ -42,6 +41,23 @@ const is = {
 function makeId(event) {
   return (event.eventObject || event.object).uuid + '/' + event.index + event.instanceId;
 }
+/** Release pointer captures.
+ * This is called by releasePointerCapture in the API, and when an object is removed.
+ */
+
+
+function releaseInternalPointerCapture(capturedMap, obj, captures, pointerId) {
+  const captureData = captures.get(obj);
+
+  if (captureData) {
+    captures.delete(obj); // If this was the last capturing object for this pointer
+
+    if (captures.size === 0) {
+      capturedMap.delete(pointerId);
+      captureData.target.releasePointerCapture(pointerId);
+    }
+  }
+}
 
 function removeInteractivity(store, object) {
   const {
@@ -55,6 +71,9 @@ function removeInteractivity(store, object) {
       internal.hovered.delete(key);
     }
   });
+  internal.capturedMap.forEach((captures, pointerId) => {
+    releaseInternalPointerCapture(internal.capturedMap, object, captures, pointerId);
+  });
 }
 function createEvents(store) {
   const temp = new THREE.Vector3();
@@ -134,7 +153,7 @@ function createEvents(store) {
       while (eventObject) {
         var _r3f2;
 
-        if ((_r3f2 = eventObject.__r3f) != null && _r3f2.handlers.count) intersections.push({ ...intersect,
+        if ((_r3f2 = eventObject.__r3f) != null && _r3f2.eventCount) intersections.push({ ...intersect,
           eventObject
         });
         eventObject = eventObject.parent;
@@ -153,7 +172,9 @@ function createEvents(store) {
     // intersect.
 
     if ('pointerId' in event && internal.capturedMap.has(event.pointerId)) {
-      intersections.push(...internal.capturedMap.get(event.pointerId).values());
+      for (let captureData of internal.capturedMap.get(event.pointerId).values()) {
+        intersections.push(captureData.intersection);
+      }
     }
 
     return intersections;
@@ -171,9 +192,6 @@ function createEvents(store) {
 
     if (intersections.length) {
       const unprojectedPoint = temp.set(mouse.x, mouse.y, 0).unproject(camera);
-
-      const releasePointerCapture = id => event.target.releasePointerCapture(id);
-
       const localState = {
         stopped: false
       };
@@ -186,23 +204,36 @@ function createEvents(store) {
         };
 
         const setPointerCapture = id => {
+          const captureData = {
+            intersection: hit,
+            target: event.target
+          };
+
           if (internal.capturedMap.has(id)) {
             // if the pointerId was previously captured, we add the hit to the
             // event capturedMap.
-            internal.capturedMap.get(id).set(hit.eventObject, hit);
+            internal.capturedMap.get(id).set(hit.eventObject, captureData);
           } else {
             // if the pointerId was not previously captured, we create a map
             // containing the hitObject, and the hit. hitObject is used for
             // faster access.
-            internal.capturedMap.set(id, new Map([[hit.eventObject, hit]]));
+            internal.capturedMap.set(id, new Map([[hit.eventObject, captureData]]));
           } // Call the original event now
           event.target.setPointerCapture(id);
+        };
+
+        const releasePointerCapture = id => {
+          const captures = internal.capturedMap.get(id);
+
+          if (captures) {
+            releaseInternalPointerCapture(internal.capturedMap, hit.eventObject, captures, id);
+          }
         }; // Add native event props
 
 
-        let extractEventProps = {};
+        let extractEventProps = {}; // This iterates over the event's properties including the inherited ones. Native PointerEvents have most of their props as getters which are inherited, but polyfilled PointerEvents have them all as their own properties (i.e. not inherited). We can't use Object.keys() or Object.entries() as they only return "own" properties; nor Object.getPrototypeOf(event) as that *doesn't* return "own" properties, only inherited ones.
 
-        for (let prop in Object.getPrototypeOf(event)) {
+        for (let prop in event) {
           let property = event[prop]; // Only copy over atomics, leave functions alone as these should be
           // called as event.nativeEvent.fn()
 
@@ -271,13 +302,12 @@ function createEvents(store) {
       // When no objects were hit or the the hovered object wasn't found underneath the cursor
       // we call onPointerOut and delete the object from the hovered-elements map
       if (!hits.length || !hits.find(hit => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId)) {
-        var _r3f3;
-
         const eventObject = hoveredObj.eventObject;
-        const handlers = (_r3f3 = eventObject.__r3f) == null ? void 0 : _r3f3.handlers;
+        const instance = eventObject.__r3f;
+        const handlers = instance == null ? void 0 : instance.handlers;
         internal.hovered.delete(makeId(hoveredObj));
 
-        if (handlers != null && handlers.count) {
+        if (instance != null && instance.eventCount) {
           // Clear out intersects, they are outdated by now
           const data = { ...hoveredObj,
             intersections: hits || []
@@ -299,9 +329,8 @@ function createEvents(store) {
       case 'onLostPointerCapture':
         return event => {
           if ('pointerId' in event) {
-            // this will be a problem if one target releases the pointerId
-            // and another one is still keeping it, as the line below
-            // indifferently deletes all capturing references.
+            // If the object event interface had onLostPointerCapture, we'd call it here on every
+            // object that's getting removed.
             store.getState().internal.capturedMap.delete(event.pointerId);
           }
 
@@ -340,12 +369,11 @@ function createEvents(store) {
 
       if (isPointerMove) cancelPointer(hits);
       handleIntersects(hits, event, delta, data => {
-        var _r3f4;
-
         const eventObject = data.eventObject;
-        const handlers = (_r3f4 = eventObject.__r3f) == null ? void 0 : _r3f4.handlers; // Check presence of handlers
+        const instance = eventObject.__r3f;
+        const handlers = instance == null ? void 0 : instance.handlers; // Check presence of handlers
 
-        if (!(handlers != null && handlers.count)) return;
+        if (!(instance != null && instance.eventCount)) return;
 
         if (isPointerMove) {
           // Move event ...
@@ -388,9 +416,9 @@ function createEvents(store) {
 
   function pointerMissed(event, objects) {
     objects.forEach(object => {
-      var _r3f5;
+      var _r3f3;
 
-      return (_r3f5 = object.__r3f) == null ? void 0 : _r3f5.handlers.onPointerMissed == null ? void 0 : _r3f5.handlers.onPointerMissed(event);
+      return (_r3f3 = object.__r3f) == null ? void 0 : _r3f3.handlers.onPointerMissed == null ? void 0 : _r3f3.handlers.onPointerMissed(event);
     });
   }
 
@@ -441,9 +469,8 @@ function prepare(object, state) {
     instance.__r3f = {
       root: null,
       memoizedProps: {},
-      handlers: {
-        count: 0
-      },
+      eventCount: 0,
+      handlers: {},
       objects: [],
       parent: null,
       ...state
@@ -504,7 +531,7 @@ function createRenderer(roots) {
   }
 
   function applyProps(instance, data) {
-    var _instance$__r3f3, _root$getState, _localState$handlers, _localState$handlers2, _instance$__r3f4;
+    var _instance$__r3f3, _root$getState, _instance$__r3f4;
 
     // Filter equals, events and reserved props
     const localState = (_instance$__r3f3 = instance == null ? void 0 : instance.__r3f) != null ? _instance$__r3f3 : {};
@@ -514,7 +541,7 @@ function createRenderer(roots) {
       memoized,
       changes
     } = isDiffSet(data) ? data : diffProps(instance, data);
-    const prevHandlers = (_localState$handlers = localState.handlers) == null ? void 0 : _localState$handlers.count; // Prepare memoized props
+    const prevHandlers = localState.eventCount; // Prepare memoized props
 
     if (instance.__r3f) instance.__r3f.memoizedProps = memoized;
     changes.forEach(([key, value, isEvent, keys]) => {
@@ -553,7 +580,7 @@ function createRenderer(roots) {
 
       if (isEvent) {
         if (value) localState.handlers[key] = value;else delete localState.handlers[key];
-        localState.handlers.count = Object.keys(localState.handlers).length;
+        localState.eventCount = Object.keys(localState.handlers).length;
       } // Special treatment for objects with support for set/copy, and layers
       else if (targetProp && targetProp.set && (targetProp.copy || targetProp instanceof THREE.Layers)) {
           // If value is an array
@@ -561,21 +588,21 @@ function createRenderer(roots) {
             if (targetProp.fromArray) targetProp.fromArray(value);else targetProp.set(...value);
           } // Test again target.copy(class) next ...
           else if (targetProp.copy && value && value.constructor && targetProp.constructor.name === value.constructor.name) targetProp.copy(value); // If nothing else fits, just set the single value, ignore undefined
-            // https://github.com/react-spring/react-three-fiber/issues/274
+            // https://github.com/pmndrs/react-three-fiber/issues/274
             else if (value !== undefined) {
                 const isColor = targetProp instanceof THREE.Color; // Allow setting array scalars
 
                 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); // Auto-convert sRGB colors, for now ...
-                // https://github.com/react-spring/react-three-fiber/issues/344
+                // https://github.com/pmndrs/react-three-fiber/issues/344
 
                 if (!rootState.linear && isColor) targetProp.convertSRGBToLinear();
               } // Else, just overwrite the value
 
         } else {
           currentInstance[key] = value; // Auto-convert sRGB textures, for now ...
-          // https://github.com/react-spring/react-three-fiber/issues/344
+          // https://github.com/pmndrs/react-three-fiber/issues/344
 
           if (!rootState.linear && currentInstance[key] instanceof THREE.Texture) currentInstance[key].encoding = THREE.sRGBEncoding;
         }
@@ -583,12 +610,12 @@ function createRenderer(roots) {
       invalidateInstance(instance);
     });
 
-    if (rootState.internal && instance.raycast && prevHandlers !== ((_localState$handlers2 = localState.handlers) == null ? void 0 : _localState$handlers2.count)) {
+    if (rootState.internal && instance.raycast && prevHandlers !== localState.eventCount) {
       // Pre-emptively remove the instance from the interaction manager
       const index = rootState.internal.interaction.indexOf(instance);
       if (index > -1) rootState.internal.interaction.splice(index, 1); // Add the instance to the interaction manager only when it has handlers
 
-      if (localState.handlers.count) rootState.internal.interaction.push(instance);
+      if (localState.eventCount) rootState.internal.interaction.push(instance);
     } // Call the update lifecycle when it is being updated
 
 
@@ -779,7 +806,7 @@ function createRenderer(roots) {
         } else if (is.fun(detachFn)) {
           detachFn(child, parentInstance);
         }
-      } else if (child.isObject3D) {
+      } else if (child.isObject3D && parentInstance.isObject3D) {
         var _child$__r3f;
 
         parentInstance.remove(child); // Remove interactivity
@@ -1025,11 +1052,11 @@ const createStore = (applyProps, invalidate, advance, props) => {
   if (shadows) {
     gl.shadowMap.enabled = true;
     if (typeof shadows === 'object') Object.assign(gl.shadowMap, shadows);else gl.shadowMap.type = THREE.PCFSoftShadowMap;
-  } // Set color management
+  } // Set color preferences
 
 
-  if (!linear) gl.outputEncoding = THREE.sRGBEncoding;
-  if (!flat) gl.toneMapping = THREE.ACESFilmicToneMapping; // clock.elapsedTime is updated using advance(timestamp)
+  if (linear) gl.outputEncoding = THREE.LinearEncoding;
+  if (flat) gl.toneMapping = THREE.NoToneMapping; // clock.elapsedTime is updated using advance(timestamp)
 
   if (frameloop === 'never') {
     clock.stop();
@@ -1218,38 +1245,45 @@ const createStore = (applyProps, invalidate, advance, props) => {
         }
       }
     };
-  }); // Resize camera and renderer on changes to size and pixelratio
+  });
+  const state = rootState.getState(); // Resize camera and renderer on changes to size and pixelratio
 
+  let oldSize = state.size;
+  let oldDpr = state.viewport.dpr;
   rootState.subscribe(() => {
     const {
       camera,
       size,
       viewport,
       internal
-    } = rootState.getState(); // https://github.com/pmndrs/react-three-fiber/issues/92
-    // Do not mess with the camera if it belongs to the user
-
-    if (!(internal.lastProps.camera instanceof THREE.Camera)) {
-      if (isOrthographicCamera(camera)) {
-        camera.left = size.width / -2;
-        camera.right = size.width / 2;
-        camera.top = size.height / 2;
-        camera.bottom = size.height / -2;
-      } else {
-        camera.aspect = size.width / size.height;
-      }
+    } = rootState.getState();
+
+    if (size !== oldSize || viewport.dpr !== oldDpr) {
+      // https://github.com/pmndrs/react-three-fiber/issues/92
+      // Do not mess with the camera if it belongs to the user
+      if (!(internal.lastProps.camera instanceof THREE.Camera)) {
+        if (isOrthographicCamera(camera)) {
+          camera.left = size.width / -2;
+          camera.right = size.width / 2;
+          camera.top = size.height / 2;
+          camera.bottom = size.height / -2;
+        } else {
+          camera.aspect = size.width / size.height;
+        }
 
-      camera.updateProjectionMatrix(); // https://github.com/pmndrs/react-three-fiber/issues/178
-      // Update matrix world since the renderer is a frame late
+        camera.updateProjectionMatrix(); // https://github.com/pmndrs/react-three-fiber/issues/178
+        // Update matrix world since the renderer is a frame late
 
-      camera.updateMatrixWorld();
-    } // Update renderer
+        camera.updateMatrixWorld();
+      } // Update renderer
 
 
-    gl.setPixelRatio(viewport.dpr);
-    gl.setSize(size.width, size.height);
-  }, state => [state.viewport.dpr, state.size], shallow);
-  const state = rootState.getState(); // Update size
+      gl.setPixelRatio(viewport.dpr);
+      gl.setSize(size.width, size.height);
+      oldSize = size;
+      oldDpr = viewport.dpr;
+    }
+  }); // Update size
 
   if (size) state.setSize(size.width, size.height); // Invalidate on any change
 
@@ -1613,7 +1647,11 @@ const createRendererInstance = (gl, canvas) => {
     antialias: true,
     alpha: true,
     ...gl
-  });
+  }); // Set color management
+
+  renderer.outputEncoding = THREE.sRGBEncoding;
+  renderer.toneMapping = THREE.ACESFilmicToneMapping; // Set gl props
+
   if (gl) applyProps(renderer, gl);
   return renderer;
 };

package/native/dist/react-three-fiber-native.cjs.d.ts

@@ -0,0 +1 @@
+export * from "../../dist/declarations/src/native";