8000 Axes.draw w/o getBoundingClientRect + many axis automargin fixes by etpinard · Pull Request #4165 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Axes.draw w/o getBoundingClientRect + many axis automargin fixes #4165

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 15 commits into from
Sep 6, 2019
Merged

Axes.draw w/o getBoundingClientRect + many axis automargin fixes #4165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
93ef043
:hocho: useless axis mocking in polar
etpinard Aug 21, 2019
e907b9f
:hocho: obsolete `geocontainer` purge call
etpinard Aug 28, 2019
0cf93f8
use Plots.previousPromises in lsInner
etpinard Aug 20, 2019
2a9bbee
draw in shapes, images and annotations in drawData only
etpinard Aug 20, 2019
d54ec94
add four failing axis automargin mocks
etpinard Aug 27, 2019
a7e8eaf
add outside ticks to multicategory2 mock
etpinard Aug 27, 2019
16542f3
add spikeline tests
etpinard Aug 27, 2019
9781e8c
rename titleOffset -> Axes.getPxPosition
etpinard Aug 27, 2019
2e7b3dd
use Axes.getPxPosition instead of ax._boundingBox
etpinard Aug 22, 2019
9ebbd57
replace ax._counterSpan with ax._counterDomain(Min|Max)
etpinard Sep 4, 2019
d2650fe
resolve #1988 - :hocho: ax._boundingBox (!)
etpinard Sep 4, 2019
ecc592c
update baselines post :hocho: ax._boundingBox commit
etpinard Sep 4, 2019
daa88e0
fix #2434 - handle ax.automargin + ax.mirror cases
etpinard Sep 4, 2019
40f1b24
fix ax automargin for multi-line ax titles
etpinard Sep 4, 2019
bb127af
fix multicategory label placement for outside `tickson:labels`
etpinard Sep 4, 2019
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
Prev Previous commit
Next Next commit
resolve #1988 - 🔪 ax._boundingBox (!) 
- replace it with getLabelLevelBBox (an extension of getLabelLevelSpan),
  to compute axis margin push values. Use cache to not have to compute
  the (costly) label bounding boxes unnecessarily
- compute ax._depth during Axes.drawOne, which is the measure in px
  between axis position and outward-most part of bounding box,
  we use this for (1) multicategory label, (2) axis title and (3)
  rangeslider positioning
  • Loading branch information
@etpinard
etpinard committed Sep 4, 2019
commit d2650fe30a38a4997774acc3d66f97de44b0d989
3 changes: 1 addition & 2 deletions src/components/rangeslider/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,14 @@ module.exports = function(gd) {

var gs = fullLayout._size;
var domain = axisOpts.domain;
var tickHeight = opts._tickHeight;

opts._width = gs.w * (domain[1] - domain[0]);

var x = Math.round(gs.l + (gs.w * domain[0]));

var y = Math.round(
gs.t + gs.h * (1 - axisOpts._counterDomainMin) +
tickHeight +
(axisOpts.side === 'bottom' ? axisOpts._depth : 0) +
opts._offsetShift + constants.extraPad
);

Expand Down
9 changes: 3 additions & 6 deletions src/components/rangeslider/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,14 @@ exports.makeData = function(fullLayout) {

exports.autoMarginOpts = function(gd, ax) {
var opts = ax[name];

var tickHeight = (ax.side === 'bottom' && ax._boundingBox.height) || 0;
opts._tickHeight = tickHeight;

var bottomDepth = ax.side === 'bottom' ? ax._depth : 0;
return {
x: 0,
y: oppBottom,
y: ax._counterDomainMin,
l: 0,
r: 0,
t: 0,
b: opts._height + gd._fullLayout.margin.b + tickHeight,
b: opts._height + gd._fullLayout.margin.b + bottomDepth,
pad: constants.extraPad + opts._offsetShift * 2
};
};
Loading
0