From 1305d5b431b66e300ac1b2f6afbe2f673c3d3ce4 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 25 May 2026 21:58:47 +0100 Subject: [PATCH 01/25] add domain, domainPadding and padding to context --- .../components/VictoryChartCartesian.tsx | 10 ++++---- .../context/VictoryChartContext.tsx | 8 ++++++- .../parsers/parserRegistry.ts | 2 ++ .../parsers/processVictoryChartTree.ts | 23 ++++++++++++++++++- .../parsers/victoryChartParser.ts | 17 ++++++++++++++ .../VictoryChartRenderer/types.ts | 3 +++ 6 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx index 753ffb2314f6..a4eab9eb4510 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx @@ -3,8 +3,6 @@ import {CartesianChart} from 'victory-native'; import {useVictoryChartContext} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext'; import {VictoryChartRenderArgsProvider} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartRenderArgsContext'; import getYKey from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getYKey'; -import parseAttribute from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseAttribute'; -import parseDomainPadding from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding'; import VictoryChartLabels from './VictoryChartLabels'; import VictoryChartLegend from './VictoryChartLegend'; import VictoryChartSeries from './VictoryChartSeries'; @@ -14,7 +12,7 @@ import VictoryChartSeries from './VictoryChartSeries'; * Labels and legend overlays are handled internally via `renderOutside`. */ function VictoryChartCartesian() { - const {data, xKey, yKeys, xAxis, yAxis, tnode, labelItems, legendItems} = useVictoryChartContext(); + const {tnode, data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, labelItems, legendItems} = useVictoryChartContext(); return ( ( diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx index 329e8f690e12..f9bd256c867d 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx @@ -13,6 +13,9 @@ type VictoryChartContextValue = { yKeys: ProcessNodeResult['yKeys']; xAxis: ProcessNodeResult['xAxis']; yAxis: ProcessNodeResult['yAxis']; + domain: ProcessNodeResult['domain']; + domainPadding: ProcessNodeResult['domainPadding']; + padding: ProcessNodeResult['padding']; labelItems: ProcessNodeResult['labelItems']; legendItems: ProcessNodeResult['legendItems']; chartContentStyles: ReturnType['nodeStyles']; @@ -28,7 +31,7 @@ const VictoryChartContext = createContext(null) */ function VictoryChartProvider({tnode, children}: {tnode: TNode; children: React.ReactNode}) { const {regular: regularTypeface} = useChartDefaultTypeface(); - const {data, xKey, yKeys, xAxis, yAxis, labelItems, legendItems} = processVictoryChartTree(tnode, regularTypeface); + const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, labelItems, legendItems} = processVictoryChartTree(tnode, regularTypeface); const {nodeStyles: chartContentStyles, parentNodeStyles: chartContainerStyles} = parseStyles(tnode); const hasCartesianData = Object.keys(data).length > 0; @@ -55,6 +58,9 @@ function VictoryChartProvider({tnode, children}: {tnode: TNode; children: React. yKeys, xAxis, yAxis, + domain, + domainPadding, + padding, labelItems, legendItems, chartContentStyles, diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/parserRegistry.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/parserRegistry.ts index d20acff2a2cc..91a9f211e56c 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/parserRegistry.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/parserRegistry.ts @@ -1,5 +1,6 @@ import type {NodeParser} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; import parseVictoryAxisNode from './victoryAxisParser'; +import parseVictoryChartNode from './victoryChartParser'; import parseVictoryLabelNode from './victoryLabelParser'; import parseVictoryLegendNode from './victoryLegendParser'; import parseVictorySeriesNode from './victorySeriesParser'; @@ -9,6 +10,7 @@ import parseVictorySeriesNode from './victorySeriesParser'; * To support a new VictoryChart tag, add a new entry here and create the parser file. */ const PARSER_REGISTRY: Partial> = { + victorychart: parseVictoryChartNode, victorybar: parseVictorySeriesNode, victoryline: parseVictorySeriesNode, victoryaxis: parseVictoryAxisNode, diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts index a5f1762d94e8..407affda88e8 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts @@ -14,6 +14,9 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null): Pro const yKeys: ProcessNodeResult['yKeys'] = []; let xAxis: ProcessNodeResult['xAxis']; let yAxis: ProcessNodeResult['yAxis']; + let domain: ProcessNodeResult['domain']; + let domainPadding: ProcessNodeResult['domainPadding']; + let padding: ProcessNodeResult['padding']; const labelItems: ProcessNodeResult['labelItems'] = []; const legendItems: ProcessNodeResult['legendItems'] = []; @@ -32,6 +35,15 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null): Pro if (result.yAxis?.length) { yAxis = [...(yAxis ?? []), ...result.yAxis]; } + if (result.domain) { + domain = result.domain; + } + if (result.domainPadding) { + domainPadding = result.domainPadding; + } + if (result.padding) { + padding = result.padding; + } if (result.labelItems) { labelItems.push(...result.labelItems); } @@ -50,11 +62,20 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null): Pro if (childResult.yAxis?.length) { yAxis = [...(yAxis ?? []), ...childResult.yAxis]; } + if (childResult.domain) { + domain = childResult.domain; + } + if (childResult.domainPadding) { + domainPadding = childResult.domainPadding; + } + if (childResult.padding) { + padding = childResult.padding; + } labelItems.push(...childResult.labelItems); legendItems.push(...childResult.legendItems); } - return {data, xKey: X_KEY, yKeys, xAxis, yAxis, labelItems, legendItems}; + return {data, xKey: X_KEY, yKeys, xAxis, yAxis, domain, domainPadding, padding, labelItems, legendItems}; } export default processVictoryChartTree; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts new file mode 100644 index 000000000000..d8688a31bc3c --- /dev/null +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts @@ -0,0 +1,17 @@ +import type {TNode} from 'react-native-render-html'; +import type {PartialProcessNodeResult} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; +import type {CartesianChartProps} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; +import parseAttribute from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseAttribute'; +import parseDomainPadding from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding'; + +/** + * Parse chart config from a `` node. + */ +function parseVictoryChartNode(tnode: TNode): PartialProcessNodeResult { + const domain = parseAttribute(tnode.attributes.domain); + const domainPadding = parseDomainPadding(tnode.attributes.domainpadding); + const padding = parseAttribute(tnode.attributes.padding); + return {domain, domainPadding, padding}; +} + +export default parseVictoryChartNode; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts index 7fb426a6ef1c..b53bd23d3cc1 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts @@ -121,6 +121,9 @@ type ProcessNodeResult = { yKeys: YKey[]; xAxis: CartesianChartProps['xAxis']; yAxis: CartesianChartProps['yAxis']; + domain: CartesianChartProps['domain']; + domainPadding: CartesianChartProps['domainPadding']; + padding: CartesianChartProps['padding']; labelItems: LabelItem[]; legendItems: LegendItem[]; }; From 837647c37e77cc1a4295ac82aeaa5a620446e8a3 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 25 May 2026 22:45:51 +0100 Subject: [PATCH 02/25] add parsePadding and parseDomain --- .../parsers/victoryChartParser.ts | 8 ++-- .../VictoryChartRenderer/utils/parseDomain.ts | 31 ++++++++++++++++ .../utils/parsePadding.ts | 37 +++++++++++++++++++ 3 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomain.ts create mode 100644 src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parsePadding.ts diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts index d8688a31bc3c..61e596c723ef 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts @@ -1,16 +1,16 @@ import type {TNode} from 'react-native-render-html'; import type {PartialProcessNodeResult} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; -import type {CartesianChartProps} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; -import parseAttribute from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseAttribute'; +import parseDomain from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomain'; import parseDomainPadding from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding'; +import parsePadding from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parsePadding'; /** * Parse chart config from a `` node. */ function parseVictoryChartNode(tnode: TNode): PartialProcessNodeResult { - const domain = parseAttribute(tnode.attributes.domain); + const domain = parseDomain(tnode.attributes.domain); const domainPadding = parseDomainPadding(tnode.attributes.domainpadding); - const padding = parseAttribute(tnode.attributes.padding); + const padding = parsePadding(tnode.attributes.padding); return {domain, domainPadding, padding}; } diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomain.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomain.ts new file mode 100644 index 000000000000..85c24694b9d3 --- /dev/null +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomain.ts @@ -0,0 +1,31 @@ +import lodashIsObject from 'lodash/isObject'; +import type {CartesianChartProps} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; +import parseAttribute from './parseAttribute'; + +type Domain = CartesianChartProps['domain']; + +/** + * Translate VictoryChart's `domain` attribute into victory-native's `domain` shape. + */ +function parseDomain(attribute: string): Domain { + const domain = parseAttribute(attribute); + if (Array.isArray(domain)) { + return { + y: [Number(domain.at(0)), Number(domain.at(1))], + }; + } + if (lodashIsObject(domain)) { + let x: [number, number] | undefined; + let y: [number, number] | undefined; + if ('x' in domain && Array.isArray(domain.x)) { + x = [Number(domain.x.at(0)), Number(domain.x.at(1))]; + } + if ('y' in domain && Array.isArray(domain.y)) { + y = [Number(domain.y.at(0)), Number(domain.y.at(1))]; + } + return {x, y}; + } + return undefined; +} + +export default parseDomain; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parsePadding.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parsePadding.ts new file mode 100644 index 000000000000..5dfd3a06a770 --- /dev/null +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parsePadding.ts @@ -0,0 +1,37 @@ +import lodashIsObject from 'lodash/isObject'; +import type {CartesianChartProps} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; +import parseAttribute from './parseAttribute'; + +type Padding = CartesianChartProps['padding']; + +/** + * Translate VictoryChart's `padding` attribute into victory-native's `padding` shape. + */ +function parsePadding(attribute: string): Padding { + const padding = parseAttribute(attribute); + if (typeof padding === 'number') { + return padding; + } + if (lodashIsObject(padding)) { + let left: number | undefined; + let right: number | undefined; + let top: number | undefined; + let bottom: number | undefined; + if ('left' in padding && typeof padding.left === 'number') { + left = padding.left; + } + if ('right' in padding && typeof padding.right === 'number') { + right = padding.right; + } + if ('top' in padding && typeof padding.top === 'number') { + top = padding.top; + } + if ('bottom' in padding && typeof padding.bottom === 'number') { + bottom = padding.bottom; + } + return {left, right, top, bottom}; + } + return undefined; +} + +export default parsePadding; From e843d8416c0441e99b945e75e74122226864fd2b Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 25 May 2026 22:53:37 +0100 Subject: [PATCH 03/25] add isHorizontal param --- .../VictoryChartRenderer/context/VictoryChartContext.tsx | 4 +++- .../parsers/processVictoryChartTree.ts | 9 ++++++++- .../VictoryChartRenderer/parsers/victoryChartParser.ts | 3 ++- .../HTMLRenderers/VictoryChartRenderer/types.ts | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx index f9bd256c867d..acb4dfe046f7 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx @@ -16,6 +16,7 @@ type VictoryChartContextValue = { domain: ProcessNodeResult['domain']; domainPadding: ProcessNodeResult['domainPadding']; padding: ProcessNodeResult['padding']; + isHorizontal: ProcessNodeResult['isHorizontal']; labelItems: ProcessNodeResult['labelItems']; legendItems: ProcessNodeResult['legendItems']; chartContentStyles: ReturnType['nodeStyles']; @@ -31,7 +32,7 @@ const VictoryChartContext = createContext(null) */ function VictoryChartProvider({tnode, children}: {tnode: TNode; children: React.ReactNode}) { const {regular: regularTypeface} = useChartDefaultTypeface(); - const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, labelItems, legendItems} = processVictoryChartTree(tnode, regularTypeface); + const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, labelItems, legendItems} = processVictoryChartTree(tnode, regularTypeface); const {nodeStyles: chartContentStyles, parentNodeStyles: chartContainerStyles} = parseStyles(tnode); const hasCartesianData = Object.keys(data).length > 0; @@ -61,6 +62,7 @@ function VictoryChartProvider({tnode, children}: {tnode: TNode; children: React. domain, domainPadding, padding, + isHorizontal, labelItems, legendItems, chartContentStyles, diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts index 407affda88e8..7091ef60a670 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts @@ -17,6 +17,7 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null): Pro let domain: ProcessNodeResult['domain']; let domainPadding: ProcessNodeResult['domainPadding']; let padding: ProcessNodeResult['padding']; + let isHorizontal: ProcessNodeResult['isHorizontal']; const labelItems: ProcessNodeResult['labelItems'] = []; const legendItems: ProcessNodeResult['legendItems'] = []; @@ -44,6 +45,9 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null): Pro if (result.padding) { padding = result.padding; } + if (result.isHorizontal) { + isHorizontal = result.isHorizontal; + } if (result.labelItems) { labelItems.push(...result.labelItems); } @@ -71,11 +75,14 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null): Pro if (childResult.padding) { padding = childResult.padding; } + if (childResult.isHorizontal) { + isHorizontal = childResult.isHorizontal; + } labelItems.push(...childResult.labelItems); legendItems.push(...childResult.legendItems); } - return {data, xKey: X_KEY, yKeys, xAxis, yAxis, domain, domainPadding, padding, labelItems, legendItems}; + return {data, xKey: X_KEY, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, labelItems, legendItems}; } export default processVictoryChartTree; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts index 61e596c723ef..ab9c9a20996a 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts @@ -11,7 +11,8 @@ function parseVictoryChartNode(tnode: TNode): PartialProcessNodeResult { const domain = parseDomain(tnode.attributes.domain); const domainPadding = parseDomainPadding(tnode.attributes.domainpadding); const padding = parsePadding(tnode.attributes.padding); - return {domain, domainPadding, padding}; + const isHorizontal = 'horizontal' in tnode.attributes && tnode.attributes.horizontal !== 'false'; + return {domain, domainPadding, padding, isHorizontal}; } export default parseVictoryChartNode; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts index b53bd23d3cc1..42c76763e315 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts @@ -124,6 +124,7 @@ type ProcessNodeResult = { domain: CartesianChartProps['domain']; domainPadding: CartesianChartProps['domainPadding']; padding: CartesianChartProps['padding']; + isHorizontal: boolean | undefined; labelItems: LabelItem[]; legendItems: LegendItem[]; }; From a2df0efd8023886241541dd4b55b9e2fddfc2167 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Mon, 25 May 2026 23:55:13 +0100 Subject: [PATCH 04/25] pass rootProcessedResult to children to get access to isHorizontal --- .../VictoryChartRenderer/context/VictoryChartContext.tsx | 2 +- .../parsers/processVictoryChartTree.ts | 9 ++++++--- .../VictoryChartRenderer/parsers/victoryChartParser.ts | 2 +- .../HTMLRenderers/VictoryChartRenderer/types.ts | 2 +- 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 acb4dfe046f7..570503a1ae4f 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx @@ -32,7 +32,7 @@ const VictoryChartContext = createContext(null) */ function VictoryChartProvider({tnode, children}: {tnode: TNode; children: React.ReactNode}) { const {regular: regularTypeface} = useChartDefaultTypeface(); - const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, labelItems, legendItems} = processVictoryChartTree(tnode, regularTypeface); + const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, labelItems, legendItems} = processVictoryChartTree(tnode, regularTypeface, null); const {nodeStyles: chartContentStyles, parentNodeStyles: chartContainerStyles} = parseStyles(tnode); const hasCartesianData = Object.keys(data).length > 0; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts index 7091ef60a670..e50f2d492870 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts @@ -9,7 +9,7 @@ import PARSER_REGISTRY from './parserRegistry'; * Recursively walk the HTML tnode tree, dispatching each node to its registered parser * and merging the results into a single chart config. */ -function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null): ProcessNodeResult { +function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, rootProcessedResult: ProcessNodeResult | null): ProcessNodeResult { const data: ProcessNodeResult['data'] = {}; const yKeys: ProcessNodeResult['yKeys'] = []; let xAxis: ProcessNodeResult['xAxis']; @@ -23,7 +23,7 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null): Pro const parser = PARSER_REGISTRY[tnode.tagName ?? '']; if (parser) { - const result = parser(tnode, typeface); + const result = parser(tnode, typeface, rootProcessedResult); if (result.data) { lodashMerge(data, result.data); } @@ -56,8 +56,11 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null): Pro } } + // If we have `rootProcessedResult` then forward it as it, otherwise we must be the root so construct the data that we just built + const rootProcessedNodeResult = rootProcessedResult ?? {data, xKey: X_KEY, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, labelItems, legendItems}; + for (const child of tnode.children) { - const childResult = processVictoryChartTree(child, typeface); + const childResult = processVictoryChartTree(child, typeface, rootProcessedNodeResult); lodashMerge(data, childResult.data); yKeys.push(...childResult.yKeys); if (childResult.xAxis) { diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts index ab9c9a20996a..b71c473846a9 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts @@ -8,10 +8,10 @@ import parsePadding from '@components/HTMLEngineProvider/HTMLRenderers/VictoryCh * Parse chart config from a `` node. */ function parseVictoryChartNode(tnode: TNode): PartialProcessNodeResult { + const isHorizontal = 'horizontal' in tnode.attributes && tnode.attributes.horizontal !== 'false'; const domain = parseDomain(tnode.attributes.domain); const domainPadding = parseDomainPadding(tnode.attributes.domainpadding); const padding = parsePadding(tnode.attributes.padding); - const isHorizontal = 'horizontal' in tnode.attributes && tnode.attributes.horizontal !== 'false'; return {domain, domainPadding, padding, isHorizontal}; } diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts index 42c76763e315..eae704842d51 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts @@ -132,7 +132,7 @@ type ProcessNodeResult = { /** Partial slice produced by a single per-tag parser before merging. */ type PartialProcessNodeResult = Partial; -type NodeParser = (tnode: TNode, typeface: SkTypeface | null) => PartialProcessNodeResult; +type NodeParser = (tnode: TNode, typeface: SkTypeface | null, rootProcessedResult: ProcessNodeResult | null) => PartialProcessNodeResult; type ChartType = ValueOf; From 7b3d23f97542d8750d447baac395dbf25670ca05 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 00:07:34 +0100 Subject: [PATCH 05/25] update comment --- .../VictoryChartRenderer/parsers/processVictoryChartTree.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts index e50f2d492870..fb48be1f707d 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts @@ -56,7 +56,7 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root } } - // If we have `rootProcessedResult` then forward it as it, otherwise we must be the root so construct the data that we just built + // If we have `rootProcessedResult` then forward it as it, otherwise we must be the root so pass the data that we just built const rootProcessedNodeResult = rootProcessedResult ?? {data, xKey: X_KEY, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, labelItems, legendItems}; for (const child of tnode.children) { From 3543be6775d603796edf2ebbfefc1a57f8d79df4 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 00:37:55 +0100 Subject: [PATCH 06/25] make domain and domainPadding aware of isHorizontal --- .../parsers/victoryChartParser.ts | 4 ++-- .../VictoryChartRenderer/utils/parseDomain.ts | 8 +++----- .../VictoryChartRenderer/utils/parseDomainPadding.ts | 11 +++++------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts index b71c473846a9..045a43be5a92 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts @@ -9,8 +9,8 @@ import parsePadding from '@components/HTMLEngineProvider/HTMLRenderers/VictoryCh */ function parseVictoryChartNode(tnode: TNode): PartialProcessNodeResult { const isHorizontal = 'horizontal' in tnode.attributes && tnode.attributes.horizontal !== 'false'; - const domain = parseDomain(tnode.attributes.domain); - const domainPadding = parseDomainPadding(tnode.attributes.domainpadding); + const domain = parseDomain(tnode.attributes.domain, isHorizontal); + const domainPadding = parseDomainPadding(tnode.attributes.domainpadding, isHorizontal); const padding = parsePadding(tnode.attributes.padding); return {domain, domainPadding, padding, isHorizontal}; } diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomain.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomain.ts index 85c24694b9d3..f5c51cc7c99d 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomain.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomain.ts @@ -7,12 +7,10 @@ type Domain = CartesianChartProps['domain']; /** * Translate VictoryChart's `domain` attribute into victory-native's `domain` shape. */ -function parseDomain(attribute: string): Domain { +function parseDomain(attribute: string, isHorizontal: boolean): Domain { const domain = parseAttribute(attribute); if (Array.isArray(domain)) { - return { - y: [Number(domain.at(0)), Number(domain.at(1))], - }; + return isHorizontal ? {x: [Number(domain.at(0)), Number(domain.at(1))]} : {y: [Number(domain.at(0)), Number(domain.at(1))]}; } if (lodashIsObject(domain)) { let x: [number, number] | undefined; @@ -23,7 +21,7 @@ function parseDomain(attribute: string): Domain { if ('y' in domain && Array.isArray(domain.y)) { y = [Number(domain.y.at(0)), Number(domain.y.at(1))]; } - return {x, y}; + return isHorizontal ? {x: y, y: x} : {x, y}; } return undefined; } diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding.ts index 8c439af02a03..82a0477d76cd 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding.ts @@ -7,16 +7,14 @@ type DomainPadding = CartesianChartProps['domainPadding']; /** * Translate VictoryChart's `domainPadding` attribute into victory-native's `domainPadding` shape. */ -function parseDomainPadding(attribute: string): DomainPadding { +function parseDomainPadding(attribute: string, isHorizontal: boolean): DomainPadding { const domainPadding = parseAttribute(attribute); if (typeof domainPadding === 'number') { return domainPadding; } if (Array.isArray(domainPadding)) { - return { - left: Number(domainPadding.at(0)), - right: Number(domainPadding.at(1)), - }; + // s77rt check + return isHorizontal ? {bottom: Number(domainPadding.at(0)), top: Number(domainPadding.at(1))} : {left: Number(domainPadding.at(0)), right: Number(domainPadding.at(1))}; } if (lodashIsObject(domainPadding)) { let left: number | undefined; @@ -37,7 +35,8 @@ function parseDomainPadding(attribute: string): DomainPadding { top = Number(domainPadding.y.at(1)); bottom = Number(domainPadding.y.at(0)); } - return {left, right, top, bottom}; + // s77rt check + return isHorizontal ? {left: bottom, right: top, top: left, bottom: right} : {left, right, top, bottom}; } return undefined; } From c743bf4c7e75341c5a43b777249a8fdb71592b4b Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 01:25:02 +0100 Subject: [PATCH 07/25] axix horizontal bar support --- .../parsers/victoryAxisParser.ts | 91 +++++++++++++------ 1 file changed, 61 insertions(+), 30 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts index 6087fc96eae9..b33f9c9f15bd 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryAxisParser.ts @@ -1,14 +1,15 @@ import {Skia} from '@shopify/react-native-skia'; import type {SkTypeface} from '@shopify/react-native-skia'; import type {TNode} from 'react-native-render-html'; -import type {PartialProcessNodeResult, RawAxisStyle} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; +import type {PartialProcessNodeResult, ProcessNodeResult, RawAxisStyle} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; import parseAttribute from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseAttribute'; /** * Parse axis config from a `` node. * Dependent axes become yAxis entries; independent axes become the xAxis. */ -function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null): PartialProcessNodeResult { +function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null, rootProcessedResult: ProcessNodeResult | null): PartialProcessNodeResult { + const isHorizontal = rootProcessedResult?.isHorizontal; const isDependentAxis = 'dependentaxis' in tnode.attributes && tnode.attributes.dependentaxis !== 'false'; const orientation = parseAttribute(tnode.attributes.orientation); const tickCount = parseAttribute(tnode.attributes.tickcount) ?? 0; @@ -25,35 +26,65 @@ function parseVictoryAxisNode(tnode: TNode, typeface: SkTypeface | null): Partia const font = typeface ? Skia.Font(typeface, fontSize) : null; if (isDependentAxis) { - return { - yAxis: [ - { - tickCount, - tickValues, - formatYLabel: formatLabel, - axisSide: orientation === 'right' ? 'right' : 'left', - lineColor, - lineWidth, - labelColor, - labelOffset, - font, - }, - ], - }; + 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, + }, + ], + }; } - return { - xAxis: { - tickCount, - tickValues, - formatXLabel: formatLabel, - axisSide: orientation === 'top' ? 'top' : 'bottom', - lineColor, - lineWidth, - labelColor, - labelOffset, - font, - }, - }; + return isHorizontal + ? { + yAxis: [ + { + tickCount, + tickValues, + formatYLabel: formatLabel, + axisSide: orientation === 'top' ? 'right' : 'left', + lineColor, + lineWidth, + labelColor, + labelOffset, + font, + }, + ], + } + : { + xAxis: { + tickCount, + tickValues, + formatXLabel: formatLabel, + axisSide: orientation === 'top' ? 'top' : 'bottom', + lineColor, + lineWidth, + labelColor, + labelOffset, + font, + }, + }; } export default parseVictoryAxisNode; From adc0af3ff6513913dc1ca6841d7a04953d6cf110 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 02:24:17 +0100 Subject: [PATCH 08/25] remove comments --- .../VictoryChartRenderer/utils/parseDomainPadding.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding.ts index 82a0477d76cd..ada97e835b6f 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding.ts @@ -13,7 +13,6 @@ function parseDomainPadding(attribute: string, isHorizontal: boolean): DomainPad return domainPadding; } if (Array.isArray(domainPadding)) { - // s77rt check return isHorizontal ? {bottom: Number(domainPadding.at(0)), top: Number(domainPadding.at(1))} : {left: Number(domainPadding.at(0)), right: Number(domainPadding.at(1))}; } if (lodashIsObject(domainPadding)) { @@ -35,8 +34,7 @@ function parseDomainPadding(attribute: string, isHorizontal: boolean): DomainPad top = Number(domainPadding.y.at(1)); bottom = Number(domainPadding.y.at(0)); } - // s77rt check - return isHorizontal ? {left: bottom, right: top, top: left, bottom: right} : {left, right, top, bottom}; + return isHorizontal ? {left: bottom, right: top, top: right, bottom: left} : {left, right, top, bottom}; } return undefined; } From 1807152c7db316ba38f9ace91201f00a7ba9ea67 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 04:10:08 +0100 Subject: [PATCH 09/25] add categories and handle data for horizontal bars --- .../context/VictoryChartContext.tsx | 4 +++- .../parsers/processVictoryChartTree.ts | 11 +++++++-- .../parsers/victoryChartParser.ts | 4 +++- .../parsers/victorySeriesParser.ts | 23 ++++++++++++++----- .../VictoryChartRenderer/types.ts | 1 + .../utils/parseCategories.ts | 17 ++++++++++++++ 6 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseCategories.ts diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx index 570503a1ae4f..36d801870b00 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/context/VictoryChartContext.tsx @@ -17,6 +17,7 @@ type VictoryChartContextValue = { domainPadding: ProcessNodeResult['domainPadding']; padding: ProcessNodeResult['padding']; isHorizontal: ProcessNodeResult['isHorizontal']; + categories: ProcessNodeResult['categories']; labelItems: ProcessNodeResult['labelItems']; legendItems: ProcessNodeResult['legendItems']; chartContentStyles: ReturnType['nodeStyles']; @@ -32,7 +33,7 @@ const VictoryChartContext = createContext(null) */ function VictoryChartProvider({tnode, children}: {tnode: TNode; children: React.ReactNode}) { const {regular: regularTypeface} = useChartDefaultTypeface(); - const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, labelItems, legendItems} = processVictoryChartTree(tnode, regularTypeface, null); + const {data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, categories, labelItems, legendItems} = processVictoryChartTree(tnode, regularTypeface, null); const {nodeStyles: chartContentStyles, parentNodeStyles: chartContainerStyles} = parseStyles(tnode); const hasCartesianData = Object.keys(data).length > 0; @@ -63,6 +64,7 @@ function VictoryChartProvider({tnode, children}: {tnode: TNode; children: React. domainPadding, padding, isHorizontal, + categories, labelItems, legendItems, chartContentStyles, diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts index fb48be1f707d..7409c123c6a5 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts @@ -18,6 +18,7 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root let domainPadding: ProcessNodeResult['domainPadding']; let padding: ProcessNodeResult['padding']; let isHorizontal: ProcessNodeResult['isHorizontal']; + let categories: ProcessNodeResult['categories']; const labelItems: ProcessNodeResult['labelItems'] = []; const legendItems: ProcessNodeResult['legendItems'] = []; @@ -48,6 +49,9 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root if (result.isHorizontal) { isHorizontal = result.isHorizontal; } + if (result.categories) { + categories = result.categories; + } if (result.labelItems) { labelItems.push(...result.labelItems); } @@ -57,7 +61,7 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root } // If we have `rootProcessedResult` then forward it as it, otherwise we must be the root so pass the data that we just built - const rootProcessedNodeResult = rootProcessedResult ?? {data, xKey: X_KEY, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, labelItems, legendItems}; + const rootProcessedNodeResult = rootProcessedResult ?? {data, xKey: X_KEY, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, categories, labelItems, legendItems}; for (const child of tnode.children) { const childResult = processVictoryChartTree(child, typeface, rootProcessedNodeResult); @@ -81,11 +85,14 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root if (childResult.isHorizontal) { isHorizontal = childResult.isHorizontal; } + if (childResult.categories) { + categories = childResult.categories; + } labelItems.push(...childResult.labelItems); legendItems.push(...childResult.legendItems); } - return {data, xKey: X_KEY, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, labelItems, legendItems}; + return {data, xKey: X_KEY, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, categories, labelItems, legendItems}; } export default processVictoryChartTree; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts index 045a43be5a92..fb39dd45b622 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victoryChartParser.ts @@ -1,5 +1,6 @@ import type {TNode} from 'react-native-render-html'; import type {PartialProcessNodeResult} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; +import parseCategories from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseCategories'; import parseDomain from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomain'; import parseDomainPadding from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseDomainPadding'; import parsePadding from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parsePadding'; @@ -12,7 +13,8 @@ function parseVictoryChartNode(tnode: TNode): PartialProcessNodeResult { const domain = parseDomain(tnode.attributes.domain, isHorizontal); const domainPadding = parseDomainPadding(tnode.attributes.domainpadding, isHorizontal); const padding = parsePadding(tnode.attributes.padding); - return {domain, domainPadding, padding, isHorizontal}; + const categories = parseCategories(tnode.attributes.categories); + return {domain, domainPadding, padding, isHorizontal, categories}; } export default parseVictoryChartNode; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts index d9930fce5926..ae405d8e9e86 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts @@ -1,6 +1,7 @@ +import type {SkTypeface} from '@shopify/react-native-skia'; import type {TNode} from 'react-native-render-html'; import {X_KEY} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/constants'; -import type {CartesianChartData, PartialProcessNodeResult, RawChartData} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; +import type {CartesianChartData, PartialProcessNodeResult, ProcessNodeResult, RawChartData} from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types'; import getYKey from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getYKey'; import parseAttribute from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseAttribute'; @@ -8,16 +9,26 @@ import parseAttribute from '@components/HTMLEngineProvider/HTMLRenderers/Victory * Parse data points from a `` or `` node. * Both series types share the same data structure: an array of {x, y} points. */ -function parseVictorySeriesNode(tnode: TNode): PartialProcessNodeResult { +function parseVictorySeriesNode(tnode: TNode, typeface: SkTypeface | null, rootProcessedResult: ProcessNodeResult | null): PartialProcessNodeResult { + const isHorizontal = rootProcessedResult?.isHorizontal; + const categories = rootProcessedResult?.categories; const points = parseAttribute(tnode.attributes.data) ?? []; const yKey = getYKey(tnode); const data: Record = {}; for (const point of points) { - data[point.x] = { - [X_KEY]: point.x, - [yKey]: point.y, - } as CartesianChartData; + if (isHorizontal) { + data[point.y] = { + [X_KEY]: point.y, + [yKey]: typeof point.x === 'number' ? point.x : categories?.indexOf(point.x), + } as CartesianChartData; + } else { + data[point.x] = { + [X_KEY]: point.x, + [yKey]: point.y, + } as CartesianChartData; + } } + console.log({data}); return {data, yKeys: [yKey]}; } diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts index eae704842d51..4575207ac169 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/types.ts @@ -125,6 +125,7 @@ type ProcessNodeResult = { domainPadding: CartesianChartProps['domainPadding']; padding: CartesianChartProps['padding']; isHorizontal: boolean | undefined; + categories: string[] | undefined; labelItems: LabelItem[]; legendItems: LegendItem[]; }; diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseCategories.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseCategories.ts new file mode 100644 index 000000000000..5efed88e1f8f --- /dev/null +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseCategories.ts @@ -0,0 +1,17 @@ +import lodashIsObject from 'lodash/isObject'; +import parseAttribute from './parseAttribute'; + +/** + * Translate VictoryChart's `categories` attribute into string[]. + */ +function parseCategories(attribute: string): string[] | undefined { + const categories = parseAttribute(attribute); + if (lodashIsObject(categories)) { + if ('x' in categories && Array.isArray(categories.x)) { + return categories.x; + } + } + return undefined; +} + +export default parseCategories; From df3367f8a02be23459837891a77a60bc02331bf1 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 04:10:52 +0100 Subject: [PATCH 10/25] remove console log --- .../VictoryChartRenderer/parsers/victorySeriesParser.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts index ae405d8e9e86..5f2bfb035da7 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts @@ -28,7 +28,6 @@ function parseVictorySeriesNode(tnode: TNode, typeface: SkTypeface | null, rootP } as CartesianChartData; } } - console.log({data}); return {data, yKeys: [yKey]}; } From ce14f7c54c1014b4daefe57d6c99f53b9f50ab33 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 05:00:03 +0100 Subject: [PATCH 11/25] lint --- .../HTMLRenderers/VictoryChartRenderer/utils/parseCategories.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseCategories.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseCategories.ts index 5efed88e1f8f..cbea8c184c0c 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseCategories.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseCategories.ts @@ -8,7 +8,7 @@ function parseCategories(attribute: string): string[] | undefined { const categories = parseAttribute(attribute); if (lodashIsObject(categories)) { if ('x' in categories && Array.isArray(categories.x)) { - return categories.x; + return categories.x.map(String); } } return undefined; From 7ec4ce93bf2b13c65b5c130f03f3c9d771fc6bb1 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 05:39:13 +0100 Subject: [PATCH 12/25] pass down isHorizontal --- .../components/VictoryChartBarGroup.tsx | 8 ++++++-- .../components/VictoryChartCartesian.tsx | 3 ++- .../components/VictoryChartSeries.tsx | 14 +++++++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx index 6a622ee7948e..db9a023aceb8 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx @@ -9,12 +9,15 @@ import parseAttribute from '@components/HTMLEngineProvider/HTMLRenderers/Victory import parseCornerRadius from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseCornerRadius'; import parseStyles from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseStyles'; -type VictoryCharBarGroupProps = {tnode: TNode}; +type VictoryCharBarGroupProps = { + tnode: TNode; + isHorizontal?: boolean; +}; const BAR_BETWEEN_GROUP_PADDING = 2 / 3; const BAR_WITHIN_GROUP_PADDING = BAR_INNER_PADDING; -function VictoryCharBarGroup({tnode}: VictoryCharBarGroupProps) { +function VictoryCharBarGroup({tnode, isHorizontal}: VictoryCharBarGroupProps) { const {points, chartBounds} = useVictoryChartRenderArgs(); const barChildren = tnode.children.filter((child) => child.tagName === 'victorybar'); return ( @@ -24,6 +27,7 @@ function VictoryCharBarGroup({tnode}: VictoryCharBarGroupProps) { withinGroupPadding={BAR_WITHIN_GROUP_PADDING} roundedCorners={parseCornerRadius(barChildren.at(0)?.attributes?.cornerradius ?? '')} barWidth={parseAttribute(barChildren.at(0)?.attributes?.barwidth ?? '')} + isHorizontal={isHorizontal} > {barChildren.map((child) => { const yKey = getYKey(child); diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx index a4eab9eb4510..de06e6443bba 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartCartesian.tsx @@ -12,7 +12,7 @@ import VictoryChartSeries from './VictoryChartSeries'; * Labels and legend overlays are handled internally via `renderOutside`. */ function VictoryChartCartesian() { - const {tnode, data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, labelItems, legendItems} = useVictoryChartContext(); + const {tnode, data, xKey, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, labelItems, legendItems} = useVictoryChartContext(); return ( ))} diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartSeries.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartSeries.tsx index 571541cb4280..c921c14c920a 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartSeries.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartSeries.tsx @@ -5,7 +5,10 @@ import VictoryChartBar from './VictoryChartBar'; import VictoryChartBarGroup from './VictoryChartBarGroup'; import VictoryChartLine from './VictoryChartLine'; -type VictoryChartSeriesProps = {tnode: TNode}; +type VictoryChartSeriesProps = { + tnode: TNode; + isHorizontal?: boolean; +}; type SeriesComponent = (props: VictoryChartSeriesProps) => React.ReactElement | null; @@ -19,7 +22,7 @@ const SERIES_RENDERERS: Partial> = { victoryline: VictoryChartLine, }; -function VictoryChartSeries({tnode}: VictoryChartSeriesProps) { +function VictoryChartSeries({tnode, isHorizontal}: VictoryChartSeriesProps) { const SeriesRenderer = SERIES_RENDERERS[tnode.tagName ?? '']; useEffect(() => { @@ -33,7 +36,12 @@ function VictoryChartSeries({tnode}: VictoryChartSeriesProps) { return null; } - return ; + return ( + + ); } VictoryChartSeries.displayName = 'VictoryChartSeries'; From 99e160e1193b8a2e84dde1500d1e88c7873367ea Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 06:00:03 +0100 Subject: [PATCH 13/25] add victory-native patch to support horizontal bars --- patches/victory-native/details.md | 13 ++ ...y-native+41.20.2+001+horizontal-bars.patch | 111 ++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 patches/victory-native/details.md create mode 100644 patches/victory-native/victory-native+41.20.2+001+horizontal-bars.patch diff --git a/patches/victory-native/details.md b/patches/victory-native/details.md new file mode 100644 index 000000000000..d654443807b6 --- /dev/null +++ b/patches/victory-native/details.md @@ -0,0 +1,13 @@ +# `victory-native` patches + +### [victory-native+41.20.2+001+horizontal-bars.patch](victory-native+41.20.2+001+horizontal-bars.patch) + +- Reason: + + ``` + This patch adds support to horizontal bars when rendered in + ``` + +- Upstream PR/issue: Not yet. This is unrgent patch with deadline. +- E/App issue: https://github.com/Expensify/Expensify/issues/636601 +- PR introducing patch: https://github.com/Expensify/App/pull/91659 diff --git a/patches/victory-native/victory-native+41.20.2+001+horizontal-bars.patch b/patches/victory-native/victory-native+41.20.2+001+horizontal-bars.patch new file mode 100644 index 000000000000..628e6f43dcfb --- /dev/null +++ b/patches/victory-native/victory-native+41.20.2+001+horizontal-bars.patch @@ -0,0 +1,111 @@ +diff --git a/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts b/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts +index b486f76..45788f0 100644 +--- a/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts ++++ b/node_modules/victory-native/dist/cartesian/components/BarGroup.d.ts +@@ -16,6 +16,7 @@ type BarGroupProps = { + groupWidth: number; + gapWidth: number; + }) => void; ++ isHorizontal?: boolean; + }; + export declare function BarGroup({ betweenGroupPadding, withinGroupPadding, chartBounds, roundedCorners, children, onBarSizeChange, barWidth: customBarWidth, barCount, }: BarGroupProps): React.DetailedReactHTMLElement, HTMLInputElement>[] | null; + export declare namespace BarGroup { +diff --git a/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts b/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts +index 63b69bc..75641b1 100644 +--- a/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts ++++ b/node_modules/victory-native/dist/cartesian/hooks/useBarGroupPaths.d.ts +@@ -1,6 +1,6 @@ + import type { ChartBounds, PointsArray } from "../../types"; + import { type RoundedCorners } from "../../utils/createRoundedRectPath"; +-export declare const useBarGroupPaths: (points: PointsArray[], chartBounds: ChartBounds, betweenGroupPadding?: number, withinGroupPadding?: number, roundedCorners?: RoundedCorners, customBarWidth?: number, barCount?: number) => { ++export declare const useBarGroupPaths: (points: PointsArray[], chartBounds: ChartBounds, betweenGroupPadding?: number, withinGroupPadding?: number, roundedCorners?: RoundedCorners, customBarWidth?: number, barCount?: number, isHorizontal?: boolean) => { + barWidth: number; + groupWidth: number; + gapWidth: number; +diff --git a/node_modules/victory-native/src/cartesian/components/BarGroup.tsx b/node_modules/victory-native/src/cartesian/components/BarGroup.tsx +index f46fad7..ad75c04 100644 +--- a/node_modules/victory-native/src/cartesian/components/BarGroup.tsx ++++ b/node_modules/victory-native/src/cartesian/components/BarGroup.tsx +@@ -20,6 +20,7 @@ type BarGroupProps = { + groupWidth: number; + gapWidth: number; + }) => void; ++ isHorizontal?: boolean; + }; + + export function BarGroup({ +@@ -31,6 +32,7 @@ export function BarGroup({ + onBarSizeChange, + barWidth: customBarWidth, + barCount, ++ isHorizontal, + }: BarGroupProps) { + // Collect the bar props + const bars = [] as BarGroupBarProps[]; +@@ -49,6 +51,7 @@ export function BarGroup({ + roundedCorners, + customBarWidth, + barCount, ++ isHorizontal, + ); + + // Handle bar size change +diff --git a/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts b/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts +index 4bfb6d4..32b65de 100644 +--- a/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts ++++ b/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts +@@ -15,17 +15,19 @@ export const useBarGroupPaths = ( + roundedCorners?: RoundedCorners, + customBarWidth?: number, + barCount?: number, ++ isHorizontal?: boolean, + ) => { + const numGroups = points[0]?.length || 0; + +- const { yScale } = useCartesianChartContext(); ++ const { xScale, yScale } = useCartesianChartContext(); + + const groupWidth = React.useMemo(() => { ++ const boundSize = isHorizontal ? chartBounds.top - chartBounds.bottom : chartBounds.right - chartBounds.left; + return ( +- ((1 - betweenGroupPadding) * (chartBounds.right - chartBounds.left)) / ++ ((1 - betweenGroupPadding) * boundSize) / + Math.max(1, numGroups) + ); +- }, [betweenGroupPadding, chartBounds.left, chartBounds.right, numGroups]); ++ }, [betweenGroupPadding, chartBounds, numGroups, isHorizontal]); + + const barWidth = React.useMemo(() => { + if (customBarWidth) return customBarWidth; +@@ -46,19 +48,24 @@ export const useBarGroupPaths = ( + const offset = -groupWidth / 2 + i * (barWidth + gapWidth); + pointSet.forEach(({ x, y, yValue }) => { + if (typeof y !== "number") return; +- const barHeight = yScale(0) - y; ++ const barHeight = isHorizontal ? xScale(0) - x : yScale(0) - y; + if (roundedCorners) { + const nonUniformRoundedRect = createRoundedRectPath( +- x + offset, +- y, +- barWidth, +- barHeight, +- roundedCorners, ++ isHorizontal ? x : x + offset, ++ isHorizontal ? y + offset : y, ++ isHorizontal ? barHeight : barWidth, ++ isHorizontal ? barWidth : barHeight, ++ isHorizontal ? {topLeft: roundedCorners.bottomLeft, topRight: roundedCorners.topLeft, bottomLeft: roundedCorners.bottomRight, bottomRight: roundedCorners.topLeft} : roundedCorners, + Number(yValue), + ); + p.addRRect(nonUniformRoundedRect); + } else { +- p.addRect(Skia.XYWHRect(x + offset, y, barWidth, barHeight)); ++ p.addRect(Skia.XYWHRect( ++ isHorizontal ? x : x + offset, ++ isHorizontal ? y + offset : y, ++ isHorizontal ? barHeight : barWidth, ++ isHorizontal ? barWidth : barHeight, ++ )); + } + }); + return p; From 24bc5e0fecd13e868fbc284a9158d7817e3e0454 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 06:44:27 +0100 Subject: [PATCH 14/25] parse group offset --- .../components/VictoryChartBarGroup.tsx | 22 +++++++++++++------ .../VictoryChartRenderer/utils/parseOffset.ts | 15 +++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseOffset.ts diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx index db9a023aceb8..2d11bad44a1c 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx @@ -7,6 +7,7 @@ import {useVictoryChartRenderArgs} from '@components/HTMLEngineProvider/HTMLRend import getYKey from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/getYKey'; import parseAttribute from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseAttribute'; import parseCornerRadius from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseCornerRadius'; +import parseOffset from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseOffset'; import parseStyles from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseStyles'; type VictoryCharBarGroupProps = { @@ -14,19 +15,26 @@ type VictoryCharBarGroupProps = { isHorizontal?: boolean; }; -const BAR_BETWEEN_GROUP_PADDING = 2 / 3; -const BAR_WITHIN_GROUP_PADDING = BAR_INNER_PADDING; - function VictoryCharBarGroup({tnode, isHorizontal}: VictoryCharBarGroupProps) { const {points, chartBounds} = useVictoryChartRenderArgs(); const barChildren = tnode.children.filter((child) => child.tagName === 'victorybar'); + const firstBarChild = barChildren.at(0); + + if (!firstBarChild) { + return null; + } + + const roundedCorners = parseCornerRadius(firstBarChild?.attributes?.cornerradius ?? ''); + const barWidth = Number(parseAttribute(firstBarChild.attributes?.barwidth ?? '')); + const betweenGroupPadding = parseOffset(tnode.attributes.offset, chartBounds, barChildren.length, barWidth, points[getYKey(firstBarChild)].length, isHorizontal ?? false); + return ( {barChildren.map((child) => { diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseOffset.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseOffset.ts new file mode 100644 index 000000000000..21dcacd9f8e4 --- /dev/null +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseOffset.ts @@ -0,0 +1,15 @@ +import type {ChartBounds, PointsArray} from 'victory-native'; +import parseAttribute from './parseAttribute'; + +/** + * Translate VictoryChart's `offset` attribute into victory-native's `betweenGroupPadding` percentage. + */ +function parseOffset(attribute: string, chartBounds: ChartBounds, groupCount: number, barWidth: number, pointsCount: number, isHorizontal: boolean): number { + const offset = attribute ? Number(parseAttribute(attribute)) : 0; + const boundSize = isHorizontal ? chartBounds.top - chartBounds.bottom : chartBounds.right - chartBounds.left; + const groupWidth = barWidth + offset * (groupCount - 1); + const betweenGroupPadding = 1 - groupWidth * (pointsCount / boundSize); + return betweenGroupPadding; +} + +export default parseOffset; From cbf63d97e45a74ef29aefab189ce71152de46d83 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 06:52:31 +0100 Subject: [PATCH 15/25] lint --- .../HTMLRenderers/VictoryChartRenderer/utils/parseOffset.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseOffset.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseOffset.ts index 21dcacd9f8e4..ffd3dc9da702 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseOffset.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseOffset.ts @@ -1,4 +1,4 @@ -import type {ChartBounds, PointsArray} from 'victory-native'; +import type {ChartBounds} from 'victory-native'; import parseAttribute from './parseAttribute'; /** From 28eb0a1fe0ff9326981a28e0ac055fe6faeb482a Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 19:19:51 +0100 Subject: [PATCH 16/25] Apply suggestions from code review Co-authored-by: Carlos Martins --- .../VictoryChartRenderer/components/VictoryChartBarGroup.tsx | 4 ++-- .../VictoryChartRenderer/parsers/processVictoryChartTree.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx index 2d11bad44a1c..7bf053e3827d 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx @@ -10,12 +10,12 @@ import parseCornerRadius from '@components/HTMLEngineProvider/HTMLRenderers/Vict import parseOffset from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseOffset'; import parseStyles from '@components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/utils/parseStyles'; -type VictoryCharBarGroupProps = { +type VictoryChartBarGroupProps = { tnode: TNode; isHorizontal?: boolean; }; -function VictoryCharBarGroup({tnode, isHorizontal}: VictoryCharBarGroupProps) { +function VictoryChartBarGroup({tnode, isHorizontal}: VictoryChartBarGroupProps) { const {points, chartBounds} = useVictoryChartRenderArgs(); const barChildren = tnode.children.filter((child) => child.tagName === 'victorybar'); const firstBarChild = barChildren.at(0); diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts index 7409c123c6a5..94504a715c1e 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/processVictoryChartTree.ts @@ -60,7 +60,7 @@ function processVictoryChartTree(tnode: TNode, typeface: SkTypeface | null, root } } - // If we have `rootProcessedResult` then forward it as it, otherwise we must be the root so pass the data that we just built + // If we have `rootProcessedResult` then forward it as is, otherwise we must be the root so pass the data that we just built const rootProcessedNodeResult = rootProcessedResult ?? {data, xKey: X_KEY, yKeys, xAxis, yAxis, domain, domainPadding, padding, isHorizontal, categories, labelItems, legendItems}; for (const child of tnode.children) { From 55e3ae670cf85b1558c18156c66679c4f3baf741 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 19:22:17 +0100 Subject: [PATCH 17/25] fix componenet name --- .../VictoryChartRenderer/components/VictoryChartBarGroup.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx index 7bf053e3827d..fffddfff27f9 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx @@ -52,6 +52,6 @@ function VictoryChartBarGroup({tnode, isHorizontal}: VictoryChartBarGroupProps) ); } -VictoryCharBarGroup.displayName = 'VictoryCharBarGroup'; +VictoryChartBarGroup.displayName = 'VictoryCharBarGroup'; -export default VictoryCharBarGroup; +export default VictoryChartBarGroup; From c47f651cdf42071327bcff15ceb7e0a0b4a6f01a Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 19:25:11 +0100 Subject: [PATCH 18/25] typo --- patches/victory-native/details.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/victory-native/details.md b/patches/victory-native/details.md index d654443807b6..6d7643d39cb3 100644 --- a/patches/victory-native/details.md +++ b/patches/victory-native/details.md @@ -8,6 +8,6 @@ This patch adds support to horizontal bars when rendered in ``` -- Upstream PR/issue: Not yet. This is unrgent patch with deadline. +- Upstream PR/issue: Not yet. This is urgent patch with deadline. - E/App issue: https://github.com/Expensify/Expensify/issues/636601 - PR introducing patch: https://github.com/Expensify/App/pull/91659 From d5c4676f1d60aaebc7c43173ade466f121e8561d Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 19:35:18 +0100 Subject: [PATCH 19/25] fix crash on main --- .../inbox/report/ReportActionCompose/ComposerActionButton.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/inbox/report/ReportActionCompose/ComposerActionButton.tsx b/src/pages/inbox/report/ReportActionCompose/ComposerActionButton.tsx index c0f694363919..e9147bd9afd7 100644 --- a/src/pages/inbox/report/ReportActionCompose/ComposerActionButton.tsx +++ b/src/pages/inbox/report/ReportActionCompose/ComposerActionButton.tsx @@ -1,3 +1,4 @@ +import React from 'react'; import ComposerActionMenu from './ComposerActionMenu'; import {useComposerEditState} from './ComposerContext'; import ComposerEditingButtons from './ComposerEditingButtons'; From 4c9f399ff484e78eeb369b762d6800061038bdd4 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 20:02:36 +0100 Subject: [PATCH 20/25] fix patch corder radius values --- .../victory-native+41.20.2+001+horizontal-bars.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/victory-native/victory-native+41.20.2+001+horizontal-bars.patch b/patches/victory-native/victory-native+41.20.2+001+horizontal-bars.patch index 628e6f43dcfb..064636ba22be 100644 --- a/patches/victory-native/victory-native+41.20.2+001+horizontal-bars.patch +++ b/patches/victory-native/victory-native+41.20.2+001+horizontal-bars.patch @@ -51,7 +51,7 @@ index f46fad7..ad75c04 100644 // Handle bar size change diff --git a/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts b/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts -index 4bfb6d4..32b65de 100644 +index 4bfb6d4..9805bfe 100644 --- a/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts +++ b/node_modules/victory-native/src/cartesian/hooks/useBarGroupPaths.ts @@ -15,17 +15,19 @@ export const useBarGroupPaths = ( @@ -94,7 +94,7 @@ index 4bfb6d4..32b65de 100644 + isHorizontal ? y + offset : y, + isHorizontal ? barHeight : barWidth, + isHorizontal ? barWidth : barHeight, -+ isHorizontal ? {topLeft: roundedCorners.bottomLeft, topRight: roundedCorners.topLeft, bottomLeft: roundedCorners.bottomRight, bottomRight: roundedCorners.topLeft} : roundedCorners, ++ isHorizontal ? {topLeft: roundedCorners.bottomLeft, topRight: roundedCorners.topLeft, bottomLeft: roundedCorners.bottomRight, bottomRight: roundedCorners.topRight} : roundedCorners, Number(yValue), ); p.addRRect(nonUniformRoundedRect); From 394184bec068c560567ae776ebed6b08542b27b3 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 23:26:10 +0100 Subject: [PATCH 21/25] key data by x and y values for horizontal mode --- .../VictoryChartRenderer/parsers/victorySeriesParser.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts index 5f2bfb035da7..e311492904e9 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts @@ -17,7 +17,9 @@ function parseVictorySeriesNode(tnode: TNode, typeface: SkTypeface | null, rootP const data: Record = {}; for (const point of points) { if (isHorizontal) { - data[point.y] = { + // Even though the X-Axis is going to hold the y values on horizontal mode, it's not the independent axis + // thus we cannot use `point.y` as the key since a two points can have the same y value. + data[`${point.y}-${point.x}`] = { [X_KEY]: point.y, [yKey]: typeof point.x === 'number' ? point.x : categories?.indexOf(point.x), } as CartesianChartData; From 905073792804706cefc9488eda48cdd51c784b1e Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 26 May 2026 23:30:49 +0100 Subject: [PATCH 22/25] fallback if barWidth is not set --- .../VictoryChartRenderer/components/VictoryChartBarGroup.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx index fffddfff27f9..dc766da37cfc 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx @@ -25,8 +25,8 @@ function VictoryChartBarGroup({tnode, isHorizontal}: VictoryChartBarGroupProps) } const roundedCorners = parseCornerRadius(firstBarChild?.attributes?.cornerradius ?? ''); - const barWidth = Number(parseAttribute(firstBarChild.attributes?.barwidth ?? '')); - const betweenGroupPadding = parseOffset(tnode.attributes.offset, chartBounds, barChildren.length, barWidth, points[getYKey(firstBarChild)].length, isHorizontal ?? false); + const barWidth = firstBarChild.attributes?.barwidth ? Number(parseAttribute(firstBarChild.attributes.barwidth)) : undefined; + const betweenGroupPadding = parseOffset(tnode.attributes.offset, chartBounds, barChildren.length, barWidth ?? 0, points[getYKey(firstBarChild)].length, isHorizontal ?? false); return ( Date: Tue, 26 May 2026 23:35:44 +0100 Subject: [PATCH 23/25] typo --- .../VictoryChartRenderer/parsers/victorySeriesParser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts index e311492904e9..79b1ac8234be 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/parsers/victorySeriesParser.ts @@ -18,7 +18,7 @@ function parseVictorySeriesNode(tnode: TNode, typeface: SkTypeface | null, rootP for (const point of points) { if (isHorizontal) { // Even though the X-Axis is going to hold the y values on horizontal mode, it's not the independent axis - // thus we cannot use `point.y` as the key since a two points can have the same y value. + // thus we cannot use `point.y` as the key since two points can have the same y value. data[`${point.y}-${point.x}`] = { [X_KEY]: point.y, [yKey]: typeof point.x === 'number' ? point.x : categories?.indexOf(point.x), From e3398c22fb60c6cc795b74a85520b12468e1cedb Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Wed, 27 May 2026 15:06:41 +0100 Subject: [PATCH 24/25] fix displayName --- .../VictoryChartRenderer/components/VictoryChartBarGroup.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx index dc766da37cfc..e2f30a1d4e3e 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx @@ -52,6 +52,6 @@ function VictoryChartBarGroup({tnode, isHorizontal}: VictoryChartBarGroupProps) ); } -VictoryChartBarGroup.displayName = 'VictoryCharBarGroup'; +VictoryChartBarGroup.displayName = 'VictoryChartBarGroup'; export default VictoryChartBarGroup; From ca276581bbdb57b33f045428f8c5f259b1dcd5ab Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Wed, 27 May 2026 15:39:21 +0100 Subject: [PATCH 25/25] handle barWidth and betweenGroupPadding fallback --- .../components/VictoryChartBarGroup.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx index e2f30a1d4e3e..9a203cd1e0ff 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx +++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartBarGroup.tsx @@ -25,8 +25,10 @@ function VictoryChartBarGroup({tnode, isHorizontal}: VictoryChartBarGroupProps) } const roundedCorners = parseCornerRadius(firstBarChild?.attributes?.cornerradius ?? ''); - const barWidth = firstBarChild.attributes?.barwidth ? Number(parseAttribute(firstBarChild.attributes.barwidth)) : undefined; - const betweenGroupPadding = parseOffset(tnode.attributes.offset, chartBounds, barChildren.length, barWidth ?? 0, points[getYKey(firstBarChild)].length, isHorizontal ?? false); + const barWidth = firstBarChild.attributes.barwidth !== undefined ? Number(parseAttribute(firstBarChild.attributes.barwidth)) : undefined; + const betweenGroupPadding = barWidth + ? parseOffset(tnode.attributes.offset, chartBounds, barChildren.length, barWidth, points[getYKey(firstBarChild)].length, isHorizontal ?? false) + : undefined; return (