Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions src/core/core.scale.js
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ export default class Scale extends Element {

if (isHorizontal) {
// A horizontal axis is more constrained by the height.
const labelHeight = sin * widest.width + cos * highest.height;
const labelHeight = tickOpts.mirror ? 0 : sin * widest.width + cos * highest.height;
minSize.height = Math.min(me.maxHeight, minSize.height + labelHeight + tickPadding);
} else {
// A vertical axis is more constrained by the width. Labels are the
Expand Down Expand Up @@ -1122,26 +1122,27 @@ export default class Scale extends Element {
const {position, ticks: optionTicks} = options;
const isHorizontal = me.isHorizontal();
const ticks = me.ticks;
const {align, crossAlign, padding} = optionTicks;
const {align, crossAlign, padding, mirror} = optionTicks;
const tl = getTickMarkLength(options.grid);
const tickAndPadding = tl + padding;
const hTickAndPadding = mirror ? -padding : tickAndPadding;
const rotation = -toRadians(me.labelRotation);
const items = [];
let i, ilen, tick, label, x, y, textAlign, pixel, font, lineHeight, lineCount, textOffset;
let textBaseline = 'middle';

if (position === 'top') {
y = me.bottom - tickAndPadding;
y = me.bottom - hTickAndPadding;
textAlign = me._getXAxisLabelAlignment();
} else if (position === 'bottom') {
y = me.top + tickAndPadding;
y = me.top + hTickAndPadding;
textAlign = me._getXAxisLabelAlignment();
} else if (position === 'left') {
const ret = this._getYAxisLabelAlignment(tl);
const ret = me._getYAxisLabelAlignment(tl);
textAlign = ret.textAlign;
x = ret.x;
} else if (position === 'right') {
const ret = this._getYAxisLabelAlignment(tl);
const ret = me._getYAxisLabelAlignment(tl);
textAlign = ret.textAlign;
x = ret.x;
} else if (axis === 'x') {
Expand All @@ -1161,7 +1162,7 @@ export default class Scale extends Element {
const value = position[positionAxisID];
x = me.chart.scales[positionAxisID].getPixelForValue(value);
}
textAlign = this._getYAxisLabelAlignment(tl).textAlign;
textAlign = me._getYAxisLabelAlignment(tl).textAlign;
}

if (axis === 'y') {
Expand Down Expand Up @@ -1207,6 +1208,9 @@ export default class Scale extends Element {
textOffset = labelSizes.highest.height - lineCount * lineHeight;
}
}
if (mirror) {
textOffset *= -1;
}
} else {
y = pixel;
textOffset = (1 - lineCount) * lineHeight / 2;
Expand Down Expand Up @@ -1262,7 +1266,7 @@ export default class Scale extends Element {
if (position === 'left') {
if (mirror) {
textAlign = 'left';
x = me.right - padding;
x = me.right + padding;
} else {
x = me.right - tickAndPadding;

Expand Down
30 changes: 30 additions & 0 deletions test/fixtures/core.scale/ticks-mirror-x.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
module.exports = {
config: {
type: 'line',
data: {
datasets: [{
data: [1, -1, 3],
}],
labels: ['Label1', 'Label2', 'Label3']
},
options: {
scales: {
x: {
ticks: {
mirror: true
}
},
y: {
display: false
}
}
}
},
options: {
spriteText: true,
canvas: {
height: 256,
width: 512
}
}
};
Binary file added test/fixtures/core.scale/ticks-mirror-x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/fixtures/core.scale/ticks-mirror.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.