@fluentui/react-charts 9.1.2 → 9.1.4

package/lib-commonjs/utilities/utilities.js

@@ -24,6 +24,9 @@ _export(exports, {
     HighContrastSelectorWhite: function() {
         return HighContrastSelectorWhite;
     },
+    MIN_DOMAIN_MARGIN: function() {
+        return MIN_DOMAIN_MARGIN;
+    },
     Points: function() {
         return Points;
     },
@@ -42,6 +45,9 @@ _export(exports, {
     calloutData: function() {
         return calloutData;
     },
+    computeLongestBars: function() {
+        return computeLongestBars;
+    },
     createDateXAxis: function() {
         return createDateXAxis;
     },
@@ -156,6 +162,9 @@ _export(exports, {
     getXAxisType: function() {
         return getXAxisType;
     },
+    groupChartDataByYValue: function() {
+        return groupChartDataByYValue;
+    },
     isScalePaddingDefined: function() {
         return isScalePaddingDefined;
     },
@@ -197,6 +206,7 @@ const _d3time = require("d3-time");
 const _d3shape = require("d3-shape");
 const _reactsharedcontexts = require("@fluentui/react-shared-contexts");
 const _chartutilities = require("@fluentui/chart-utilities");
+const MIN_DOMAIN_MARGIN = 8;
 var ChartTypes;
 (function(ChartTypes) {
     ChartTypes[ChartTypes["AreaChart"] = 0] = "AreaChart";
@@ -641,10 +651,10 @@ function createYAxisForHorizontalBarChartWithAxis(yAxisParams, isRtl, axisData,
         startValue: 0,
         endValue: 0
     }, yAxisElement = null, yMaxValue = 0, yMinValue = 0, containerHeight, margins, tickPadding = 12, maxOfYVal = 0, yAxisTickFormat, yAxisTickCount = 4 } = yAxisParams;
-    // maxOfYVal coming from only area chart and Grouped vertical bar chart(Calculation done at base file)
+    // maxOfYVal coming from horizontal bar chart with axis (Calculation done at base file)
     const tempVal = maxOfYVal || yMinMaxValues.endValue;
     const finalYmax = tempVal > yMaxValue ? tempVal : yMaxValue;
-    const finalYmin = yMinMaxValues.startValue < yMinValue ? 0 : yMinValue;
+    const finalYmin = yMinMaxValues.startValue < yMinValue ? Math.min(0, yMinMaxValues.startValue) : yMinValue;
     const yAxisScale = (0, _d3scale.scaleLinear)().domain([
         finalYmin,
         finalYmax
@@ -664,9 +674,9 @@ function createNumericYAxisForOtherCharts(yAxisParams, isRtl, axisData, isIntegr
         endValue: 0
     }, yAxisElement = null, yMaxValue = 0, yMinValue = 0, containerHeight, containerWidth, margins, tickPadding = 12, maxOfYVal = 0, yAxisTickFormat, yAxisTickCount = 4, eventAnnotationProps, eventLabelHeight } = yAxisParams;
     // maxOfYVal coming from only area chart and Grouped vertical bar chart(Calculation done at base file)
-    const tempVal = maxOfYVal || yMinMaxValues.endValue;
+    const tempVal = maxOfYVal || yMinMaxValues.endValue || 0;
     const finalYmax = tempVal > yMaxValue ? tempVal : yMaxValue;
-    const finalYmin = Math.min(yMinMaxValues.startValue, yMinValue || 0);
+    const finalYmin = Math.min(yMinMaxValues.startValue || 0, yMinValue || 0);
     const domainValues = prepareDatapoints(finalYmax, finalYmin, yAxisTickCount, isIntegralDataset, roundedTicks);
     let yMin = finalYmin;
     let yMax = domainValues[domainValues.length - 1];
@@ -698,11 +708,13 @@ const createStringYAxis = (yAxisParams, dataPoints, isRtl, chartType, barWidth,
     }
 };
 const createStringYAxisForHorizontalBarChartWithAxis = (yAxisParams, dataPoints, isRtl, barWidth, culture)=>{
-    const { containerHeight, tickPadding = 12, margins, yAxisTickFormat, yAxisElement } = yAxisParams;
+    const { containerHeight, tickPadding = 12, margins, yAxisTickFormat, yAxisElement, yAxisPadding } = yAxisParams;
+    let yAxisPaddingValue = yAxisPadding !== null && yAxisPadding !== void 0 ? yAxisPadding : 0.5;
+    yAxisPaddingValue = yAxisPaddingValue === 1 ? 0.99 : yAxisPaddingValue;
     const yAxisScale = (0, _d3scale.scaleBand)().domain(dataPoints).range([
-        containerHeight - margins.bottom - barWidth / 2,
-        margins.top + barWidth / 2
-    ]);
+        containerHeight - margins.bottom,
+        margins.top
+    ]).padding(yAxisPaddingValue);
     const axis = isRtl ? (0, _d3axis.axisRight)(yAxisScale) : (0, _d3axis.axisLeft)(yAxisScale);
     const yAxis = axis.tickPadding(tickPadding).ticks(dataPoints);
     if (yAxisTickFormat) {
@@ -1007,17 +1019,44 @@ function domainRangeOfNumericForScatterChart(points, margins, width, isRTL) {
         rEndValue
     };
 }
-function domainRangeOfNumericForHorizontalBarChartWithAxis(points, margins, containerWidth, isRTL, shiftX) {
-    const xMax = (0, _d3array.max)(points, (point)=>point.x);
+function groupChartDataByYValue(chartData) {
+    const map = {};
+    chartData.forEach((dataPoint)=>{
+        const key = dataPoint.y;
+        if (!map[key]) {
+            map[key] = [];
+        }
+        map[key].push(dataPoint);
+    });
+    return Object.values(map);
+}
+function computeLongestBars(stackedChartData, X_ORIGIN) {
+    let longestPositiveBar = 0;
+    let longestNegativeBar = 0;
+    stackedChartData.forEach((group)=>{
+        const positiveBarTotal = group.reduce((acc, point)=>acc + (point.x > 0 ? point.x : 0), X_ORIGIN);
+        const negativeBarTotal = group.reduce((acc, point)=>acc + (point.x < 0 ? point.x : 0), X_ORIGIN);
+        longestPositiveBar = Math.max(longestPositiveBar, positiveBarTotal);
+        longestNegativeBar = Math.min(longestNegativeBar, negativeBarTotal);
+    });
+    return {
+        longestPositiveBar,
+        longestNegativeBar
+    };
+}
+function domainRangeOfNumericForHorizontalBarChartWithAxis(points, margins, containerWidth, isRTL, shiftX, X_ORIGIN) {
+    const longestBars = computeLongestBars(groupChartDataByYValue(points), X_ORIGIN);
+    const xMax = longestBars.longestPositiveBar;
+    const xMin = longestBars.longestNegativeBar;
     const rMin = isRTL ? margins.left : margins.left + shiftX;
     const rMax = isRTL ? containerWidth - margins.right - shiftX : containerWidth - margins.right;
     return isRTL ? {
         dStartValue: xMax,
-        dEndValue: 0,
+        dEndValue: Math.min(xMin, X_ORIGIN),
         rStartValue: rMin,
         rEndValue: rMax
     } : {
-        dStartValue: 0,
+        dStartValue: Math.min(xMin, X_ORIGIN),
         dEndValue: xMax,
         rStartValue: rMin,
         rEndValue: rMax
@@ -1164,7 +1203,7 @@ function domainRageOfVerticalNumeric(points, margins, containerWidth, isRTL, bar
         rEndValue: rMax
     };
 }
-function getDomainNRangeValues(points, margins, width, chartType, isRTL, xAxisType, barWidth, tickValues, shiftX) {
+function getDomainNRangeValues(points, margins, width, chartType, isRTL, xAxisType, barWidth, tickValues, shiftX, X_ORIGIN) {
     let domainNRangeValue;
     if (xAxisType === 0) {
         switch(chartType){
@@ -1179,7 +1218,7 @@ function getDomainNRangeValues(points, margins, width, chartType, isRTL, xAxisTy
                 domainNRangeValue = domainRageOfVerticalNumeric(points, margins, width, isRTL, barWidth);
                 break;
             case 6:
-                domainNRangeValue = domainRangeOfNumericForHorizontalBarChartWithAxis(points, margins, width, isRTL, shiftX);
+                domainNRangeValue = domainRangeOfNumericForHorizontalBarChartWithAxis(points, margins, width, isRTL, shiftX, X_ORIGIN);
                 break;
             case 7:
                 domainNRangeValue = domainRangeOfNumericForScatterChart(points, margins, width, isRTL);
@@ -1232,16 +1271,18 @@ function getDomainNRangeValues(points, margins, width, chartType, isRTL, xAxisTy
     }
     return domainNRangeValue;
 }
-function findNumericMinMaxOfY(points) {
-    const yMax = (0, _d3array.max)(points, (point)=>{
-        return (0, _d3array.max)(point.data, (item)=>item.y);
-    });
-    const yMin = (0, _d3array.min)(points, (point)=>{
-        return (0, _d3array.min)(point.data, (item)=>item.y);
+function findNumericMinMaxOfY(points, yAxisType, useSecondaryYScale) {
+    const values = [];
+    points.forEach((point)=>{
+        if (!useSecondaryYScale === !point.useSecondaryYScale) {
+            point.data.forEach((data)=>{
+                values.push(data.y);
+            });
+        }
     });
     return {
-        startValue: yMin,
-        endValue: yMax
+        startValue: (0, _d3array.min)(values),
+        endValue: (0, _d3array.max)(values)
     };
 }
 function findVSBCNumericMinMaxOfY(dataset) {
@@ -1252,32 +1293,21 @@ function findVSBCNumericMinMaxOfY(dataset) {
         endValue: yMax
     };
 }
-function findVerticalNumericMinMaxOfY(points) {
-    const yMax = (0, _d3array.max)(points, (point)=>{
-        if (point.lineData !== undefined) {
-            if (point.y > point.lineData.y) {
-                return point.y;
-            } else {
-                return point.lineData.y;
-            }
-        } else {
-            return point.y;
+function findVerticalNumericMinMaxOfY(points, yAxisType, useSecondaryYScale) {
+    const values = [];
+    points.forEach((point)=>{
+        if (!useSecondaryYScale) {
+            values.push(point.y);
         }
-    });
-    const yMin = (0, _d3array.min)(points, (point)=>{
-        if (point.lineData !== undefined) {
-            if (point.y < point.lineData.y) {
-                return point.y;
-            } else {
-                return point.lineData.y;
+        if (typeof point.lineData !== 'undefined') {
+            if (!useSecondaryYScale === !point.lineData.useSecondaryYScale) {
+                values.push(point.lineData.y);
             }
-        } else {
-            return point.y;
         }
     });
     return {
-        startValue: yMin,
-        endValue: yMax
+        startValue: (0, _d3array.min)(values),
+        endValue: (0, _d3array.max)(values)
     };
 }
 function findHBCWANumericMinMaxOfY(points, yAxisType) {
@@ -1294,19 +1324,19 @@ function findHBCWANumericMinMaxOfY(points, yAxisType) {
         endValue: 0
     };
 }
-function getMinMaxOfYAxis(points, chartType, yAxisType = 0) {
+function getMinMaxOfYAxis(points, chartType, yAxisType = 0, useSecondaryYScale) {
     let minMaxValues;
     switch(chartType){
         case 0:
         case 1:
         case 7:
-            minMaxValues = findNumericMinMaxOfY(points);
+            minMaxValues = findNumericMinMaxOfY(points, yAxisType, useSecondaryYScale);
             break;
         case 3:
             minMaxValues = findVSBCNumericMinMaxOfY(points);
             break;
         case 2:
-            minMaxValues = findVerticalNumericMinMaxOfY(points);
+            minMaxValues = findVerticalNumericMinMaxOfY(points, yAxisType, useSecondaryYScale);
             break;
         case 6:
             minMaxValues = findHBCWANumericMinMaxOfY(points, yAxisType);