Remove redundant code

Author: phamfoo

src/Chase.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { Animated, Easing } from 'react-native'
 import { SpinnerProps, defaultProps } from './SpinnerProps'
 import AnimationContainer from './AnimationContainer'
-import { anim, stagger } from './utils'
+import { loop, stagger } from './utils'
 
 export default class Chase extends React.Component<SpinnerProps> {
   static defaultProps = defaultProps
@@ -29,7 +29,7 @@ export default class Chase extends React.Component<SpinnerProps> {
         initAnimation={() => ({
           chase: (value) => ({
             values: [value],
-            animation: anim({
+            animation: loop({
               duration: 2500,
               easing: Easing.linear,
               value: value,

src/Plane.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { Animated } from 'react-native'
 import { SpinnerProps, defaultProps } from './SpinnerProps'
 import AnimationContainer from './AnimationContainer'
-import { anim } from './utils'
+import { loop } from './utils'
 
 export default class Plane extends React.Component<SpinnerProps> {
   static defaultProps = defaultProps
@@ -22,7 +22,7 @@ export default class Plane extends React.Component<SpinnerProps> {
         initAnimation={() => ({
           plane: (value) => ({
             values: [value],
-            animation: anim({
+            animation: loop({
               duration: 1200,
               value: value,
               keyframes: [0, 50, 100],

src/Pulse.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { Animated, Easing } from 'react-native'
 import { SpinnerProps, defaultProps } from './SpinnerProps'
 import AnimationContainer from './AnimationContainer'
-import { anim } from './utils'
+import { loop } from './utils'
 
 export default class Pulse extends React.Component<SpinnerProps> {
   static defaultProps = defaultProps
@@ -22,7 +22,7 @@ export default class Pulse extends React.Component<SpinnerProps> {
         initAnimation={() => ({
           pulse: (value) => ({
             values: [value],
-            animation: anim({
+            animation: loop({
               duration: 1200,
               value: value,
               easing: Easing.bezier(0.455, 0.03, 0.515, 0.955),

src/Swing.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { Animated, Easing } from 'react-native'
 import { SpinnerProps, defaultProps } from './SpinnerProps'
 import AnimationContainer from './AnimationContainer'
-import { anim } from './utils'
+import { loop } from './utils'
 
 export default class Swing extends React.Component<SpinnerProps> {
   static defaultProps = defaultProps
@@ -28,7 +28,7 @@ export default class Swing extends React.Component<SpinnerProps> {
         initAnimation={() => ({
           swing: (value) => ({
             values: [value],
-            animation: anim({
+            animation: loop({
               duration: 1800,
               value: value,
               easing: Easing.linear,
@@ -37,7 +37,7 @@ export default class Swing extends React.Component<SpinnerProps> {
           }),
           swingDot: (value) => ({
             values: [value],
-            animation: anim({
+            animation: loop({
               duration: 2000,
               value: value,
               keyframes: [0, 50, 100],

src/Wander.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { Animated, View } from 'react-native'
 import { SpinnerProps, defaultProps } from './SpinnerProps'
 import AnimationContainer from './AnimationContainer'
-import { anim } from './utils'
+import { loop } from './utils'
 
 export default class Wander extends React.Component<SpinnerProps> {
   static defaultProps = defaultProps
@@ -23,7 +23,7 @@ export default class Wander extends React.Component<SpinnerProps> {
         initAnimation={() => ({
           wander: (value) => ({
             values: [value],
-            animation: anim({
+            animation: loop({
               duration: 2000,
               value: value,
               keyframes: [0, 25, 50, 75, 100],

src/utils.ts

@@ -1,6 +1,6 @@
 import { EasingFunction, Easing, Animated, Platform } from 'react-native'
 
-export function createKeyframeEasingFunction(
+function createKeyframeEasingFunction(
   keyframes: number[],
   easing: EasingFunction
 ) {
@@ -22,36 +22,32 @@ export function createKeyframeEasingFunction(
   }
 }
 
-export interface AnimationConfig {
+interface AnimationConfig {
   duration: number
   value: Animated.Value
   keyframes?: number[]
   toValue?: number
   easing?: EasingFunction
-  infinite?: boolean
-  delay?: number
 }
 
-export function anim({
+function loop({
   duration,
   value,
   keyframes = [0, 100],
   easing = Easing.bezier(0.42, 0.0, 0.58, 1.0),
   toValue = 100,
-  infinite = true,
-  delay = 0,
 }: AnimationConfig) {
   const timing = Animated.timing(value, {
     duration: duration,
     easing: createKeyframeEasingFunction(keyframes, easing),
     toValue: toValue,
     useNativeDriver: Platform.OS !== 'web',
-    delay: delay,
   })
-  return infinite ? Animated.loop(timing) : timing
+
+  return Animated.loop(timing)
 }
 
-export function stagger(
+function stagger(
   time: number,
   amount: number,
   animationConfig: AnimationConfig
@@ -62,8 +58,6 @@ export function stagger(
     keyframes = [0, 100],
     easing = Easing.bezier(0.42, 0.0, 0.58, 1.0),
     toValue = 100,
-    infinite = true,
-    delay = 0,
   } = animationConfig
   const easingFunction = createKeyframeEasingFunction(keyframes, easing)
 
@@ -73,13 +67,12 @@ export function stagger(
       .map((_) => new Animated.Value(0))
 
     const animations = values.map((value) =>
-      anim({
+      loop({
         value,
         duration,
         easing,
         toValue,
         keyframes,
-        infinite,
       })
     )
 
@@ -93,9 +86,9 @@ export function stagger(
     easing: easingFunction,
     toValue: toValue,
     useNativeDriver: true,
-    delay: delay,
   })
-  const animation = infinite ? Animated.loop(timing) : timing
+
+  const animation = Animated.loop(timing)
 
   // React Native only does 60fps
   // https://github.com/facebook/react-native/blob/d3980dceab90b118cc7f69696967aa7f8d4388d9/Libraries/Animated/src/animations/TimingAnimation.js#L78
@@ -125,3 +118,5 @@ export function stagger(
 
   return { animation, values }
 }
+
+export { loop, stagger, AnimationConfig }