@fluentui/react-charting 5.23.76 → 5.23.78

package/lib/utilities/utilities.d.ts

@@ -258,12 +258,15 @@ export declare function domainRangeOfNumericForAreaChart(points: ILineChartPoint
  */
 export declare function groupChartDataByYValue(chartData: IHorizontalBarChartWithAxisDataPoint[]): IHorizontalBarChartWithAxisDataPoint[][];
 /**
- * Calculates maximum domain value for Numeric x axis
+ * Calculates maximum domain values for Numeric x axis for both positive and negative values
  * works for Horizontal Bar Chart With axis
  * @param {IHorizontalBarChartWithAxisDataPoint[][]} stackedChartData
  * @returns {number}
  */
-export declare function computeDomainMax(stackedChartData: IHorizontalBarChartWithAxisDataPoint[][]): number;
+export declare function computeLongestBars(stackedChartData: IHorizontalBarChartWithAxisDataPoint[][], X_ORIGIN: number): {
+    longestPositiveBar: number;
+    longestNegativeBar: number;
+};
 /**
  * Calculates Domain and range values for Numeric X axis.
  * This method calculates Horizontal Chart with Axis
@@ -274,7 +277,7 @@ export declare function computeDomainMax(stackedChartData: IHorizontalBarChartWi
  * @param {boolean} isRTL
  * @returns {IDomainNRange}
  */
-export declare function domainRangeOfNumericForHorizontalBarChartWithAxis(points: IHorizontalBarChartWithAxisDataPoint[], margins: IMargins, containerWidth: number, isRTL: boolean, shiftX: number): IDomainNRange;
+export declare function domainRangeOfNumericForHorizontalBarChartWithAxis(points: IHorizontalBarChartWithAxisDataPoint[], margins: IMargins, containerWidth: number, isRTL: boolean, shiftX: number, X_ORIGIN: number): IDomainNRange;
 /**
  * Calculates Range values of x Axis string axis
  * For String axis, we need to give domain values (Not start and end array values)
@@ -327,7 +330,7 @@ export declare function domainRageOfVerticalNumeric(points: IDataPoint[], margin
  * @param {ILineChartPoints[]} points
  * @returns {{ startValue: number; endValue: number }}
  */
-export declare function findNumericMinMaxOfY(points: ILineChartPoints[]): {
+export declare function findNumericMinMaxOfY(points: ILineChartPoints[], yAxisType?: YAxisType, useSecondaryYScale?: boolean): {
     startValue: number;
     endValue: number;
 };
@@ -347,7 +350,7 @@ export declare function findVSBCNumericMinMaxOfY(dataset: IDataPoint[]): {
  * @param {IVerticalBarChartDataPoint[]} points
  * @returns {{ startValue: number; endValue: number }}
  */
-export declare function findVerticalNumericMinMaxOfY(points: IVerticalBarChartDataPoint[]): {
+export declare function findVerticalNumericMinMaxOfY(points: IVerticalBarChartDataPoint[], yAxisType?: YAxisType, useSecondaryYScale?: boolean): {
     startValue: number;
     endValue: number;
 };

package/lib/utilities/utilities.js

@@ -738,18 +738,21 @@ export function groupChartDataByYValue(chartData) {
     return Object.values(map);
 }
 /**
- * Calculates maximum domain value for Numeric x axis
+ * Calculates maximum domain values for Numeric x axis for both positive and negative values
  * works for Horizontal Bar Chart With axis
  * @param {IHorizontalBarChartWithAxisDataPoint[][]} stackedChartData
  * @returns {number}
  */
-export function computeDomainMax(stackedChartData) {
-    var longestBarTotalValue = 0;
-    stackedChartData.map(function (group) {
-        var barTotalValue = group.reduce(function (acc, point) { return acc + (point.x ? point.x : 0); }, 0);
-        return (longestBarTotalValue = Math.max(longestBarTotalValue, barTotalValue));
+export function computeLongestBars(stackedChartData, X_ORIGIN) {
+    var longestPositiveBar = 0;
+    var longestNegativeBar = 0;
+    stackedChartData.forEach(function (group) {
+        var positiveBarTotal = group.reduce(function (acc, point) { return acc + (point.x > 0 ? point.x : 0); }, X_ORIGIN);
+        var negativeBarTotal = group.reduce(function (acc, point) { return acc + (point.x < 0 ? point.x : 0); }, X_ORIGIN);
+        longestPositiveBar = Math.max(longestPositiveBar, positiveBarTotal);
+        longestNegativeBar = Math.min(longestNegativeBar, negativeBarTotal);
     });
-    return longestBarTotalValue;
+    return { longestPositiveBar: longestPositiveBar, longestNegativeBar: longestNegativeBar };
 }
 /**
  * Calculates Domain and range values for Numeric X axis.
@@ -761,13 +764,15 @@ export function computeDomainMax(stackedChartData) {
  * @param {boolean} isRTL
  * @returns {IDomainNRange}
  */
-export function domainRangeOfNumericForHorizontalBarChartWithAxis(points, margins, containerWidth, isRTL, shiftX) {
-    var xMax = computeDomainMax(groupChartDataByYValue(points));
+export function domainRangeOfNumericForHorizontalBarChartWithAxis(points, margins, containerWidth, isRTL, shiftX, X_ORIGIN) {
+    var longestBars = computeLongestBars(groupChartDataByYValue(points), X_ORIGIN);
+    var xMax = longestBars.longestPositiveBar;
+    var xMin = longestBars.longestNegativeBar;
     var rMin = isRTL ? margins.left : margins.left + shiftX;
     var rMax = isRTL ? containerWidth - margins.right - shiftX : containerWidth - margins.right;
     return isRTL
-        ? { dStartValue: xMax, dEndValue: 0, rStartValue: rMin, rEndValue: rMax }
-        : { dStartValue: 0, dEndValue: xMax, rStartValue: rMin, rEndValue: rMax };
+        ? { dStartValue: xMax, dEndValue: Math.min(xMin, X_ORIGIN), rStartValue: rMin, rEndValue: rMax }
+        : { dStartValue: Math.min(xMin, X_ORIGIN), dEndValue: xMax, rStartValue: rMin, rEndValue: rMax };
 }
 /**
  * Calculates Range values of x Axis string axis
@@ -878,16 +883,18 @@ export function domainRageOfVerticalNumeric(points, margins, containerWidth, isR
  * @param {ILineChartPoints[]} points
  * @returns {{ startValue: number; endValue: number }}
  */
-export function findNumericMinMaxOfY(points) {
-    var yMax = d3Max(points, function (point) {
-        return d3Max(point.data, function (item) { return item.y; });
-    });
-    var yMin = d3Min(points, function (point) {
-        return d3Min(point.data, function (item) { return item.y; });
+export function findNumericMinMaxOfY(points, yAxisType, useSecondaryYScale) {
+    var values = [];
+    points.forEach(function (point) {
+        if (!useSecondaryYScale === !point.useSecondaryYScale) {
+            point.data.forEach(function (data) {
+                values.push(data.y);
+            });
+        }
     });
     return {
-        startValue: yMin,
-        endValue: yMax,
+        startValue: d3Min(values),
+        endValue: d3Max(values),
     };
 }
 /**
@@ -907,34 +914,19 @@ export function findVSBCNumericMinMaxOfY(dataset) {
  * @param {IVerticalBarChartDataPoint[]} points
  * @returns {{ startValue: number; endValue: number }}
  */
-export function findVerticalNumericMinMaxOfY(points) {
-    var yMax = d3Max(points, function (point) {
-        if (point.lineData !== undefined) {
-            if (point.y > point.lineData.y) {
-                return point.y;
-            }
-            else {
-                return point.lineData.y;
-            }
-        }
-        else {
-            return point.y;
+export function findVerticalNumericMinMaxOfY(points, yAxisType, useSecondaryYScale) {
+    var values = [];
+    points.forEach(function (point) {
+        if (!useSecondaryYScale) {
+            values.push(point.y);
         }
-    });
-    var yMin = d3Min(points, function (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 };
+    return { startValue: d3Min(values), endValue: d3Max(values) };
 }
 /**
  * Fins the min and max values of the vertical bar chart y axis data point.