Fixes

bartgryszko · Jun 25, 2018 · 2474fdb · 2474fdb
1 parent 805c34e
commit 2474fdb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 86 deletions.
diff --git a/example/App.js b/example/App.js
@@ -24,13 +24,13 @@ export default class Example extends React.Component {
       },
 
       onPanResponderMove: (evt, gestureState) => {
-        this.refs.circularProgress.performLinearAnimation(0, 0);
+        this.refs.circularProgress.animate(0, 0);
         // For each 2 pixels add or subtract 1 point
         this.setState({ pointsDelta: Math.round(-gestureState.dy / 2) });
       },
       onPanResponderTerminationRequest: (evt, gestureState) => true,
       onPanResponderRelease: (evt, gestureState) => {
-        this.refs.circularProgress.performLinearAnimation(100, 2000);
+        this.refs.circularProgress.animate(100, 2000);
         let points = this.state.points + this.state.pointsDelta;
         console.log(Math.min(points, MAX_POINTS));
         this.setState({
@@ -55,12 +55,13 @@ export default class Example extends React.Component {
           fill={fill}
           tintColor="#00e0ff"
           backgroundColor="#3d5875"
-          renderChild={(fill) => (
+        >
+          {(fill) => (
             <Text style={styles.points}>
               { Math.round(MAX_POINTS * fill / 100) }
             </Text>
           )}
-        />
+        </AnimatedCircularProgress>
 
         <AnimatedCircularProgress
           size={120}

diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/package.json b/example/package.json
@@ -22,6 +22,6 @@
     "expo": "^27.0.0",
     "react": "16.3.1",
     "react-native": "^0.55.0",
-    "react-native-circular-progress": "file:../"
+    "react-native-circular-progress": "git+https://github.com/bgryszko/react-native-circular-progress.git"
   }
 }
diff --git a/src/AnimatedCircularProgress.js b/src/AnimatedCircularProgress.js
@@ -62,6 +62,6 @@ AnimatedCircularProgress.propTypes = {
 
 AnimatedCircularProgress.defaultProps = {
   duration: 500,
-  easing: Easing.ease,
+  easing: Easing.elastic(1),
   prefill: 0,
 };
diff --git a/src/CircularProgress.js b/src/CircularProgress.js
@@ -83,7 +83,7 @@ export default class CircularProgress extends React.PureComponent {
         </Svg>
         {children && (
           <View style={childContainerStyle}>
-            {typeof children === 'function' ? children(fill) : children}
+            {children(fill)}
           </View>
         )}
       </View>
@@ -102,10 +102,7 @@ CircularProgress.propTypes = {
   rotation: PropTypes.number,
   lineCap: PropTypes.string,
   arcSweepAngle: PropTypes.number,
-  children: PropTypes.oneOf([
-    propTypes.func,
-    PropTypes.node,
-  ]),
+  children: PropTypes.func,
 };
 
 CircularProgress.defaultProps = {