From a3a79419d72187e692c6fe32d6705d1e0d7c88be Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Wed, 21 Oct 2026 21:17:25 +0100 Subject: [PATCH 01/24] fallback tickCount to number of tickValues --- .../VictoryChartRenderer/parsers/victoryAxisParser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index 6a5ee01533d9..40f08a5a4105 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -35,9 +35,9 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro const isHorizontal = rootProcessedResult?.isHorizontal; const isDependentAxis = 'dependentaxis' in tnode.attributes && tnode.attributes.dependentaxis !== 'false'; const orientation = parseAttributeAsString(tnode.attributes.orientation); - const tickCount = parseAttributeAsNumber(tnode.attributes.tickcount) ?? 0; const rawTickValues = parseAttributeAsNumberArray(tnode.attributes.tickvalues); const tickValues = Array.isArray(rawTickValues) ? rawTickValues : undefined; + const tickCount = parseAttributeAsNumber(tnode.attributes.tickcount) ?? tickValues?.length; const rawTickFormat = parseAttributeAsStringArray(tnode.attributes.tickformat); const tickFormat = Array.isArray(rawTickFormat) ? rawTickFormat : undefined; const formatLabel = (label: string | number) => tickFormat?.[tickValues?.indexOf(Number(label)) ?? -1] ?? String(label); From b3c2c02bab371e1a2e813c19c799c6437ae1b7a9 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Wed, 21 Oct 2026 21:31:55 +0100 Subject: [PATCH 02/24] remove tickCount patch --- patches/victory-native/details.md | 16 ---------------- ...ictory-native+42.0.1+002+tickCount-4121.patch | 13 ------------- 2 files changed, 29 deletions(-) delete mode 100644 patches/victory-native/victory-native+42.0.1+002+tickCount-4121.patch diff --git a/patches/victory-native/details.md b/patches/victory-native/details.md index ad919a91a15c..84c369411886 100644 --- a/patches/victory-native/details.md +++ b/patches/victory-native/details.md @@ -11,19 +11,3 @@ - Upstream PR/issue: Not yet. This is urgent patch with deadline. - E/App issue: https://github.com/Expensify/App/issues/91883 - PR introducing patch: https://github.com/Expensify/App/pull/91659 - - -### [victory-native+42.0.1+002+tickCount-4121.patch](victory-native+42.0.1+002+tickCount-4121.patch) - -- Reason: - - ``` - After updating to v42 the tickCount broke. - This was caused by this commit https://github.com/FormidableLabs/victory-native-xl/pull/664/changes/fcd8affe655878d0bf95ab87c087eab428d4f62d - which fixed some bug but caused us another bug. This small patch reverts it. This is a temporary solution not a real fix. - The fix should address both bugs. - ``` - -- Upstream PR/issue: Not yet. -- E/App issue: https://github.com/Expensify/App/issues/91883 -- PR introducing patch: https://github.com/Expensify/App/pull/100186 diff --git a/patches/victory-native/victory-native+42.0.1+002+tickCount-4121.patch b/patches/victory-native/victory-native+42.0.1+002+tickCount-4121.patch deleted file mode 100644 index 2df5629281c1..000000000000 --- a/patches/victory-native/victory-native+42.0.1+002+tickCount-4121.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/victory-native/src/utils/tickHelpers.ts b/node_modules/victory-native/src/utils/tickHelpers.ts -index 100fb89..ea9fdca 100644 ---- a/node_modules/victory-native/src/utils/tickHelpers.ts -+++ b/node_modules/victory-native/src/utils/tickHelpers.ts -@@ -17,7 +17,7 @@ export const downsampleTicks = (tickValues: number[], tickCount: number) => { - } - - if (tickCount <= 0) { -- return []; -+ return tickValues; - } - - if (!Array.isArray(tickValues) || tickValues.length <= tickCount) { From 5c46dad923b000a9277da9b3bea89c961d1950fa Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Wed, 21 Oct 2026 22:05:04 +0100 Subject: [PATCH 03/24] clean up --- .../parsers/victoryAxisParser.ts | 122 ++++++++++-------- 1 file changed, 66 insertions(+), 56 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index 40f08a5a4105..1bca2f36c6b5 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -1,5 +1,5 @@ import {LEFT_AXIS_LABEL_OFFSET_MAX} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/constants'; -import type {PartialProcessNodeResult, ProcessNodeResult} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; +import type {CartesianChartProps, PartialProcessNodeResult, ProcessNodeResult} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; import getFontGlyphWidth from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getFontGlyphWidth'; import { parseAttributeAsNumber, @@ -11,6 +11,7 @@ import parseRawAxisStyle from '@components/HTMLEngineProvider/HTMLRenderers/Vict import type {SkFont, SkTypeface} from '@shopify/react-native-skia'; import type {TNode} from 'react-native-render-html'; +import type {XAxisSide, YAxisSide} from 'victory-native'; import {Skia} from '@shopify/react-native-skia'; @@ -46,74 +47,83 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro // 0 width intentionally avoids drawing grid lines, preserving VictoryChart compatibility const lineWidth = style?.grid?.strokeWidth !== undefined ? Number(style.grid.strokeWidth) : 0; const labelColor = style?.tickLabels?.fill !== undefined ? String(style.tickLabels.fill) : undefined; - const labelOffset = style?.tickLabels?.padding !== undefined ? Number(style.tickLabels.padding) : undefined; const fontSize = style?.tickLabels?.fontSize !== undefined ? Number(style.tickLabels.fontSize) : undefined; const font = typeface && fontSize ? Skia.Font(typeface, fontSize) : null; const labelsForMeasurement = tickValues?.map(formatLabel) ?? tickFormat; + const rawLabelOffset = style?.tickLabels?.padding !== undefined ? Number(style.tickLabels.padding) : undefined; - if (isDependentAxis) { - return isHorizontal - ? { - xAxis: { - tickCount, - tickValues, - formatXLabel: formatLabel, - axisSide: orientation === 'right' ? 'top' : 'bottom', - lineColor, - lineWidth, - labelColor, - labelOffset, - font, - }, - } - : { - yAxis: [ - { - tickCount, - tickValues, - formatYLabel: formatLabel, - axisSide: orientation === 'right' ? 'right' : 'left', - lineColor, - lineWidth, - labelColor, - labelOffset, - font, - }, - ], - }; - } - if (isHorizontal) { - const axisSide = orientation === 'top' ? 'right' : 'left'; - const resolvedLabelOffset = axisSide === 'left' && labelOffset !== undefined ? Math.min(labelOffset, LEFT_AXIS_LABEL_OFFSET_MAX) : labelOffset; - return { - yAxis: [ - { - tickCount, - tickValues, - formatYLabel: formatLabel, - axisSide, - lineColor, - lineWidth, - labelColor, - labelOffset: resolvedLabelOffset, - font, - }, - ], - leftAxisLabelPadding: computeLeftAxisLabelPadding(axisSide, labelsForMeasurement, font, resolvedLabelOffset), + let xAxis: CartesianChartProps['xAxis'] | undefined; + let yAxis: CartesianChartProps['yAxis'] | undefined; + let axisSide: XAxisSide | YAxisSide | undefined; + let labelOffset: number | undefined; + let leftAxisLabelPadding: number | undefined; + + if (isDependentAxis && isHorizontal) { + axisSide = orientation === 'right' ? 'top' : 'bottom'; + labelOffset = rawLabelOffset; + xAxis = { + tickCount, + tickValues, + formatXLabel: formatLabel, + axisSide, + lineColor, + lineWidth, + labelColor, + labelOffset, + font, }; - } - return { - xAxis: { + } else if (isDependentAxis && !isHorizontal) { + axisSide = orientation === 'right' ? 'right' : 'left'; + labelOffset = rawLabelOffset; + yAxis = [ + { + tickCount, + tickValues, + formatYLabel: formatLabel, + axisSide, + lineColor, + lineWidth, + labelColor, + labelOffset, + font, + }, + ]; + } else if (!isDependentAxis && isHorizontal) { + axisSide = orientation === 'top' ? 'right' : 'left'; + labelOffset = axisSide === 'left' && rawLabelOffset !== undefined ? Math.min(rawLabelOffset, LEFT_AXIS_LABEL_OFFSET_MAX) : rawLabelOffset; + yAxis = [ + { + tickCount, + tickValues, + formatYLabel: formatLabel, + axisSide, + lineColor, + lineWidth, + labelColor, + labelOffset, + font, + }, + ]; + leftAxisLabelPadding = computeLeftAxisLabelPadding(axisSide, labelsForMeasurement, font, labelOffset); + } else if (!isDependentAxis && !isHorizontal) { + ((axisSide = orientation === 'top' ? 'top' : 'bottom'), (labelOffset = rawLabelOffset)); + xAxis = { tickCount, tickValues, formatXLabel: formatLabel, - axisSide: orientation === 'top' ? 'top' : 'bottom', + axisSide, lineColor, lineWidth, labelColor, labelOffset, font, - }, + }; + } + + return { + xAxis, + yAxis, + leftAxisLabelPadding, }; } From efa838b624f79f889519b73b7e35e28a52c19624 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Wed, 21 Oct 2026 22:06:05 +0100 Subject: [PATCH 04/24] fix declaration --- .../VictoryChartRenderer/parsers/victoryAxisParser.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index 1bca2f36c6b5..e466d6fc9761 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -106,7 +106,8 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro ]; leftAxisLabelPadding = computeLeftAxisLabelPadding(axisSide, labelsForMeasurement, font, labelOffset); } else if (!isDependentAxis && !isHorizontal) { - ((axisSide = orientation === 'top' ? 'top' : 'bottom'), (labelOffset = rawLabelOffset)); + axisSide = orientation === 'top' ? 'top' : 'bottom'; + labelOffset = rawLabelOffset; xAxis = { tickCount, tickValues, From 9aa3b768629c91afd4f5ba4b0a06a88ce5370d56 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Wed, 21 Oct 2026 22:47:23 +0100 Subject: [PATCH 05/24] compensate for padding --- .../parsers/victoryAxisParser.ts | 58 +++++++++++++++++-- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index e466d6fc9761..c389368c8467 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -1,6 +1,7 @@ import {LEFT_AXIS_LABEL_OFFSET_MAX} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/constants'; import type {CartesianChartProps, PartialProcessNodeResult, ProcessNodeResult} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; import getFontGlyphWidth from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getFontGlyphWidth'; +import getSkiaLineMetrics from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getSkiaLineMetrics'; import { parseAttributeAsNumber, parseAttributeAsNumberArray, @@ -16,14 +17,17 @@ import type {XAxisSide, YAxisSide} from 'victory-native'; import {Skia} from '@shopify/react-native-skia'; /** - * The widest rendered label on a left-side y-axis, plus its offset from the axis line — - * i.e. how much horizontal space the axis actually needs for its labels. Used to shrink - * the chart's `padding.left` when the configured value is more than the content needs. + * For y-axis this returns the widest rendered label plus its offset from the axis line + * For x-axis this returns the label line height plus plus its offset from the axis line */ -function computeLeftAxisLabelPadding(axisSide: 'left' | 'right', labels: Array | undefined, font: SkFont | null, labelOffset: number | undefined): number | undefined { - if (axisSide !== 'left' || !font || !labels?.length) { +function computeAxisSize(axisSide: XAxisSide | YAxisSide, labels: Array | undefined, font: SkFont | null, labelOffset: number | undefined): number | undefined { + if (!font || !labels?.length) { return undefined; } + if (axisSide === 'bottom' || axisSide === 'top') { + const lineHeight = getSkiaLineMetrics(font).lineHeight; + return 2 * lineHeight + (labelOffset ?? 0); + } const maxLabelWidth = Math.max(...labels.map((label) => getFontGlyphWidth(String(label), font))); return maxLabelWidth + (labelOffset ?? 0); } @@ -56,11 +60,13 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro let yAxis: CartesianChartProps['yAxis'] | undefined; let axisSide: XAxisSide | YAxisSide | undefined; let labelOffset: number | undefined; + let axisSize: number | undefined; let leftAxisLabelPadding: number | undefined; if (isDependentAxis && isHorizontal) { axisSide = orientation === 'right' ? 'top' : 'bottom'; labelOffset = rawLabelOffset; + axisSize = computeAxisSize(axisSide, labelsForMeasurement, font, labelOffset); xAxis = { tickCount, tickValues, @@ -75,6 +81,7 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro } else if (isDependentAxis && !isHorizontal) { axisSide = orientation === 'right' ? 'right' : 'left'; labelOffset = rawLabelOffset; + axisSize = computeAxisSize(axisSide, labelsForMeasurement, font, labelOffset); yAxis = [ { tickCount, @@ -91,6 +98,8 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro } else if (!isDependentAxis && isHorizontal) { axisSide = orientation === 'top' ? 'right' : 'left'; labelOffset = axisSide === 'left' && rawLabelOffset !== undefined ? Math.min(rawLabelOffset, LEFT_AXIS_LABEL_OFFSET_MAX) : rawLabelOffset; + axisSize = computeAxisSize(axisSide, labelsForMeasurement, font, labelOffset); + leftAxisLabelPadding = axisSide === 'left' ? axisSize : undefined; yAxis = [ { tickCount, @@ -104,10 +113,10 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro font, }, ]; - leftAxisLabelPadding = computeLeftAxisLabelPadding(axisSide, labelsForMeasurement, font, labelOffset); } else if (!isDependentAxis && !isHorizontal) { axisSide = orientation === 'top' ? 'top' : 'bottom'; labelOffset = rawLabelOffset; + axisSize = computeAxisSize(axisSide, labelsForMeasurement, font, labelOffset); xAxis = { tickCount, tickValues, @@ -121,6 +130,43 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro }; } + // The axis size is used to reduce the size of the padding since the axis labels consume part of the drawing window + // and we need to compensate for that otherwise the chart will look smaller + if (rootProcessedResult && axisSize) { + if (!rootProcessedResult.padding || typeof rootProcessedResult.padding === 'number') { + rootProcessedResult.padding = { + left: rootProcessedResult.padding, + right: rootProcessedResult.padding, + top: rootProcessedResult.padding, + bottom: rootProcessedResult.padding, + }; + } + switch (axisSide) { + case 'bottom': + if (rootProcessedResult.padding.bottom) { + rootProcessedResult.padding.bottom -= axisSize; + } + break; + case 'top': + if (rootProcessedResult.padding.top) { + rootProcessedResult.padding.top -= axisSize; + } + break; + case 'left': + if (rootProcessedResult.padding.left) { + rootProcessedResult.padding.left -= axisSize; + } + break; + case 'right': + if (rootProcessedResult.padding.right) { + rootProcessedResult.padding.right -= axisSize; + } + break; + default: + break; + } + } + return { xAxis, yAxis, From 6bef6ad9bdb841716cf13bfe78ea5958813e7ce5 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Thu, 22 Oct 2026 01:40:34 +0100 Subject: [PATCH 06/24] fix axisSIze line height --- .../VictoryChartRenderer/parsers/victoryAxisParser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index c389368c8467..31a71c9627ff 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -26,7 +26,7 @@ function computeAxisSize(axisSide: XAxisSide | YAxisSide, labels: Array getFontGlyphWidth(String(label), font))); return maxLabelWidth + (labelOffset ?? 0); From 5b498269cf9e4d139a7538006be7e0abd4c65540 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Thu, 22 Oct 2026 01:43:45 +0100 Subject: [PATCH 07/24] guard on tickCount --- .../VictoryChartRenderer/parsers/victoryAxisParser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index 31a71c9627ff..50e9ef91ec14 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -132,7 +132,7 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro // The axis size is used to reduce the size of the padding since the axis labels consume part of the drawing window // and we need to compensate for that otherwise the chart will look smaller - if (rootProcessedResult && axisSize) { + if (rootProcessedResult && axisSize && tickCount) { if (!rootProcessedResult.padding || typeof rootProcessedResult.padding === 'number') { rootProcessedResult.padding = { left: rootProcessedResult.padding, From b757f35936d513a6c2f6660cf31730aba63358fd Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Thu, 22 Oct 2026 16:44:52 +0100 Subject: [PATCH 08/24] add axis sizes to padding resolver --- .../parsers/processVictoryChartTree.ts | 43 ++++++++++--- .../parsers/victoryAxisParser.ts | 60 +++++++------------ .../VictoryChartRenderer/types.ts | 6 +- .../utils/resolvePadding.ts | 37 ++++++++++-- .../VictoryChartExpandModalTest.tsx | 5 +- .../VictoryChartScaledProviderTest.tsx | 5 +- 6 files changed, 101 insertions(+), 55 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts index 8d44f9b7f822..c9ef2dfa684b 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts @@ -21,7 +21,10 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root let domain: ProcessNodeResult['domain']; let domainPadding: ProcessNodeResult['domainPadding']; let padding: ProcessNodeResult['padding']; - let leftAxisLabelPadding: ProcessNodeResult['leftAxisLabelPadding']; + let leftAxisSize: ProcessNodeResult['leftAxisSize']; + let rightAxisSize: ProcessNodeResult['rightAxisSize']; + let bottomAxisSize: ProcessNodeResult['bottomAxisSize']; + let topAxisSize: ProcessNodeResult['topAxisSize']; let isHorizontal: ProcessNodeResult['isHorizontal']; let categories: ProcessNodeResult['categories']; const labelItems: ProcessNodeResult['labelItems'] = []; @@ -52,8 +55,17 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root if (result.padding) { padding = result.padding; } - if (result.leftAxisLabelPadding !== undefined) { - leftAxisLabelPadding = result.leftAxisLabelPadding; + if (result.leftAxisSize !== undefined) { + leftAxisSize = result.leftAxisSize; + } + if (result.rightAxisSize !== undefined) { + rightAxisSize = result.rightAxisSize; + } + if (result.bottomAxisSize !== undefined) { + bottomAxisSize = result.bottomAxisSize; + } + if (result.topAxisSize !== undefined) { + topAxisSize = result.topAxisSize; } if (result.isHorizontal) { isHorizontal = result.isHorizontal; @@ -82,7 +94,10 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root domain, domainPadding, padding, - leftAxisLabelPadding, + leftAxisSize, + rightAxisSize, + bottomAxisSize, + topAxisSize, isHorizontal, categories, labelItems, @@ -109,8 +124,17 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root if (childResult.padding) { padding = childResult.padding; } - if (childResult.leftAxisLabelPadding !== undefined) { - leftAxisLabelPadding = childResult.leftAxisLabelPadding; + if (childResult.leftAxisSize !== undefined) { + leftAxisSize = childResult.leftAxisSize; + } + if (childResult.rightAxisSize !== undefined) { + rightAxisSize = childResult.rightAxisSize; + } + if (childResult.bottomAxisSize !== undefined) { + bottomAxisSize = childResult.bottomAxisSize; + } + if (childResult.topAxisSize !== undefined) { + topAxisSize = childResult.topAxisSize; } if (childResult.isHorizontal) { isHorizontal = childResult.isHorizontal; @@ -131,8 +155,11 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root yAxis, domain, domainPadding, - padding: resolvePadding(padding, leftAxisLabelPadding), - leftAxisLabelPadding, + padding: resolvePadding(padding, leftAxisSize, rightAxisSize, bottomAxisSize, topAxisSize), + leftAxisSize, + rightAxisSize, + bottomAxisSize, + topAxisSize, isHorizontal, categories, labelItems, diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index 50e9ef91ec14..65ad9e1801da 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -26,10 +26,10 @@ function computeAxisSize(axisSide: XAxisSide | YAxisSide, labels: Array getFontGlyphWidth(String(label), font))); - return maxLabelWidth + (labelOffset ?? 0); + return Math.ceil(maxLabelWidth + (labelOffset ?? 0)); } /** @@ -56,17 +56,19 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro const labelsForMeasurement = tickValues?.map(formatLabel) ?? tickFormat; const rawLabelOffset = style?.tickLabels?.padding !== undefined ? Number(style.tickLabels.padding) : undefined; - let xAxis: CartesianChartProps['xAxis'] | undefined; - let yAxis: CartesianChartProps['yAxis'] | undefined; let axisSide: XAxisSide | YAxisSide | undefined; let labelOffset: number | undefined; - let axisSize: number | undefined; - let leftAxisLabelPadding: number | undefined; + let xAxis: CartesianChartProps['xAxis'] | undefined; + let yAxis: CartesianChartProps['yAxis'] | undefined; + + let leftAxisSize: number | undefined; + let rightAxisSize: number | undefined; + let bottomAxisSize: number | undefined; + let topAxisSize: number | undefined; if (isDependentAxis && isHorizontal) { axisSide = orientation === 'right' ? 'top' : 'bottom'; labelOffset = rawLabelOffset; - axisSize = computeAxisSize(axisSide, labelsForMeasurement, font, labelOffset); xAxis = { tickCount, tickValues, @@ -81,7 +83,6 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro } else if (isDependentAxis && !isHorizontal) { axisSide = orientation === 'right' ? 'right' : 'left'; labelOffset = rawLabelOffset; - axisSize = computeAxisSize(axisSide, labelsForMeasurement, font, labelOffset); yAxis = [ { tickCount, @@ -98,8 +99,6 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro } else if (!isDependentAxis && isHorizontal) { axisSide = orientation === 'top' ? 'right' : 'left'; labelOffset = axisSide === 'left' && rawLabelOffset !== undefined ? Math.min(rawLabelOffset, LEFT_AXIS_LABEL_OFFSET_MAX) : rawLabelOffset; - axisSize = computeAxisSize(axisSide, labelsForMeasurement, font, labelOffset); - leftAxisLabelPadding = axisSide === 'left' ? axisSize : undefined; yAxis = [ { tickCount, @@ -116,7 +115,6 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro } else if (!isDependentAxis && !isHorizontal) { axisSide = orientation === 'top' ? 'top' : 'bottom'; labelOffset = rawLabelOffset; - axisSize = computeAxisSize(axisSide, labelsForMeasurement, font, labelOffset); xAxis = { tickCount, tickValues, @@ -132,35 +130,20 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro // The axis size is used to reduce the size of the padding since the axis labels consume part of the drawing window // and we need to compensate for that otherwise the chart will look smaller - if (rootProcessedResult && axisSize && tickCount) { - if (!rootProcessedResult.padding || typeof rootProcessedResult.padding === 'number') { - rootProcessedResult.padding = { - left: rootProcessedResult.padding, - right: rootProcessedResult.padding, - top: rootProcessedResult.padding, - bottom: rootProcessedResult.padding, - }; - } + if (axisSide && tickCount) { + const axisSize = computeAxisSize(axisSide, labelsForMeasurement, font, labelOffset); switch (axisSide) { - case 'bottom': - if (rootProcessedResult.padding.bottom) { - rootProcessedResult.padding.bottom -= axisSize; - } - break; - case 'top': - if (rootProcessedResult.padding.top) { - rootProcessedResult.padding.top -= axisSize; - } - break; case 'left': - if (rootProcessedResult.padding.left) { - rootProcessedResult.padding.left -= axisSize; - } + leftAxisSize = axisSize; break; case 'right': - if (rootProcessedResult.padding.right) { - rootProcessedResult.padding.right -= axisSize; - } + rightAxisSize = axisSize; + break; + case 'bottom': + bottomAxisSize = axisSize; + break; + case 'top': + topAxisSize = axisSize; break; default: break; @@ -170,7 +153,10 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro return { xAxis, yAxis, - leftAxisLabelPadding, + leftAxisSize, + rightAxisSize, + bottomAxisSize, + topAxisSize, }; } diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts index c7addc6a3472..649363ae293f 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts @@ -170,8 +170,10 @@ type ProcessNodeResult = { domain: CartesianChartProps['domain']; domainPadding: CartesianChartProps['domainPadding']; padding: CartesianChartProps['padding']; - // Pixel width the left y-axis actually needs for its widest label, used to shrink `padding.left` when it's larger than the content requires. - leftAxisLabelPadding: number | undefined; + leftAxisSize: number | undefined; + rightAxisSize: number | undefined; + bottomAxisSize: number | undefined; + topAxisSize: number | undefined; isHorizontal: boolean | undefined; categories: string[] | undefined; labelItems: LabelItem[]; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts index d090f0b5c204..4341a7817d6a 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts @@ -4,14 +4,39 @@ import type {ProcessNodeResult} from '@components/HTMLEngineProvider/HTMLRendere import lodashIsObject from 'lodash/isObject'; /** - * Shrinks `padding.left` down to the left axis's measured label width (plus a small edge buffer) - * whenever the configured padding is wider than the label content actually needs. + * Shrinks the padding to take into account the size consumed by the axis. */ -function resolvePadding(padding: ProcessNodeResult['padding'], leftAxisLabelPadding: ProcessNodeResult['leftAxisLabelPadding']): ProcessNodeResult['padding'] { - if (leftAxisLabelPadding === undefined || !lodashIsObject(padding) || typeof padding.left !== 'number') { - return padding; +function resolvePadding( + padding: ProcessNodeResult['padding'], + leftAxisSize: ProcessNodeResult['leftAxisSize'], + rightAxisSize: ProcessNodeResult['rightAxisSize'], + bottomAxisSize: ProcessNodeResult['bottomAxisSize'], + topAxisSize: ProcessNodeResult['topAxisSize'], +): ProcessNodeResult['padding'] { + let resolvedPadding = padding; + if (!resolvedPadding || typeof resolvedPadding === 'number') { + resolvedPadding = { + left: resolvedPadding, + right: resolvedPadding, + top: resolvedPadding, + bottom: resolvedPadding, + }; } - return {...padding, left: Math.min(padding.left, Math.ceil(leftAxisLabelPadding) + LEFT_AXIS_LABEL_PADDING)}; + + if (leftAxisSize && resolvedPadding.left) { + resolvedPadding.left = Math.min(resolvedPadding.left, leftAxisSize + LEFT_AXIS_LABEL_PADDING) - leftAxisSize; + } + if (rightAxisSize && resolvedPadding.right) { + resolvedPadding.right -= rightAxisSize; + } + if (bottomAxisSize && resolvedPadding.bottom) { + resolvedPadding.bottom -= bottomAxisSize; + } + if (topAxisSize && resolvedPadding.top) { + resolvedPadding.top -= topAxisSize; + } + + return resolvedPadding; } export default resolvePadding; diff --git a/tests/unit/components/HTMLEngineProvider/VictoryChartExpandModalTest.tsx b/tests/unit/components/HTMLEngineProvider/VictoryChartExpandModalTest.tsx index 8e29574e1057..821ba2caa96c 100644 --- a/tests/unit/components/HTMLEngineProvider/VictoryChartExpandModalTest.tsx +++ b/tests/unit/components/HTMLEngineProvider/VictoryChartExpandModalTest.tsx @@ -35,7 +35,10 @@ const processedResult = { domain: undefined, domainPadding: 20, padding: 16, - leftAxisLabelPadding: undefined, + leftAxisSize: undefined, + rightAxisSize: undefined, + bottomAxisSize: undefined, + topAxisSize: undefined, isHorizontal: false, categories: undefined, labelItems: [], diff --git a/tests/unit/components/HTMLEngineProvider/VictoryChartScaledProviderTest.tsx b/tests/unit/components/HTMLEngineProvider/VictoryChartScaledProviderTest.tsx index 65bfcba3d9d0..73516b8001e1 100644 --- a/tests/unit/components/HTMLEngineProvider/VictoryChartScaledProviderTest.tsx +++ b/tests/unit/components/HTMLEngineProvider/VictoryChartScaledProviderTest.tsx @@ -23,7 +23,10 @@ const processedResult = { domain: undefined, domainPadding: 20, padding: 16, - leftAxisLabelPadding: undefined, + leftAxisSize: undefined, + rightAxisSize: undefined, + bottomAxisSize: undefined, + topAxisSize: undefined, isHorizontal: false, categories: undefined, labelItems: [{x: 340, y: 24, text: 'Title', fontSize: {0: 14}}], From c7be0d894d7477b716ec5b83b7cfcdaff6a0eed7 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Thu, 22 Oct 2026 16:51:25 +0100 Subject: [PATCH 09/24] fix overwriting padding --- .../VictoryChartRenderer/utils/resolvePadding.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts index 4341a7817d6a..33d934092baf 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts @@ -13,8 +13,12 @@ function resolvePadding( bottomAxisSize: ProcessNodeResult['bottomAxisSize'], topAxisSize: ProcessNodeResult['topAxisSize'], ): ProcessNodeResult['padding'] { + if (!padding) { + return; + } + let resolvedPadding = padding; - if (!resolvedPadding || typeof resolvedPadding === 'number') { + if (typeof resolvedPadding === 'number') { resolvedPadding = { left: resolvedPadding, right: resolvedPadding, From 811aa942310f2646d2d748e4914c755d04a2feb1 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Thu, 22 Oct 2026 16:52:45 +0100 Subject: [PATCH 10/24] lint and add comment --- .../VictoryChartRenderer/utils/resolvePadding.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts index 33d934092baf..876009b8ab6c 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts @@ -1,8 +1,6 @@ import {LEFT_AXIS_LABEL_PADDING} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/constants'; import type {ProcessNodeResult} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; -import lodashIsObject from 'lodash/isObject'; - /** * Shrinks the padding to take into account the size consumed by the axis. */ @@ -28,6 +26,8 @@ function resolvePadding( } if (leftAxisSize && resolvedPadding.left) { + // Shrinks `padding.left` down to the left axis's measured label width (plus a small edge buffer) + // whenever the configured padding is wider than the label content actually needs. resolvedPadding.left = Math.min(resolvedPadding.left, leftAxisSize + LEFT_AXIS_LABEL_PADDING) - leftAxisSize; } if (rightAxisSize && resolvedPadding.right) { From 8e0dc5fbdaee2114ad2827e7896bb34ac197f118 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Thu, 22 Oct 2026 17:05:30 +0100 Subject: [PATCH 11/24] compute lineheight same as victory-native does --- .../VictoryChartRenderer/parsers/victoryAxisParser.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index 65ad9e1801da..d5805217926b 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -1,7 +1,6 @@ import {LEFT_AXIS_LABEL_OFFSET_MAX} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/constants'; import type {CartesianChartProps, PartialProcessNodeResult, ProcessNodeResult} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; import getFontGlyphWidth from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getFontGlyphWidth'; -import getSkiaLineMetrics from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getSkiaLineMetrics'; import { parseAttributeAsNumber, parseAttributeAsNumberArray, @@ -25,7 +24,9 @@ function computeAxisSize(axisSide: XAxisSide | YAxisSide, labels: Array getFontGlyphWidth(String(label), font))); From 7cf90dae4bd321c21084c50e4820af4151dcf878 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Thu, 22 Oct 2026 17:07:46 +0100 Subject: [PATCH 12/24] update golden --- .../__golden__/top-employees-by-spend.png | Bin 13673 -> 16530 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend.png b/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend.png index 088854b04d9016f6f7ae2525638ed2f3f16a250c..b4eaa3452e532ab82edf259b9e6a59e5ee652acc 100644 GIT binary patch literal 16530 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 W+dMr*K^r#=rmJOmu~6gcz5fL)kQ_?@ literal 13673 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 Date: Thu, 22 Oct 2026 17:08:54 +0100 Subject: [PATCH 13/24] Revert "update golden" This reverts commit 7cf90dae4bd321c21084c50e4820af4151dcf878. --- .../__golden__/top-employees-by-spend.png | Bin 16530 -> 13673 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend.png b/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend.png index b4eaa3452e532ab82edf259b9e6a59e5ee652acc..088854b04d9016f6f7ae2525638ed2f3f16a250c 100644 GIT binary patch literal 13673 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 W+dMr*K^r#=rmJOmu~6gcz5fL)kQ_?@ From 964a7c073b04d8cf66bb819d7e563a3984cf64c1 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Thu, 22 Oct 2026 17:10:27 +0100 Subject: [PATCH 14/24] Reapply "update golden" This reverts commit 81e5979bc2e91b3a9bf54b69dcda2b85e9833959. --- .../__golden__/top-employees-by-spend.png | Bin 13673 -> 16530 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend.png b/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend.png index 088854b04d9016f6f7ae2525638ed2f3f16a250c..b4eaa3452e532ab82edf259b9e6a59e5ee652acc 100644 GIT binary patch literal 16530 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 W+dMr*K^r#=rmJOmu~6gcz5fL)kQ_?@ literal 13673 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 Date: Thu, 22 Oct 2026 18:27:14 +0100 Subject: [PATCH 15/24] fix typo --- .../VictoryChartRenderer/parsers/victoryAxisParser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index d5805217926b..0dac5ffabdb2 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -17,7 +17,7 @@ import {Skia} from '@shopify/react-native-skia'; /** * For y-axis this returns the widest rendered label plus its offset from the axis line - * For x-axis this returns the label line height plus plus its offset from the axis line + * For x-axis this returns the label line height plus its offset from the axis line */ function computeAxisSize(axisSide: XAxisSide | YAxisSide, labels: Array | undefined, font: SkFont | null, labelOffset: number | undefined): number | undefined { if (!font || !labels?.length) { From 4ac1006f979d47ef3f8b19fe66c051a710d3774c Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Thu, 22 Oct 2026 19:01:35 +0100 Subject: [PATCH 16/24] take axis size into account when computing dynamic height --- .../context/VictoryChartContext.tsx | 4 +++- .../utils/computeDynamicChartHeight.ts | 8 +++++--- tests/unit/computeDynamicChartHeightTest.ts | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx index 26b685a6309f..55e25bf956cb 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx @@ -44,7 +44,7 @@ type VictoryChartProviderProps = { /** Supplies parsed chart config to chart sub-components. Callers must parse and validate the tnode first. */ function VictoryChartProvider({tnode, processedResult, type, children}: VictoryChartProviderProps) { - const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, categories, labelItems, legendItems, pointMetadata} = processedResult; + const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, bottomAxisSize, topAxisSize, isHorizontal, categories, labelItems, legendItems, pointMetadata} = processedResult; const {nodeStyles: chartContentStyles, parentNodeStyles: chartContainerStyles} = parseStyles(tnode); const parsedDesignHeight = typeof chartContentStyles.height === 'number' ? chartContentStyles.height : undefined; const itemCount = categories?.length ?? Object.keys(data).length; @@ -53,6 +53,8 @@ function VictoryChartProvider({tnode, processedResult, type, children}: VictoryC isHorizontal, itemCount, padding, + bottomAxisSize, + topAxisSize, }); const heightDelta = parsedDesignHeight !== undefined && effectiveChartHeight !== undefined ? parsedDesignHeight - effectiveChartHeight : 0; const effectiveChartContentStyles = heightDelta > 0 ? {...chartContentStyles, height: effectiveChartHeight} : chartContentStyles; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts index aa2f8852ed2a..2e1b8ca2a1a7 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts @@ -34,27 +34,29 @@ type ComputeDynamicChartHeightParams = { isHorizontal: boolean | undefined; itemCount: number; padding: Padding; + bottomAxisSize: number | undefined; + topAxisSize: number | undefined; }; /** * Derives a shorter canvas height for horizontal bar charts that have fewer rows than the * backend's fixed five-row reference height, keeping row spacing consistent. */ -function computeDynamicChartHeight({designHeight, isHorizontal, itemCount, padding}: ComputeDynamicChartHeightParams): number | undefined { +function computeDynamicChartHeight({designHeight, isHorizontal, itemCount, padding, bottomAxisSize, topAxisSize}: ComputeDynamicChartHeightParams): number | undefined { if (!isHorizontal || designHeight === undefined || itemCount <= 0 || itemCount >= HORIZONTAL_BAR_REFERENCE_ROW_COUNT) { return designHeight; } const paddingTop = getPaddingValue(padding, 'top', DEFAULT_HORIZONTAL_BAR_PADDING.top); const paddingBottom = getPaddingValue(padding, 'bottom', DEFAULT_HORIZONTAL_BAR_PADDING.bottom); - const referencePlotHeight = HORIZONTAL_BAR_REFERENCE_HEIGHT - paddingTop - paddingBottom; + const referencePlotHeight = HORIZONTAL_BAR_REFERENCE_HEIGHT - paddingTop - paddingBottom - (bottomAxisSize ?? 0) - (topAxisSize ?? 0); if (referencePlotHeight <= 0) { return designHeight; } const rowHeight = referencePlotHeight / HORIZONTAL_BAR_REFERENCE_ROW_COUNT; - const dynamicHeight = paddingTop + paddingBottom + rowHeight * itemCount; + const dynamicHeight = paddingTop + paddingBottom + (bottomAxisSize ?? 0) + (topAxisSize ?? 0) + rowHeight * itemCount; return Math.min(Math.round(dynamicHeight), designHeight); } diff --git a/tests/unit/computeDynamicChartHeightTest.ts b/tests/unit/computeDynamicChartHeightTest.ts index 6ff4f39a4aad..3056da2d9d09 100644 --- a/tests/unit/computeDynamicChartHeightTest.ts +++ b/tests/unit/computeDynamicChartHeightTest.ts @@ -11,6 +11,8 @@ describe('computeDynamicChartHeight', () => { isHorizontal: false, itemCount: 2, padding: horizontalChartPadding, + bottomAxisSize: 0, + topAxisSize: 0, }), ).toBe(designHeight); }); @@ -22,6 +24,8 @@ describe('computeDynamicChartHeight', () => { isHorizontal: true, itemCount: 5, padding: horizontalChartPadding, + bottomAxisSize: 0, + topAxisSize: 0, }), ).toBe(designHeight); }); @@ -33,6 +37,8 @@ describe('computeDynamicChartHeight', () => { isHorizontal: true, itemCount: 6, padding: horizontalChartPadding, + bottomAxisSize: 0, + topAxisSize: 0, }), ).toBe(designHeight); }); @@ -44,6 +50,8 @@ describe('computeDynamicChartHeight', () => { isHorizontal: true, itemCount: 0, padding: horizontalChartPadding, + bottomAxisSize: 0, + topAxisSize: 0, }), ).toBe(designHeight); }); @@ -55,6 +63,8 @@ describe('computeDynamicChartHeight', () => { isHorizontal: true, itemCount: 2, padding: horizontalChartPadding, + bottomAxisSize: 0, + topAxisSize: 0, }), ).toBeUndefined(); }); @@ -66,6 +76,8 @@ describe('computeDynamicChartHeight', () => { isHorizontal: true, itemCount: 2, padding: horizontalChartPadding, + bottomAxisSize: 0, + topAxisSize: 0, }), ).toBe(291); }); @@ -77,6 +89,8 @@ describe('computeDynamicChartHeight', () => { isHorizontal: true, itemCount: 2, padding: undefined, + bottomAxisSize: 0, + topAxisSize: 0, }), ).toBe(291); }); @@ -88,6 +102,8 @@ describe('computeDynamicChartHeight', () => { isHorizontal: true, itemCount: 2, padding: horizontalChartPadding, + bottomAxisSize: 0, + topAxisSize: 0, }), ).toBe(291); }); @@ -99,6 +115,8 @@ describe('computeDynamicChartHeight', () => { isHorizontal: true, itemCount: 2, padding: horizontalChartPadding, + bottomAxisSize: 0, + topAxisSize: 0, }), ).toBe(250); }); From 8eb0aba96644f49507cb7abfd521ed5544ec0d20 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 26 Oct 2026 06:56:40 +0100 Subject: [PATCH 17/24] Revert "Reapply "update golden"" This reverts commit 964a7c073b04d8cf66bb819d7e563a3984cf64c1. --- .../__golden__/top-employees-by-spend.png | Bin 16530 -> 13673 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend.png b/server/victory-chart-renderer/tests/__golden__/top-employees-by-spend.png index b4eaa3452e532ab82edf259b9e6a59e5ee652acc..088854b04d9016f6f7ae2525638ed2f3f16a250c 100644 GIT binary patch literal 13673 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 W+dMr*K^r#=rmJOmu~6gcz5fL)kQ_?@ From cb95071f7fe7fabfcca697c9d106e0a1b0f4346d Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 26 Oct 2026 06:59:56 +0100 Subject: [PATCH 18/24] fallback tickCount to 0 --- .../VictoryChartRenderer/parsers/victoryAxisParser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index 0dac5ffabdb2..8a501bf8c4b9 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -43,7 +43,7 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro const orientation = parseAttributeAsString(tnode.attributes.orientation); const rawTickValues = parseAttributeAsNumberArray(tnode.attributes.tickvalues); const tickValues = Array.isArray(rawTickValues) ? rawTickValues : undefined; - const tickCount = parseAttributeAsNumber(tnode.attributes.tickcount) ?? tickValues?.length; + const tickCount = parseAttributeAsNumber(tnode.attributes.tickcount) ?? tickValues?.length ?? 0; const rawTickFormat = parseAttributeAsStringArray(tnode.attributes.tickformat); const tickFormat = Array.isArray(rawTickFormat) ? rawTickFormat : undefined; const formatLabel = (label: string | number) => tickFormat?.[tickValues?.indexOf(Number(label)) ?? -1] ?? String(label); From 5d576c97b38d02025fcd3dca42ba0a84304dc962 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 26 Oct 2026 08:10:43 +0100 Subject: [PATCH 19/24] always shrink the left padding - as in main --- .../parsers/processVictoryChartTree.ts | 2 +- .../parsers/victoryAxisParser.ts | 2 +- .../utils/resolvePadding.ts | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts index c9ef2dfa684b..136b0d84642c 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts @@ -155,7 +155,7 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root yAxis, domain, domainPadding, - padding: resolvePadding(padding, leftAxisSize, rightAxisSize, bottomAxisSize, topAxisSize), + padding: resolvePadding(padding, xAxis, yAxis, leftAxisSize, rightAxisSize, bottomAxisSize, topAxisSize), leftAxisSize, rightAxisSize, bottomAxisSize, diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index 8a501bf8c4b9..a488170ca528 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -131,7 +131,7 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootPro // The axis size is used to reduce the size of the padding since the axis labels consume part of the drawing window // and we need to compensate for that otherwise the chart will look smaller - if (axisSide && tickCount) { + if (axisSide) { const axisSize = computeAxisSize(axisSide, labelsForMeasurement, font, labelOffset); switch (axisSide) { case 'left': diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts index 876009b8ab6c..3fcf848588a8 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts @@ -6,6 +6,8 @@ import type {ProcessNodeResult} from '@components/HTMLEngineProvider/HTMLRendere */ function resolvePadding( padding: ProcessNodeResult['padding'], + xAxis: ProcessNodeResult['xAxis'], + yAxis: ProcessNodeResult['yAxis'], leftAxisSize: ProcessNodeResult['leftAxisSize'], rightAxisSize: ProcessNodeResult['rightAxisSize'], bottomAxisSize: ProcessNodeResult['bottomAxisSize'], @@ -25,18 +27,23 @@ function resolvePadding( }; } + // Shrink `padding.left` down to the left axis's measured label width (plus a small edge buffer) + // whenever the configured padding is wider than the label content actually needs. if (leftAxisSize && resolvedPadding.left) { - // Shrinks `padding.left` down to the left axis's measured label width (plus a small edge buffer) - // whenever the configured padding is wider than the label content actually needs. - resolvedPadding.left = Math.min(resolvedPadding.left, leftAxisSize + LEFT_AXIS_LABEL_PADDING) - leftAxisSize; + resolvedPadding.left = Math.min(resolvedPadding.left, leftAxisSize + LEFT_AXIS_LABEL_PADDING); } - if (rightAxisSize && resolvedPadding.right) { + + // Shrink the paddings further to take into account the axis labels size + if (yAxis?.[0].tickCount && leftAxisSize && resolvedPadding.left) { + resolvedPadding.left -= leftAxisSize; + } + if (yAxis?.[0].tickCount && rightAxisSize && resolvedPadding.right) { resolvedPadding.right -= rightAxisSize; } - if (bottomAxisSize && resolvedPadding.bottom) { + if (xAxis?.tickCount && bottomAxisSize && resolvedPadding.bottom) { resolvedPadding.bottom -= bottomAxisSize; } - if (topAxisSize && resolvedPadding.top) { + if (xAxis?.tickCount && topAxisSize && resolvedPadding.top) { resolvedPadding.top -= topAxisSize; } From d3b4793bec6dbff542c6d609a4da75a9afaa4173 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 26 Oct 2026 12:37:12 +0100 Subject: [PATCH 20/24] apply padding shrink clamp on horizontal charts only --- .../VictoryChartRenderer/parsers/processVictoryChartTree.ts | 2 +- .../HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts index 136b0d84642c..dfc20ca975a5 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts @@ -155,7 +155,7 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root yAxis, domain, domainPadding, - padding: resolvePadding(padding, xAxis, yAxis, leftAxisSize, rightAxisSize, bottomAxisSize, topAxisSize), + padding: resolvePadding(padding, xAxis, yAxis, leftAxisSize, rightAxisSize, bottomAxisSize, topAxisSize, isHorizontal), leftAxisSize, rightAxisSize, bottomAxisSize, diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts index 3fcf848588a8..d03473816158 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts @@ -12,6 +12,7 @@ function resolvePadding( rightAxisSize: ProcessNodeResult['rightAxisSize'], bottomAxisSize: ProcessNodeResult['bottomAxisSize'], topAxisSize: ProcessNodeResult['topAxisSize'], + isHorizontal: ProcessNodeResult['isHorizontal'], ): ProcessNodeResult['padding'] { if (!padding) { return; @@ -29,7 +30,7 @@ function resolvePadding( // Shrink `padding.left` down to the left axis's measured label width (plus a small edge buffer) // whenever the configured padding is wider than the label content actually needs. - if (leftAxisSize && resolvedPadding.left) { + if (isHorizontal && leftAxisSize && resolvedPadding.left) { resolvedPadding.left = Math.min(resolvedPadding.left, leftAxisSize + LEFT_AXIS_LABEL_PADDING); } From 31668e1f2f3458828e54f552a058fc62bb1272b0 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 26 Oct 2026 19:08:28 +0100 Subject: [PATCH 21/24] copy padding --- .../context/VictoryChartContext.tsx | 4 +--- .../utils/computeDynamicChartHeight.ts | 8 +++----- .../VictoryChartRenderer/utils/resolvePadding.ts | 14 ++++++++------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx index 55e25bf956cb..26b685a6309f 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx @@ -44,7 +44,7 @@ type VictoryChartProviderProps = { /** Supplies parsed chart config to chart sub-components. Callers must parse and validate the tnode first. */ function VictoryChartProvider({tnode, processedResult, type, children}: VictoryChartProviderProps) { - const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, bottomAxisSize, topAxisSize, isHorizontal, categories, labelItems, legendItems, pointMetadata} = processedResult; + const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, categories, labelItems, legendItems, pointMetadata} = processedResult; const {nodeStyles: chartContentStyles, parentNodeStyles: chartContainerStyles} = parseStyles(tnode); const parsedDesignHeight = typeof chartContentStyles.height === 'number' ? chartContentStyles.height : undefined; const itemCount = categories?.length ?? Object.keys(data).length; @@ -53,8 +53,6 @@ function VictoryChartProvider({tnode, processedResult, type, children}: VictoryC isHorizontal, itemCount, padding, - bottomAxisSize, - topAxisSize, }); const heightDelta = parsedDesignHeight !== undefined && effectiveChartHeight !== undefined ? parsedDesignHeight - effectiveChartHeight : 0; const effectiveChartContentStyles = heightDelta > 0 ? {...chartContentStyles, height: effectiveChartHeight} : chartContentStyles; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts index 2e1b8ca2a1a7..aa2f8852ed2a 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts @@ -34,29 +34,27 @@ type ComputeDynamicChartHeightParams = { isHorizontal: boolean | undefined; itemCount: number; padding: Padding; - bottomAxisSize: number | undefined; - topAxisSize: number | undefined; }; /** * Derives a shorter canvas height for horizontal bar charts that have fewer rows than the * backend's fixed five-row reference height, keeping row spacing consistent. */ -function computeDynamicChartHeight({designHeight, isHorizontal, itemCount, padding, bottomAxisSize, topAxisSize}: ComputeDynamicChartHeightParams): number | undefined { +function computeDynamicChartHeight({designHeight, isHorizontal, itemCount, padding}: ComputeDynamicChartHeightParams): number | undefined { if (!isHorizontal || designHeight === undefined || itemCount <= 0 || itemCount >= HORIZONTAL_BAR_REFERENCE_ROW_COUNT) { return designHeight; } const paddingTop = getPaddingValue(padding, 'top', DEFAULT_HORIZONTAL_BAR_PADDING.top); const paddingBottom = getPaddingValue(padding, 'bottom', DEFAULT_HORIZONTAL_BAR_PADDING.bottom); - const referencePlotHeight = HORIZONTAL_BAR_REFERENCE_HEIGHT - paddingTop - paddingBottom - (bottomAxisSize ?? 0) - (topAxisSize ?? 0); + const referencePlotHeight = HORIZONTAL_BAR_REFERENCE_HEIGHT - paddingTop - paddingBottom; if (referencePlotHeight <= 0) { return designHeight; } const rowHeight = referencePlotHeight / HORIZONTAL_BAR_REFERENCE_ROW_COUNT; - const dynamicHeight = paddingTop + paddingBottom + (bottomAxisSize ?? 0) + (topAxisSize ?? 0) + rowHeight * itemCount; + const dynamicHeight = paddingTop + paddingBottom + rowHeight * itemCount; return Math.min(Math.round(dynamicHeight), designHeight); } diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts index d03473816158..162a0dea39ac 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts @@ -18,14 +18,16 @@ function resolvePadding( return; } - let resolvedPadding = padding; - if (typeof resolvedPadding === 'number') { + let resolvedPadding: ProcessNodeResult['padding']; + if (typeof padding === 'number') { resolvedPadding = { - left: resolvedPadding, - right: resolvedPadding, - top: resolvedPadding, - bottom: resolvedPadding, + left: padding, + right: padding, + top: padding, + bottom: padding, }; + } else { + resolvedPadding = {...padding}; } // Shrink `padding.left` down to the left axis's measured label width (plus a small edge buffer) From a16aa251fdb43b2c32d44f2869e6fa978da57d5c Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 26 Oct 2026 19:11:42 +0100 Subject: [PATCH 22/24] compute dynamic height using design padding --- .../VictoryChartRenderer/context/VictoryChartContext.tsx | 4 ++-- .../parsers/processVictoryChartTree.ts | 2 ++ .../HTMLRenderers/VictoryChartRenderer/types.ts | 1 + .../utils/computeDynamicChartHeight.ts | 8 ++++---- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx index 26b685a6309f..6cbbd9d5b951 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx @@ -44,7 +44,7 @@ type VictoryChartProviderProps = { /** Supplies parsed chart config to chart sub-components. Callers must parse and validate the tnode first. */ function VictoryChartProvider({tnode, processedResult, type, children}: VictoryChartProviderProps) { - const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, categories, labelItems, legendItems, pointMetadata} = processedResult; + const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, designPadding, padding, isHorizontal, categories, labelItems, legendItems, pointMetadata} = processedResult; const {nodeStyles: chartContentStyles, parentNodeStyles: chartContainerStyles} = parseStyles(tnode); const parsedDesignHeight = typeof chartContentStyles.height === 'number' ? chartContentStyles.height : undefined; const itemCount = categories?.length ?? Object.keys(data).length; @@ -52,7 +52,7 @@ function VictoryChartProvider({tnode, processedResult, type, children}: VictoryC designHeight: parsedDesignHeight, isHorizontal, itemCount, - padding, + designPadding, }); const heightDelta = parsedDesignHeight !== undefined && effectiveChartHeight !== undefined ? parsedDesignHeight - effectiveChartHeight : 0; const effectiveChartContentStyles = heightDelta > 0 ? {...chartContentStyles, height: effectiveChartHeight} : chartContentStyles; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts index dfc20ca975a5..0f7628b34efc 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts @@ -93,6 +93,7 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root yAxis, domain, domainPadding, + designPadding: padding, padding, leftAxisSize, rightAxisSize, @@ -155,6 +156,7 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root yAxis, domain, domainPadding, + designPadding: padding, padding: resolvePadding(padding, xAxis, yAxis, leftAxisSize, rightAxisSize, bottomAxisSize, topAxisSize, isHorizontal), leftAxisSize, rightAxisSize, diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts index 649363ae293f..7151312d53c6 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts @@ -169,6 +169,7 @@ type ProcessNodeResult = { yAxis: CartesianChartProps['yAxis']; domain: CartesianChartProps['domain']; domainPadding: CartesianChartProps['domainPadding']; + designPadding: CartesianChartProps['padding']; padding: CartesianChartProps['padding']; leftAxisSize: number | undefined; rightAxisSize: number | undefined; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts index aa2f8852ed2a..82df00749e17 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/computeDynamicChartHeight.ts @@ -33,20 +33,20 @@ type ComputeDynamicChartHeightParams = { designHeight: number | undefined; isHorizontal: boolean | undefined; itemCount: number; - padding: Padding; + designPadding: Padding; }; /** * Derives a shorter canvas height for horizontal bar charts that have fewer rows than the * backend's fixed five-row reference height, keeping row spacing consistent. */ -function computeDynamicChartHeight({designHeight, isHorizontal, itemCount, padding}: ComputeDynamicChartHeightParams): number | undefined { +function computeDynamicChartHeight({designHeight, isHorizontal, itemCount, designPadding}: ComputeDynamicChartHeightParams): number | undefined { if (!isHorizontal || designHeight === undefined || itemCount <= 0 || itemCount >= HORIZONTAL_BAR_REFERENCE_ROW_COUNT) { return designHeight; } - const paddingTop = getPaddingValue(padding, 'top', DEFAULT_HORIZONTAL_BAR_PADDING.top); - const paddingBottom = getPaddingValue(padding, 'bottom', DEFAULT_HORIZONTAL_BAR_PADDING.bottom); + const paddingTop = getPaddingValue(designPadding, 'top', DEFAULT_HORIZONTAL_BAR_PADDING.top); + const paddingBottom = getPaddingValue(designPadding, 'bottom', DEFAULT_HORIZONTAL_BAR_PADDING.bottom); const referencePlotHeight = HORIZONTAL_BAR_REFERENCE_HEIGHT - paddingTop - paddingBottom; if (referencePlotHeight <= 0) { From 82ac01bd0fb60d61373df3889f55d28f2174a239 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 26 Oct 2026 19:28:00 +0100 Subject: [PATCH 23/24] differentiate between left and right axis shrink guard --- .../VictoryChartRenderer/utils/resolvePadding.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts index 162a0dea39ac..5d4504453272 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/resolvePadding.ts @@ -37,16 +37,21 @@ function resolvePadding( } // Shrink the paddings further to take into account the axis labels size - if (yAxis?.[0].tickCount && leftAxisSize && resolvedPadding.left) { + // The shrink is only needed if we are actually going to draw the axis labels i.e. `tickCount` > 0 + const shouldShrinkLeftPadding = Object.values(yAxis ?? {}).some((y) => y.tickCount && y.axisSide === 'left'); + const shouldShrinkRightPadding = Object.values(yAxis ?? {}).some((y) => y.tickCount && y.axisSide === 'right'); + const shouldShrinkBottomPadding = xAxis?.tickCount && xAxis.axisSide === 'bottom'; + const shouldShrinkTopPadding = xAxis?.tickCount && xAxis.axisSide === 'top'; + if (shouldShrinkLeftPadding && leftAxisSize && resolvedPadding.left) { resolvedPadding.left -= leftAxisSize; } - if (yAxis?.[0].tickCount && rightAxisSize && resolvedPadding.right) { + if (shouldShrinkRightPadding && rightAxisSize && resolvedPadding.right) { resolvedPadding.right -= rightAxisSize; } - if (xAxis?.tickCount && bottomAxisSize && resolvedPadding.bottom) { + if (shouldShrinkBottomPadding && bottomAxisSize && resolvedPadding.bottom) { resolvedPadding.bottom -= bottomAxisSize; } - if (xAxis?.tickCount && topAxisSize && resolvedPadding.top) { + if (shouldShrinkTopPadding && topAxisSize && resolvedPadding.top) { resolvedPadding.top -= topAxisSize; } From 11b8ebe45f761a5fb5446f09e1ecb7736e4ab205 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 26 Oct 2026 19:37:25 +0100 Subject: [PATCH 24/24] lint --- tests/unit/computeDynamicChartHeightTest.ts | 36 ++++++--------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/tests/unit/computeDynamicChartHeightTest.ts b/tests/unit/computeDynamicChartHeightTest.ts index 3056da2d9d09..33aee49c20c3 100644 --- a/tests/unit/computeDynamicChartHeightTest.ts +++ b/tests/unit/computeDynamicChartHeightTest.ts @@ -10,9 +10,7 @@ describe('computeDynamicChartHeight', () => { designHeight, isHorizontal: false, itemCount: 2, - padding: horizontalChartPadding, - bottomAxisSize: 0, - topAxisSize: 0, + designPadding: horizontalChartPadding, }), ).toBe(designHeight); }); @@ -23,9 +21,7 @@ describe('computeDynamicChartHeight', () => { designHeight, isHorizontal: true, itemCount: 5, - padding: horizontalChartPadding, - bottomAxisSize: 0, - topAxisSize: 0, + designPadding: horizontalChartPadding, }), ).toBe(designHeight); }); @@ -36,9 +32,7 @@ describe('computeDynamicChartHeight', () => { designHeight, isHorizontal: true, itemCount: 6, - padding: horizontalChartPadding, - bottomAxisSize: 0, - topAxisSize: 0, + designPadding: horizontalChartPadding, }), ).toBe(designHeight); }); @@ -49,9 +43,7 @@ describe('computeDynamicChartHeight', () => { designHeight, isHorizontal: true, itemCount: 0, - padding: horizontalChartPadding, - bottomAxisSize: 0, - topAxisSize: 0, + designPadding: horizontalChartPadding, }), ).toBe(designHeight); }); @@ -62,9 +54,7 @@ describe('computeDynamicChartHeight', () => { designHeight: undefined, isHorizontal: true, itemCount: 2, - padding: horizontalChartPadding, - bottomAxisSize: 0, - topAxisSize: 0, + designPadding: horizontalChartPadding, }), ).toBeUndefined(); }); @@ -75,9 +65,7 @@ describe('computeDynamicChartHeight', () => { designHeight, isHorizontal: true, itemCount: 2, - padding: horizontalChartPadding, - bottomAxisSize: 0, - topAxisSize: 0, + designPadding: horizontalChartPadding, }), ).toBe(291); }); @@ -88,9 +76,7 @@ describe('computeDynamicChartHeight', () => { designHeight, isHorizontal: true, itemCount: 2, - padding: undefined, - bottomAxisSize: 0, - topAxisSize: 0, + designPadding: undefined, }), ).toBe(291); }); @@ -101,9 +87,7 @@ describe('computeDynamicChartHeight', () => { designHeight: 300, isHorizontal: true, itemCount: 2, - padding: horizontalChartPadding, - bottomAxisSize: 0, - topAxisSize: 0, + designPadding: horizontalChartPadding, }), ).toBe(291); }); @@ -114,9 +98,7 @@ describe('computeDynamicChartHeight', () => { designHeight: 250, isHorizontal: true, itemCount: 2, - padding: horizontalChartPadding, - bottomAxisSize: 0, - topAxisSize: 0, + designPadding: horizontalChartPadding, }), ).toBe(250); });