diff --git a/packages/pluggableWidgets/bar-chart-native/CHANGELOG.md b/packages/pluggableWidgets/bar-chart-native/CHANGELOG.md
index a147a3657..105fdd72b 100644
--- a/packages/pluggableWidgets/bar-chart-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/bar-chart-native/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased]
+### Fixed
+
+- We have resolved an issue preventing Bar chart from rendering correctly.
+
## [3.1.0] - 2024-12-3
### Changed
diff --git a/packages/pluggableWidgets/bar-chart-native/package.json b/packages/pluggableWidgets/bar-chart-native/package.json
index 6d98c232f..d237a58b4 100644
--- a/packages/pluggableWidgets/bar-chart-native/package.json
+++ b/packages/pluggableWidgets/bar-chart-native/package.json
@@ -1,7 +1,7 @@
{
"name": "bar-chart-native",
"widgetName": "BarChart",
- "version": "3.1.0",
+ "version": "3.1.1",
"license": "Apache-2.0",
"copyright": "© Mendix Technology BV 2022. All rights reserved.",
"repository": {
diff --git a/packages/pluggableWidgets/bar-chart-native/src/components/BarChart.tsx b/packages/pluggableWidgets/bar-chart-native/src/components/BarChart.tsx
index e8bd11333..ccdf3f22b 100644
--- a/packages/pluggableWidgets/bar-chart-native/src/components/BarChart.tsx
+++ b/packages/pluggableWidgets/bar-chart-native/src/components/BarChart.tsx
@@ -58,7 +58,7 @@ export function BarChart({
style,
warningPrefix
}: BarChartProps): ReactElement | null {
- const [chartDimensions, setChartDimensions] = useState<{ height: number; width: number }>();
+ const [chartDimensions, setChartDimensions] = useState<{ height?: number; width?: number }>();
const warningMessagePrefix = useMemo(() => (warningPrefix ? warningPrefix + "i" : "I"), [warningPrefix]);
@@ -133,16 +133,7 @@ export function BarChart({
}
return {bars};
- }, [
- dataTypesResult,
- series,
- style,
- warningMessagePrefix,
- sortProps,
- showLabels,
- normalizedBarColors,
- presentation
- ]);
+ }, [dataTypesResult, series, style, sortProps, showLabels, normalizedBarColors, presentation]);
const [firstSeries] = series;
@@ -195,8 +186,8 @@ export function BarChart({
(event: LayoutChangeEvent) => {
const { height, width } = event.nativeEvent.layout;
setChartDimensions({
- height: height <= 0 ? -1 : height,
- width: width <= 0 ? -1 : width
+ height: height <= 0 ? undefined : height,
+ width: width <= 0 ? undefined : width
});
},
[setChartDimensions]
@@ -222,8 +213,8 @@ export function BarChart({
// horizontal charts.
-
+
diff --git a/packages/pluggableWidgets/column-chart-native/CHANGELOG.md b/packages/pluggableWidgets/column-chart-native/CHANGELOG.md
index 435f89e9d..7539b4e6a 100644
--- a/packages/pluggableWidgets/column-chart-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/column-chart-native/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased]
+### Fixed
+
+- We have resolved an issue preventing Column chart from rendering correctly
+
## [2.1.0] - 2024-12-3
### Changed
diff --git a/packages/pluggableWidgets/column-chart-native/package.json b/packages/pluggableWidgets/column-chart-native/package.json
index c763e9e1d..0ce160a44 100644
--- a/packages/pluggableWidgets/column-chart-native/package.json
+++ b/packages/pluggableWidgets/column-chart-native/package.json
@@ -1,7 +1,7 @@
{
"name": "column-chart-native",
"widgetName": "ColumnChart",
- "version": "2.1.0",
+ "version": "2.1.1",
"license": "Apache-2.0",
"copyright": "© Mendix Technology BV 2022. All rights reserved.",
"repository": {
diff --git a/packages/pluggableWidgets/column-chart-native/src/components/ColumnChart.tsx b/packages/pluggableWidgets/column-chart-native/src/components/ColumnChart.tsx
index 53f5ad7b3..76a8debbe 100644
--- a/packages/pluggableWidgets/column-chart-native/src/components/ColumnChart.tsx
+++ b/packages/pluggableWidgets/column-chart-native/src/components/ColumnChart.tsx
@@ -66,7 +66,7 @@ export function ColumnChart({
return sortSeriesDataPoints(series, sortOrder, dataTypesResult);
}, [sortOrder, series, dataTypesResult]);
- const [chartDimensions, setChartDimensions] = useState<{ height: number; width: number }>();
+ const [chartDimensions, setChartDimensions] = useState<{ height?: number; width?: number }>();
// Column Chart user-styling may be missing for certain series. A palette is passed, any missing colours
// fallback to a colour from the palette.
@@ -153,8 +153,8 @@ export function ColumnChart({
(event: LayoutChangeEvent) => {
const { height, width } = event.nativeEvent.layout;
setChartDimensions({
- height: height <= 0 ? -1 : height,
- width: width <= 0 ? -1 : width
+ height: height <= 0 ? undefined : height,
+ width: width <= 0 ? undefined : width
});
},
[setChartDimensions]
@@ -178,10 +178,8 @@ export function ColumnChart({
{chartDimensions ? (
-
+
diff --git a/packages/pluggableWidgets/line-chart-native/CHANGELOG.md b/packages/pluggableWidgets/line-chart-native/CHANGELOG.md
index a352001e7..41b80d5cb 100644
--- a/packages/pluggableWidgets/line-chart-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/line-chart-native/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased]
+### Fixed
+
+- We have resolved an issue preventing Line chart from rendering correctly
+
## [3.1.0] - 2024-12-3
### Changed
diff --git a/packages/pluggableWidgets/line-chart-native/package.json b/packages/pluggableWidgets/line-chart-native/package.json
index e88ec8182..5ad8fd072 100644
--- a/packages/pluggableWidgets/line-chart-native/package.json
+++ b/packages/pluggableWidgets/line-chart-native/package.json
@@ -1,7 +1,7 @@
{
"name": "line-chart-native",
"widgetName": "LineChart",
- "version": "3.1.0",
+ "version": "3.1.1",
"license": "Apache-2.0",
"repository": {
"type": "git",
diff --git a/packages/pluggableWidgets/line-chart-native/src/components/LineChart.tsx b/packages/pluggableWidgets/line-chart-native/src/components/LineChart.tsx
index 86a030b3c..9324d1e9e 100644
--- a/packages/pluggableWidgets/line-chart-native/src/components/LineChart.tsx
+++ b/packages/pluggableWidgets/line-chart-native/src/components/LineChart.tsx
@@ -177,12 +177,12 @@ export function LineChart(props: LineChartProps): ReactElement | null {
const xAxisLabelComponent = xAxisLabel ? {xAxisLabel} : null;
const yAxisLabelComponent = yAxisLabel ? {yAxisLabel} : null;
- const [chartDimensions, setChartDimensions] = useState<{ height: number; width: number }>();
+ const [chartDimensions, setChartDimensions] = useState<{ height?: number; width?: number }>();
const updateChartDimensions = useCallback(
(event: LayoutChangeEvent) => {
const { height, width } = event.nativeEvent.layout;
- setChartDimensions({ height: height <= 0 ? -1 : height, width: width <= 0 ? -1 : width });
+ setChartDimensions({ height: height <= 0 ? undefined : height, width: width <= 0 ? undefined : width });
},
[setChartDimensions]
);
@@ -205,8 +205,8 @@ export function LineChart(props: LineChartProps): ReactElement | null {
{chartDimensions ? (
-
+
diff --git a/packages/pluggableWidgets/pie-doughnut-chart-native/CHANGELOG.md b/packages/pluggableWidgets/pie-doughnut-chart-native/CHANGELOG.md
index 881b6116c..3fe71c6c6 100644
--- a/packages/pluggableWidgets/pie-doughnut-chart-native/CHANGELOG.md
+++ b/packages/pluggableWidgets/pie-doughnut-chart-native/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased]
+### Fixed
+
+- We have resolved an issue preventing Pie chart from rendering correctly
+
## [2.1.0] - 2024-12-3
### Changed
diff --git a/packages/pluggableWidgets/pie-doughnut-chart-native/package.json b/packages/pluggableWidgets/pie-doughnut-chart-native/package.json
index b0960a55d..6a660df24 100644
--- a/packages/pluggableWidgets/pie-doughnut-chart-native/package.json
+++ b/packages/pluggableWidgets/pie-doughnut-chart-native/package.json
@@ -1,7 +1,7 @@
{
"name": "pie-doughnut-chart-native",
"widgetName": "PieDoughnutChart",
- "version": "2.1.0",
+ "version": "2.1.1",
"license": "Apache-2.0",
"copyright": "© Mendix Technology BV 2022. All rights reserved.",
"repository": {
diff --git a/packages/pluggableWidgets/pie-doughnut-chart-native/src/components/PieDoughnutChart.tsx b/packages/pluggableWidgets/pie-doughnut-chart-native/src/components/PieDoughnutChart.tsx
index 1cb70bc83..c563f7434 100644
--- a/packages/pluggableWidgets/pie-doughnut-chart-native/src/components/PieDoughnutChart.tsx
+++ b/packages/pluggableWidgets/pie-doughnut-chart-native/src/components/PieDoughnutChart.tsx
@@ -28,7 +28,7 @@ export interface Slice {
export function PieDoughnutChart({ name, presentation, series, style, showLabels }: ChartProps): ReactElement | null {
// due to the nature of the chart type, we only reply on the width, as the chart is always a square
- const [chartDimensions, setChartDimensions] = useState<{ width: number }>();
+ const [chartDimensions, setChartDimensions] = useState<{ width?: number }>();
// Chart user-styling may be missing for certain slices. A palette is passed, any missing colours
// fallback to a colour from the palette or the default color.
const normalizedSliceColors: string[] = useMemo(() => {
@@ -56,7 +56,7 @@ export function PieDoughnutChart({ name, presentation, series, style, showLabels
(event: LayoutChangeEvent) => {
const { width } = event.nativeEvent.layout;
setChartDimensions({
- width: width <= 0 ? -1 : width
+ width: width <= 0 ? undefined : width
});
},
[setChartDimensions]
@@ -89,7 +89,7 @@ export function PieDoughnutChart({ name, presentation, series, style, showLabels
}}
labels={({ datum }) => (showLabels ? datum.x : undefined)}
innerRadius={
- presentation === "doughnut"
+ presentation === "doughnut" && chartDimensions.width && chartDimensions.width > 0
? style.slices?.innerRadius ?? chartDimensions.width / DEFAULT_INNER_RADIUS_RATIO
: undefined
}
diff --git a/packages/pluggableWidgets/pie-doughnut-chart-native/src/package.xml b/packages/pluggableWidgets/pie-doughnut-chart-native/src/package.xml
index dd76a537d..a0e2938d9 100644
--- a/packages/pluggableWidgets/pie-doughnut-chart-native/src/package.xml
+++ b/packages/pluggableWidgets/pie-doughnut-chart-native/src/package.xml
@@ -1,6 +1,6 @@
-
+