Skip to content

Commit ea6eca1

Browse files
committed
add logic for special case of weeks and quarters
1 parent 8928851 commit ea6eca1

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/plots/cartesian/axes.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,10 @@ axes.calcTicks = function calcTicks(ax, opts) {
790790
v += ONEAVGYEAR / 2;
791791
}
792792
} else if(delta >= ONEMINQUARTER) {
793-
if(actualDelta >= ONEMINQUARTER && actualDelta <= ONEMAXQUARTER) {
793+
if(
794+
definedDelta && // case of specified by tickfomat
795+
actualDelta >= ONEMINQUARTER && actualDelta <= ONEMAXQUARTER
796+
) {
794797
v += actualDelta / 2;
795798
} else {
796799
v += ONEAVGQUARTER / 2;
@@ -803,8 +806,11 @@ axes.calcTicks = function calcTicks(ax, opts) {
803806
}
804807
} else if(delta >= ONEWEEK) {
805808
v += ONEWEEK / 2;
806-
if(actualDelta === ONEWEEK && ax._hasDayOfWeekBreaks) {
807-
v -= ONEDAY; // half of two days which is a good approximate for the number of week-end days
809+
if(
810+
definedDelta && // case of specified by tickfomat
811+
actualDelta === ONEWEEK && ax._hasDayOfWeekBreaks
812+
) {
813+
v -= ONEDAY; // half of two days which is a good approximation for the number of week-end days
808814
}
809815
} else if(delta >= ONEDAY) {
810816
v += ONEDAY / 2;

0 commit comments

Comments
 (0)