Merge branch 'chart-backport-9-24' into backport-custom-chart-parsing-issue

gjulivan · web-flow · commit d02aba01a2b9 · 2025-07-04T14:18:36.000+02:00
diff --git a/packages/pluggableWidgets/area-chart-web/CHANGELOG.md b/packages/pluggableWidgets/area-chart-web/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- We updated shared charts dependency.
+
 ## [6.1.0] - 2025-06-04
 
 ### Fixed
diff --git a/packages/pluggableWidgets/area-chart-web/package.json b/packages/pluggableWidgets/area-chart-web/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/area-chart-web",
     "widgetName": "AreaChart",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "An area chart displays a solid color between the traces of a graph.",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/area-chart-web/src/package.xml b/packages/pluggableWidgets/area-chart-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="AreaChart" version="6.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="AreaChart" version="6.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="AreaChart.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/bar-chart-web/CHANGELOG.md b/packages/pluggableWidgets/bar-chart-web/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- We updated shared charts dependency.
+
 ## [6.1.0] - 2025-06-04
 
 ### Fixed
diff --git a/packages/pluggableWidgets/bar-chart-web/package.json b/packages/pluggableWidgets/bar-chart-web/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/bar-chart-web",
     "widgetName": "BarChart",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "Shows difference between the data points for one or more categories.",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/bar-chart-web/src/package.xml b/packages/pluggableWidgets/bar-chart-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="BarChart" version="6.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="BarChart" version="6.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="BarChart.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/bubble-chart-web/CHANGELOG.md b/packages/pluggableWidgets/bubble-chart-web/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- We updated shared charts dependency.
+
 ## [6.1.0] - 2025-06-04
 
 ### Fixed
diff --git a/packages/pluggableWidgets/bubble-chart-web/package.json b/packages/pluggableWidgets/bubble-chart-web/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/bubble-chart-web",
     "widgetName": "BubbleChart",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "Shows data in a bubble format graph.",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/bubble-chart-web/src/package.xml b/packages/pluggableWidgets/bubble-chart-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="BubbleChart" version="6.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="BubbleChart" version="6.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="BubbleChart.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/chart-playground-web/CHANGELOG.md b/packages/pluggableWidgets/chart-playground-web/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- We updated shared charts dependency.
+
 ## [2.0.0] - 2025-02-28
 
 ### Changed
diff --git a/packages/pluggableWidgets/chart-playground-web/package.json b/packages/pluggableWidgets/chart-playground-web/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/chart-playground-web",
     "widgetName": "ChartPlayground",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "description": "A small playground widget for charts",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/chart-playground-web/src/package.xml b/packages/pluggableWidgets/chart-playground-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="ChartPlayground" version="2.0.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="ChartPlayground" version="2.0.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="ChartPlayground.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/charts-web/package.json b/packages/pluggableWidgets/charts-web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mendix/charts-web",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "Chart widgets collection for data visualization",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/charts-web/src/package.xml b/packages/pluggableWidgets/charts-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="Charts" version="6.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="Charts" version="6.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="AreaChart/AreaChart.xml" />
             <widgetFile path="BarChart/BarChart.xml" />
diff --git a/packages/pluggableWidgets/column-chart-web/CHANGELOG.md b/packages/pluggableWidgets/column-chart-web/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- We updated shared charts dependency.
+
 ## [6.1.0] - 2025-06-04
 
 ### Fixed
diff --git a/packages/pluggableWidgets/column-chart-web/package.json b/packages/pluggableWidgets/column-chart-web/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/column-chart-web",
     "widgetName": "ColumnChart",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "Shows data in a column format graph.",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/column-chart-web/src/package.xml b/packages/pluggableWidgets/column-chart-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="ColumnChart" version="6.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="ColumnChart" version="6.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="ColumnChart.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/custom-chart-web/package.json b/packages/pluggableWidgets/custom-chart-web/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/custom-chart-web",
     "widgetName": "CustomChart",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/custom-chart-web/src/package.xml b/packages/pluggableWidgets/custom-chart-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="CustomChart" version="1.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="CustomChart" version="1.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="CustomChart.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/heatmap-chart-web/CHANGELOG.md b/packages/pluggableWidgets/heatmap-chart-web/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Fixed
+
+- We fixed on click events by correctly adding datasource.
+
 ## [6.0.0] - 2025-02-28
 
 ### Changed
diff --git a/packages/pluggableWidgets/heatmap-chart-web/package.json b/packages/pluggableWidgets/heatmap-chart-web/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/heatmap-chart-web",
     "widgetName": "HeatMap",
-    "version": "6.0.0",
+    "version": "6.1.1",
     "description": "Shows data in a heatmap format graph.",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/heatmap-chart-web/src/HeatMap.xml b/packages/pluggableWidgets/heatmap-chart-web/src/HeatMap.xml
@@ -184,7 +184,7 @@
         </propertyGroup>
         <propertyGroup caption="Events">
             <propertyGroup caption="Events">
-                <property key="onClickAction" type="action" required="false">
+                <property key="onClickAction" type="action" required="false" dataSource="seriesDataSource">
                     <caption>On click action</caption>
                     <description />
                 </property>
diff --git a/packages/pluggableWidgets/heatmap-chart-web/src/hooks/data.ts b/packages/pluggableWidgets/heatmap-chart-web/src/hooks/data.ts
@@ -1,10 +1,11 @@
-import { ValueStatus } from "mendix";
-import { useEffect, useMemo, useState } from "react";
+import { ObjectItem, ValueStatus } from "mendix";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { ensure } from "@mendix/pluggable-widgets-tools";
 import { HeatMapContainerProps } from "../../typings/HeatMapProps";
 import { ChartWidgetProps, compareAttrValuesAsc } from "@mendix/shared-charts/main";
 import { executeAction } from "@mendix/widget-plugin-platform/framework/execute-action";
 import Big from "big.js";
+import { PlotDatum } from "plotly.js-dist-min";
 
 type HeatMapDataSeriesHooks = Pick<
     HeatMapContainerProps,
@@ -67,6 +68,7 @@ export const useHeatMapDataSeries = ({
     verticalSortOrder
 }: HeatMapDataSeriesHooks): HeatMapHookData => {
     const [heatmapChartData, setHeatMapData] = useState<LocalHeatMapData[]>([]);
+    const objectMap = useRef<Map<string, ObjectItem>>(new Map());
 
     useEffect(() => {
         if (seriesDataSource.status === ValueStatus.Available && seriesDataSource.items) {
@@ -90,7 +92,29 @@ export const useHeatMapDataSeries = ({
         verticalSortAttribute
     ]);
 
-    const onClick = useMemo(() => (onClickAction ? () => executeAction(onClickAction) : undefined), [onClickAction]);
+    const onClick = useCallback(
+        (item: ObjectItem, data: PlotDatum) => {
+            let selectedObjectItem: ObjectItem | undefined = item;
+            if (selectedObjectItem === null || selectedObjectItem === undefined) {
+                const selectedLocalHeatmapData = heatmapChartData.values().find(heatMapPointData => {
+                    return (
+                        heatMapPointData.horizontalAxisValue === data.x &&
+                        heatMapPointData.verticalAxisValue === data.y &&
+                        heatMapPointData.value === data.z
+                    );
+                });
+
+                if (selectedLocalHeatmapData) {
+                    selectedObjectItem = objectMap.current.get(selectedLocalHeatmapData.id);
+                }
+            }
+
+            if (selectedObjectItem) {
+                executeAction(onClickAction?.get(selectedObjectItem));
+            }
+        },
+        [onClickAction, heatmapChartData, seriesItemSelection]
+    );
 
     return useMemo<HeatMapHookData>(() => {
         // `Array.reverse` mutates, so we make a copy.
diff --git a/packages/pluggableWidgets/heatmap-chart-web/src/package.xml b/packages/pluggableWidgets/heatmap-chart-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="HeatMap" version="6.0.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="HeatMap" version="6.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="HeatMap.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/pie-doughnut-chart-web/CHANGELOG.md b/packages/pluggableWidgets/pie-doughnut-chart-web/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- We updated shared charts dependency.
+
+## [6.1.0] - 2025-06-04
+
 ### Breaking
 
 - We remove listened to selection in order for charts to works on Studio Pro 9.24.
diff --git a/packages/pluggableWidgets/pie-doughnut-chart-web/package.json b/packages/pluggableWidgets/pie-doughnut-chart-web/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/pie-doughnut-chart-web",
     "widgetName": "PieChart",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "Shows data in a pie format graph.",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/pie-doughnut-chart-web/src/package.xml b/packages/pluggableWidgets/pie-doughnut-chart-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="PieChart" version="6.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="PieChart" version="6.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="PieChart.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/time-series-chart-web/CHANGELOG.md b/packages/pluggableWidgets/time-series-chart-web/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- We updated shared charts dependency.
+
 ## [6.1.0] - 2025-06-04
 
 ### Fixed
diff --git a/packages/pluggableWidgets/time-series-chart-web/package.json b/packages/pluggableWidgets/time-series-chart-web/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/time-series-chart-web",
     "widgetName": "TimeSeries",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "Shows data changes over period of time.",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/time-series-chart-web/src/package.xml b/packages/pluggableWidgets/time-series-chart-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="TimeSeries" version="6.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="TimeSeries" version="6.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="TimeSeries.xml" />
         </widgetFiles>
diff --git a/packages/shared/charts/package.json b/packages/shared/charts/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mendix/shared-charts",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "Shared components for charts",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "private": true,
diff --git a/packages/shared/charts/src/components/ChartView.tsx b/packages/shared/charts/src/components/ChartView.tsx
@@ -32,10 +32,16 @@ export const ChartView = ({
             const [{ curveNumber, pointIndex, pointIndices, pointNumber, pointNumbers }] = event.points;
             const index = pointIndex ?? pointNumber;
             const indices = pointIndices ?? pointNumbers;
-            const itemIndex = getItemIndex(index, indices);
-            const { dataSourceItems, onClick } = data[curveNumber];
-            const item = dataSourceItems[itemIndex];
-            onClick?.(item);
+            try {
+                const itemIndex = getItemIndex(index, indices);
+                const { dataSourceItems, onClick } = data[curveNumber];
+                const item = dataSourceItems[itemIndex];
+                onClick?.(item);
+            } catch (_e: any) {
+                // let the chart handle it's own onClick
+                const { onClick } = data[curveNumber];
+                onClick?.(null, event.points[0]);
+            }
         },
         [data]
     );
diff --git a/packages/shared/charts/src/components/types.ts b/packages/shared/charts/src/components/types.ts
@@ -1,11 +1,13 @@
 import { ObjectItem } from "mendix";
-import { Config, Data, Layout } from "plotly.js-dist-min";
+import { Config, Data, Layout, PlotDatum } from "plotly.js-dist-min";
 
 declare module "plotly.js-dist-min" {
     interface PlotDatum {
         /** This array appears on only when aggregation is used */
         pointIndices?: number[];
         pointNumbers?: number[];
+        // this is only appear on 3 dimentional matrix datasource
+        z?: number;
     }
 }
 export type ExtraTraceProps = {
@@ -14,7 +16,7 @@ export type ExtraTraceProps = {
     /** JSON string. Expected to be an object with custom 'trace' options. */
     customSeriesOptions: string | undefined;
     /** Click handler for each point on current 'trace'. Should be call with ObjectItem associated with clicked point. */
-    onClick?: (item: ObjectItem) => void;
+    onClick?: (item: ObjectItem | null, data?: Partial<PlotDatum>) => void;
 };
 
 export type PlotTrace = Partial<Data> & ExtraTraceProps;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@mendix/area-chart-web",`
`3`	`3`	`"widgetName": "AreaChart",`
`4`		`- "version": "6.1.0",`
	`4`	`+ "version": "6.1.1",`
`5`	`5`	`"description": "An area chart displays a solid color between the traces of a graph.",`
`6`	`6`	`"copyright": "© Mendix Technology BV 2025. All rights reserved.",`
`7`	`7`	`"license": "Apache-2.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@mendix/bar-chart-web",`
`3`	`3`	`"widgetName": "BarChart",`
`4`		`- "version": "6.1.0",`
	`4`	`+ "version": "6.1.1",`
`5`	`5`	`"description": "Shows difference between the data points for one or more categories.",`
`6`	`6`	`"copyright": "© Mendix Technology BV 2025. All rights reserved.",`
`7`	`7`	`"license": "Apache-2.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@mendix/bubble-chart-web",`
`3`	`3`	`"widgetName": "BubbleChart",`
`4`		`- "version": "6.1.0",`
	`4`	`+ "version": "6.1.1",`
`5`	`5`	`"description": "Shows data in a bubble format graph.",`
`6`	`6`	`"copyright": "© Mendix Technology BV 2025. All rights reserved.",`
`7`	`7`	`"license": "Apache-2.0",`