Skip to content

Add number support to gridXValues and gridYValues on Line #391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plouc merged 3 commits into from
Jan 24, 2019
Merged

Add number support to gridXValues and gridYValues on Line #391

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2240377
Add number support to gridXValues and gridYValues
jasonwells Dec 18, 2018
fb08cf2
Add Date instance acceptance to line grid values
jasonwells Jan 24, 2019
a911707
Add prop types of Date for array in generic Grid component
jasonwells Jan 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/core/src/components/axes/Grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,14 @@ Grid.propTypes = {

xScale: PropTypes.func,
yScale: PropTypes.func,
xValues: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
yValues: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
xValues: PropTypes.oneOfType([
PropTypes.number,
PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
]),
yValues: PropTypes.oneOfType([
PropTypes.number,
PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
]),

theme: PropTypes.object.isRequired,

Expand Down
13 changes: 6 additions & 7 deletions packages/core/src/lib/cartesian/axes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,12 @@ export const computeAxisTicks = ({
*
* @return {Array.<Object>}
*/
export const computeGridLines = ({
width,
height,
scale,
axis,
values = getScaleValues(scale),
}) => {
export const computeGridLines = ({ width, height, scale, axis, values: _values }) => {
const gridValues = isArray(_values) ? _values : undefined
const gridCount = isNumber(_values) ? _values : undefined

const values = gridValues || getScaleValues(scale, gridCount)

const position = scale.bandwidth ? centerScale(scale) : scale

let lines
Expand Down
10 changes: 8 additions & 2 deletions packages/line/src/props.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,14 @@ export const LinePropTypes = {

enableGridX: PropTypes.bool.isRequired,
enableGridY: PropTypes.bool.isRequired,
gridXValues: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
gridYValues: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
gridXValues: PropTypes.oneOfType([
PropTypes.number,
PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
Copy link
Copy Markdown
Owner

@plouc plouc Jan 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The line chart also supports Date objects, so you should add PropTypes.instanceOf(Date) to both gridXValues and gridYValues.

Copy link
Copy Markdown
Contributor Author

@jasonwells jasonwells Jan 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the feedback, I wasn't sure about that. I've added it now.

]),
gridYValues: PropTypes.oneOfType([
PropTypes.number,
PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
]),

enableDots: PropTypes.bool.isRequired,
dotSymbol: PropTypes.func,
Expand Down