@fluentui/react-charting 5.25.1 → 5.25.2

package/lib-commonjs/utilities/utilities.js

@@ -453,8 +453,9 @@ function prepareDatapoints(maxVal, minVal, splitInto, isIntegralDataset, rounded
     }
     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;
@@ -489,13 +490,16 @@ function createYAxisForHorizontalBarChartWithAxis(yAxisParams, isRtl) {
         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;
@@ -531,16 +535,9 @@ function createNumericYAxis(yAxisParams, isRtl, axisData, isIntegralDataset, use
     }
     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') {
@@ -557,6 +554,8 @@ function createNumericYAxis(yAxisParams, isRtl, axisData, isIntegralDataset, use
     };
     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;
 }
 /**
@@ -565,7 +564,7 @@ function createNumericYAxis(yAxisParams, isRtl, axisData, isIntegralDataset, use
  * @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;
@@ -587,6 +586,7 @@ var createStringYAxisForHorizontalBarChartWithAxis = function (yAxisParams, data
     };
     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;
@@ -596,7 +596,7 @@ exports.createStringYAxisForHorizontalBarChartWithAxis = createStringYAxisForHor
  * @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)()
@@ -622,6 +622,7 @@ var createStringYAxis = function (yAxisParams, dataPoints, isRtl, barWidth, char
         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;
@@ -1014,12 +1015,12 @@ function computeLongestBars(stackedChartData, X_ORIGIN) {
  * @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 };