Fix/grid min max (#31)

* gridMin/Max should not have default values. YAxis now supports min/max prop to sync with chart * 2.2.0
JesperLekland · Jan 24, 2018 · 0cea679 · 0cea679
1 parent 1906b7c
commit 0cea679
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -657,6 +657,9 @@ class YAxisExample extends React.PureComponent {
 | labelStyle | undefined | Supports all [TextStyleProps](https://facebook.github.io/react-native/docs/textstyleproptypes.html) |
 | formatLabel | `value => {}` | A utility function to format the text before it is displayed, e.g `value => "$" + value |
 | contentInset | { top: 0, bottom: 0 } | Used to sync layout with chart (if same prop used there) |
+| min | undefined | Used to sync layout with chart (if gridMin is used there) |
+| max | undefined | Used to sync layout with chart (if gridMax is used there) |
+
 
 ### XAxis
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-svg-charts",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "private": false,
   "description": "Customizable charts (Line, Bar, Area, Pie, Circle, Waterfall, Progress) for React Native",
   "main": "src/index.js",

diff --git a/src/area-chart.js b/src/area-chart.js
@@ -160,8 +160,6 @@ AreaChart.defaultProps = {
     contentInset: {},
     numberOfTicks: 10,
     showGrid: true,
-    gridMin: 0,
-    gridMax: 0,
     extras: [],
     renderDecorator: () => {
     },

diff --git a/src/bar-chart.js b/src/bar-chart.js
@@ -220,8 +220,6 @@ BarChart.defaultProps = {
     contentInset: {},
     numberOfTicks: 10,
     showGrid: true,
-    gridMin: 0,
-    gridMax: 0,
     extras: [],
     renderDecorator: () => {
     },

diff --git a/src/line-chart.js b/src/line-chart.js
@@ -65,7 +65,7 @@ class LineChart extends PureComponent {
             return <View style={ style }/>
         }
 
-        const extent = array.extent([ ...dataPoints, gridMax, gridMin, -shadowOffset ])
+        const extent = array.extent([ ...dataPoints, gridMax, gridMin ])
         const ticks  = array.ticks(extent[ 0 ], extent[ 1 ], numberOfTicks)
 
         //invert range to support svg coordinate system
@@ -128,7 +128,6 @@ LineChart.propTypes = {
     dataPoints: PropTypes.arrayOf(PropTypes.number).isRequired,
     svg: PropTypes.object,
     shadowSvg: PropTypes.object,
-    shadowWidth: PropTypes.number,
     shadowOffset: PropTypes.number,
 
     style: PropTypes.any,
@@ -167,8 +166,6 @@ LineChart.defaultProps = {
     contentInset: {},
     numberOfTicks: 10,
     showGrid: true,
-    gridMin: 0,
-    gridMax: 0,
     extras: [],
     renderDecorator: () => {
     },

diff --git a/src/stacked-area-chart.js b/src/stacked-area-chart.js
@@ -183,8 +183,6 @@ AreaStack.defaultProps = {
     contentInset: {},
     numberOfTicks: 10,
     showGrid: true,
-    gridMin: 0,
-    gridMax: 0,
     extras: [],
     renderDecorator: () => {
     },

diff --git a/src/stacked-bar-chart.js b/src/stacked-bar-chart.js
@@ -188,8 +188,6 @@ BarChart.defaultProps = {
     contentInset: {},
     numberOfTicks: 10,
     showGrid: true,
-    gridMin: 0,
-    gridMax: 0,
     extras: [],
     renderDecorator: () => {
     },

diff --git a/src/y-axis.js b/src/y-axis.js
@@ -36,14 +36,16 @@ class YAxis extends PureComponent {
                       top    = 0,
                       bottom = 0,
                   },
+                  min,
+                  max,
               }                      = this.props
         const { height, textHeight } = this.state
 
         if (dataPoints.length === 0) {
             return <View style={ style }/>
         }
 
-        const extent = array.extent([ ...dataPoints, 0 ])
+        const extent = array.extent([ ...dataPoints, min, max ])
         const ticks  = array.ticks(extent[ 0 ], extent[ 1 ], numberOfTicks)
 
         const y = scale.scaleLinear()
@@ -101,6 +103,8 @@ YAxis.propTypes = {
         top: PropTypes.number,
         bottom: PropTypes.number,
     }),
+    min: PropTypes.number,
+    max: PropTypes.number,
 }
 
 YAxis.defaultProps = {