diff --git a/src/x-axis.js b/src/x-axis.js index 0d503bbf..25c204fe 100644 --- a/src/x-axis.js +++ b/src/x-axis.js @@ -102,10 +102,12 @@ class XAxis extends PureComponent { // causes rendering issues width > 0 && ticks.map((value, index) => { + console.log('x', x(value)) return ( ) - })} + }) + } @@ -121,11 +124,6 @@ class XAxis extends PureComponent { } } -XAxis.Type = { - LINE: 'line', - BAR: 'bar', -} - XAxis.propTypes = { data: PropTypes.array.isRequired, labelStyle: PropTypes.any, @@ -142,9 +140,7 @@ XAxis.propTypes = { } XAxis.defaultProps = { - type: 'line', spacing: 0.05, - chartType: XAxis.Type.LINE, contentInset: {}, svg: {}, xAccessor: ({ index }) => index, diff --git a/storybook/stories/x-axis/scale-band.js b/storybook/stories/x-axis/scale-band.js index a9d1e7c5..91487e58 100644 --- a/storybook/stories/x-axis/scale-band.js +++ b/storybook/stories/x-axis/scale-band.js @@ -32,7 +32,6 @@ class XAxisExample extends React.PureComponent { data={ data } scale={scale.scaleBand} formatLabel={ (value, index) => index } - chartType={ XAxis.Type.BAR } labelStyle={ { color: 'black' } } /> diff --git a/storybook/stories/x-axis/scale-linear.js b/storybook/stories/x-axis/scale-linear.js index ed2a634d..e8f06fe4 100644 --- a/storybook/stories/x-axis/scale-linear.js +++ b/storybook/stories/x-axis/scale-linear.js @@ -22,7 +22,7 @@ class XAxisExample extends React.PureComponent { data={ data } formatLabel={ (value, index) => index } contentInset={{ left: 10, right: 10 }} - svg={{ fontSize: 10 }} + svg={{ fontSize: 10, fill: 'black' }} /> ) diff --git a/storybook/stories/x-axis/scale-time.js b/storybook/stories/x-axis/scale-time.js index 6e2225aa..62753bb2 100644 --- a/storybook/stories/x-axis/scale-time.js +++ b/storybook/stories/x-axis/scale-time.js @@ -51,12 +51,12 @@ class XAxisScaleTimeExample extends React.PureComponent { item.date} scale={scale.scaleTime}