@fluentui/react-charts 9.3.7 → 9.3.8

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

@@ -313,6 +313,62 @@ const resolveXAxisPoint = (x, isXYearCategory, isXString, isXDate, isXNumber)=>{
     }
     return x;
 };
+/**
+ * Formats text values according to the texttemplate specification
+ * Supports D3 format specifiers within %{text:format} patterns
+ * @param textValue The raw text value to format
+ * @param textTemplate The template string (e.g., "%{text:.1f}%", "%{text:.2%}", "%{text:,.0f}")
+ * @param index Optional index for array-based templates
+ * @returns Formatted text string
+ *
+ * Examples:
+ * - "%{text:.1f}%" → Formats number with 1 decimal place and adds % suffix
+ * - "%{text:.2%}" → Formats as percentage with 2 decimal places
+ * - "%{text:,.0f}" → Formats with thousands separator and no decimals
+ * - "%{text:$,.2f}" → Formats as currency with thousands separator and 2 decimals
+ */ const formatTextWithTemplate = (textValue, textTemplate, index)=>{
+    if (!textTemplate) {
+        return String(textValue);
+    }
+    const numVal = typeof textValue === 'number' ? textValue : parseFloat(String(textValue));
+    if (isNaN(numVal)) {
+        return String(textValue);
+    }
+    const template = typeof textTemplate === 'string' ? textTemplate : textTemplate[index || 0] || '';
+    // Match Plotly's texttemplate pattern: %{text:format} or %{text}
+    // Can be followed by any literal text like %, $, etc.
+    const plotlyPattern = /%\{text(?::([^}]+))?\}(.*)$/;
+    const match = template.match(plotlyPattern);
+    if (match) {
+        const formatSpec = match[1]; // The format specifier (e.g., ".1f", ".2%", ",.0f") or undefined
+        const suffix = match[2]; // Any text after the closing brace (e.g., "%", " units")
+        // If no format specifier is provided (e.g., %{text}%), try to infer from suffix
+        if (!formatSpec) {
+            // Check if suffix starts with % - assume simple percentage with 1 decimal
+            if (suffix.startsWith('%')) {
+                return `${numVal.toFixed(1)}${suffix}`;
+            }
+            // No format specifier, just return the number with the suffix
+            return `${numVal}${suffix}`;
+        }
+        try {
+            // Use D3 format function to apply the format specifier
+            const formatter = (0, _d3format.format)(formatSpec);
+            const formattedValue = formatter(numVal);
+            return `${formattedValue}${suffix}`;
+        } catch (error) {
+            // Try to extract precision for basic fallback
+            const precisionMatch = formatSpec.match(/\.(\d+)[f%]/);
+            const precision = precisionMatch ? parseInt(precisionMatch[1], 10) : 2;
+            // Check if it's a percentage format
+            if (formatSpec.includes('%')) {
+                return `${(numVal * 100).toFixed(precision)}%${suffix}`;
+            }
+            return `${numVal.toFixed(precision)}${suffix}`;
+        }
+    }
+    return String(textValue);
+};
 /**
  * Extracts unique X-axis categories from Plotly data traces
  * @param data Array of Plotly data traces
@@ -377,62 +433,6 @@ const toFiniteNumber = (value)=>{
     const numeric = typeof value === 'number' ? value : Number(value);
     return Number.isFinite(numeric) ? numeric : undefined;
 };
-/**
- * Normalizes Plotly axis reference strings so equivalent aliases (e.g. `xaxis1`, `x1`) collapse to the base axis id.
- */ const normalizeAxisRef = (ref, axis)=>{
-    if (!ref) {
-        return axis;
-    }
-    const normalized = ref.toLowerCase();
-    if (normalized === axis || normalized === `${axis}axis` || normalized === `${axis}axis1` || normalized === `${axis}1`) {
-        return axis;
-    }
-    const match = normalized.match(/^([xy])(axis)?(\d+)$/);
-    if (match && match[1] === axis && match[3]) {
-        return match[3] === '1' ? axis : `${axis}${match[3]}`;
-    }
-    return normalized;
-};
-/**
- * Scans the data traces bound to a given axis and returns the numeric min/max values plotted on that axis.
- */ const getAxisNumericRangeFromData = (axis, ref, layout, data)=>{
-    if (!data || data.length === 0) {
-        return undefined;
-    }
-    const axisLayout = getAxisLayoutByRef(layout, ref, axis);
-    const targetRef = normalizeAxisRef(ref, axis);
-    const traceAxisKey = axis === 'x' ? 'xaxis' : 'yaxis';
-    let minValue;
-    let maxValue;
-    data.forEach((trace)=>{
-        const plotTrace = trace;
-        const traceAxisRef = normalizeAxisRef(plotTrace[traceAxisKey], axis);
-        if (traceAxisRef !== targetRef) {
-            return;
-        }
-        const values = axis === 'x' ? plotTrace.x : plotTrace.y;
-        if (!(0, _chartutilities.isArrayOrTypedArray)(values)) {
-            return;
-        }
-        const arrayLike = values;
-        for(let index = 0; index < arrayLike.length; index++){
-            const value = arrayLike[index];
-            const numeric = toNumericValue(convertDataValue(value, axisLayout));
-            if (numeric === undefined || Number.isNaN(numeric)) {
-                continue;
-            }
-            minValue = minValue === undefined ? numeric : Math.min(minValue, numeric);
-            maxValue = maxValue === undefined ? numeric : Math.max(maxValue, numeric);
-        }
-    });
-    if (minValue === undefined || maxValue === undefined || minValue === maxValue) {
-        return undefined;
-    }
-    return [
-        minValue,
-        maxValue
-    ];
-};
 /**
  * Converts Plotly's bottom-origin relative Y coordinate into the SVG top-origin space used by our overlay.
  */ const transformRelativeYForChart = (value)=>{
@@ -533,49 +533,32 @@ const appendPx = (value)=>{
     if (value === undefined || value === null) {
         return undefined;
     }
-    if ((axisLayout === null || axisLayout === void 0 ? void 0 : axisLayout.type) === 'date' || (0, _chartutilities.isDate)(value)) {
+    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 (typeof value === 'number') {
-        return value;
-    }
-    if ((axisLayout === null || axisLayout === void 0 ? void 0 : axisLayout.type) === 'linear' || (axisLayout === null || axisLayout === void 0 ? void 0 : axisLayout.type) === 'log') {
-        const numeric = Number(value);
-        return Number.isFinite(numeric) ? numeric : undefined;
-    }
     if (value instanceof Date) {
-        return value;
-    }
-    return value;
-};
-const toNumericValue = (value)=>{
-    if (value instanceof Date) {
-        const timestamp = value.getTime();
-        return Number.isFinite(timestamp) ? timestamp : undefined;
+        return Number.isNaN(value.getTime()) ? undefined : value;
     }
     if (typeof value === 'number') {
         return Number.isFinite(value) ? value : undefined;
     }
-    if (typeof value === 'string') {
+    if (axisType === 'linear' || axisType === 'log') {
         const numeric = Number(value);
         return Number.isFinite(numeric) ? numeric : undefined;
     }
-    return undefined;
-};
-const toRelativeCoordinate = (value, axisLayout, fallbackRange)=>{
-    const range = Array.isArray(axisLayout === null || axisLayout === void 0 ? void 0 : axisLayout.range) ? axisLayout.range : undefined;
-    let start = range && range.length >= 2 ? toNumericValue(convertDataValue(range[0], axisLayout)) : undefined;
-    let end = range && range.length >= 2 ? toNumericValue(convertDataValue(range[1], axisLayout)) : undefined;
-    if ((start === undefined || end === undefined || start === end) && fallbackRange) {
-        [start, end] = fallbackRange;
-    }
-    const current = toNumericValue(convertDataValue(value, axisLayout));
-    if (start === undefined || end === undefined || current === undefined || start === end) {
-        return 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;
+            }
+        }
+        return value;
     }
-    const relative = (current - start) / (end - start);
-    return Number.isFinite(relative) ? relative : undefined;
+    return value;
 };
 const createAnnotationId = (text, index)=>{
     const normalized = text.replace(/\s+/g, ' ').trim();
@@ -640,10 +623,35 @@ const mapArrowDashToPattern = (value)=>{
             return value;
     }
 };
+const mapRefTypeToCoordinateType = (refType)=>{
+    return refType === 'axis' ? 'data' : refType;
+};
+const normalizeCoordinateValueForType = (coordinateType, value)=>{
+    if (coordinateType === 'data') {
+        return value;
+    }
+    return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
+};
+const getAnnotationCoordinateValue = (axis, refType, annotation, layout)=>{
+    if (refType === 'axis') {
+        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);
+    }
+    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) {
+        return undefined;
+    }
+    if (refType === 'relative') {
+        return axis === 'y' ? transformRelativeYForChart(numericValue) : numericValue;
+    }
+    return numericValue;
+};
 /**
  * Converts a Plotly annotation definition into the internal `ChartAnnotation` format, translating coordinates,
  * layout alignment, styling, and connector metadata while skipping unsupported configurations.
- */ const convertPlotlyAnnotation = (annotation, layout, data, index)=>{
+ */ const convertPlotlyAnnotation = (annotation, layout, index)=>{
     if (!annotation || annotation.visible === false) {
         return undefined;
     }
@@ -652,77 +660,51 @@ const mapArrowDashToPattern = (value)=>{
     if (!xRefType || !yRefType) {
         return undefined;
     }
+    const xValue = getAnnotationCoordinateValue('x', xRefType, annotation, layout);
+    const yValue = getAnnotationCoordinateValue('y', yRefType, annotation, layout);
+    if (xValue === undefined || yValue === undefined) {
+        return undefined;
+    }
+    const xCoordinateType = mapRefTypeToCoordinateType(xRefType);
+    const yCoordinateType = mapRefTypeToCoordinateType(yRefType);
+    const normalizedX = normalizeCoordinateValueForType(xCoordinateType, xValue);
+    const normalizedY = normalizeCoordinateValueForType(yCoordinateType, yValue);
+    if (normalizedX === undefined || normalizedY === undefined) {
+        return undefined;
+    }
+    const yRefNormalized = typeof annotation.yref === 'string' ? annotation.yref.toLowerCase() : undefined;
+    const yAxisProps = yCoordinateType === 'data' && yRefNormalized === 'y2' ? {
+        yAxis: 'secondary'
+    } : undefined;
     let coordinates;
-    if (xRefType === 'axis' && yRefType === 'axis') {
-        const xAxisLayout = getAxisLayoutByRef(layout, annotation.xref, 'x');
-        const yAxisLayout = getAxisLayoutByRef(layout, annotation.yref, 'y');
-        const xValue = convertDataValue(annotation.x, xAxisLayout);
-        const yValue = convertDataValue(annotation.y, yAxisLayout);
-        if (xValue === undefined || yValue === undefined) {
-            return undefined;
-        }
-        const yRefNormalized = typeof annotation.yref === 'string' ? annotation.yref.toLowerCase() : undefined;
+    if (xCoordinateType === 'data' && yCoordinateType === 'data') {
         coordinates = {
             type: 'data',
-            x: xValue,
-            y: yValue,
-            ...yRefNormalized === 'y2' ? {
-                yAxis: 'secondary'
-            } : {}
+            x: normalizedX,
+            y: normalizedY,
+            ...yAxisProps !== null && yAxisProps !== void 0 ? yAxisProps : {}
         };
-    } else if (xRefType === 'relative' && yRefType === 'relative') {
-        const xValue = toFiniteNumber(annotation.x);
-        const yValue = toFiniteNumber(annotation.y);
-        const chartRelativeY = transformRelativeYForChart(yValue);
-        if (xValue === undefined || chartRelativeY === undefined) {
-            return undefined;
-        }
+    } else if (xCoordinateType === 'relative' && yCoordinateType === 'relative') {
         coordinates = {
             type: 'relative',
-            x: xValue,
-            y: chartRelativeY
+            x: normalizedX,
+            y: normalizedY
         };
-    } else if (xRefType === 'relative' && yRefType === 'axis') {
-        const xValue = toFiniteNumber(annotation.x);
-        const yAxisLayout = getAxisLayoutByRef(layout, annotation.yref, 'y');
-        const yFallbackRange = getAxisNumericRangeFromData('y', annotation.yref, layout, data);
-        const yRelative = toRelativeCoordinate(annotation.y, yAxisLayout, yFallbackRange);
-        const chartRelativeY = transformRelativeYForChart(yRelative);
-        if (xValue === undefined || chartRelativeY === undefined) {
-            return undefined;
-        }
-        coordinates = {
-            type: 'relative',
-            x: xValue,
-            y: chartRelativeY
-        };
-    } else if (xRefType === 'axis' && yRefType === 'relative') {
-        const yValue = toFiniteNumber(annotation.y);
-        const xAxisLayout = getAxisLayoutByRef(layout, annotation.xref, 'x');
-        const xFallbackRange = getAxisNumericRangeFromData('x', annotation.xref, layout, data);
-        const xRelative = toRelativeCoordinate(annotation.x, xAxisLayout, xFallbackRange);
-        const chartRelativeY = transformRelativeYForChart(yValue);
-        if (xRelative === undefined || chartRelativeY === undefined) {
-            return undefined;
-        }
-        coordinates = {
-            type: 'relative',
-            x: xRelative,
-            y: chartRelativeY
-        };
-    } else if (xRefType === 'pixel' && yRefType === 'pixel') {
-        const xValue = toFiniteNumber(annotation.x);
-        const yValue = toFiniteNumber(annotation.y);
-        if (xValue === undefined || yValue === undefined) {
-            return undefined;
-        }
+    } else if (xCoordinateType === 'pixel' && yCoordinateType === 'pixel') {
         coordinates = {
             type: 'pixel',
-            x: xValue,
-            y: yValue
+            x: normalizedX,
+            y: normalizedY
         };
     } else {
-        return undefined;
+        coordinates = {
+            type: 'mixed',
+            xCoordinateType,
+            yCoordinateType,
+            x: normalizedX,
+            y: normalizedY,
+            ...yAxisProps !== null && yAxisProps !== void 0 ? yAxisProps : {}
+        };
     }
     const textValue = annotation.text;
     const rawText = textValue === undefined || textValue === null ? '' : String(textValue);
@@ -879,14 +861,14 @@ const mapArrowDashToPattern = (value)=>{
     }
     return chartAnnotation;
 };
-const getChartAnnotationsFromLayout = (layout, data, isMultiPlot)=>{
+const getChartAnnotationsFromLayout = (layout, isMultiPlot)=>{
     if (isMultiPlot || !(layout === null || layout === void 0 ? void 0 : layout.annotations)) {
         return undefined;
     }
     const annotationsArray = Array.isArray(layout.annotations) ? layout.annotations : [
         layout.annotations
     ];
-    const converted = annotationsArray.map((annotation, index)=>convertPlotlyAnnotation(annotation, layout, data, index)).filter((annotation)=>annotation !== undefined);
+    const converted = annotationsArray.map((annotation, index)=>convertPlotlyAnnotation(annotation, layout, index)).filter((annotation)=>annotation !== undefined);
     return converted.length > 0 ? converted : undefined;
 };
 const normalizeObjectArrayForGVBC = (data, xLabels)=>{
@@ -963,7 +945,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, input.data, isMultiPlot)) !== null && _getChartAnnotationsFromLayout !== void 0 ? _getChartAnnotationsFromLayout : [];
+    const annotations = (_getChartAnnotationsFromLayout = getChartAnnotationsFromLayout(input.layout, isMultiPlot)) !== null && _getChartAnnotationsFromLayout !== void 0 ? _getChartAnnotationsFromLayout : [];
     const titles = getTitles(input.layout);
     const layoutTitle = titles.chartTitle || undefined;
     const layoutWithMeta = input.layout;
@@ -1038,7 +1020,8 @@ const transformPlotlyJsonToDonutProps = (input, isMultiPlot, colorMap, colorwayT
     const hideLabels = firstData.textinfo ? ![
         'value',
         'percent',
-        'label+percent'
+        'label+percent',
+        'percent+label'
     ].includes(firstData.textinfo) : false;
     const donutMarginHorizontal = hideLabels ? 0 : 80;
     const donutMarginVertical = 40 + (hideLabels ? 0 : 40);
@@ -1071,14 +1054,15 @@ const transformPlotlyJsonToDonutProps = (input, isMultiPlot, colorMap, colorwayT
         hideLabels,
         showLabelsInPercent: firstData.textinfo ? [
             'percent',
-            'label+percent'
+            'label+percent',
+            'percent+label'
         ].includes(firstData.textinfo) : true,
         roundCorners: true,
         order: 'sorted'
     };
 };
 const transformPlotlyJsonToVSBCProps = (input, isMultiPlot, colorMap, colorwayType, isDarkTheme, fallbackVSBC)=>{
-    var _input_layout, _input_layout1, _input_layout2, _vsbcData_;
+    var _input_layout, _input_layout1, _input_layout2;
     const mapXToDataPoints = {};
     let yMaxValue = 0;
     let yMinValue = 0;
@@ -1098,6 +1082,7 @@ const transformPlotlyJsonToVSBCProps = (input, isMultiPlot, colorMap, colorwayTy
         validXYRanges.forEach(([rangeStart, rangeEnd], rangeIdx)=>{
             const rangeXValues = series.x.slice(rangeStart, rangeEnd);
             const rangeYValues = series.y.slice(rangeStart, rangeEnd);
+            const textValues = Array.isArray(series.text) ? series.text.slice(rangeStart, rangeEnd) : typeof series.text === 'string' ? series.text : undefined;
             rangeXValues.forEach((x, index2)=>{
                 var _series_marker, _series_marker1, _series_marker_color, _series_marker2, _input_layout_template_layout, _input_layout_template, _input_layout;
                 if (!mapXToDataPoints[x]) {
@@ -1113,6 +1098,11 @@ const transformPlotlyJsonToVSBCProps = (input, isMultiPlot, colorMap, colorwayTy
                 const opacity = (0, _PlotlyColorAdapter.getOpacity)(series, index2);
                 const yVal = rangeYValues[index2];
                 const yAxisCalloutData = getFormattedCalloutYData(yVal, yAxisTickFormat);
+                let barLabel = Array.isArray(textValues) ? textValues[index2] : textValues;
+                // Apply texttemplate formatting if specified
+                if (barLabel && series.texttemplate) {
+                    barLabel = formatTextWithTemplate(barLabel, series.texttemplate, index2);
+                }
                 if (series.type === 'bar') {
                     var _rgb_copy_formatHex8;
                     mapXToDataPoints[x].chartData.push({
@@ -1121,7 +1111,10 @@ const transformPlotlyJsonToVSBCProps = (input, isMultiPlot, colorMap, colorwayTy
                         color: (_rgb_copy_formatHex8 = (0, _d3color.rgb)(color).copy({
                             opacity
                         }).formatHex8()) !== null && _rgb_copy_formatHex8 !== void 0 ? _rgb_copy_formatHex8 : color,
-                        yAxisCalloutData
+                        yAxisCalloutData,
+                        ...barLabel ? {
+                            barLabel: String(barLabel)
+                        } : {}
                     });
                     if (typeof yVal === 'number') {
                         yMaxValue = Math.max(yMaxValue, yVal);
@@ -1219,7 +1212,7 @@ const transformPlotlyJsonToVSBCProps = (input, isMultiPlot, colorMap, colorwayTy
         }
     });
     const vsbcData = Object.values(mapXToDataPoints);
-    const annotations = getChartAnnotationsFromLayout(input.layout, input.data, isMultiPlot);
+    const annotations = getChartAnnotationsFromLayout(input.layout, isMultiPlot);
     var _input_layout_height;
     return {
         data: vsbcData,
@@ -1230,7 +1223,6 @@ const transformPlotlyJsonToVSBCProps = (input, isMultiPlot, colorMap, colorwayTy
         yMinValue,
         mode: 'plotly',
         ...secondaryYAxisValues,
-        wrapXAxisLables: typeof ((_vsbcData_ = vsbcData[0]) === null || _vsbcData_ === void 0 ? void 0 : _vsbcData_.xAxisPoint) === 'string',
         hideTickOverlap: true,
         barGapMax: 2,
         hideLegend,
@@ -1308,6 +1300,12 @@ const transformPlotlyJsonToGVBCProps = (input, isMultiPlot, colorMap, colorwayTy
                     const color = colorScale ? colorScale((0, _chartutilities.isArrayOrTypedArray)((_series_marker = series.marker) === null || _series_marker === void 0 ? void 0 : _series_marker.color) ? (_series_marker2 = series.marker) === null || _series_marker2 === void 0 ? void 0 : (_series_marker_color = _series_marker2.color) === null || _series_marker_color === void 0 ? void 0 : _series_marker_color[xIndex % ((_series_marker1 = series.marker) === null || _series_marker1 === void 0 ? void 0 : _series_marker1.color).length] : 0) : (0, _PlotlyColorAdapter.resolveColor)(extractedBarColors, xIndex, legend, colorMap, (_processedInput_layout = processedInput.layout) === null || _processedInput_layout === void 0 ? void 0 : (_processedInput_layout_template = _processedInput_layout.template) === null || _processedInput_layout_template === void 0 ? void 0 : (_processedInput_layout_template_layout = _processedInput_layout_template.layout) === null || _processedInput_layout_template_layout === void 0 ? void 0 : _processedInput_layout_template_layout.colorway, isDarkTheme);
                     const opacity = (0, _PlotlyColorAdapter.getOpacity)(series, xIndex);
                     const yVal = series.y[xIndex];
+                    // Extract text value for barLabel
+                    let barLabel = Array.isArray(series.text) ? series.text[xIndex] : series.text;
+                    // Apply texttemplate formatting if specified
+                    if (barLabel && series.texttemplate) {
+                        barLabel = formatTextWithTemplate(barLabel, series.texttemplate, xIndex);
+                    }
                     var _rgb_copy_formatHex8;
                     return {
                         x: x.toString(),
@@ -1315,7 +1313,10 @@ const transformPlotlyJsonToGVBCProps = (input, isMultiPlot, colorMap, colorwayTy
                         yAxisCalloutData: getFormattedCalloutYData(yVal, yAxisTickFormat),
                         color: (_rgb_copy_formatHex8 = (0, _d3color.rgb)(color).copy({
                             opacity
-                        }).formatHex8()) !== null && _rgb_copy_formatHex8 !== void 0 ? _rgb_copy_formatHex8 : color
+                        }).formatHex8()) !== null && _rgb_copy_formatHex8 !== void 0 ? _rgb_copy_formatHex8 : color,
+                        ...barLabel ? {
+                            barLabel: String(barLabel)
+                        } : {}
                     };
                 }).filter((item)=>typeof item !== 'undefined'),
                 useSecondaryYScale: usesSecondaryYScale(series, processedInput.layout)
@@ -1356,7 +1357,7 @@ const transformPlotlyJsonToGVBCProps = (input, isMultiPlot, colorMap, colorwayTy
             });
         }
     });
-    const annotations = getChartAnnotationsFromLayout(processedInput.layout, processedInput.data, isMultiPlot);
+    const annotations = getChartAnnotationsFromLayout(processedInput.layout, isMultiPlot);
     var _processedInput_layout_height;
     return {
         dataV2: gvbcDataV2,
@@ -1366,7 +1367,6 @@ const transformPlotlyJsonToGVBCProps = (input, isMultiPlot, colorMap, colorwayTy
         mode: 'plotly',
         ...secondaryYAxisValues,
         hideTickOverlap: true,
-        wrapXAxisLables: true,
         hideLegend,
         roundCorners: true,
         showYAxisLables: true,
@@ -1385,7 +1385,7 @@ const transformPlotlyJsonToGVBCProps = (input, isMultiPlot, colorMap, colorwayTy
     };
 };
 const transformPlotlyJsonToVBCProps = (input, isMultiPlot, colorMap, colorwayType, isDarkTheme)=>{
-    var _input_layout, _input_layout1, _vbcData_;
+    var _input_layout, _input_layout1;
     const vbcData = [];
     const { legends, hideLegend } = getLegendProps(input.data, input.layout, isMultiPlot);
     let colorScale = undefined;
@@ -1432,6 +1432,11 @@ const transformPlotlyJsonToVBCProps = (input, isMultiPlot, colorMap, colorwayTyp
             const color = colorScale ? colorScale((0, _chartutilities.isArrayOrTypedArray)((_series_marker = series.marker) === null || _series_marker === void 0 ? void 0 : _series_marker.color) ? (_series_marker2 = series.marker) === null || _series_marker2 === void 0 ? void 0 : (_series_marker_color = _series_marker2.color) === null || _series_marker_color === void 0 ? void 0 : _series_marker_color[index % ((_series_marker1 = series.marker) === null || _series_marker1 === void 0 ? void 0 : _series_marker1.color).length] : 0) : (0, _PlotlyColorAdapter.resolveColor)(extractedColors, index, legend, colorMap, (_input_layout = input.layout) === null || _input_layout === void 0 ? void 0 : (_input_layout_template = _input_layout.template) === null || _input_layout_template === void 0 ? void 0 : (_input_layout_template_layout = _input_layout_template.layout) === null || _input_layout_template_layout === void 0 ? void 0 : _input_layout_template_layout.colorway, isDarkTheme);
             const opacity = (0, _PlotlyColorAdapter.getOpacity)(series, index);
             const yVal = calculateHistNorm(series.histnorm, y[index], total, isXString ? bin.length : getBinSize(bin));
+            // Handle text values and texttemplate formatting for histogram bins
+            let barLabel = Array.isArray(series.text) ? series.text[index] : series.text;
+            if (barLabel && series.texttemplate) {
+                barLabel = formatTextWithTemplate(barLabel, series.texttemplate, index);
+            }
             var _rgb_copy_formatHex8;
             vbcData.push({
                 x: isXString ? bin.join(', ') : getBinCenter(bin),
@@ -1442,11 +1447,14 @@ const transformPlotlyJsonToVBCProps = (input, isMultiPlot, colorMap, colorwayTyp
                 }).formatHex8()) !== null && _rgb_copy_formatHex8 !== void 0 ? _rgb_copy_formatHex8 : color,
                 ...isXString ? {} : {
                     xAxisCalloutData: `[${bin.x0} - ${bin.x1})`
-                }
+                },
+                ...barLabel ? {
+                    barLabel: String(barLabel)
+                } : {}
             });
         });
     });
-    const annotations = getChartAnnotationsFromLayout(input.layout, input.data, isMultiPlot);
+    const annotations = getChartAnnotationsFromLayout(input.layout, isMultiPlot);
     var _input_layout_height;
     return {
         data: vbcData,
@@ -1454,7 +1462,6 @@ const transformPlotlyJsonToVBCProps = (input, isMultiPlot, colorMap, colorwayTyp
         height: (_input_layout_height = (_input_layout1 = input.layout) === null || _input_layout1 === void 0 ? void 0 : _input_layout1.height) !== null && _input_layout_height !== void 0 ? _input_layout_height : 350,
         mode: 'histogram',
         hideTickOverlap: true,
-        wrapXAxisLables: typeof ((_vbcData_ = vbcData[0]) === null || _vbcData_ === void 0 ? void 0 : _vbcData_.x) === 'string',
         maxBarWidth: 50,
         hideLegend,
         roundCorners: true,
@@ -1517,9 +1524,7 @@ const transformPlotlyJsonToScatterTraceProps = (input, isMultiPlot, chartType, c
     let mode = 'tonexty';
     const { legends, hideLegend } = getLegendProps(input.data, input.layout, isMultiPlot);
     const yAxisTickFormat = getYAxisTickFormat(input.data[0], input.layout);
-    const xAxisType = getAxisType(input.data, getAxisObjects(input.data, input.layout).x);
-    const resolveXValue = getAxisValueResolver(xAxisType);
-    const shouldWrapLabels = xAxisType === 'category';
+    const resolveXValue = getAxisValueResolver(getAxisType(input.data, getAxisObjects(input.data, input.layout).x));
     const chartData = input.data.map((series, index)=>{
         var _series_mode, _series_line, _series_marker, _series_line1, _input_layout_template_layout, _input_layout_template, _input_layout, _input_layout_template_layout1, _input_layout_template1, _input_layout1, _series_mode1;
         const colors = isScatterMarkers ? (series === null || series === void 0 ? void 0 : (_series_mode = series.mode) === null || _series_mode === void 0 ? void 0 : _series_mode.includes('line')) ? (_series_line = series.line) === null || _series_line === void 0 ? void 0 : _series_line.color : (_series_marker = series.marker) === null || _series_marker === void 0 ? void 0 : _series_marker.color : (_series_line1 = series.line) === null || _series_line1 === void 0 ? void 0 : _series_line1.color;
@@ -1668,7 +1673,7 @@ const transformPlotlyJsonToScatterTraceProps = (input, isMultiPlot, chartType, c
             ...lineShape
         ]
     };
-    const annotations = getChartAnnotationsFromLayout(input.layout, input.data, isMultiPlot);
+    const annotations = getChartAnnotationsFromLayout(input.layout, isMultiPlot);
     var _input_layout_height;
     const commonProps = {
         supportNegativeData: true,
@@ -1678,7 +1683,6 @@ const transformPlotlyJsonToScatterTraceProps = (input, isMultiPlot, chartType, c
         hideTickOverlap: true,
         hideLegend,
         useUTC: false,
-        wrapXAxisLabels: shouldWrapLabels,
         optimizeLargeData: numDataPoints > 1000,
         showYAxisLables: true,
         roundedTicks: true,
@@ -1797,14 +1801,14 @@ const transformPlotlyJsonToGanttChartProps = (input, isMultiPlot, colorMap, colo
             // extract colors for each series only once
             const extractedColors = (0, _PlotlyColorAdapter.extractColor)((_input_layout = input.layout) === null || _input_layout === void 0 ? void 0 : (_input_layout_template = _input_layout.template) === null || _input_layout_template === void 0 ? void 0 : (_input_layout_template_layout = _input_layout_template.layout) === null || _input_layout_template_layout === void 0 ? void 0 : _input_layout_template_layout.colorway, colorwayType, (_series_marker = series.marker) === null || _series_marker === void 0 ? void 0 : _series_marker.color, colorMap, isDarkTheme);
             series.y.forEach((yVal, i)=>{
-                var _series_marker, _series_marker1, _series_marker_color, _series_marker2, _input_layout_template_layout, _input_layout_template, _input_layout, _series_base, _series_x;
+                var _series_marker, _series_marker1, _series_marker_color, _series_marker2, _input_layout_template_layout, _input_layout_template, _input_layout, _series_x;
                 if ((0, _chartutilities.isInvalidValue)(yVal)) {
                     return;
                 }
                 // resolve color for each legend's bars from the colorscale or extracted colors
                 const color = colorScale ? colorScale((0, _chartutilities.isArrayOrTypedArray)((_series_marker = series.marker) === null || _series_marker === void 0 ? void 0 : _series_marker.color) ? (_series_marker2 = series.marker) === null || _series_marker2 === void 0 ? void 0 : (_series_marker_color = _series_marker2.color) === null || _series_marker_color === void 0 ? void 0 : _series_marker_color[i % ((_series_marker1 = series.marker) === null || _series_marker1 === void 0 ? void 0 : _series_marker1.color).length] : 0) : (0, _PlotlyColorAdapter.resolveColor)(extractedColors, i, legend, colorMap, (_input_layout = input.layout) === null || _input_layout === void 0 ? void 0 : (_input_layout_template = _input_layout.template) === null || _input_layout_template === void 0 ? void 0 : (_input_layout_template_layout = _input_layout_template.layout) === null || _input_layout_template_layout === void 0 ? void 0 : _input_layout_template_layout.colorway, isDarkTheme);
                 const opacity = (0, _PlotlyColorAdapter.getOpacity)(series, i);
-                const base = +resolveGanttXValue((_series_base = series.base) === null || _series_base === void 0 ? void 0 : _series_base[i]);
+                const base = +resolveGanttXValue((0, _chartutilities.isArrayOrTypedArray)(series.base) ? series.base[i] : series.base);
                 const xVal = +resolveGanttXValue((_series_x = series.x) === null || _series_x === void 0 ? void 0 : _series_x[i]);
                 var _rgb_copy_formatHex8;
                 ganttData.push({
@@ -1859,11 +1863,53 @@ const transformPlotlyJsonToGanttChartProps = (input, isMultiPlot, colorMap, colo
     };
 };
 const transformPlotlyJsonToHeatmapProps = (input, isMultiPlot, colorMap, colorwayType, isDarkTheme)=>{
-    var _input_layout, _input_layout_coloraxis, _input_layout1, _input_layout_template_layout, _input_layout_template, _input_layout2, _input_layout_template_data_histogram2d_, _input_layout_template_data_histogram2d, _input_layout_template_data, _input_layout_template1, _input_layout3, _input_layout_template_data_heatmap_, _input_layout_template_data_heatmap, _input_layout_template_data1, _input_layout_template2, _input_layout4, _input_layout5, _input_layout6;
+    var _input_layout, _input_layout1, _input_layout_coloraxis, _input_layout2, _input_layout_template_layout, _input_layout_template, _input_layout3, _input_layout_template_data_histogram2d_, _input_layout_template_data_histogram2d, _input_layout_template_data, _input_layout_template1, _input_layout4, _input_layout_template_data_heatmap_, _input_layout_template_data_heatmap, _input_layout_template_data1, _input_layout_template2, _input_layout5, _input_layout6, _input_layout7;
     const firstData = input.data[0];
     const heatmapDataPoints = [];
     let zMin = Number.POSITIVE_INFINITY;
     let zMax = Number.NEGATIVE_INFINITY;
+    // Build a 2D array of annotations based on their grid position
+    const annotationGrid = [];
+    const rawAnnotations = (_input_layout = input.layout) === null || _input_layout === void 0 ? void 0 : _input_layout.annotations;
+    if (rawAnnotations) {
+        const annotationsArray = Array.isArray(rawAnnotations) ? rawAnnotations : [
+            rawAnnotations
+        ];
+        // Collect all unique x and y values from valid annotations
+        const xSet = new Set();
+        const ySet = new Set();
+        const validAnnotations = [];
+        annotationsArray.forEach((a)=>{
+            if (a && typeof a.x === 'number' && typeof a.y === 'number' && typeof a.text === 'string' && (a.xref === 'x' || a.xref === undefined) && (a.yref === 'y' || a.yref === undefined)) {
+                xSet.add(a.x);
+                ySet.add(a.y);
+                validAnnotations.push({
+                    x: a.x,
+                    y: a.y,
+                    text: cleanText(a.text)
+                });
+            }
+        });
+        if (validAnnotations.length > 0) {
+            // Get sorted unique x and y values
+            const xValues = Array.from(xSet).sort((a, b)=>a - b);
+            const yValues = Array.from(ySet).sort((a, b)=>a - b);
+            // Initialize 2D grid and populate
+            validAnnotations.forEach((annotation)=>{
+                const xIdx = xValues.indexOf(annotation.x);
+                const yIdx = yValues.indexOf(annotation.y);
+                if (!annotationGrid[yIdx]) {
+                    annotationGrid[yIdx] = [];
+                }
+                annotationGrid[yIdx][xIdx] = annotation.text;
+            });
+        }
+    }
+    // Helper function to get annotation from 2D grid by index
+    const getAnnotationByIndex = (xIdx, yIdx)=>{
+        var _annotationGrid_yIdx;
+        return (_annotationGrid_yIdx = annotationGrid[yIdx]) === null || _annotationGrid_yIdx === void 0 ? void 0 : _annotationGrid_yIdx[xIdx];
+    };
     if (firstData.type === 'histogram2d') {
         var _firstData_x, _firstData_xbins, _firstData_xbins1, _firstData_xbins2, _firstData_ybins, _firstData_ybins1, _firstData_ybins2;
         const xValues = [];
@@ -1903,11 +1949,12 @@ const transformPlotlyJsonToHeatmapProps = (input, isMultiPlot, colorMap, colorwa
         xBins.forEach((xBin, xIdx)=>{
             yBins.forEach((yBin, yIdx)=>{
                 const zVal = calculateHistNorm(firstData.histnorm, z[yIdx][xIdx], total, isXString ? xBin.length : getBinSize(xBin), isYString ? yBin.length : getBinSize(yBin));
+                const annotationText = getAnnotationByIndex(xIdx, yIdx);
                 heatmapDataPoints.push({
                     x: isXString ? xBin.join(', ') : getBinCenter(xBin),
                     y: isYString ? yBin.join(', ') : getBinCenter(yBin),
                     value: zVal,
-                    rectText: zVal
+                    rectText: annotationText || zVal
                 });
                 if (typeof zVal === 'number') {
                     zMin = Math.min(zMin, zVal);
@@ -1916,17 +1963,34 @@ const transformPlotlyJsonToHeatmapProps = (input, isMultiPlot, colorMap, colorwa
             });
         });
     } else {
-        var _firstData_x1;
-        (_firstData_x1 = firstData.x) === null || _firstData_x1 === void 0 ? void 0 : _firstData_x1.forEach((xVal, xIdx)=>{
-            var _firstData_y;
-            (_firstData_y = firstData.y) === null || _firstData_y === void 0 ? void 0 : _firstData_y.forEach((yVal, yIdx)=>{
-                var _firstData_z_yIdx, _firstData_z, _input_layout_xaxis, _input_layout, _input_layout_yaxis, _input_layout1;
-                const zVal = (_firstData_z = firstData.z) === null || _firstData_z === void 0 ? void 0 : (_firstData_z_yIdx = _firstData_z[yIdx]) === null || _firstData_z_yIdx === void 0 ? void 0 : _firstData_z_yIdx[xIdx];
+        var _zArray_;
+        // If x and y are not provided, generate indices based on z dimensions
+        const zArray = firstData.z;
+        const xValues = firstData.x;
+        const yValues = firstData.y;
+        var _zArray_length;
+        // Determine the dimensions from z array
+        const yLength = (_zArray_length = zArray === null || zArray === void 0 ? void 0 : zArray.length) !== null && _zArray_length !== void 0 ? _zArray_length : 0;
+        var _zArray__length;
+        const xLength = (_zArray__length = zArray === null || zArray === void 0 ? void 0 : (_zArray_ = zArray[0]) === null || _zArray_ === void 0 ? void 0 : _zArray_.length) !== null && _zArray__length !== void 0 ? _zArray__length : 0;
+        // Use provided x/y values or generate indices
+        const xData = xValues !== null && xValues !== void 0 ? xValues : Array.from({
+            length: xLength
+        }, (_, i)=>i);
+        const yData = yValues !== null && yValues !== void 0 ? yValues : Array.from({
+            length: yLength
+        }, (_, i)=>yLength - 1 - i);
+        xData.forEach((xVal, xIdx)=>{
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            yData.forEach((yVal, yIdx)=>{
+                var _zArray_yIdx, _input_layout_xaxis, _input_layout, _input_layout_yaxis, _input_layout1;
+                const zVal = zArray === null || zArray === void 0 ? void 0 : (_zArray_yIdx = zArray[yIdx]) === null || _zArray_yIdx === void 0 ? void 0 : _zArray_yIdx[xIdx];
+                const annotationText = getAnnotationByIndex(xIdx, yIdx);
                 heatmapDataPoints.push({
                     x: ((_input_layout = input.layout) === null || _input_layout === void 0 ? void 0 : (_input_layout_xaxis = _input_layout.xaxis) === null || _input_layout_xaxis === void 0 ? void 0 : _input_layout_xaxis.type) === 'date' ? xVal : xVal !== null && xVal !== void 0 ? xVal : 0,
                     y: ((_input_layout1 = input.layout) === null || _input_layout1 === void 0 ? void 0 : (_input_layout_yaxis = _input_layout1.yaxis) === null || _input_layout_yaxis === void 0 ? void 0 : _input_layout_yaxis.type) === 'date' ? yVal : yVal,
                     value: zVal,
-                    rectText: zVal
+                    rectText: annotationText || zVal
                 });
                 if (typeof zVal === 'number') {
                     zMin = Math.min(zMin, zVal);
@@ -1953,7 +2017,7 @@ const transformPlotlyJsonToHeatmapProps = (input, isMultiPlot, colorMap, colorwa
         (0, _colors.getColorFromToken)(_colors.DataVizPalette.color3)
     ];
     var _firstData_colorscale, _ref, _ref1, _ref2, _ref3;
-    let colorscale = (_ref3 = (_ref2 = (_ref1 = (_ref = (_firstData_colorscale = firstData === null || firstData === void 0 ? void 0 : firstData.colorscale) !== null && _firstData_colorscale !== void 0 ? _firstData_colorscale : (_input_layout = input.layout) === null || _input_layout === void 0 ? void 0 : _input_layout.colorscale) !== null && _ref !== void 0 ? _ref : (_input_layout1 = input.layout) === null || _input_layout1 === void 0 ? void 0 : (_input_layout_coloraxis = _input_layout1.coloraxis) === null || _input_layout_coloraxis === void 0 ? void 0 : _input_layout_coloraxis.colorscale) !== null && _ref1 !== void 0 ? _ref1 : (_input_layout2 = input.layout) === null || _input_layout2 === void 0 ? void 0 : (_input_layout_template = _input_layout2.template) === null || _input_layout_template === void 0 ? void 0 : (_input_layout_template_layout = _input_layout_template.layout) === null || _input_layout_template_layout === void 0 ? void 0 : _input_layout_template_layout.colorscale) !== null && _ref2 !== void 0 ? _ref2 : firstData.type === 'histogram2d' && ((_input_layout3 = input.layout) === null || _input_layout3 === void 0 ? void 0 : (_input_layout_template1 = _input_layout3.template) === null || _input_layout_template1 === void 0 ? void 0 : (_input_layout_template_data = _input_layout_template1.data) === null || _input_layout_template_data === void 0 ? void 0 : (_input_layout_template_data_histogram2d = _input_layout_template_data.histogram2d) === null || _input_layout_template_data_histogram2d === void 0 ? void 0 : (_input_layout_template_data_histogram2d_ = _input_layout_template_data_histogram2d[0]) === null || _input_layout_template_data_histogram2d_ === void 0 ? void 0 : _input_layout_template_data_histogram2d_.colorscale)) !== null && _ref3 !== void 0 ? _ref3 : (_input_layout4 = input.layout) === null || _input_layout4 === void 0 ? void 0 : (_input_layout_template2 = _input_layout4.template) === null || _input_layout_template2 === void 0 ? void 0 : (_input_layout_template_data1 = _input_layout_template2.data) === null || _input_layout_template_data1 === void 0 ? void 0 : (_input_layout_template_data_heatmap = _input_layout_template_data1.heatmap) === null || _input_layout_template_data_heatmap === void 0 ? void 0 : (_input_layout_template_data_heatmap_ = _input_layout_template_data_heatmap[0]) === null || _input_layout_template_data_heatmap_ === void 0 ? void 0 : _input_layout_template_data_heatmap_.colorscale;
+    let colorscale = (_ref3 = (_ref2 = (_ref1 = (_ref = (_firstData_colorscale = firstData === null || firstData === void 0 ? void 0 : firstData.colorscale) !== null && _firstData_colorscale !== void 0 ? _firstData_colorscale : (_input_layout1 = input.layout) === null || _input_layout1 === void 0 ? void 0 : _input_layout1.colorscale) !== null && _ref !== void 0 ? _ref : (_input_layout2 = input.layout) === null || _input_layout2 === void 0 ? void 0 : (_input_layout_coloraxis = _input_layout2.coloraxis) === null || _input_layout_coloraxis === void 0 ? void 0 : _input_layout_coloraxis.colorscale) !== null && _ref1 !== void 0 ? _ref1 : (_input_layout3 = input.layout) === null || _input_layout3 === void 0 ? void 0 : (_input_layout_template = _input_layout3.template) === null || _input_layout_template === void 0 ? void 0 : (_input_layout_template_layout = _input_layout_template.layout) === null || _input_layout_template_layout === void 0 ? void 0 : _input_layout_template_layout.colorscale) !== null && _ref2 !== void 0 ? _ref2 : firstData.type === 'histogram2d' && ((_input_layout4 = input.layout) === null || _input_layout4 === void 0 ? void 0 : (_input_layout_template1 = _input_layout4.template) === null || _input_layout_template1 === void 0 ? void 0 : (_input_layout_template_data = _input_layout_template1.data) === null || _input_layout_template_data === void 0 ? void 0 : (_input_layout_template_data_histogram2d = _input_layout_template_data.histogram2d) === null || _input_layout_template_data_histogram2d === void 0 ? void 0 : (_input_layout_template_data_histogram2d_ = _input_layout_template_data_histogram2d[0]) === null || _input_layout_template_data_histogram2d_ === void 0 ? void 0 : _input_layout_template_data_histogram2d_.colorscale)) !== null && _ref3 !== void 0 ? _ref3 : (_input_layout5 = input.layout) === null || _input_layout5 === void 0 ? void 0 : (_input_layout_template2 = _input_layout5.template) === null || _input_layout_template2 === void 0 ? void 0 : (_input_layout_template_data1 = _input_layout_template2.data) === null || _input_layout_template_data1 === void 0 ? void 0 : (_input_layout_template_data_heatmap = _input_layout_template_data1.heatmap) === null || _input_layout_template_data_heatmap === void 0 ? void 0 : (_input_layout_template_data_heatmap_ = _input_layout_template_data_heatmap[0]) === null || _input_layout_template_data_heatmap_ === void 0 ? void 0 : _input_layout_template_data_heatmap_.colorscale;
     // determine if the types diverging, sequential or sequentialminus are present in colorscale
     if (colorscale && typeof colorscale === 'object' && ('diverging' in colorscale || 'sequential' in colorscale || 'sequentialminus' in colorscale)) {
         const isDivergent = zMin < 0 && zMax > 0; // Data spans both positive and negative values
@@ -1979,12 +2043,11 @@ const transformPlotlyJsonToHeatmapProps = (input, isMultiPlot, colorMap, colorwa
         hideLegend: true,
         showYAxisLables: true,
         sortOrder: 'none',
-        width: (_input_layout5 = input.layout) === null || _input_layout5 === void 0 ? void 0 : _input_layout5.width,
-        height: (_input_layout_height = (_input_layout6 = input.layout) === null || _input_layout6 === void 0 ? void 0 : _input_layout6.height) !== null && _input_layout_height !== void 0 ? _input_layout_height : 350,
+        width: (_input_layout6 = input.layout) === null || _input_layout6 === void 0 ? void 0 : _input_layout6.width,
+        height: (_input_layout_height = (_input_layout7 = input.layout) === null || _input_layout7 === void 0 ? void 0 : _input_layout7.height) !== null && _input_layout_height !== void 0 ? _input_layout_height : 350,
         hideTickOverlap: true,
         noOfCharsToTruncate: 20,
         showYAxisLablesTooltip: true,
-        wrapXAxisLables: true,
         ...getTitles(input.layout),
         ...getAxisCategoryOrderProps([
             firstData
@@ -2829,7 +2892,10 @@ const isNonPlotType = (chartType)=>{
         'donut',
         'sankey',
         'pie',
-        'annotation'
+        'annotation',
+        'table',
+        'gauge',
+        'funnel'
     ].includes(chartType);
 };
 const getGridProperties = (schema, isMultiPlot, validTracesInfo)=>{
@@ -3015,7 +3081,7 @@ const getGridProperties = (schema, isMultiPlot, validTracesInfo)=>{
         }
         const isValidArray = (0, _chartutilities.isArrayOrTypedArray)(ax === null || ax === void 0 ? void 0 : ax.categoryarray) && ax.categoryarray.length > 0;
         if (isValidArray && (!(ax === null || ax === void 0 ? void 0 : ax.categoryorder) || ax.categoryorder === 'array')) {
-            result[propName] = ax.categoryarray;
+            result[propName] = (ax === null || ax === void 0 ? void 0 : ax.autorange) === 'reversed' ? ax.categoryarray.slice().reverse() : ax.categoryarray;
             return;
         }
         if (!(ax === null || ax === void 0 ? void 0 : ax.categoryorder) || ax.categoryorder === 'trace' || ax.categoryorder === 'array') {
@@ -3092,16 +3158,23 @@ const getAxisScaleTypeProps = (data, layout)=>{
             return;
         }
         const axType = getAxisType(data, ax);
+        if (axId === 'x' && axType === 'category') {
+            props.xAxis = {
+                tickLayout: 'auto'
+            };
+        }
         if ((!ax.tickmode || ax.tickmode === 'array') && (0, _chartutilities.isArrayOrTypedArray)(ax.tickvals)) {
             const tickValues = axType === 'date' ? ax.tickvals.map((v)=>new Date(v)) : ax.tickvals;
             if (axId === 'x') {
                 props.tickValues = tickValues;
                 props.xAxis = {
+                    ...props.xAxis,
                     tickText: ax.ticktext
                 };
             } else if (axId === 'y') {
                 props.yAxisTickValues = tickValues;
                 props.yAxis = {
+                    ...props.yAxis,
                     tickText: ax.ticktext
                 };
             }
@@ -3112,11 +3185,13 @@ const getAxisScaleTypeProps = (data, layout)=>{
             const tick0 = plotlyTick0(ax.tick0, axType, dtick);
             if (axId === 'x') {
                 props.xAxis = {
+                    ...props.xAxis,
                     tickStep: dtick,
                     tick0
                 };
             } else if (axId === 'y') {
                 props.yAxis = {
+                    ...props.yAxis,
                     tickStep: dtick,
                     tick0
                 };