Skip to content
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

Fixed misplaced data points on category scale #4062

Merged
merged 5 commits into from
Mar 27, 2017
Merged

Fixed misplaced data points on category scale #4062

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f431c7
Fixed issue, that category scale shows data points misplaced. See #4060
martinzuern Mar 23, 2017
30b5ed2
Cleaned code
martinzuern Mar 23, 2017
fed5178
Fixed Irregular whitespace
martinzuern Mar 23, 2017
66245db
Fixed error in case value is undefined
martinzuern Mar 24, 2017
b8e4389
Verified that no error is thrown in case value === null
martinzuern Mar 27, 2017
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
6 changes: 5 additions & 1 deletion src/scales/scale.category.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,12 @@ module.exports = function(Chart) {
// 1 is added because we need the length but we have the indexes
var offsetAmt = Math.max((me.maxIndex + 1 - me.minIndex - ((me.options.gridLines.offsetGridLines) ? 0 : 1)), 1);

if (value !== undefined && isNaN(index)) {
// If value is a data object, then index is the index in the data array,
// not the index of the scale. We need to change that.
var valueCategory = me.isHorizontal() ? value.x : value.y;
Copy link
Member

Choose a reason for hiding this comment

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

this will error if value is undefined

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're totally right, thank you for your feedback. Addressed this on the latest commit.

if (valueCategory !== undefined || (value !== undefined && isNaN(index))) {
var labels = me.getLabels();
value = valueCategory || value;
var idx = labels.indexOf(value);
index = idx !== -1 ? idx : index;
}
Expand Down