Bento, the office suite that fits in a file
TypeScript mit-licenseofficeoffice-365office-suiteoffice-toolsoffice365open-sourcepowerpointself-hostedsingle-page-appslidesslideshareslideshowslideshow-galleryslideshow-makerslideshows
Charts: reserve the legend's height in the cartesian grid too
nyblnetb58b24a8a0be
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex abb20b4b..60b5fb50 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -11,6 +11,10 @@ pre-1.0.## [Unreleased]+- **Fix: a large chart legend no longer crowds the axis labels.** Charts that+ don't set their own margins now leave room for the legend at whatever size+ it's set to, instead of assuming the default one.+- **Chart labels and legends now honor their visual options.** The lightweightchart renderer applies configured font sizes and weights to axis labels andlegends, respects legend spacing and placement, and measures CJK legend textdiff --git a/kernel/src/charts.ts b/kernel/src/charts.tsindex b72b9845..6f6c6739 100644--- a/kernel/src/charts.ts+++ b/kernel/src/charts.ts@@ -164,13 +164,33 @@ function digest(option: Opt, w: number, h: number): Digest {const twoAxes = !isPie && yAxes.length > 1const pieTop = legend?.top !== undefined ? legend.top + legendH : 0const pieBottom = legend && legend.top === undefined ? legend.bottom + legendH : 0+ // A cartesian plot has to make room for the legend too, not just a pie.+ //+ // The legend's height now follows its own font size, so a big legend gets+ // taller — but the default bottom inset is a fixed 44px, sized for the old+ // 12px legend. Past roughly 20px the legend simply grew into the x-axis+ // labels and the two overlapped. Only ever visible on a chart that does NOT+ // set `grid` explicitly, which is why a chart authored with generous margins+ // looks fine and the default one does not.+ //+ // An EXPLICIT grid value always wins: someone who wrote `grid.bottom` meant+ // it, and silently enlarging their inset would be its own bug. This only+ // raises the DEFAULT, and only by however much the legend actually outgrew+ // the space that default assumed.+ const legendPad = Math.max(0, legendH - 12) // 12px legend == the old default+ const gridBottom = g.bottom !== undefined+ ? num(g.bottom, 44)+ : 44 + (legend && legend.top === undefined ? legendPad : 0)+ const gridTop = g.top !== undefined+ ? num(g.top, 24)+ : 24 + (legend?.top !== undefined ? legendPad : 0)const grid = isPie? { x: 0, y: pieTop, w, h: Math.max(0, h - pieTop - pieBottom) }: {x: num(g.left, 48),- y: num(g.top, 24),+ y: gridTop,w: w - num(g.left, 48) - num(g.right, twoAxes ? 56 : 16),- h: h - num(g.top, 24) - num(g.bottom, 44),+ h: Math.max(0, h - gridTop - gridBottom),}return {w, h,