@fluentui/react-charting 5.24.36 → 5.24.38

package/lib/components/DeclarativeChart/PlotlySchemaAdapter.d.ts

@@ -71,7 +71,7 @@ export declare const projectPolarToCartesian: (input: PlotlySchema) => PlotlySch
 export declare function findArrayAttributes(trace: any): void;
 export declare const getAllupLegendsProps: (input: PlotlySchema, colorMap: React.MutableRefObject<Map<string, string>>, colorwayType: ColorwayType, traceInfo: TraceInfo[], isDarkTheme?: boolean) => ILegendsProps;
 export declare const getNumberAtIndexOrDefault: (data: PlotData["z"] | undefined, index: number) => number | undefined;
-export declare const getValidXYRanges: (series: Partial<PlotData>) => [number, number][];
+export declare const getValidXYRanges: (series: Partial<PlotData>, resolveX?: (v: Datum) => Datum, resolveY?: (v: Datum) => Datum) => [number, number][];
 export declare const isNonPlotType: (chartType: string) => boolean;
 export declare const getGridProperties: (schema: PlotlySchema | undefined, isMultiPlot: boolean, validTracesInfo: TraceInfo[]) => GridProperties;
 export {};

package/lib/components/DeclarativeChart/PlotlySchemaAdapter.js

@@ -417,19 +417,15 @@ export var transformPlotlyJsonToVSBCProps = function (input, isMultiPlot, colorM
     var _j = getLegendProps(input.data, input.layout, isMultiPlot), legends = _j.legends, hideLegend = _j.hideLegend;
     var colorScale = undefined;
     var yAxisTickFormat = getYAxisTickFormat(input.data[0], input.layout);
+    var resolveXAxisValue = getAxisValueResolver(input.data, input.layout, 'x');
     input.data.forEach(function (series, index1) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         colorScale = createColorScale(input.layout, series, colorScale);
-        var isXYearCategory = isYearArray(series.x); // Consider year as categorical not numeric continuous axis
         // extract bar colors for each series only once
         var extractedBarColors = extractColor((_c = (_b = (_a = input.layout) === null || _a === void 0 ? void 0 : _a.template) === null || _b === void 0 ? void 0 : _b.layout) === null || _c === void 0 ? void 0 : _c.colorway, colorwayType, (_d = series.marker) === null || _d === void 0 ? void 0 : _d.color, colorMap, isDarkTheme);
         // extract line colors for each series only once
         var extractedLineColors = extractColor((_g = (_f = (_e = input.layout) === null || _e === void 0 ? void 0 : _e.template) === null || _f === void 0 ? void 0 : _f.layout) === null || _g === void 0 ? void 0 : _g.colorway, colorwayType, (_h = series.line) === null || _h === void 0 ? void 0 : _h.color, colorMap, isDarkTheme);
-        var xValues = series.x;
-        var isXDate = isDateArray(xValues);
-        var isXString = isStringArray(xValues);
-        var isXNumber = isNumberArray(xValues);
-        var validXYRanges = getValidXYRanges(series);
+        var validXYRanges = getValidXYRanges(series, resolveXAxisValue);
         validXYRanges.forEach(function (_a, rangeIdx) {
             var rangeStart = _a[0], rangeEnd = _a[1];
             var rangeXValues = series.x.slice(rangeStart, rangeEnd);
@@ -438,7 +434,7 @@ export var transformPlotlyJsonToVSBCProps = function (input, isMultiPlot, colorM
                 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
                 if (!mapXToDataPoints[x]) {
                     mapXToDataPoints[x] = {
-                        xAxisPoint: resolveXAxisPoint(x, isXYearCategory, isXString, isXDate, isXNumber),
+                        xAxisPoint: resolveXAxisValue(x),
                         chartData: [],
                         lineData: [],
                     };
@@ -647,8 +643,9 @@ export var transformPlotlyJsonToVBCProps = function (input, isMultiPlot, colorMa
         var xValues = [];
         var yValues = [];
         series.x.forEach(function (xVal, index) {
-            var yVal = getNumberAtIndexOrDefault(series.y, index);
-            if (isInvalidValue(xVal) || isInvalidValue(yVal)) {
+            var _a;
+            var yVal = (_a = getNumberAtIndexOrDefault(series.y, index)) !== null && _a !== void 0 ? _a : 0;
+            if (isInvalidValue(xVal)) {
                 return;
             }
             xValues.push(xVal);
@@ -698,8 +695,27 @@ export var transformPlotlyJsonToLineChartProps = function (input, isMultiPlot, c
 export var transformPlotlyJsonToScatterChartProps = function (input, isMultiPlot, colorMap, colorwayType, isDarkTheme) {
     return transformPlotlyJsonToScatterTraceProps(input, isMultiPlot, 'scatter', colorMap, colorwayType, isDarkTheme);
 };
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+var mapColorFillBars = function (layout) {
+    if (!Array.isArray(layout === null || layout === void 0 ? void 0 : layout.shapes)) {
+        return [];
+    }
+    return layout.shapes
+        .filter(function (shape) { return shape.type === 'rect'; })
+        .map(function (shape) {
+        //colorFillbars doesn't support string dates or categories
+        if (typeof shape.x0 === 'string' || typeof shape.x1 === 'string') {
+            return null;
+        }
+        return {
+            color: shape.fillcolor,
+            data: [{ startX: shape.x0, endX: shape.x1 }],
+            applyPattern: false,
+        };
+    });
+};
 var transformPlotlyJsonToScatterTraceProps = function (input, isMultiPlot, chartType, colorMap, colorwayType, isDarkTheme) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     var isScatterMarkers = [
         'text',
         'markers',
@@ -714,9 +730,10 @@ var transformPlotlyJsonToScatterTraceProps = function (input, isMultiPlot, chart
     var isScatterChart = chartType === 'scatter';
     var secondaryYAxisValues = getSecondaryYAxisValues(input.data, input.layout);
     var mode = 'tonexty';
-    var _g = getLegendProps(input.data, input.layout, isMultiPlot), legends = _g.legends, hideLegend = _g.hideLegend;
+    var _h = getLegendProps(input.data, input.layout, isMultiPlot), legends = _h.legends, hideLegend = _h.hideLegend;
     var yAxisTickFormat = getYAxisTickFormat(input.data[0], input.layout);
-    var shouldWrapLabels = false;
+    var resolveXAxisValue = getAxisValueResolver(input.data, input.layout, 'x');
+    var shouldWrapLabels = getAxisType(input.data, input.layout, 'x') === 'category';
     var chartData = input.data
         .map(function (series, index) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -728,11 +745,6 @@ var transformPlotlyJsonToScatterTraceProps = function (input, isMultiPlot, chart
         // extract colors for each series only once
         var extractedColors = extractColor((_g = (_f = (_e = input.layout) === null || _e === void 0 ? void 0 : _e.template) === null || _f === void 0 ? void 0 : _f.layout) === null || _g === void 0 ? void 0 : _g.colorway, colorwayType, colors, colorMap, isDarkTheme);
         var xValues = series.x;
-        var isXString = isStringArray(xValues);
-        var isXDate = isDateArray(xValues);
-        var isXNumber = isNumberArray(xValues);
-        var isXYearCategory = isYearArray(series.x); // Consider year as categorical not numeric continuous axis
-        shouldWrapLabels = shouldWrapLabels || (isXString && !isXDate);
         var legend = legends[index];
         // resolve color for each legend's lines from the extracted colors
         var seriesColor = resolveColor(extractedColors, index, legend, colorMap, (_k = (_j = (_h = input.layout) === null || _h === void 0 ? void 0 : _h.template) === null || _j === void 0 ? void 0 : _j.layout) === null || _k === void 0 ? void 0 : _k.colorway, isDarkTheme);
@@ -741,7 +753,7 @@ var transformPlotlyJsonToScatterTraceProps = function (input, isMultiPlot, chart
         // if mode contains 'text', we prioritize showing the text over curving the line
         var lineOptions = !((_l = series.mode) === null || _l === void 0 ? void 0 : _l.includes('text')) && series.type !== 'scatterpolar' ? getLineOptions(series.line) : undefined;
         var legendShape = getLegendShape(series);
-        var validXYRanges = getValidXYRanges(series);
+        var validXYRanges = getValidXYRanges(series, resolveXAxisValue);
         return validXYRanges.map(function (_a, rangeIdx) {
             var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             var rangeStart = _a[0], rangeEnd = _a[1];
@@ -761,7 +773,7 @@ var transformPlotlyJsonToScatterTraceProps = function (input, isMultiPlot, chart
                 legendShape: legendShape,
                 data: rangeXValues.map(function (x, i) {
                     var _a, _b;
-                    return (__assign(__assign(__assign(__assign({ x: resolveXAxisPoint(x, isXYearCategory, isXString, isXDate, isXNumber), y: rangeYValues[i] }, (Array.isArray((_a = series.marker) === null || _a === void 0 ? void 0 : _a.size)
+                    return (__assign(__assign(__assign(__assign({ x: resolveXAxisValue(x), y: rangeYValues[i] }, (Array.isArray((_a = series.marker) === null || _a === void 0 ? void 0 : _a.size)
                         ? { markerSize: markerSizes[i] }
                         : typeof ((_b = series.marker) === null || _b === void 0 ? void 0 : _b.size) === 'number'
                             ? { markerSize: series.marker.size }
@@ -818,8 +830,10 @@ var transformPlotlyJsonToScatterTraceProps = function (input, isMultiPlot, chart
         return __assign({ data: chartProps, mode: mode }, commonProps);
     }
     else {
-        return __assign(__assign(__assign({ data: isScatterChart ? scatterChartProps : chartProps, roundedTicks: true, enableReflow: false }, commonProps), yMinMax), (isScatterChart
-            ? __assign({ showYAxisLablesTooltip: true }, getAxisCategoryOrderProps(input.data, input.layout)) : {}));
+        return __assign(__assign(__assign(__assign({ data: isScatterChart ? scatterChartProps : chartProps, roundedTicks: true, enableReflow: false }, commonProps), yMinMax), (isScatterChart
+            ? __assign({ showYAxisLablesTooltip: true }, getAxisCategoryOrderProps(input.data, input.layout)) : {})), (!isScatterChart && ((_g = mapColorFillBars(input.layout)) === null || _g === void 0 ? void 0 : _g.length)
+            ? { colorFillBars: mapColorFillBars(input.layout) }
+            : {}));
     }
 };
 export var transformPlotlyJsonToHorizontalBarWithAxisProps = function (input, isMultiPlot, colorMap, colorwayType, isDarkTheme) {
@@ -836,18 +850,18 @@ export var transformPlotlyJsonToHorizontalBarWithAxisProps = function (input, is
         return series.y
             .map(function (yValue, i) {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            if (isInvalidValue((_a = series.x) === null || _a === void 0 ? void 0 : _a[i]) || isInvalidValue(yValue)) {
+            if (isInvalidValue(yValue)) {
                 return null;
             }
             // resolve color for each legend's bars from the colorscale or extracted colors
             var color = colorScale
-                ? colorScale(isArrayOrTypedArray((_b = series.marker) === null || _b === void 0 ? void 0 : _b.color)
-                    ? (_d = (_c = series.marker) === null || _c === void 0 ? void 0 : _c.color) === null || _d === void 0 ? void 0 : _d[i % ((_e = series.marker) === null || _e === void 0 ? void 0 : _e.color).length]
+                ? colorScale(isArrayOrTypedArray((_a = series.marker) === null || _a === void 0 ? void 0 : _a.color)
+                    ? (_c = (_b = series.marker) === null || _b === void 0 ? void 0 : _b.color) === null || _c === void 0 ? void 0 : _c[i % ((_d = series.marker) === null || _d === void 0 ? void 0 : _d.color).length]
                     : 0)
-                : resolveColor(extractedColors, i, legend, colorMap, (_h = (_g = (_f = input.layout) === null || _f === void 0 ? void 0 : _f.template) === null || _g === void 0 ? void 0 : _g.layout) === null || _h === void 0 ? void 0 : _h.colorway, isDarkTheme);
+                : resolveColor(extractedColors, i, legend, colorMap, (_g = (_f = (_e = input.layout) === null || _e === void 0 ? void 0 : _e.template) === null || _f === void 0 ? void 0 : _f.layout) === null || _g === void 0 ? void 0 : _g.colorway, isDarkTheme);
             var opacity = getOpacity(series, i);
             return {
-                x: series.x[i],
+                x: isInvalidValue((_h = series.x) === null || _h === void 0 ? void 0 : _h[i]) ? 0 : series.x[i],
                 y: yValue,
                 legend: legend,
                 color: (_j = rgb(color).copy({ opacity: opacity }).formatHex8()) !== null && _j !== void 0 ? _j : color,
@@ -872,14 +886,14 @@ export var transformPlotlyJsonToGanttChartProps = function (input, isMultiPlot,
     var _a, _b, _c;
     var _d = getLegendProps(input.data, input.layout, isMultiPlot), legends = _d.legends, hideLegend = _d.hideLegend;
     var colorScale = undefined;
+    var isXDate = getAxisType(input.data, input.layout, 'x') === 'date';
     var chartData = input.data
         .map(function (series, index) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d;
         colorScale = createColorScale(input.layout, series, colorScale);
         // extract colors for each series only once
         var extractedColors = extractColor((_c = (_b = (_a = input.layout) === null || _a === void 0 ? void 0 : _a.template) === null || _b === void 0 ? void 0 : _b.layout) === null || _c === void 0 ? void 0 : _c.colorway, colorwayType, (_d = series.marker) === null || _d === void 0 ? void 0 : _d.color, colorMap, isDarkTheme);
         var legend = legends[index];
-        var isXDate = ((_f = (_e = input.layout) === null || _e === void 0 ? void 0 : _e.xaxis) === null || _f === void 0 ? void 0 : _f.type) === 'date' || isDateArray(series.x);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         var convertXValueToNumber = function (value) {
             return isInvalidValue(value) ? 0 : isXDate ? +parseLocalDate(value) : +value;
@@ -925,9 +939,9 @@ export var transformPlotlyJsonToHeatmapProps = function (input, isMultiPlot, col
         var yValues_1 = [];
         var zValues_1 = [];
         (_a = firstData.x) === null || _a === void 0 ? void 0 : _a.forEach(function (xVal, index) {
-            var _a;
-            var zVal = getNumberAtIndexOrDefault(firstData.z, index);
-            if (isInvalidValue(xVal) || isInvalidValue((_a = firstData.y) === null || _a === void 0 ? void 0 : _a[index]) || isInvalidValue(zVal)) {
+            var _a, _b;
+            var zVal = (_a = getNumberAtIndexOrDefault(firstData.z, index)) !== null && _a !== void 0 ? _a : 0;
+            if (isInvalidValue(xVal) || isInvalidValue((_b = firstData.y) === null || _b === void 0 ? void 0 : _b[index])) {
                 return;
             }
             xValues_1.push(xVal);
@@ -1759,7 +1773,7 @@ export var getNumberAtIndexOrDefault = function (data, index) {
     }
     return 1;
 };
-export var getValidXYRanges = function (series) {
+export var getValidXYRanges = function (series, resolveX, resolveY) {
     if (!isArrayOrTypedArray(series.x) || !isArrayOrTypedArray(series.y)) {
         return [];
     }
@@ -1767,7 +1781,10 @@ export var getValidXYRanges = function (series) {
     var start = 0;
     var end = 0;
     for (; end < series.x.length; end++) {
-        if (isInvalidValue(series.x[end]) || isInvalidValue(series.y[end])) {
+        if (isInvalidValue(series.x[end]) ||
+            (typeof resolveX === 'function' && isInvalidValue(resolveX(series.x[end]))) ||
+            isInvalidValue(series.y[end]) ||
+            (typeof resolveY === 'function' && isInvalidValue(resolveY(series.y[end])))) {
             if (end - start > 0) {
                 ranges.push([start, end]);
             }
@@ -2077,7 +2094,7 @@ var getAxisTickProps = function (data, layout) {
         if (!ax) {
             return;
         }
-        var axType = getAxisType(data, axId[0], ax);
+        var axType = getAxisType(data, ax);
         if ((!ax.tickmode || ax.tickmode === 'array') && isArrayOrTypedArray(ax.tickvals)) {
             var tickValues = axType === 'date' ? ax.tickvals.map(function (v) { return new Date(v); }) : ax.tickvals;
             if (axId === 'x') {
@@ -2184,43 +2201,80 @@ var getAxisObjects = function (data, layout) {
         xAxisId = axisIds.x;
         yAxisIds.add(axisIds.y);
     });
+    var makeAxisObject = function (axLetter, axId) { return (__assign(__assign({}, layout === null || layout === void 0 ? void 0 : layout[getAxisKey(axLetter, axId)]), { _id: "".concat(axLetter).concat(axId > 1 ? axId : '') })); };
     var axisObjects = {};
     if (typeof xAxisId === 'number') {
-        axisObjects.x = layout === null || layout === void 0 ? void 0 : layout[getAxisKey('x', xAxisId)];
+        axisObjects.x = makeAxisObject('x', xAxisId);
     }
     var sortedYAxisIds = Array.from(yAxisIds).sort();
     if (sortedYAxisIds.length > 0) {
-        axisObjects.y = layout === null || layout === void 0 ? void 0 : layout[getAxisKey('y', sortedYAxisIds[0])];
+        axisObjects.y = makeAxisObject('y', sortedYAxisIds[0]);
     }
     if (sortedYAxisIds.length > 1) {
-        axisObjects.y2 = layout === null || layout === void 0 ? void 0 : layout[getAxisKey('y', sortedYAxisIds[1])];
+        axisObjects.y2 = makeAxisObject('y', sortedYAxisIds[1]);
     }
     return axisObjects;
 };
-var getAxisType = function (data, axLetter, ax) {
+function getAxisType(data, arg2, arg3) {
+    var _a;
+    var ax;
+    if (arg2 && typeof arg2 === 'object' && '_id' in arg2) {
+        ax = arg2;
+    }
+    else if (typeof arg3 === 'string') {
+        var layout = arg2;
+        ax = getAxisObjects(data, layout)[arg3];
+    }
+    if (!ax) {
+        return 'category';
+    }
+    if (['linear', 'log', 'date', 'category'].includes((_a = ax.type) !== null && _a !== void 0 ? _a : '')) {
+        return ax.type;
+    }
+    var axLetter = ax._id[0];
     var values = [];
     data.forEach(function (series) {
         var _a;
-        (_a = series[axLetter]) === null || _a === void 0 ? void 0 : _a.forEach(function (val) {
-            if (!isInvalidValue(val)) {
-                values.push(val);
-            }
-        });
-    });
-    // Note: When ax.type is explicitly specified, Plotly casts the values to match that type.
-    // Therefore, simply checking the type of the values may not be sufficient. At the moment,
-    // we don’t always perform this casting ourselves and instead use the values as provided.
-    if (isNumberArray(values)) {
-        if ((ax === null || ax === void 0 ? void 0 : ax.type) === 'log') {
-            return 'log';
+        var axId = series["".concat(axLetter, "axis")];
+        if (axId === ax._id || (!axId && ax._id === axLetter)) {
+            (_a = series[axLetter]) === null || _a === void 0 ? void 0 : _a.forEach(function (val) {
+                if (!isInvalidValue(val)) {
+                    values.push(val);
+                }
+            });
         }
+    });
+    if (isNumberArray(values) && !isYearArray(values)) {
         return 'linear';
     }
     if (isDateArray(values)) {
         return 'date';
     }
-    if (isStringArray(values)) {
-        return 'category';
-    }
+    return 'category';
+}
+var getAxisValueResolver = function (data, layout, axisId) {
+    var axType = getAxisType(data, layout, axisId);
+    return function (value) {
+        if (isInvalidValue(value)) {
+            return null;
+        }
+        switch (axType) {
+            case 'linear':
+            case 'log':
+                return isNumber(value) ? +value : null;
+            case 'date':
+                if (isNumber(value)) {
+                    return new Date(+value);
+                }
+                if (typeof value === 'string') {
+                    return new Date(value);
+                }
+                return null;
+            case 'category':
+                return "".concat(value);
+            default:
+                return null;
+        }
+    };
 };
 //# sourceMappingURL=PlotlySchemaAdapter.js.map