Refactor

Author: inokawa

src/hooks/useAnimation.ts

@@ -75,6 +75,10 @@ export const useAnimation = (
     const getAnimation = () => cache?.[0];
     const handle = createHandle();
 
+    const cancel = () => {
+      handle._cancel(getAnimation());
+    };
+
     const externalHandle: AnimationHandle = {
       play: (opts) => {
         handle._play(initAnimation(getKeyframes(), getOptions()), opts);
@@ -85,7 +89,7 @@ export const useAnimation = (
         return externalHandle;
       },
       cancel: () => {
-        handle._cancel(getAnimation());
+        cancel();
         return externalHandle;
       },
       finish: () => {
@@ -114,7 +118,7 @@ export const useAnimation = (
     return [
       externalHandle,
       () => {
-        handle._cancel(getAnimation());
+        cancel();
       },
     ];
   })[0];

src/hooks/useAnimationController.ts

@@ -38,6 +38,12 @@ export const useAnimationController = <ID extends string>(
         );
       };
 
+      const cancelAll = () => {
+        forAllHandle((handle) => {
+          handle.cancel();
+        });
+      };
+
       const externalHandle: AnimationController<ID> = {
         get: getHandle,
         playAll: (opts) => {
@@ -53,9 +59,7 @@ export const useAnimationController = <ID extends string>(
           return externalHandle;
         },
         cancelAll: () => {
-          forAllHandle((handle) => {
-            handle.cancel();
-          });
+          cancelAll();
           return externalHandle;
         },
         finishAll: () => {
@@ -79,7 +83,7 @@ export const useAnimationController = <ID extends string>(
       return [
         externalHandle,
         () => {
-          externalHandle.cancelAll();
+          cancelAll();
         },
       ];
     }

src/hooks/useAnimationFunction.ts

@@ -79,6 +79,10 @@ export const useAnimationFunction = (
       const getAnimation = () => cache?.[0];
       const handle = createHandle();
 
+      const cancel = () => {
+        handle._cancel(getAnimation());
+      };
+
       const externalHandle: AnimationFunctionHandle = {
         play: (opts) => {
           handle._play(initAnimation(getOptions()), opts);
@@ -89,7 +93,7 @@ export const useAnimationFunction = (
           return externalHandle;
         },
         cancel: () => {
-          handle._cancel(getAnimation());
+          cancel();
           return externalHandle;
         },
         finish: () => {
@@ -113,7 +117,7 @@ export const useAnimationFunction = (
       return [
         externalHandle,
         () => {
-          handle._cancel(getAnimation());
+          cancel();
         },
       ];
     }