feat(react-charting): add plotly adapter for grouped vertical bar cha…

…rt (microsoft#33383)
spmonahan · Dec 2, 2024 · f97d1c3 · f97d1c3
1 parent b9cac91
commit f97d1c3
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 12 deletions.
diff --git a/change/@fluentui-react-charting-7cca2ab0-3c7f-42a3-9739-cf8ba2e5b048.json b/change/@fluentui-react-charting-7cca2ab0-3c7f-42a3-9739-cf8ba2e5b048.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Add grouped vertical bar chart plotly adapter",
+  "packageName": "@fluentui/react-charting",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/charts/react-charting/src/components/DeclarativeChart/DeclarativeChart.tsx b/packages/charts/react-charting/src/components/DeclarativeChart/DeclarativeChart.tsx
@@ -5,21 +5,23 @@ import { DonutChart } from '../DonutChart/index';
 import { VerticalStackedBarChart } from '../VerticalStackedBarChart/index';
 import {
   transformPlotlyJsonToDonutProps,
-  transformPlotlyJsonToColumnProps,
+  transformPlotlyJsonToVSBCProps,
   transformPlotlyJsonToScatterChartProps,
   transformPlotlyJsonToHorizontalBarWithAxisProps,
   isDateArray,
   isNumberArray,
   transformPlotlyJsonToHeatmapProps,
   transformPlotlyJsonToSankeyProps,
   transformPlotlyJsonToGaugeProps,
+  transformPlotlyJsonToGVBCProps,
 } from './PlotlySchemaAdapter';
 import { LineChart } from '../LineChart/index';
 import { HorizontalBarChartWithAxis } from '../HorizontalBarChartWithAxis/index';
 import { AreaChart } from '../AreaChart/index';
 import { HeatMapChart } from '../HeatMapChart/index';
 import { SankeyChart } from '../SankeyChart/SankeyChart';
 import { GaugeChart } from '../GaugeChart/index';
+import { GroupedVerticalBarChart } from '../GroupedVerticalBarChart/index';
 
 export interface Schema {
   /**
@@ -83,7 +85,10 @@ export const DeclarativeChart: React.FunctionComponent<DeclarativeChartProps> =
           <HorizontalBarChartWithAxis {...transformPlotlyJsonToHorizontalBarWithAxisProps(plotlySchema, colorMap)} />
         );
       } else {
-        return <VerticalStackedBarChart {...transformPlotlyJsonToColumnProps(plotlySchema, colorMap)} />;
+        if (['group', 'overlay'].includes(plotlySchema?.layout?.barmode)) {
+          return <GroupedVerticalBarChart {...transformPlotlyJsonToGVBCProps(plotlySchema, colorMap)} />;
+        }
+        return <VerticalStackedBarChart {...transformPlotlyJsonToVSBCProps(plotlySchema, colorMap)} />;
       }
     case 'scatter':
       const isAreaChart = plotlySchema.data.some((series: any) => series.fill === 'tonexty');
@@ -93,7 +98,7 @@ export const DeclarativeChart: React.FunctionComponent<DeclarativeChartProps> =
         }
         return <LineChart {...transformPlotlyJsonToScatterChartProps(plotlySchema, false, colorMap)} />;
       }
-      return <VerticalStackedBarChart {...transformPlotlyJsonToColumnProps(plotlySchema, colorMap)} />;
+      return <VerticalStackedBarChart {...transformPlotlyJsonToVSBCProps(plotlySchema, colorMap)} />;
     case 'heatmap':
       return <HeatMapChart {...transformPlotlyJsonToHeatmapProps(plotlySchema)} />;
     case 'sankey':

diff --git a/packages/charts/react-charting/src/components/DeclarativeChart/PlotlySchemaAdapter.ts b/packages/charts/react-charting/src/components/DeclarativeChart/PlotlySchemaAdapter.ts
@@ -13,6 +13,7 @@ import {
   IVerticalStackedChartProps,
   IHeatMapChartData,
   IHeatMapChartDataPoint,
+  IGroupedVerticalBarChartData,
 } from '../../types/IDataPoint';
 import { ISankeyChartProps } from '../SankeyChart/index';
 import { IVerticalStackedBarChartProps } from '../VerticalStackedBarChart/index';
@@ -22,6 +23,7 @@ import { IAreaChartProps } from '../AreaChart/index';
 import { IHeatMapChartProps } from '../HeatMapChart/index';
 import { getNextColor } from '../../utilities/colors';
 import { IGaugeChartProps, IGaugeChartSegment } from '../GaugeChart/index';
+import { IGroupedVerticalBarChartProps } from '../GroupedVerticalBarChart/index';
 
 const isDate = (value: any): boolean => !isNaN(Date.parse(value));
 const isNumber = (value: any): boolean => !isNaN(parseFloat(value)) && isFinite(value);
@@ -90,7 +92,7 @@ export const transformPlotlyJsonToDonutProps = (
   };
 };
 
-export const transformPlotlyJsonToColumnProps = (
+export const transformPlotlyJsonToVSBCProps = (
   jsonObj: any,
   colorMap: React.MutableRefObject<Map<string, string>>,
 ): IVerticalStackedBarChartProps => {
@@ -99,40 +101,77 @@ export const transformPlotlyJsonToColumnProps = (
   let yMaxValue = 0;
 
   data.forEach((series: any, index1: number) => {
-    series.x.forEach((x: string | number, index2: number) => {
+    series.x?.forEach((x: string | number, index2: number) => {
       if (!mapXToDataPoints[x]) {
         mapXToDataPoints[x] = { xAxisPoint: x, chartData: [], lineData: [] };
       }
-      const legend = series.name || `Series ${index1 + 1}`;
+      const legend: string = series.name || `Series ${index1 + 1}`;
       if (series.type === 'bar') {
         const color = getColor(legend, colorMap);
         mapXToDataPoints[x].chartData.push({
           legend,
-          data: series.y[index2],
+          data: series.y?.[index2],
           color,
         });
       } else if (series.type === 'line') {
         const color = getColor(legend, colorMap);
         mapXToDataPoints[x].lineData!.push({
           legend,
-          y: series.y[index2],
+          y: series.y?.[index2],
           color,
         });
       }
-      yMaxValue = Math.max(yMaxValue, series.y[index2]);
+
+      yMaxValue = Math.max(yMaxValue, series.y?.[index2]);
     });
   });
 
   return {
     data: Object.values(mapXToDataPoints),
-    chartTitle: layout.title,
-    // width: layout.width,
-    // height: layout.height,
+    chartTitle: layout?.title,
+    // width: layout?.width,
+    // height: layout?.height,
     barWidth: 'auto',
     yMaxValue,
   };
 };
 
+// TODO: Add support for continuous x-axis in grouped vertical bar chart
+export const transformPlotlyJsonToGVBCProps = (
+  jsonObj: any,
+  colorMap: React.MutableRefObject<Map<string, string>>,
+): IGroupedVerticalBarChartProps => {
+  const { data, layout } = jsonObj;
+  const mapXToDataPoints: Record<string, IGroupedVerticalBarChartData> = {};
+
+  data.forEach((series: any, index1: number) => {
+    series.x?.forEach((x: string | number, index2: number) => {
+      if (!mapXToDataPoints[x]) {
+        mapXToDataPoints[x] = { name: x.toString(), series: [] };
+      }
+      if (series.type === 'bar') {
+        const legend: string = series.name || `Series ${index1 + 1}`;
+        const color = getColor(legend, colorMap);
+
+        mapXToDataPoints[x].series.push({
+          key: legend,
+          data: series.y?.[index2],
+          color,
+          legend,
+        });
+      }
+    });
+  });
+
+  return {
+    data: Object.values(mapXToDataPoints),
+    chartTitle: layout?.title,
+    // width: layout?.width,
+    // height: layout?.height,
+    barwidth: 'auto',
+  };
+};
+
 export const transformPlotlyJsonToScatterChartProps = (
   jsonObj: any,
   isAreaChart: boolean,