The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Increase stacked series gap, make it dynamic (#72118)
Aleksandr Lesnenkoafe5a73498aa
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Split_Panels_Ordinal_Mixed_Ticks_Widths_Per_Panel.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Split_Panels_Ordinal_Mixed_Ticks_Widths_Per_Panel.pngindex b1987f93e1e..c0198aa8567 100644Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Split_Panels_Ordinal_Mixed_Ticks_Widths_Per_Panel.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Split_Panels_Ordinal_Mixed_Ticks_Widths_Per_Panel.png differdiff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Combo_Split_Panels_Mixed_Series_Display_Settings.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Combo_Split_Panels_Mixed_Series_Display_Settings.pngindex 79185b99d28..71f256b5fc9 100644Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Combo_Split_Panels_Mixed_Series_Display_Settings.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Combo_Split_Panels_Mixed_Series_Display_Settings.png differdiff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Line_Chart_Split_Panels_Timeseries_Different_Ranges.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Line_Chart_Split_Panels_Timeseries_Different_Ranges.pngindex fd7440a1877..1865ffb9942 100644Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Line_Chart_Split_Panels_Timeseries_Different_Ranges.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Line_Chart_Split_Panels_Timeseries_Different_Ranges.png differdiff --git a/.loki/reference/chrome_laptop_viz_GridMapPdfExport_Grid_Map_Pdf_Export.png b/.loki/reference/chrome_laptop_viz_GridMapPdfExport_Grid_Map_Pdf_Export.pngdeleted file mode 100644index 2f40ada69ba..00000000000Binary files a/.loki/reference/chrome_laptop_viz_GridMapPdfExport_Grid_Map_Pdf_Export.png and /dev/null differdiff --git a/frontend/src/metabase/visualizations/echarts/cartesian/constants/style.ts b/frontend/src/metabase/visualizations/echarts/cartesian/constants/style.tsindex 03d0c0116f4..9c7c3bcc39b 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/constants/style.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/constants/style.ts@@ -67,6 +67,14 @@ export const CHART_STYLE = {borderWidth: 1,},splitPanel: {- gap: 30,+ gapRatio: 2.2,+ maxGap: 48,},};++export function getSplitPanelGap(panelHeight: number): number {+ return Math.min(+ panelHeight / CHART_STYLE.splitPanel.gapRatio,+ CHART_STYLE.splitPanel.maxGap,+ );+}diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.tsindex eccb8709182..58cf31763ec 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.ts@@ -2,7 +2,10 @@ import _ from "underscore";import { isNotNull } from "metabase/lib/types";import { X_AXIS_DATA_KEY } from "metabase/visualizations/echarts/cartesian/constants/dataset";-import { CHART_STYLE } from "metabase/visualizations/echarts/cartesian/constants/style";+import {+ CHART_STYLE,+ getSplitPanelGap,+} from "metabase/visualizations/echarts/cartesian/constants/style";import type {AxisFormatter,ChartDataset,@@ -835,6 +838,7 @@ export const getChartLayout = (outerHeight: height,axisEnabledSetting,stackedBarTicksRotation,+ panelGap: 0,};};@@ -903,10 +907,17 @@ const computeSplitPanelLayout = (ticksDimensions.yTicksWidthLeft -ticksDimensions.yTicksWidthRight;- const panelGap = CHART_STYLE.splitPanel.gap;+ const { gapRatio, maxGap } = CHART_STYLE.splitPanel;const availableHeight = height - padding.top - padding.bottom;- const panelHeight =- (availableHeight - (panelCount - 1) * panelGap) / panelCount;++ let panelHeight =+ availableHeight / (panelCount + (panelCount - 1) / gapRatio);+ let panelGap = getSplitPanelGap(panelHeight);++ if (panelGap >= maxGap) {+ panelGap = maxGap;+ panelHeight = (availableHeight - (panelCount - 1) * maxGap) / panelCount;+ }return {ticksDimensions,@@ -916,5 +927,6 @@ const computeSplitPanelLayout = (outerHeight: height,axisEnabledSetting,panelHeight,+ panelGap,};};diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/layout/types.ts b/frontend/src/metabase/visualizations/echarts/cartesian/layout/types.tsindex a3329f42140..3d6e39142a9 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/layout/types.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/layout/types.ts@@ -29,4 +29,5 @@ export interface ChartLayout {axisEnabledSetting: ComputedVisualizationSettings["graph.x_axis.axis_enabled"];stackedBarTicksRotation?: TicksRotation;panelHeight?: number;+ panelGap: number;}diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/index.tsindex aaff85c5c80..cb379100fef 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts@@ -338,7 +338,7 @@ export function buildSplitPanelGrid(right: chartLayout.padding.right,top:chartLayout.padding.top +- index * ((chartLayout.panelHeight ?? 0) + CHART_STYLE.splitPanel.gap),+ index * ((chartLayout.panelHeight ?? 0) + chartLayout.panelGap),height: chartLayout.panelHeight ?? 0,}));}@@ -455,7 +455,7 @@ export function getSplitPanelTimelineEventsYExtent(topY: chartLayout.padding.top,bottomY:chartLayout.padding.top +- (panelCount - 1) * (panelHeight + CHART_STYLE.splitPanel.gap) ++ (panelCount - 1) * (panelHeight + chartLayout.panelGap) +panelHeight,};}@@ -473,7 +473,7 @@ export function buildSplitPanelYAxisLabel(const panelHeight = chartLayout.panelHeight ?? 0;const totalPanelsHeight =- panelCount * panelHeight + (panelCount - 1) * CHART_STYLE.splitPanel.gap;+ panelCount * panelHeight + (panelCount - 1) * chartLayout.panelGap;const { fontSize } = renderingContext.theme.cartesian.label;return [