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

Jump to bottom

Remove autoSkip logic to always display last tick #5891

Merged
merged 1 commit into from Dec 9, 2018
Merged

Remove autoSkip logic to always display last tick #5891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/core/core.scale.js
View file
Open in desktop
Expand Up @@ -644,7 +644,7 @@ module.exports = Element.extend({
var cosRotation = Math.cos(labelRotationRadians);
var longestRotatedLabel = me.longestLabelWidth * cosRotation;
var result = [];
var i, tick, shouldSkip;
var i, tick;

// figure out the maximum number of gridlines to show
var maxTicks;
Expand All @@ -669,9 +669,7 @@ module.exports = Element.extend({
for (i = 0; i < tickCount; i++) {
tick = ticks[i];

// Since we always show the last tick,we need may need to hide the last shown one before
shouldSkip = (skipRatio > 1 && i % skipRatio > 0) || (i % skipRatio === 0 && i + skipRatio >= tickCount);
if (shouldSkip && i !== tickCount - 1) {
if (skipRatio > 1 && i % skipRatio > 0) {
// leave tick in place but make sure it's not displayed (#4635)
delete tick.label;
}
Expand Down
54 changes: 54 additions & 0 deletions test/specs/core.scale.tests.js
View file
Open in desktop
Expand Up @@ -20,6 +20,60 @@ describe('Core.scale', function() {
});
});

describe('displaying xAxis ticks with autoSkip=true', function() {
function getChart(data) {
return window.acquireChart({
type: 'line',
data: data,
options: {
scales: {
xAxes: [{
ticks: {
autoSkip: true
}
}]
}
}
});
}

function lastTick(chart) {
var xAxis = chart.scales['x-axis-0'];
var ticks = xAxis.getTicks();
return ticks[ticks.length - 1];
}

it('should display the last tick if it fits evenly with other ticks', function() {
var chart = getChart({
labels: [
'January 2018', 'February 2018', 'March 2018', 'April 2018',
'May 2018', 'June 2018', 'July 2018', 'August 2018',
'September 2018'
],
datasets: [{
data: [12, 19, 3, 5, 2, 3, 7, 8, 9]
}]
});

expect(lastTick(chart).label).toEqual('September 2018');
});

it('should not display the last tick if it does not fit evenly', function() {
var chart = getChart({
labels: [
'January 2018', 'February 2018', 'March 2018', 'April 2018',
'May 2018', 'June 2018', 'July 2018', 'August 2018',
'September 2018', 'October 2018', 'November 2018', 'December 2018'
],
datasets: [{
data: [12, 19, 3, 5, 2, 3, 7, 8, 9, 10, 11, 12]
}]
});

expect(lastTick(chart).label).toBeUndefined();
});
});

var gridLineTests = [{
labels: ['tick1', 'tick2', 'tick3', 'tick4', 'tick5'],
offsetGridLines: false,
Expand Down