Skip to content

Commit a7633c3

Browse files
committed
move last tick on rangebreaks to the start of break instead of removing it
1 parent 4eab137 commit a7633c3

8 files changed

+4
-5
lines changed

src/plots/cartesian/axes.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,7 @@ axes.calcTicks = function calcTicks(ax) {
636636
for(var q = first; dir * q <= dir * last; q += dir) { // apply reverse loop to pick greater values in breaks first
637637
var tickVal = tickVals[q];
638638
if(ax.maskBreaks(tickVal.value) === BADNUM) {
639-
tickVal.value = moveToEndOfBreak(tickVal.value, ax);
640-
if(ax.maskBreaks(tickVal.value) === BADNUM) continue;
639+
tickVal.value = moveOutsideBreak(tickVal.value, ax, q < len - 1);
641640
}
642641

643642
var pos = ax.c2p(tickVal.value);
@@ -959,7 +958,7 @@ axes.tickFirst = function(ax) {
959958
var tick0 = r2l(ax.tick0);
960959

961960
if(ax.tickmode === 'auto' && ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {
962-
tick0 = moveToEndOfBreak(tick0, ax);
961+
tick0 = moveOutsideBreak(tick0, ax, true);
963962
}
964963

965964
if(isNumeric(dtick)) {
@@ -3161,11 +3160,11 @@ function isAngular(ax) {
31613160
return ax._id === 'angularaxis';
31623161
}
31633162

3164-
function moveToEndOfBreak(v, ax) {
3163+
function moveOutsideBreak(v, ax, toEnd) {
31653164
for(var k = 0; k < ax._rangebreaks.length; k++) {
31663165
var brk = ax._rangebreaks[k];
31673166
if(v >= brk.min && v < brk.max) {
3168-
return brk.max;
3167+
return toEnd ? brk.max : brk.min;
31693168
}
31703169
}
31713170
return v;
165 Bytes
Loading
Loading
22 Bytes
Loading
71 Bytes
Loading
52 Bytes
Loading
163 Bytes
Loading
Loading

0 commit comments

Comments
 (0)