@react-three/fiber 7.0.23 → 7.0.24

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @react-three/fiber
 
+## 7.0.24
+
+### Patch Changes
+
+- 7f46ddf: cleanup captured pointers when released (#1914)
+
 ## 7.0.23
 
 ### Patch Changes

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

@@ -74,7 +74,8 @@ const is = {
 function makeId(event) {
   return (event.eventObject || event.object).uuid + '/' + event.index + event.instanceId;
 }
-/** Release pointer captures.
+/**
+ * Release pointer captures.
  * This is called by releasePointerCapture in the API, and when an object is removed.
  */
 
@@ -361,13 +362,16 @@ function createEvents(store) {
 
       case 'onLostPointerCapture':
         return event => {
-          if ('pointerId' in event) {
+          const {
+            internal
+          } = store.getState();
+
+          if ('pointerId' in event && !internal.capturedMap.has(event.pointerId)) {
             // 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);
+            internal.capturedMap.delete(event.pointerId);
+            cancelPointer([]);
           }
-
-          cancelPointer([]);
         };
     } // Any other pointer goes here ...
 
@@ -837,7 +841,7 @@ function createRenderer(roots) {
         parentInstance[child.attachArray] = parentInstance[child.attachArray].filter(x => x !== child);
       } else if (child.attachObject) {
         delete parentInstance[child.attachObject[0]][child.attachObject[1]];
-      } else if (child.attach && !is.fun(child.attach)) {
+      } else if (child.attach && !is.fun(child.attach) && parentInstance[child.attach] === child) {
         parentInstance[child.attach] = null;
       } else if (is.arr(child.attachFns)) {
         const [, detachFn] = child.attachFns;
@@ -985,7 +989,17 @@ function createRenderer(roots) {
         if (argsNew.some((value, index) => value !== argsOld[index])) return [true]; // Create a diff-set, flag if there are any changes
 
         const diff = diffProps(instance, restNew, restOld, true);
-        if (diff.changes.length) return [false, diff]; // Otherwise do not touch the instance
+        if (diff.changes.length) return [false, diff]; // If instance was never attached, attach it
+
+        if (instance.attach && typeof instance.attach !== 'function') {
+          const localState = instance.__r3f;
+          const parent = localState.parent;
+
+          if (parent && parent[instance.attach] !== instance) {
+            appendChild(parent, instance);
+          }
+        } // Otherwise do not touch the instance
+
 
         return null;
       }

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

@@ -74,7 +74,8 @@ const is = {
 function makeId(event) {
   return (event.eventObject || event.object).uuid + '/' + event.index + event.instanceId;
 }
-/** Release pointer captures.
+/**
+ * Release pointer captures.
  * This is called by releasePointerCapture in the API, and when an object is removed.
  */
 
@@ -361,13 +362,16 @@ function createEvents(store) {
 
       case 'onLostPointerCapture':
         return event => {
-          if ('pointerId' in event) {
+          const {
+            internal
+          } = store.getState();
+
+          if ('pointerId' in event && !internal.capturedMap.has(event.pointerId)) {
             // 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);
+            internal.capturedMap.delete(event.pointerId);
+            cancelPointer([]);
           }
-
-          cancelPointer([]);
         };
     } // Any other pointer goes here ...
 
@@ -837,7 +841,7 @@ function createRenderer(roots) {
         parentInstance[child.attachArray] = parentInstance[child.attachArray].filter(x => x !== child);
       } else if (child.attachObject) {
         delete parentInstance[child.attachObject[0]][child.attachObject[1]];
-      } else if (child.attach && !is.fun(child.attach)) {
+      } else if (child.attach && !is.fun(child.attach) && parentInstance[child.attach] === child) {
         parentInstance[child.attach] = null;
       } else if (is.arr(child.attachFns)) {
         const [, detachFn] = child.attachFns;
@@ -985,7 +989,17 @@ function createRenderer(roots) {
         if (argsNew.some((value, index) => value !== argsOld[index])) return [true]; // Create a diff-set, flag if there are any changes
 
         const diff = diffProps(instance, restNew, restOld, true);
-        if (diff.changes.length) return [false, diff]; // Otherwise do not touch the instance
+        if (diff.changes.length) return [false, diff]; // If instance was never attached, attach it
+
+        if (instance.attach && typeof instance.attach !== 'function') {
+          const localState = instance.__r3f;
+          const parent = localState.parent;
+
+          if (parent && parent[instance.attach] !== instance) {
+            appendChild(parent, instance);
+          }
+        } // Otherwise do not touch the instance
+
 
         return null;
       }

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

@@ -41,7 +41,8 @@ const is = {
 function makeId(event) {
   return (event.eventObject || event.object).uuid + '/' + event.index + event.instanceId;
 }
-/** Release pointer captures.
+/**
+ * Release pointer captures.
  * This is called by releasePointerCapture in the API, and when an object is removed.
  */
 
@@ -328,13 +329,16 @@ function createEvents(store) {
 
       case 'onLostPointerCapture':
         return event => {
-          if ('pointerId' in event) {
+          const {
+            internal
+          } = store.getState();
+
+          if ('pointerId' in event && !internal.capturedMap.has(event.pointerId)) {
             // 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);
+            internal.capturedMap.delete(event.pointerId);
+            cancelPointer([]);
           }
-
-          cancelPointer([]);
         };
     } // Any other pointer goes here ...
 
@@ -804,7 +808,7 @@ function createRenderer(roots) {
         parentInstance[child.attachArray] = parentInstance[child.attachArray].filter(x => x !== child);
       } else if (child.attachObject) {
         delete parentInstance[child.attachObject[0]][child.attachObject[1]];
-      } else if (child.attach && !is.fun(child.attach)) {
+      } else if (child.attach && !is.fun(child.attach) && parentInstance[child.attach] === child) {
         parentInstance[child.attach] = null;
       } else if (is.arr(child.attachFns)) {
         const [, detachFn] = child.attachFns;
@@ -952,7 +956,17 @@ function createRenderer(roots) {
         if (argsNew.some((value, index) => value !== argsOld[index])) return [true]; // Create a diff-set, flag if there are any changes
 
         const diff = diffProps(instance, restNew, restOld, true);
-        if (diff.changes.length) return [false, diff]; // Otherwise do not touch the instance
+        if (diff.changes.length) return [false, diff]; // If instance was never attached, attach it
+
+        if (instance.attach && typeof instance.attach !== 'function') {
+          const localState = instance.__r3f;
+          const parent = localState.parent;
+
+          if (parent && parent[instance.attach] !== instance) {
+            appendChild(parent, instance);
+          }
+        } // Otherwise do not touch the instance
+
 
         return null;
       }