Skip to content

add 'tickformatstops' #1965

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
merged 17 commits into from
Oct 16, 2017
Merged

add 'tickformatstops' #1965

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1baa14a
add 'tickformatstops'
yauhen-kavaliou Aug 17, 2017
f958c3b
change tickformatstops definition and code review fixes
yauhen-kavaliou Aug 23, 2017
a155bd9
change valType
yauhen-kavaliou Aug 24, 2017
be11c03
remove axis attribute duplication
apalchys Aug 24, 2017
a13c29e
fix: add missed semicolon
apalchys Aug 25, 2017
304d96b
add tests for tickformatstops
apalchys Aug 28, 2017
0c9fb2b
add tickformatstop image for test
apalchys Aug 28, 2017
db526d9
Merge branch 'master' into tickformatstops
alexcjohnson Oct 9, 2017
7f1fd41
editTypes for tickformatstops
alexcjohnson Oct 9, 2017
86777f7
make sure the tickformatstops tests actually run as expected
alexcjohnson Oct 9, 2017
531aea8
flatten tickformatstops tests
alexcjohnson Oct 9, 2017
0b48a33
robustify tickformatstops supplydefaults
alexcjohnson Oct 9, 2017
6420044
take the first matching tickformatstop
apalchys Oct 10, 2017
92f7c13
replace Array.prototype.find with for loop and update tests
apalchys Oct 10, 2017
df72531
lint
alexcjohnson Oct 10, 2017
7665b4c
updated tickformatstops baseline
alexcjohnson Oct 10, 2017
0e6747f
merge tickformatstops_test into axes_test
alexcjohnson Oct 12, 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
30 changes: 8 additions & 22 deletions src/plots/cartesian/axes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1539,40 +1539,26 @@ axes.getTickFormat = function(ax) {
if(ax.tickformatstops && ax.tickformatstops.length > 0) {
switch(ax.type) {
case 'date': {
tickstop = ax.tickformatstops.reduce(function(acc, stop) {
if(!isProperStop(ax.dtick, stop.dtickrange, convertToMs)) {
return acc;
}
if(!acc) {
return stop;
} else {
return getRangeWidth(stop.dtickrange, convertToMs) > getRangeWidth(acc.dtickrange, convertToMs) ? stop : acc;
}
}, null);
tickstop = ax.tickformatstops.find(function(stop) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nice and clean - unfortunately it doesn't look like IE supports Array.find, not even in IE11
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find
We've also tended to gravitate toward for loops over Array methods for performance reasons. Not a big deal here as this array will be fairly small, but it should still help.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry, just switched from the project where is supported and don't care about IE11 support.
Replaced with for loop and fixed tests.

return isProperStop(ax.dtick, stop.dtickrange, convertToMs)
});
break;
}
case 'linear': {
tickstop = ax.tickformatstops.reduce(function(acc, stop) {
if(!isProperStop(ax.dtick, stop.dtickrange)) {
return acc;
}
if(!acc) {
return stop;
} else {
return getRangeWidth(stop.dtickrange) > getRangeWidth(acc.dtickrange) ? stop : acc;
}
}, null);
tickstop = ax.tickformatstops.find(function(stop) {
return isProperStop(ax.dtick, stop.dtickrange, convertToMs)
});
break;
}
case 'log': {
tickstop = ax.tickformatstops.filter(function(stop) {
tickstop = ax.tickformatstops.find(function(stop) {
var left = stop.dtickrange[0], right = stop.dtickrange[1];
var isLeftDtickNull = left === null;
var isRightDtickNull = right === null;
var isDtickInRangeLeft = compareLogTicks(ax.dtick, left) >= 0;
var isDtickInRangeRight = compareLogTicks(ax.dtick, right) <= 0;
return (isLeftDtickNull || isDtickInRangeLeft) && (isRightDtickNull || isDtickInRangeRight);
})[0];
});
break;
}
default:
Expand Down