@spteck/fluentui-react-charts 1.0.11 → 1.0.12

package/README.md

@@ -304,6 +304,31 @@ const targetData = [
   title="Sales vs Target"
   theme={webLightTheme}
 />
+ 
+> Note: ComboChart supports a backward-compatible dual-axis layout via the `axesMode` prop.
+> - Default: `axesMode="legacy"` — preserves previous behavior: a single y-axis named `y` and a non-stacked x-axis.
+> - Dual mode: `axesMode="dual"` — enables a stacked x-axis and two named y-axes: `y-bar` (left) and `y-line` (right).
+
+Usage examples:
+
+```tsx
+// legacy (default) — unchanged behavior for existing consumers
+<ComboChart
+  data={[{ label: 'Sales', data: salesData, type: 'bar' }]}
+  getPrimary={(d) => d.month}
+  getSecondary={(d) => d.value}
+/>
+
+// dual mode — bars default to 'y-bar' (stacked on x), lines default to 'y-line'
+<ComboChart
+  data={[
+    { label: 'Sales', data: salesData, type: 'bar' },
+    { label: 'Target', data: targetData, type: 'line' }
+  ]}
+  getPrimary={(d) => d.month}
+  getSecondary={(d) => d.value}
+  axesMode="dual"
+/>
 ```
 
 #### BubbleChart

package/dist/charts/ComboChart/ComboChart.d.ts

@@ -12,6 +12,11 @@ export interface ComboChartProps<T> {
     title?: string;
     showDataLabels?: boolean;
     theme?: Theme;
+    /**
+     * 'legacy' keeps previous behaviour (single 'y' axis, non-stacked x).
+     * 'dual' enables named y-axes ('y-bar' and 'y-line') and stacked x.
+     */
+    axesMode?: 'legacy' | 'dual';
 }
-export declare function ComboChart<T extends object>({ data, getPrimary, getSecondary, title, showDataLabels, theme, }: ComboChartProps<T>): React.JSX.Element;
+export declare function ComboChart<T extends object>({ data, getPrimary, getSecondary, title, showDataLabels, theme, axesMode, }: ComboChartProps<T>): React.JSX.Element;
 export default ComboChart;

package/dist/fluentui-react-charts.cjs.development.js

@@ -1719,7 +1719,9 @@ function ComboChart(_ref) {
     _ref$showDataLabels = _ref.showDataLabels,
     showDataLabels = _ref$showDataLabels === void 0 ? false : _ref$showDataLabels,
     _ref$theme = _ref.theme,
-    theme = _ref$theme === void 0 ? reactComponents.webLightTheme : _ref$theme;
+    theme = _ref$theme === void 0 ? reactComponents.webLightTheme : _ref$theme,
+    _ref$axesMode = _ref.axesMode,
+    axesMode = _ref$axesMode === void 0 ? 'legacy' : _ref$axesMode;
   var _useState = React.useState(function () {
       return data.map(function (s) {
         return s.label;
@@ -1774,7 +1776,8 @@ function ComboChart(_ref) {
         return {
           type: series.type,
           label: series.label,
-          yAxisID: (_series$yAxisID = series.yAxisID) != null ? _series$yAxisID : 'y',
+          // default yAxis assignment: legacy uses single 'y', dual uses 'y-bar'/'y-line'
+          yAxisID: (_series$yAxisID = series.yAxisID) != null ? _series$yAxisID : axesMode === 'dual' ? series.type === 'bar' ? 'y-bar' : 'y-line' : 'y',
           data: allCategories.map(function (cat) {
             var found = series.data.find(function (d) {
               return getPrimary(d) === cat;
@@ -1805,7 +1808,7 @@ function ComboChart(_ref) {
     labelColor = _useMemo.labelColor,
     gridColor = _useMemo.gridColor;
   var options = React.useMemo(function () {
-    return _extends({
+    var base = _extends({
       responsive: true,
       maintainAspectRatio: false
     }, getInstantInteractionAnimations(), {
@@ -1836,9 +1839,61 @@ function ComboChart(_ref) {
           display: false
         },
         tooltip: createFluentTooltip(theme)
-      },
+      }
+    });
+    if (axesMode === 'dual') {
+      return _extends({}, base, {
+        scales: {
+          x: {
+            stacked: true,
+            ticks: {
+              color: labelColor,
+              font: {
+                family: fontFamily,
+                size: fontSize
+              }
+            },
+            grid: {
+              color: gridColor
+            }
+          },
+          'y-bar': {
+            type: 'linear',
+            position: 'left',
+            stacked: true,
+            ticks: {
+              color: labelColor,
+              font: {
+                family: fontFamily,
+                size: fontSize
+              }
+            },
+            grid: {
+              color: gridColor
+            }
+          },
+          'y-line': {
+            type: 'linear',
+            position: 'right',
+            stacked: false,
+            ticks: {
+              color: labelColor,
+              font: {
+                family: fontFamily,
+                size: fontSize
+              }
+            },
+            grid: {
+              color: gridColor
+            }
+          }
+        }
+      });
+    }
+    return _extends({}, base, {
       scales: {
         x: {
+          stacked: false,
           ticks: {
             color: labelColor,
             font: {
@@ -1851,7 +1906,9 @@ function ComboChart(_ref) {
           }
         },
         y: {
+          type: 'linear',
           position: 'left',
+          stacked: false,
           ticks: {
             color: labelColor,
             font: {
@@ -1861,12 +1918,11 @@ function ComboChart(_ref) {
           },
           grid: {
             color: gridColor
-          },
-          stacked: false
+          }
         }
       }
     });
-  }, [title, showDataLabels, theme, fontFamily, fontSize, labelColor, gridColor, createFluentTooltip]);
+  }, [title, showDataLabels, theme, fontFamily, fontSize, labelColor, gridColor, createFluentTooltip, getInstantInteractionAnimations, axesMode]);
   return React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
     className: styles.chartWithLegend
   }, React__default.createElement("div", {