@fluentui/react-charting 5.25.1 → 5.25.2

package/lib-amd/utilities/utilities.d.ts

@@ -46,6 +46,7 @@ export interface IRotateLabelProps {
 }
 export interface IAxisData {
     yAxisDomainValues: number[];
+    yAxisTickText: string[];
 }
 export interface IMargins {
     /**
@@ -164,7 +165,7 @@ export declare function createStringXAxis(xAxisParams: IXAxisParams, tickParams:
  * @returns {number[]}
  */
 export declare function prepareDatapoints(maxVal: number, minVal: number, splitInto: number, isIntegralDataset: boolean, roundedTicks?: boolean): number[];
-export declare function createYAxisForHorizontalBarChartWithAxis(yAxisParams: IYAxisParams, isRtl: boolean): ScaleLinear<number, number>;
+export declare function createYAxisForHorizontalBarChartWithAxis(yAxisParams: IYAxisParams, isRtl: boolean, axisData: IAxisData): ScaleLinear<number, number>;
 export declare function createNumericYAxis(yAxisParams: IYAxisParams, isRtl: boolean, axisData: IAxisData, isIntegralDataset: boolean, useSecondaryYScale?: boolean, supportNegativeData?: boolean, roundedTicks?: boolean, scaleType?: AxisScaleType): ScaleLinear<number, number, never>;
 /**
  * Creating String Y axis of the chart for Horizontal Bar Chart With Axis
@@ -172,14 +173,14 @@ export declare function createNumericYAxis(yAxisParams: IYAxisParams, isRtl: boo
  * @param dataPoints
  * @param isRtl
  */
-export declare const createStringYAxisForHorizontalBarChartWithAxis: (yAxisParams: IYAxisParams, dataPoints: string[], isRtl: boolean, barWidth: number) => ScaleBand<string>;
+export declare const createStringYAxisForHorizontalBarChartWithAxis: (yAxisParams: IYAxisParams, dataPoints: string[], isRtl: boolean, axisData: IAxisData, barWidth: number) => ScaleBand<string>;
 /**
  * Creating String Y axis of the chart for other chart except Horizontal Bar Chart With Axis
  * @param yAxisParams
  * @param dataPoints
  * @param isRtl
  */
-export declare const createStringYAxis: (yAxisParams: IYAxisParams, dataPoints: string[], isRtl: boolean, barWidth?: number, chartType?: ChartTypes) => ScaleBand<string>;
+export declare const createStringYAxis: (yAxisParams: IYAxisParams, dataPoints: string[], isRtl: boolean, axisData: IAxisData, barWidth?: number, chartType?: ChartTypes) => ScaleBand<string>;
 /**
  * For area chart and line chart, while displaying stackCallout, Need to form a callout data object.
  * This methos creates an object for those 2 charts.
@@ -306,7 +307,7 @@ export declare function computeLongestBars(stackedChartData: IHorizontalBarChart
  * @param {boolean} isRTL
  * @returns {IDomainNRange}
  */
-export declare function domainRangeOfNumericForHorizontalBarChartWithAxis(points: IHorizontalBarChartWithAxisDataPoint[], margins: IMargins, containerWidth: number, isRTL: boolean, shiftX: number, X_ORIGIN: number): IDomainNRange;
+export declare function domainRangeOfNumericForHorizontalBarChartWithAxis(points: IHorizontalBarChartWithAxisDataPoint[], margins: IMargins, containerWidth: number, isRTL: boolean, 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)

package/lib-amd/utilities/utilities.js

@@ -441,8 +441,9 @@ define(["require", "exports", "tslib", "d3-axis", "d3-array", "d3-scale", "d3-se
         }
         return dataPointsArray;
     }
-    function createYAxisForHorizontalBarChartWithAxis(yAxisParams, isRtl) {
-        var _a = yAxisParams.yMinMaxValues, yMinMaxValues = _a === void 0 ? { startValue: 0, endValue: 0 } : _a, _b = yAxisParams.yAxisElement, yAxisElement = _b === void 0 ? null : _b, _c = yAxisParams.yMaxValue, yMaxValue = _c === void 0 ? 0 : _c, _d = yAxisParams.yMinValue, yMinValue = _d === void 0 ? 0 : _d, containerHeight = yAxisParams.containerHeight, margins = yAxisParams.margins, _e = yAxisParams.tickPadding, tickPadding = _e === void 0 ? 12 : _e, _f = yAxisParams.maxOfYVal, maxOfYVal = _f === void 0 ? 0 : _f, yAxisTickFormat = yAxisParams.yAxisTickFormat, _g = yAxisParams.yAxisTickCount, yAxisTickCount = _g === void 0 ? 4 : _g, tickValues = yAxisParams.tickValues, tickStep = yAxisParams.tickStep, tick0 = yAxisParams.tick0, tickText = yAxisParams.tickText;
+    function createYAxisForHorizontalBarChartWithAxis(yAxisParams, isRtl, axisData) {
+        var _a;
+        var _b = yAxisParams.yMinMaxValues, yMinMaxValues = _b === void 0 ? { startValue: 0, endValue: 0 } : _b, _c = yAxisParams.yAxisElement, yAxisElement = _c === void 0 ? null : _c, _d = yAxisParams.yMaxValue, yMaxValue = _d === void 0 ? 0 : _d, _e = yAxisParams.yMinValue, yMinValue = _e === void 0 ? 0 : _e, containerHeight = yAxisParams.containerHeight, margins = yAxisParams.margins, _f = yAxisParams.tickPadding, tickPadding = _f === void 0 ? 12 : _f, _g = yAxisParams.maxOfYVal, maxOfYVal = _g === void 0 ? 0 : _g, yAxisTickFormat = yAxisParams.yAxisTickFormat, _h = yAxisParams.yAxisTickCount, yAxisTickCount = _h === void 0 ? 4 : _h, tickValues = yAxisParams.tickValues, tickStep = yAxisParams.tickStep, tick0 = yAxisParams.tick0, tickText = yAxisParams.tickText;
         // maxOfYVal coming from horizontal bar chart with axis (Calculation done at base file)
         var tempVal = maxOfYVal || yMinMaxValues.endValue;
         var finalYmax = tempVal > yMaxValue ? tempVal : yMaxValue;
@@ -477,13 +478,16 @@ define(["require", "exports", "tslib", "d3-axis", "d3-array", "d3-scale", "d3-se
             yAxis.tickValues(customTickValues);
         }
         yAxisElement ? (0, d3_selection_1.select)(yAxisElement).call(yAxis).selectAll('text').attr('aria-hidden', 'true') : '';
+        axisData.yAxisDomainValues = yAxisScale.domain();
+        axisData.yAxisTickText = ((_a = yAxis.tickValues()) !== null && _a !== void 0 ? _a : yAxisScale.ticks(yAxisTickCount)).map(yAxis.tickFormat());
         return yAxisScale;
     }
     function createNumericYAxis(yAxisParams, isRtl, axisData, isIntegralDataset, useSecondaryYScale, supportNegativeData, roundedTicks, scaleType) {
+        var _a;
         if (useSecondaryYScale === void 0) { useSecondaryYScale = false; }
         if (supportNegativeData === void 0) { supportNegativeData = false; }
         if (roundedTicks === void 0) { roundedTicks = false; }
-        var _a = yAxisParams.yMinMaxValues, yMinMaxValues = _a === void 0 ? { startValue: 0, endValue: 0 } : _a, _b = yAxisParams.yAxisElement, yAxisElement = _b === void 0 ? null : _b, _c = yAxisParams.yMaxValue, yMaxValue = _c === void 0 ? 0 : _c, _d = yAxisParams.yMinValue, yMinValue = _d === void 0 ? 0 : _d, containerHeight = yAxisParams.containerHeight, containerWidth = yAxisParams.containerWidth, margins = yAxisParams.margins, _e = yAxisParams.tickPadding, tickPadding = _e === void 0 ? 12 : _e, _f = yAxisParams.maxOfYVal, maxOfYVal = _f === void 0 ? 0 : _f, yAxisTickFormat = yAxisParams.yAxisTickFormat, _g = yAxisParams.yAxisTickCount, yAxisTickCount = _g === void 0 ? 4 : _g, eventAnnotationProps = yAxisParams.eventAnnotationProps, eventLabelHeight = yAxisParams.eventLabelHeight, tickValues = yAxisParams.tickValues, tickStep = yAxisParams.tickStep, tick0 = yAxisParams.tick0, tickText = yAxisParams.tickText;
+        var _b = yAxisParams.yMinMaxValues, yMinMaxValues = _b === void 0 ? { startValue: 0, endValue: 0 } : _b, _c = yAxisParams.yAxisElement, yAxisElement = _c === void 0 ? null : _c, _d = yAxisParams.yMaxValue, yMaxValue = _d === void 0 ? 0 : _d, _e = yAxisParams.yMinValue, yMinValue = _e === void 0 ? 0 : _e, containerHeight = yAxisParams.containerHeight, containerWidth = yAxisParams.containerWidth, margins = yAxisParams.margins, _f = yAxisParams.tickPadding, tickPadding = _f === void 0 ? 12 : _f, _g = yAxisParams.maxOfYVal, maxOfYVal = _g === void 0 ? 0 : _g, yAxisTickFormat = yAxisParams.yAxisTickFormat, _h = yAxisParams.yAxisTickCount, yAxisTickCount = _h === void 0 ? 4 : _h, eventAnnotationProps = yAxisParams.eventAnnotationProps, eventLabelHeight = yAxisParams.eventLabelHeight, tickValues = yAxisParams.tickValues, tickStep = yAxisParams.tickStep, tick0 = yAxisParams.tick0, tickText = yAxisParams.tickText;
         // maxOfYVal coming from only area chart and Grouped vertical bar chart(Calculation done at base file)
         var tempVal = maxOfYVal || yMinMaxValues.endValue || 0;
         var finalYmax = tempVal > yMaxValue ? tempVal : yMaxValue;
@@ -519,16 +523,9 @@ define(["require", "exports", "tslib", "d3-axis", "d3-array", "d3-scale", "d3-se
         }
         if (customTickValues) {
             yAxis.tickValues(customTickValues);
-            axisData.yAxisDomainValues = customTickValues;
         }
-        else {
-            if (scaleType === 'log') {
-                axisData.yAxisDomainValues = yAxisScale.ticks();
-            }
-            else {
-                yAxis.tickValues(domainValues);
-                axisData.yAxisDomainValues = domainValues;
-            }
+        else if (scaleType !== 'log') {
+            yAxis.tickValues(domainValues);
         }
         var tickFormat = function (domainValue, index, defaultFormat) {
             if (tickValues && tickText && typeof tickText[index] !== 'undefined') {
@@ -545,6 +542,8 @@ define(["require", "exports", "tslib", "d3-axis", "d3-array", "d3-scale", "d3-se
         };
         yAxis.tickFormat(function (v, i) { return tickFormat(v, i, yAxisScale.tickFormat(yAxisTickCount)); });
         yAxisElement ? (0, d3_selection_1.select)(yAxisElement).call(yAxis).selectAll('text').attr('aria-hidden', 'true') : '';
+        axisData.yAxisDomainValues = yAxisScale.domain();
+        axisData.yAxisTickText = ((_a = yAxis.tickValues()) !== null && _a !== void 0 ? _a : yAxisScale.ticks(yAxisTickCount)).map(yAxis.tickFormat());
         return yAxisScale;
     }
     /**
@@ -553,7 +552,7 @@ define(["require", "exports", "tslib", "d3-axis", "d3-array", "d3-scale", "d3-se
      * @param dataPoints
      * @param isRtl
      */
-    var createStringYAxisForHorizontalBarChartWithAxis = function (yAxisParams, dataPoints, isRtl, barWidth) {
+    var createStringYAxisForHorizontalBarChartWithAxis = function (yAxisParams, dataPoints, isRtl, axisData, barWidth) {
         var _a;
         var containerHeight = yAxisParams.containerHeight, _b = yAxisParams.tickPadding, tickPadding = _b === void 0 ? 12 : _b, margins = yAxisParams.margins, yAxisTickFormat = yAxisParams.yAxisTickFormat, yAxisElement = yAxisParams.yAxisElement, yAxisPadding = yAxisParams.yAxisPadding, tickValues = yAxisParams.tickValues, tickText = yAxisParams.tickText;
         var yAxisPaddingValue = yAxisPadding !== null && yAxisPadding !== void 0 ? yAxisPadding : 0.5;
@@ -575,6 +574,7 @@ define(["require", "exports", "tslib", "d3-axis", "d3-array", "d3-scale", "d3-se
         };
         var yAxis = axis.tickPadding(tickPadding).tickValues(customTickValues).tickFormat(tickFormat);
         yAxisElement ? (0, d3_selection_1.select)(yAxisElement).call(yAxis).selectAll('text') : '';
+        axisData.yAxisTickText = yAxis.tickValues().map(yAxis.tickFormat());
         return yAxisScale;
     };
     exports.createStringYAxisForHorizontalBarChartWithAxis = createStringYAxisForHorizontalBarChartWithAxis;
@@ -584,7 +584,7 @@ define(["require", "exports", "tslib", "d3-axis", "d3-array", "d3-scale", "d3-se
      * @param dataPoints
      * @param isRtl
      */
-    var createStringYAxis = function (yAxisParams, dataPoints, isRtl, barWidth, chartType) {
+    var createStringYAxis = function (yAxisParams, dataPoints, isRtl, axisData, barWidth, chartType) {
         var _a;
         var containerHeight = yAxisParams.containerHeight, _b = yAxisParams.tickPadding, tickPadding = _b === void 0 ? 12 : _b, margins = yAxisParams.margins, yAxisTickFormat = yAxisParams.yAxisTickFormat, yAxisElement = yAxisParams.yAxisElement, _c = yAxisParams.yAxisPadding, yAxisPadding = _c === void 0 ? 0 : _c, containerWidth = yAxisParams.containerWidth, tickValues = yAxisParams.tickValues, tickText = yAxisParams.tickText;
         var yAxisScale = (0, d3_scale_1.scaleBand)()
@@ -610,6 +610,7 @@ define(["require", "exports", "tslib", "d3-axis", "d3-array", "d3-scale", "d3-se
             axis.tickSizeInner(-(containerWidth - margins.left - margins.right));
         }
         yAxisElement ? (0, d3_selection_1.select)(yAxisElement).call(yAxis).selectAll('text') : '';
+        axisData.yAxisTickText = yAxis.tickValues().map(yAxis.tickFormat());
         return yAxisScale;
     };
     exports.createStringYAxis = createStringYAxis;
@@ -1002,12 +1003,12 @@ define(["require", "exports", "tslib", "d3-axis", "d3-array", "d3-scale", "d3-se
      * @param {boolean} isRTL
      * @returns {IDomainNRange}
      */
-    function domainRangeOfNumericForHorizontalBarChartWithAxis(points, margins, containerWidth, isRTL, shiftX, X_ORIGIN) {
+    function domainRangeOfNumericForHorizontalBarChartWithAxis(points, margins, containerWidth, isRTL, 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;
+        var rMin = margins.left;
+        var rMax = containerWidth - margins.right;
         return isRTL
             ? { dStartValue: xMax, dEndValue: Math.min(xMin, X_ORIGIN), rStartValue: rMin, rEndValue: rMax }
             : { dStartValue: Math.min(xMin, X_ORIGIN), dEndValue: xMax, rStartValue: rMin, rEndValue: rMax };