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.

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

Fix inconsistent axis title standoff when title is one text line vs. multiple lines #6970

Merged
merged 6 commits into from
Apr 17, 2024
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
2 changes: 2 additions & 0 deletions draftlogs/6970_fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fix positioning of multi-line axis titles with `standoff` [[#6970](https:/plotly/plotly.js/pull/6970)],
with thanks to @my-tien for the contribution!
17 changes: 13 additions & 4 deletions src/plots/cartesian/axes.js
Original file line number Diff line number Diff line change
Expand Up @@ -4060,9 +4060,7 @@ function approxTitleDepth(ax) {
var fontSize = ax.title.font.size;
var extraLines = (ax.title.text.match(svgTextUtils.BR_TAG_ALL) || []).length;
if(ax.title.hasOwnProperty('standoff')) {
return extraLines ?
fontSize * (CAP_SHIFT + (extraLines * LINE_SPACING)) :
fontSize * CAP_SHIFT;
return fontSize * (CAP_SHIFT + (extraLines * LINE_SPACING));
} else {
return extraLines ?
fontSize * (extraLines + 1) * LINE_SPACING :
Expand Down Expand Up @@ -4093,9 +4091,20 @@ function drawTitle(gd, ax) {
var axLetter = axId.charAt(0);
var fontSize = ax.title.font.size;
var titleStandoff;
var extraLines = (ax.title.text.match(svgTextUtils.BR_TAG_ALL) || []).length;

if(ax.title.hasOwnProperty('standoff')) {
titleStandoff = ax._depth + ax.title.standoff + approxTitleDepth(ax);
// With ax._depth the initial drawing baseline is at the outer axis border (where the
// ticklabels are drawn). Since the title text will be drawn above the baseline,
// bottom/right axes must be shifted by 1 text line to draw below ticklabels instead of on
// top of them, whereas for top/left axes, the first line would be drawn
// before the ticklabels, but we need an offset for the descender portion of the first line
// and all subsequent lines.
if(ax.side === 'bottom' || ax.side === 'right') {
titleStandoff = ax._depth + ax.title.standoff + fontSize * CAP_SHIFT;
} else if(ax.side === 'top' || ax.side === 'left') {
titleStandoff = ax._depth + ax.title.standoff + fontSize * (MID_SHIFT + (extraLines * LINE_SPACING));
}
} else {
var isInside = insideTicklabelposition(ax);

Expand Down
Binary file modified test/image/baselines/axis-title-standoff.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/image/baselines/line_scatter_change_side.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/image/baselines/line_scatter_change_side_shrunk.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/image/baselines/line_scatter_regular_side.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/image/baselines/line_scatter_regular_side_shrunk.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/image/baselines/mult-yaxes-simple.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/image/baselines/petrophysics.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/image/mocks/axis-title-standoff.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"yaxis": {
"title": {
"text": "Y<br>Axis (standoff:8)",
"text": "Y<br>Axis (standoff:0)",
"standoff": 0,
"font": {"size": 8}
},
Expand Down
155 changes: 155 additions & 0 deletions test/image/mocks/zz-axis_title_standoff0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
{
"data": [
{
"mode": "markers",
"x": [
100,
200,
300,
400,
500
],
"y": [
200,
300,
400,
500,
600
],
"type": "scatter"
},
{
"mode": "markers",
"x": [
100,
200,
300,
400,
500
],
"y": [
200,
300,
400,
500,
600
],
"type": "scatter",
"xaxis": "x2",
"yaxis": "y2"
},
{
"mode": "markers",
"x": [
100,
200,
300,
400,
500
],
"y": [
200,
300,
400,
500,
600
],
"type": "scatter",
"xaxis": "x3",
"yaxis": "y3"
},
{
"mode": "markers",
"x": [
100,
200,
300,
400,
500
],
"y": [
200,
300,
400,
500,
600
],
"type": "scatter",
"xaxis": "x4",
"yaxis": "y4"
}
],
"layout": {
"width": 800,
"legend": {
"visible": false
},
"grid": {
"rows": 2,
"columns": 2,
"pattern": "independent",
"xgap": 0.4
},
"xaxis": {
"title": {
"text": "______xaxis______",
"standoff": 0
},
"side": "top",
"automargin": true
},
"xaxis3": {
"title": {
"text": "¯¯¯¯¯¯xaxis3¯¯¯¯¯¯",
"standoff": 0
},
"automargin": true
},
"yaxis": {
"title": {
"text": "______yaxis______",
"standoff": 0
},
"automargin": true
},
"yaxis3": {
"title": {
"text": "¯¯¯¯¯¯yaxis3¯¯¯¯¯¯",
"standoff": 0
},
"side": "right",
"automargin": true
},
"xaxis2": {
"title": {
"text": "xaxis2<br>some<br>more<br>______text______",
"standoff": 0
},
"side": "top",
"automargin": true
},
"xaxis4": {
"title": {
"text": "¯¯¯¯¯¯xaxis4¯¯¯¯¯¯<br>some<br>more<br>text",
"standoff": 0
},
"side": "bottom",
"automargin": true
},
"yaxis2": {
"title": {
"text": "¯¯¯¯¯¯yaxis2¯¯¯¯¯¯<br>some<br>more<br>text",
"standoff": 0
},
"side": "right",
"automargin": true
},
"yaxis4": {
"title": {
"text": "yaxis4<br>some<br>more<br>______text______",
"standoff": 0
},
"automargin": true
}
}
}