@react-three/drei 9.80.1 → 9.80.2

package/core/useAnimations.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("three"),r=require("@react-three/fiber");function n(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var n=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,n.get?n:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}var c=n(e);exports.useAnimations=function(e,n){const u=c.useRef(),[a]=c.useState((()=>n?n instanceof t.Object3D?{current:n}:n:u)),[o]=c.useState((()=>new t.AnimationMixer(void 0)));c.useLayoutEffect((()=>{o._root=a.current}),[o,n]);const i=c.useRef({}),[s]=c.useState((()=>{const t={};return e.forEach((e=>Object.defineProperty(t,e.name,{enumerable:!0,get(){if(a.current)return i.current[e.name]||(i.current[e.name]=o.clipAction(e,a.current))},configurable:!0}))),{ref:a,clips:e,actions:t,names:e.map((e=>e.name)),mixer:o}}));return r.useFrame(((e,t)=>o.update(t))),c.useEffect((()=>{const e=a.current;return()=>{i.current={},Object.values(s.actions).forEach((t=>{e&&o.uncacheAction(t,e)}))}}),[e]),c.useEffect((()=>()=>{o.stopAllAction()}),[o]),s};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),r=require("three"),t=require("@react-three/fiber");function n(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var n=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,n.get?n:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}var c=n(e);exports.useAnimations=function(e,n){const u=c.useRef(),[o]=c.useState((()=>n?n instanceof r.Object3D?{current:n}:n:u)),[a]=c.useState((()=>new r.AnimationMixer(void 0)));c.useLayoutEffect((()=>{o.current=n&&(n instanceof r.Object3D?n:n.current),a._root=o.current}),[n]);const i=c.useRef({}),s=c.useMemo((()=>{const r={};return e.forEach((e=>Object.defineProperty(r,e.name,{enumerable:!0,get(){if(o.current)return i.current[e.name]||(i.current[e.name]=a.clipAction(e,o.current))},configurable:!0}))),{ref:o,clips:e,actions:r,names:e.map((e=>e.name)),mixer:a}}),[e]);return t.useFrame(((e,r)=>a.update(r))),c.useEffect((()=>{const e=o.current;return()=>{i.current={},a.stopAllAction(),Object.values(s.actions).forEach((r=>{e&&a.uncacheAction(r,e)}))}}),[e]),s};

package/core/useAnimations.js

@@ -9,9 +9,12 @@ function useAnimations(clips, root) {
   } : root : ref); // eslint-disable-next-line prettier/prettier
 
   const [mixer] = React.useState(() => new AnimationMixer(undefined));
-  React.useLayoutEffect(() => void (mixer._root = actualRef.current), [mixer, root]);
+  React.useLayoutEffect(() => {
+    actualRef.current = root && (root instanceof Object3D ? root : root.current);
+    mixer._root = actualRef.current;
+  }, [root]);
   const lazyActions = React.useRef({});
-  const [api] = React.useState(() => {
+  const api = React.useMemo(() => {
     const actions = {};
     clips.forEach(clip => Object.defineProperty(actions, clip.name, {
       enumerable: true,
@@ -31,13 +34,14 @@ function useAnimations(clips, root) {
       names: clips.map(c => c.name),
       mixer
     };
-  });
+  }, [clips]);
   useFrame((state, delta) => mixer.update(delta));
   React.useEffect(() => {
     const currentRoot = actualRef.current;
     return () => {
       // Clean up only when clips change, wipe out lazy actions and uncache clips
       lazyActions.current = {};
+      mixer.stopAllAction();
       Object.values(api.actions).forEach(action => {
         if (currentRoot) {
           mixer.uncacheAction(action, currentRoot);
@@ -45,11 +49,6 @@ function useAnimations(clips, root) {
       });
     };
   }, [clips]);
-  React.useEffect(() => {
-    return () => {
-      mixer.stopAllAction();
-    };
-  }, [mixer]);
   return api;
 }