@fluentui/react-charts 0.0.0-nightly-20251224-0407.1 → 0.0.0-nightly-20251225-0406.1

package/lib-commonjs/components/DeclarativeChart/PlotlySchemaAdapter.js

@@ -433,6 +433,57 @@ const toFiniteNumber = (value)=>{
     const numeric = typeof value === 'number' ? value : Number(value);
     return Number.isFinite(numeric) ? numeric : undefined;
 };
+/**
+ * Parses Plotly axis references (e.g. `x`, `x2`, `xaxis2`, `paper`, `pixel`, `x domain`) into a ref type + axis id.
+ */ const parseAxisRef = (ref, axis)=>{
+    if (!ref) {
+        return {
+            refType: 'axis',
+            axisId: 1
+        };
+    }
+    const normalized = ref.toLowerCase().trim();
+    if (normalized === 'pixel') {
+        return {
+            refType: 'pixel',
+            axisId: 1
+        };
+    }
+    if (normalized === 'paper') {
+        return {
+            refType: 'relative',
+            axisId: 1
+        };
+    }
+    if (normalized.endsWith(' domain')) {
+        return normalized.startsWith(axis) ? {
+            refType: 'relative',
+            axisId: 1
+        } : {
+            refType: undefined,
+            axisId: 1
+        };
+    }
+    const match = normalized.match(/^([xy])(axis)?(\d*)$/);
+    if (!match || match[1] !== axis) {
+        return {
+            refType: undefined,
+            axisId: 1
+        };
+    }
+    const suffix = match[3];
+    if (!suffix || suffix === '1') {
+        return {
+            refType: 'axis',
+            axisId: 1
+        };
+    }
+    const parsed = Number(suffix);
+    return {
+        refType: 'axis',
+        axisId: Number.isFinite(parsed) && parsed >= 1 ? parsed : 1
+    };
+};
 /**
  * Converts Plotly's bottom-origin relative Y coordinate into the SVG top-origin space used by our overlay.
  */ const transformRelativeYForChart = (value)=>{
@@ -486,21 +537,13 @@ const appendPx = (value)=>{
     if (!ref) {
         return 'axis';
     }
-    const normalized = ref.toLowerCase();
-    if (normalized === 'pixel') {
-        return 'pixel';
-    }
-    if (normalized === 'paper') {
-        return 'relative';
-    }
-    if (normalized.endsWith(' domain')) {
-        return normalized.startsWith(axis) ? 'relative' : undefined;
+    const parsed = parseAxisRef(ref, axis);
+    if (parsed.refType !== 'axis') {
+        return parsed.refType;
     }
+    const normalized = (ref !== null && ref !== void 0 ? ref : '').toLowerCase().trim();
     const match = normalized.match(/^([xy])(\d*)$/);
-    if (match && match[1] === axis) {
-        return 'axis';
-    }
-    return undefined;
+    return match && match[1] === axis ? 'axis' : undefined;
 };
 /**
  * Retrieves the appropriate axis layout section from Plotly's layout given an axis reference alias.
@@ -509,56 +552,36 @@ const appendPx = (value)=>{
         return undefined;
     }
     const defaultAxisKey = `${axis}axis`;
-    if (!ref) {
-        return layout[defaultAxisKey];
-    }
-    const normalized = ref.toLowerCase();
-    if (normalized === 'paper' || normalized === 'pixel' || normalized.endsWith(' domain')) {
+    const { refType, axisId } = parseAxisRef(ref, axis);
+    if (refType !== 'axis' || axisId === 1) {
         return layout[defaultAxisKey];
     }
-    const match = normalized.match(/^([xy])(\d*)$/);
-    if (match && match[1] === axis) {
-        const index = match[2];
-        if (index && index !== '' && index !== '1') {
-            const axisKey = `${axis}axis${index}`;
-            return layout[axisKey];
-        }
-        return layout[defaultAxisKey];
-    }
-    return layout[defaultAxisKey];
+    const axisKey = `${axis}axis${axisId}`;
+    return layout[axisKey];
 };
-/**
- * Normalizes raw Plotly data values into canonical number/date/string types based on axis configuration.
- */ const convertDataValue = (value, axisLayout)=>{
+const convertAnnotationDataValue = (value, axisType)=>{
     if (value === undefined || value === null) {
         return undefined;
     }
-    const axisType = axisLayout === null || axisLayout === void 0 ? void 0 : axisLayout.type;
     if (axisType === 'date') {
         const dateValue = value instanceof Date ? value : new Date(value);
         return Number.isNaN(dateValue.getTime()) ? undefined : dateValue;
     }
-    if (value instanceof Date) {
-        return Number.isNaN(value.getTime()) ? undefined : value;
-    }
-    if (typeof value === 'number') {
-        return Number.isFinite(value) ? value : undefined;
-    }
     if (axisType === 'linear' || axisType === 'log') {
+        if (typeof value === 'number') {
+            return Number.isFinite(value) ? value : undefined;
+        }
         const numeric = Number(value);
         return Number.isFinite(numeric) ? numeric : undefined;
     }
-    if (typeof value === 'string') {
-        const shouldTryParseDate = axisType === undefined || axisType === '-' || axisType === null;
-        if (shouldTryParseDate && (0, _chartutilities.isDate)(value)) {
-            const parsedDate = new Date(value);
-            if (!Number.isNaN(parsedDate.getTime()) && parsedDate.getFullYear() >= 1900) {
-                return parsedDate;
-            }
-        }
+    // For category-like axes, preserve raw strings (and avoid date parsing heuristics).
+    if (value instanceof Date) {
         return value;
     }
-    return value;
+    if (typeof value === 'number' || typeof value === 'string') {
+        return value;
+    }
+    return undefined;
 };
 const createAnnotationId = (text, index)=>{
     const normalized = text.replace(/\s+/g, ' ').trim();
@@ -637,7 +660,9 @@ const getAnnotationCoordinateValue = (axis, refType, annotation, layout)=>{
         const axisRef = axis === 'x' ? annotation === null || annotation === void 0 ? void 0 : annotation.xref : annotation === null || annotation === void 0 ? void 0 : annotation.yref;
         const axisLayout = getAxisLayoutByRef(layout, axisRef, axis);
         const rawValue = axis === 'x' ? annotation === null || annotation === void 0 ? void 0 : annotation.x : annotation === null || annotation === void 0 ? void 0 : annotation.y;
-        return convertDataValue(rawValue, axisLayout);
+        var _axisLayout_type;
+        const axisType = (_axisLayout_type = axisLayout === null || axisLayout === void 0 ? void 0 : axisLayout.type) !== null && _axisLayout_type !== void 0 ? _axisLayout_type : 'category';
+        return convertAnnotationDataValue(rawValue, axisType);
     }
     const numericValue = toFiniteNumber(axis === 'x' ? annotation === null || annotation === void 0 ? void 0 : annotation.x : annotation === null || annotation === void 0 ? void 0 : annotation.y);
     if (numericValue === undefined) {
@@ -861,14 +886,82 @@ const getAnnotationCoordinateValue = (axis, refType, annotation, layout)=>{
     }
     return chartAnnotation;
 };
-const getChartAnnotationsFromLayout = (layout, isMultiPlot)=>{
+const getChartAnnotationsFromLayout = (data, layout, isMultiPlot)=>{
     if (isMultiPlot || !(layout === null || layout === void 0 ? void 0 : layout.annotations)) {
         return undefined;
     }
+    // Infer axis types when they are not explicitly set.
+    // This is needed so annotation coordinate parsing can correctly treat values as 'date' vs 'category'
+    // (for example, bar chart category axes with date-like strings).
+    const inferredLayout = (()=>{
+        if (!data || !(0, _chartutilities.isArrayOrTypedArray)(data) || data.length === 0) {
+            return layout;
+        }
+        const valuesByAxisKey = new Map();
+        const axesExpectingCategories = new Set();
+        data.forEach((series)=>{
+            const trace = series;
+            const axisIds = (0, _chartutilities.getAxisIds)(trace);
+            if (trace.type === 'bar') {
+                const categoryAxisLetter = trace.orientation === 'h' ? 'y' : 'x';
+                axesExpectingCategories.add((0, _chartutilities.getAxisKey)(categoryAxisLetter, axisIds[categoryAxisLetter]));
+            }
+            [
+                'x',
+                'y'
+            ].forEach((axLetter)=>{
+                const coords = trace[axLetter];
+                if (!coords || !(0, _chartutilities.isArrayOrTypedArray)(coords)) {
+                    return;
+                }
+                const axisKey = (0, _chartutilities.getAxisKey)(axLetter, axisIds[axLetter]);
+                var _valuesByAxisKey_get;
+                const existing = (_valuesByAxisKey_get = valuesByAxisKey.get(axisKey)) !== null && _valuesByAxisKey_get !== void 0 ? _valuesByAxisKey_get : [];
+                coords.forEach((val)=>{
+                    if (!(0, _chartutilities.isInvalidValue)(val)) {
+                        existing.push(val);
+                    }
+                });
+                valuesByAxisKey.set(axisKey, existing);
+            });
+        });
+        let nextLayout;
+        valuesByAxisKey.forEach((values, axisKey)=>{
+            const currentAxis = layout === null || layout === void 0 ? void 0 : layout[axisKey];
+            const currentType = currentAxis === null || currentAxis === void 0 ? void 0 : currentAxis.type;
+            if ([
+                'linear',
+                'log',
+                'date',
+                'category'
+            ].includes(currentType !== null && currentType !== void 0 ? currentType : '')) {
+                return;
+            }
+            let inferredType;
+            if (axesExpectingCategories.has(axisKey) || (0, _chartutilities.isYearArray)(values)) {
+                inferredType = 'category';
+            } else if ((0, _chartutilities.isDateArray)(values)) {
+                inferredType = 'date';
+            }
+            if (!inferredType) {
+                return;
+            }
+            if (!nextLayout) {
+                nextLayout = {
+                    ...layout
+                };
+            }
+            nextLayout[axisKey] = {
+                ...currentAxis !== null && currentAxis !== void 0 ? currentAxis : {},
+                type: inferredType
+            };
+        });
+        return nextLayout !== null && nextLayout !== void 0 ? nextLayout : layout;
+    })();
     const annotationsArray = Array.isArray(layout.annotations) ? layout.annotations : [
         layout.annotations
     ];
-    const converted = annotationsArray.map((annotation, index)=>convertPlotlyAnnotation(annotation, layout, index)).filter((annotation)=>annotation !== undefined);
+    const converted = annotationsArray.map((annotation, index)=>convertPlotlyAnnotation(annotation, inferredLayout, index)).filter((annotation)=>annotation !== undefined);
     return converted.length > 0 ? converted : undefined;
 };
 const normalizeObjectArrayForGVBC = (data, xLabels)=>{
@@ -945,7 +1038,7 @@ const normalizeObjectArrayForGVBC = (data, xLabels)=>{
 const transformPlotlyJsonToAnnotationChartProps = (input, isMultiPlot, _colorMap, _colorwayType, _isDarkTheme)=>{
     var _layoutWithMeta_meta, _input_layout, _input_layout1, _input_layout2, _input_layout3, _input_layout_font, _input_layout4, _input_layout_font1, _input_layout5, _input_layout6;
     var _getChartAnnotationsFromLayout;
-    const annotations = (_getChartAnnotationsFromLayout = getChartAnnotationsFromLayout(input.layout, isMultiPlot)) !== null && _getChartAnnotationsFromLayout !== void 0 ? _getChartAnnotationsFromLayout : [];
+    const annotations = (_getChartAnnotationsFromLayout = getChartAnnotationsFromLayout(input.data, input.layout, isMultiPlot)) !== null && _getChartAnnotationsFromLayout !== void 0 ? _getChartAnnotationsFromLayout : [];
     const titles = getTitles(input.layout);
     const layoutTitle = titles.chartTitle || undefined;
     const layoutWithMeta = input.layout;
@@ -1212,7 +1305,7 @@ const transformPlotlyJsonToVSBCProps = (input, isMultiPlot, colorMap, colorwayTy
         }
     });
     const vsbcData = Object.values(mapXToDataPoints);
-    const annotations = getChartAnnotationsFromLayout(input.layout, isMultiPlot);
+    const annotations = getChartAnnotationsFromLayout(input.data, input.layout, isMultiPlot);
     var _input_layout_height;
     return {
         data: vsbcData,
@@ -1357,7 +1450,7 @@ const transformPlotlyJsonToGVBCProps = (input, isMultiPlot, colorMap, colorwayTy
             });
         }
     });
-    const annotations = getChartAnnotationsFromLayout(processedInput.layout, isMultiPlot);
+    const annotations = getChartAnnotationsFromLayout(processedInput.data, processedInput.layout, isMultiPlot);
     var _processedInput_layout_height;
     return {
         dataV2: gvbcDataV2,
@@ -1454,7 +1547,7 @@ const transformPlotlyJsonToVBCProps = (input, isMultiPlot, colorMap, colorwayTyp
             });
         });
     });
-    const annotations = getChartAnnotationsFromLayout(input.layout, isMultiPlot);
+    const annotations = getChartAnnotationsFromLayout(input.data, input.layout, isMultiPlot);
     var _input_layout_height;
     return {
         data: vbcData,
@@ -1673,7 +1766,7 @@ const transformPlotlyJsonToScatterTraceProps = (input, isMultiPlot, chartType, c
             ...lineShape
         ]
     };
-    const annotations = getChartAnnotationsFromLayout(input.layout, isMultiPlot);
+    const annotations = getChartAnnotationsFromLayout(input.data, input.layout, isMultiPlot);
     var _input_layout_height;
     const commonProps = {
         supportNegativeData: true,