Browse Source

Merge pull request #15847 from LeoMorgan113/feature/ticks-label-fix

Fix chart axis ticks font size
pull/15913/head
Valeriia Koriavikova 2 weeks ago
committed by GitHub
parent
commit
ec5be9bfef
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 25
      ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts

25
ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts

@ -846,15 +846,29 @@ export class TbTimeSeriesChart {
} }
} }
private maxTickLabelHalfHeight(): number {
const axes = this.yAxisList.filter(a => a.settings.show && a.settings.showTickLabels);
if (!axes.length) {
return 0;
}
const defaultSize = defaultTimeSeriesChartYAxisSettings.tickLabelFont.size;
const maxFontSize = Math.max(...axes.map(a => a.settings.tickLabelFont?.size || defaultSize));
return Math.ceil(maxFontSize / 2);
}
private minTopOffset(): number { private minTopOffset(): number {
const showTickLabels = if (this.topPointLabels) {
!!this.yAxisList.find(yAxis => yAxis.settings.show && yAxis.settings.showTickLabels); return 25;
return (this.topPointLabels) ? 25 : }
(showTickLabels ? 10 : 5); const half = this.maxTickLabelHalfHeight();
return half ? Math.max(10, half) : 5;
} }
private minBottomOffset(): number { private minBottomOffset(): number {
return this.settings.dataZoom ? 45 : 5; const half = this.maxTickLabelHalfHeight();
const minOffset = half ? Math.max(5, half) : 5;
return this.settings.dataZoom ? Math.max(45, minOffset) : minOffset;
} }
private _onParentScroll() { private _onParentScroll() {
@ -883,6 +897,7 @@ export class TbTimeSeriesChart {
this.updateBarsAnimation(barItems, false); this.updateBarsAnimation(barItems, false);
} }
this.timeSeriesChart.resize(); this.timeSeriesChart.resize();
this.updateAxes();
if (this.animationEnabled()) { if (this.animationEnabled()) {
this.updateBarsAnimation(barItems, true); this.updateBarsAnimation(barItems, true);
} }

Loading…
Cancel
Save