@react-three/fiber 8.0.6 → 8.0.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @react-three/fiber
 
+## 8.0.7
+
+### Patch Changes
+
+- 01ceb7e: remove undefined keys on detach instead of letting them hang
+
 ## 8.0.6
 
 ### Patch Changes

package/dist/declarations/src/three-types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import * as THREE from 'three';
 import { EventHandlers } from './core/events';
 import { AttachType } from './core/renderer';

package/dist/{index-0e758026.cjs.prod.js → index-4fb4daff.cjs.prod.js}

@@ -211,7 +211,10 @@ function detach(parent, child, type) {
       target,
       key
     } = resolve(parent, type);
-    target[key] = child.__r3f.previousAttach;
+    const previous = child.__r3f.previousAttach; // When the previous value was undefined, it means the value was never set to begin with
+
+    if (previous === undefined) delete target[key]; // Otherwise set the previous value
+    else target[key] = previous;
   } else (_child$__r3f = child.__r3f) == null ? void 0 : _child$__r3f.previousAttach == null ? void 0 : _child$__r3f.previousAttach(parent, child);
 
   (_child$__r3f2 = child.__r3f) == null ? true : delete _child$__r3f2.previousAttach;
@@ -304,9 +307,11 @@ function applyProps$1(instance, data) {
         // use the prop constructor to find the default it should be
         value = new targetProp.constructor(...memoized.args);
       } else if (currentInstance.constructor) {
+        var _currentInstance$__r, _currentInstance$__r2;
+
         // create a blank slate of the instance and copy the particular parameter.
         // @ts-ignore
-        const defaultClassCall = new currentInstance.constructor(...currentInstance.__r3f.memoizedProps.args);
+        const defaultClassCall = new currentInstance.constructor(...((_currentInstance$__r = (_currentInstance$__r2 = currentInstance.__r3f) == null ? void 0 : _currentInstance$__r2.memoizedProps.args) != null ? _currentInstance$__r : []));
         value = defaultClassCall[targetProp]; // destory the instance
 
         if (defaultClassCall.dispose) defaultClassCall.dispose(); // instance does not have constructor, just set it to 0
@@ -1406,10 +1411,11 @@ function run(effects, timestamp) {
 
 let subscribers;
 let subscription;
+let delta;
 
 function render$1(timestamp, state, frame) {
   // Run local effects
-  let delta = state.clock.getDelta(); // In frameloop='never' mode, clock times are updated using the provided timestamp
+  delta = state.clock.getDelta(); // In frameloop='never' mode, clock times are updated using the provided timestamp
 
   if (state.frameloop === 'never' && typeof timestamp === 'number') {
     delta = timestamp - state.clock.elapsedTime;

package/dist/{index-0076cbd6.cjs.dev.js → index-75d39ab1.cjs.dev.js}

@@ -211,7 +211,10 @@ function detach(parent, child, type) {
       target,
       key
     } = resolve(parent, type);
-    target[key] = child.__r3f.previousAttach;
+    const previous = child.__r3f.previousAttach; // When the previous value was undefined, it means the value was never set to begin with
+
+    if (previous === undefined) delete target[key]; // Otherwise set the previous value
+    else target[key] = previous;
   } else (_child$__r3f = child.__r3f) == null ? void 0 : _child$__r3f.previousAttach == null ? void 0 : _child$__r3f.previousAttach(parent, child);
 
   (_child$__r3f2 = child.__r3f) == null ? true : delete _child$__r3f2.previousAttach;
@@ -304,9 +307,11 @@ function applyProps$1(instance, data) {
         // use the prop constructor to find the default it should be
         value = new targetProp.constructor(...memoized.args);
       } else if (currentInstance.constructor) {
+        var _currentInstance$__r, _currentInstance$__r2;
+
         // create a blank slate of the instance and copy the particular parameter.
         // @ts-ignore
-        const defaultClassCall = new currentInstance.constructor(...currentInstance.__r3f.memoizedProps.args);
+        const defaultClassCall = new currentInstance.constructor(...((_currentInstance$__r = (_currentInstance$__r2 = currentInstance.__r3f) == null ? void 0 : _currentInstance$__r2.memoizedProps.args) != null ? _currentInstance$__r : []));
         value = defaultClassCall[targetProp]; // destory the instance
 
         if (defaultClassCall.dispose) defaultClassCall.dispose(); // instance does not have constructor, just set it to 0
@@ -1406,10 +1411,11 @@ function run(effects, timestamp) {
 
 let subscribers;
 let subscription;
+let delta;
 
 function render$1(timestamp, state, frame) {
   // Run local effects
-  let delta = state.clock.getDelta(); // In frameloop='never' mode, clock times are updated using the provided timestamp
+  delta = state.clock.getDelta(); // In frameloop='never' mode, clock times are updated using the provided timestamp
 
   if (state.frameloop === 'never' && typeof timestamp === 'number') {
     delta = timestamp - state.clock.elapsedTime;

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

@@ -182,7 +182,10 @@ function detach(parent, child, type) {
       target,
       key
     } = resolve(parent, type);
-    target[key] = child.__r3f.previousAttach;
+    const previous = child.__r3f.previousAttach; // When the previous value was undefined, it means the value was never set to begin with
+
+    if (previous === undefined) delete target[key]; // Otherwise set the previous value
+    else target[key] = previous;
   } else (_child$__r3f = child.__r3f) == null ? void 0 : _child$__r3f.previousAttach == null ? void 0 : _child$__r3f.previousAttach(parent, child);
 
   (_child$__r3f2 = child.__r3f) == null ? true : delete _child$__r3f2.previousAttach;
@@ -275,9 +278,11 @@ function applyProps$1(instance, data) {
         // use the prop constructor to find the default it should be
         value = new targetProp.constructor(...memoized.args);
       } else if (currentInstance.constructor) {
+        var _currentInstance$__r, _currentInstance$__r2;
+
         // create a blank slate of the instance and copy the particular parameter.
         // @ts-ignore
-        const defaultClassCall = new currentInstance.constructor(...currentInstance.__r3f.memoizedProps.args);
+        const defaultClassCall = new currentInstance.constructor(...((_currentInstance$__r = (_currentInstance$__r2 = currentInstance.__r3f) == null ? void 0 : _currentInstance$__r2.memoizedProps.args) != null ? _currentInstance$__r : []));
         value = defaultClassCall[targetProp]; // destory the instance
 
         if (defaultClassCall.dispose) defaultClassCall.dispose(); // instance does not have constructor, just set it to 0
@@ -1377,10 +1382,11 @@ function run(effects, timestamp) {
 
 let subscribers;
 let subscription;
+let delta;
 
 function render$1(timestamp, state, frame) {
   // Run local effects
-  let delta = state.clock.getDelta(); // In frameloop='never' mode, clock times are updated using the provided timestamp
+  delta = state.clock.getDelta(); // In frameloop='never' mode, clock times are updated using the provided timestamp
 
   if (state.frameloop === 'never' && typeof timestamp === 'number') {
     delta = timestamp - state.clock.elapsedTime;

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-0076cbd6.cjs.dev.js');
+var index = require('./index-75d39ab1.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -76,15 +76,13 @@ function createPointerEvents(store) {
       var _events$handlers;
 
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
       events.disconnect == null ? void 0 : events.disconnect();
-      set(state => ({
-        events: { ...state.events,
-          connected: target
-        }
-      }));
+      setEvents({
+        connected: target
+      });
       Object.entries((_events$handlers = events == null ? void 0 : events.handlers) != null ? _events$handlers : []).forEach(([name, event]) => {
         const [eventName, passive] = DOM_EVENTS[name];
         target.addEventListener(eventName, event, {
@@ -94,7 +92,7 @@ function createPointerEvents(store) {
     },
     disconnect: () => {
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
 
@@ -107,11 +105,9 @@ function createPointerEvents(store) {
             events.connected.removeEventListener(eventName, event);
           }
         });
-        set(state => ({
-          events: { ...state.events,
-            connected: undefined
-          }
-        }));
+        setEvents({
+          connected: undefined
+        });
       }
     }
   };

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-0e758026.cjs.prod.js');
+var index = require('./index-4fb4daff.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');
@@ -76,15 +76,13 @@ function createPointerEvents(store) {
       var _events$handlers;
 
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
       events.disconnect == null ? void 0 : events.disconnect();
-      set(state => ({
-        events: { ...state.events,
-          connected: target
-        }
-      }));
+      setEvents({
+        connected: target
+      });
       Object.entries((_events$handlers = events == null ? void 0 : events.handlers) != null ? _events$handlers : []).forEach(([name, event]) => {
         const [eventName, passive] = DOM_EVENTS[name];
         target.addEventListener(eventName, event, {
@@ -94,7 +92,7 @@ function createPointerEvents(store) {
     },
     disconnect: () => {
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
 
@@ -107,11 +105,9 @@ function createPointerEvents(store) {
             events.connected.removeEventListener(eventName, event);
           }
         });
-        set(state => ({
-          events: { ...state.events,
-            connected: undefined
-          }
-        }));
+        setEvents({
+          connected: undefined
+        });
       }
     }
   };

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-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 { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from './index-e42f8ac9.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-e42f8ac9.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
@@ -46,15 +46,13 @@ function createPointerEvents(store) {
       var _events$handlers;
 
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
       events.disconnect == null ? void 0 : events.disconnect();
-      set(state => ({
-        events: { ...state.events,
-          connected: target
-        }
-      }));
+      setEvents({
+        connected: target
+      });
       Object.entries((_events$handlers = events == null ? void 0 : events.handlers) != null ? _events$handlers : []).forEach(([name, event]) => {
         const [eventName, passive] = DOM_EVENTS[name];
         target.addEventListener(eventName, event, {
@@ -64,7 +62,7 @@ function createPointerEvents(store) {
     },
     disconnect: () => {
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
 
@@ -77,11 +75,9 @@ function createPointerEvents(store) {
             events.connected.removeEventListener(eventName, event);
           }
         });
-        set(state => ({
-          events: { ...state.events,
-            connected: undefined
-          }
-        }));
+        setEvents({
+          connected: undefined
+        });
       }
     }
   };

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-0076cbd6.cjs.dev.js');
+var index = require('../../dist/index-75d39ab1.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var mergeRefs = require('react-merge-refs');
@@ -94,32 +94,28 @@ function createTouchEvents(store) {
     }), {}),
     connect: () => {
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
       events.disconnect == null ? void 0 : events.disconnect();
       const connected = new Pressability__default['default'](events == null ? void 0 : events.handlers);
-      set(state => ({
-        events: { ...state.events,
-          connected
-        }
-      }));
+      setEvents({
+        connected
+      });
       const handlers = connected.getEventHandlers();
       return handlers;
     },
     disconnect: () => {
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
 
       if (events.connected) {
         events.connected.reset();
-        set(state => ({
-          events: { ...state.events,
-            connected: undefined
-          }
-        }));
+        setEvents({
+          connected: undefined
+        });
       }
     }
   };

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-0e758026.cjs.prod.js');
+var index = require('../../dist/index-4fb4daff.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var mergeRefs = require('react-merge-refs');
@@ -94,32 +94,28 @@ function createTouchEvents(store) {
     }), {}),
     connect: () => {
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
       events.disconnect == null ? void 0 : events.disconnect();
       const connected = new Pressability__default['default'](events == null ? void 0 : events.handlers);
-      set(state => ({
-        events: { ...state.events,
-          connected
-        }
-      }));
+      setEvents({
+        connected
+      });
       const handlers = connected.getEventHandlers();
       return handlers;
     },
     disconnect: () => {
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
 
       if (events.connected) {
         events.connected.reset();
-        set(state => ({
-          events: { ...state.events,
-            connected: undefined
-          }
-        }));
+        setEvents({
+          connected: undefined
+        });
       }
     }
   };

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-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 { c as createEvents, e as extend, u as useMemoizedFn, p as pick, o as omit, a as createRoot, b as unmountComponentAtNode } from '../../dist/index-e42f8ac9.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-e42f8ac9.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import mergeRefs from 'react-merge-refs';
@@ -64,32 +64,28 @@ function createTouchEvents(store) {
     }), {}),
     connect: () => {
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
       events.disconnect == null ? void 0 : events.disconnect();
       const connected = new Pressability(events == null ? void 0 : events.handlers);
-      set(state => ({
-        events: { ...state.events,
-          connected
-        }
-      }));
+      setEvents({
+        connected
+      });
       const handlers = connected.getEventHandlers();
       return handlers;
     },
     disconnect: () => {
       const {
-        set,
+        setEvents,
         events
       } = store.getState();
 
       if (events.connected) {
         events.connected.reset();
-        set(state => ({
-          events: { ...state.events,
-            connected: undefined
-          }
-        }));
+        setEvents({
+          connected: undefined
+        });
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.0.6",
+  "version": "8.0.7",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",