Skip to content

Add x boundaries for ticksarray #6912

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

Merged
merged 4 commits into from
Mar 1, 2024
Merged

Add x boundaries for ticksarray #6912

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
360d895
Add x boundaries for ticksarray
Farkites Mar 1, 2024
2f198eb
Fix lint errors
Farkites Mar 1, 2024
1168cd4
Replace baseline
Farkites Mar 1, 2024
2c08009
Add draftlog
Farkites Mar 1, 2024
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
Next Next commit
Add x boundaries for ticksarray
  • Loading branch information
@Farkites
Farkites committed Mar 1, 2024
commit 360d8959cfd9c0f21ef4774d0fa8fce11110b91d
17 changes: 11 additions & 6 deletions src/plots/cartesian/axes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,10 +1293,7 @@ function arrayTicks(ax, majorOnly) {
for(var i = 0; i < vals.length; i++) {
var vali = tickVal2l(vals[i]);
if(vali > tickMin && vali < tickMax) {
var obj = text[i] === undefined ?
axes.tickText(ax, vali) :
tickTextObj(ax, vali, String(text[i]));

var obj = axes.tickText(ax, vali, false, String(text[i]));
if(isMinor) {
obj.minor = true;
obj.text = '';
Expand Down Expand Up @@ -1633,6 +1630,14 @@ axes.tickText = function(ax, x, hover, noSuffixPrefix) {
}
if(i < ax.ticktext.length) {
out.text = String(ax.ticktext[i]);
var inbounds = function(v) {
var p = ax.l2p(v);
return p >= 0 && p <= ax._length ? v : null;
};
out.xbnd = [
inbounds(out.x - 0.5),
inbounds(out.x + ax.dtick - 0.5)
];
return out;
}
}
Expand Down Expand Up @@ -2807,7 +2812,7 @@ function getBoundaryVals(ax, vals) {
// boundaryVals are never used for labels;
// no need to worry about the other tickTextObj keys
var _push = function(d, bndIndex) {
var xb = d.xbnd ? d.xbnd[bndIndex] : d.x;
var xb = d.xbnd[bndIndex];
if(xb !== null) {
out.push(Lib.extendFlat({}, d, {x: xb}));
}
Expand Down Expand Up @@ -3755,7 +3760,7 @@ axes.drawLabels = function(gd, ax, opts) {
// TODO should secondary labels also fall into this fix-overlap regime?

for(i = 0; i < lbbArray.length; i++) {
var xbnd = (vals && vals[i].xbnd) ? vals[i].xbnd : [null, null];
var xbnd = vals[i].xbnd;
var lbb = lbbArray[i];
if(
(xbnd[0] !== null && (lbb.left - ax.l2p(xbnd[0])) < gap) ||
Expand Down