@visactor/vchart 1.13.11-alpha.1 → 1.13.11

package/build/index.es.js

@@ -64117,7 +64117,7 @@ const registerVChartCore = () => {
 };
 registerVChartCore();
 
-const version = "1.13.11-alpha.1";
+const version = "1.13.11";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -67706,7 +67706,8 @@ function getDatumByValue(data, value, startField, endField) {
 const getCartesianCrosshairTheme = (chartTheme, chartSpec) => {
     var _a, _b;
     const axes = array((_a = chartSpec.axes) !== null && _a !== void 0 ? _a : []);
-    const { bandField, linearField, xField, yField } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
+    const crosshairTheme = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
+    const { bandField, linearField, xField, yField, trigger, triggerOff } = crosshairTheme;
     const xAxis = axes.find(axis => isXAxis(axis.orient));
     let newXField;
     if (isValid$1(xAxis)) {
@@ -67725,13 +67726,15 @@ const getCartesianCrosshairTheme = (chartTheme, chartSpec) => {
     }
     return {
         xField: newXField,
-        yField: newYField
+        yField: newYField,
+        trigger,
+        triggerOff
     };
 };
 const getPolarCrosshairTheme = (chartTheme, chartSpec) => {
     var _a, _b;
     const axes = array((_a = chartSpec.axes) !== null && _a !== void 0 ? _a : []);
-    const { bandField, linearField, categoryField, valueField } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
+    const { bandField, linearField, categoryField, valueField, trigger, triggerOff } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
     const angleAxis = axes.find(axis => axis.orient === 'angle');
     let newAngleField;
     if (isValid$1(angleAxis)) {
@@ -67750,7 +67753,9 @@ const getPolarCrosshairTheme = (chartTheme, chartSpec) => {
     }
     return {
         categoryField: newAngleField,
-        valueField: newRadiusField
+        valueField: newRadiusField,
+        trigger,
+        triggerOff
     };
 };
 
@@ -72736,6 +72741,26 @@ class BarSeries extends CartesianSeries {
         this._barMarkType = "rect";
         this.transformerConstructor = BarSeriesSpecTransformer;
         this._bandPosition = 0;
+        this._getLinearBarRange = (start, end) => {
+            let [x, x1] = [start, end].sort((a, b) => a - b);
+            const realBarWidth = x1 - x;
+            if (this._spec.barGap) {
+                const halfBarGap = this._spec.barGap * 0.5;
+                const tempX = x + halfBarGap;
+                const tempX1 = x1 - halfBarGap;
+                x = tempX;
+                x1 = tempX1;
+            }
+            const curBarWidth = x1 - x;
+            const barMinWidth = getActualNumValue(this._spec.barMinWidth || 2, realBarWidth);
+            if (curBarWidth < barMinWidth) {
+                const widthDiff = barMinWidth - curBarWidth;
+                const halfWidthDiff = widthDiff / 2;
+                x -= halfWidthDiff;
+                x1 += halfWidthDiff;
+            }
+            return [x, x1];
+        };
         this._getBarXStart = (datum, scale, useWholeRange) => {
             if (this._shouldDoPreCalculate()) {
                 this._calculateStackRectPosition(false);
@@ -72753,6 +72778,11 @@ class BarSeries extends CartesianSeries {
             }
             return valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
         };
+        this._getLinearBarXRange = (datum, scale, useWholeRange) => {
+            const x = valueInScaleRange(this._dataToPosX(datum), scale, useWholeRange);
+            const x1 = valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
+            return this._getLinearBarRange(x, x1);
+        };
         this._getBarYStart = (datum, scale) => {
             if (this._shouldDoPreCalculate()) {
                 this._calculateStackRectPosition(true);
@@ -72770,6 +72800,11 @@ class BarSeries extends CartesianSeries {
             }
             return valueInScaleRange(this._dataToPosY1(datum), scale);
         };
+        this._getLinearBarYRange = (datum, scale, useWholeRange) => {
+            const y = valueInScaleRange(this._dataToPosY(datum), scale, useWholeRange);
+            const y1 = valueInScaleRange(this._dataToPosY1(datum), scale, useWholeRange);
+            return this._getLinearBarRange(y, y1);
+        };
         this._getBarBackgroundXStart = (scale) => {
             const range = scale.range();
             const min = Math.min(range[0], range[range.length - 1]);
@@ -73137,8 +73172,8 @@ class BarSeries extends CartesianSeries {
         if (this.direction === "horizontal") {
             const yChannels = isValid$1(this._fieldY2)
                 ? {
-                    y: (datum) => valueInScaleRange(this._dataToPosY(datum), yScale, true),
-                    y1: (datum) => valueInScaleRange(this._dataToPosY1(datum), yScale, true)
+                    y: (datum) => this._getLinearBarYRange(datum, yScale, true)[0],
+                    y1: (datum) => this._getLinearBarYRange(datum, yScale, true)[1]
                 }
                 : {
                     y: (datum) => valueInScaleRange(this._dataToPosY(datum) - this._getBarWidth(this._yAxisHelper) / 2, yScale, true),
@@ -73150,8 +73185,8 @@ class BarSeries extends CartesianSeries {
         else {
             const xChannels = isValid$1(this._fieldX2)
                 ? {
-                    x: (datum) => valueInScaleRange(this._dataToPosX(datum), xScale, true),
-                    x1: (datum) => valueInScaleRange(this._dataToPosX1(datum), xScale, true)
+                    x: (datum) => this._getLinearBarXRange(datum, xScale, true)[0],
+                    x1: (datum) => this._getLinearBarXRange(datum, xScale, true)[1]
                 }
                 : {
                     x: (datum) => valueInScaleRange(this._dataToPosX(datum) - this._getBarWidth(this._xAxisHelper) / 2, xScale, true),
@@ -91655,7 +91690,7 @@ class BaseHistogramChartSpecTransformer extends CartesianChartSpecTransformer {
         spec.axes.forEach((axis) => (axis.type = 'linear'));
     }
     _getDefaultSeriesSpec(spec) {
-        return super._getDefaultSeriesSpec(spec, ['x2Field', 'y2Field', 'barMinHeight', 'barBackground']);
+        return super._getDefaultSeriesSpec(spec, ['x2Field', 'y2Field', 'barMinHeight', 'barBackground', 'barGap']);
     }
 }
 
@@ -94176,11 +94211,13 @@ class TooltipSpecTransformer extends BaseComponentSpecTransformer {
         return false;
     }
     _initTheme(spec, chartSpec) {
-        var _a;
+        var _a, _b, _c;
         const { spec: newSpec, theme } = super._initTheme(spec, chartSpec);
         newSpec.style = mergeSpec({}, this._theme, newSpec.style);
         newSpec.offset = mergeSpec({}, theme.offset, spec.offset);
         newSpec.transitionDuration = (_a = spec.transitionDuration) !== null && _a !== void 0 ? _a : theme.transitionDuration;
+        newSpec.trigger = (_b = spec.trigger) !== null && _b !== void 0 ? _b : theme.trigger;
+        newSpec.triggerOff = (_c = spec.triggerOff) !== null && _c !== void 0 ? _c : theme.triggerOff;
         return { spec: newSpec, theme };
     }
     _transformSpecAfterMergingTheme(spec, chartSpec, chartSpecInfo) {
@@ -96029,10 +96066,12 @@ const dataFilterWithNewDomain = (data, op) => {
     return data.filter(filter);
 };
 const dataFilterComputeDomain = (data, op) => {
-    const { stateFields, valueFields, dataCollection } = op.input;
+    const { stateFields, valueFields, dataCollection, isCategoryState } = op.input;
     const { stateField, valueField } = op.output;
     const resultObj = {};
     const resultData = [];
+    const stateValues = [];
+    let hasLockDomain = false;
     dataCollection.forEach((dv, i) => {
         var _a;
         if (isNil$1(stateFields[i])) {
@@ -96040,14 +96079,19 @@ const dataFilterComputeDomain = (data, op) => {
         }
         const stateFieldInfo = (_a = dv.getFields()) === null || _a === void 0 ? void 0 : _a[stateFields[i]];
         if (stateFieldInfo && stateFieldInfo.lockStatisticsByDomain) {
+            hasLockDomain = true;
             stateFieldInfo.domain.forEach((d) => {
-                resultObj[d] = 0;
+                if (isNil$1(resultObj[d])) {
+                    stateValues.push(d);
+                    resultObj[d] = 0;
+                }
             });
         }
         dv.latestData.forEach((d) => {
             array(stateFields[i]).forEach(state => {
                 if (!isNil$1(d[state])) {
                     if (isNil$1(resultObj[d[state]])) {
+                        stateValues.push(d[state]);
                         resultObj[d[state]] = 0;
                     }
                     if (!isNil$1(valueFields[i])) {
@@ -96057,10 +96101,15 @@ const dataFilterComputeDomain = (data, op) => {
             });
         });
     });
-    Object.keys(resultObj).forEach((d, i) => {
-        const res = { [stateField]: d };
+    const sortedStateValues = hasLockDomain
+        ? stateValues
+        : isCategoryState === false
+            ? stateValues.sort((a, b) => a - b)
+            : Object.keys(resultObj);
+    sortedStateValues.forEach(state => {
+        const res = { [stateField]: state };
         if (valueField) {
-            res[valueField] = resultObj[d];
+            res[valueField] = resultObj[state];
         }
         resultData.push(res);
     });
@@ -96410,6 +96459,7 @@ class DataFilterBaseComponent extends BaseComponent {
         const dataCollection = [];
         const stateFields = [];
         const valueFields = [];
+        let isCategoryState;
         if (this._relatedAxisComponent) {
             const originalStateFields = {};
             eachSeries(this._regions, s => {
@@ -96435,8 +96485,6 @@ class DataFilterBaseComponent extends BaseComponent {
                             ? xAxisHelper
                             : yAxisHelper;
                 const valueAxisHelper = stateAxisHelper === xAxisHelper ? yAxisHelper : xAxisHelper;
-                const isValidateValueAxis = isContinuous(valueAxisHelper.getScale(0).type);
-                const isValidateStateAxis = isContinuous(stateAxisHelper.getScale(0).type);
                 dataCollection.push(s.getRawData());
                 const seriesSpec = s.getSpec();
                 const xField = s.coordinate === 'cartesian'
@@ -96447,7 +96495,8 @@ class DataFilterBaseComponent extends BaseComponent {
                     : array((_b = seriesSpec.radiusField) !== null && _b !== void 0 ? _b : seriesSpec.valueField);
                 originalStateFields[s.id] =
                     s.type === 'link' ? ['from_xField'] : stateAxisHelper === xAxisHelper ? xField : yField;
-                if (isValidateStateAxis) {
+                if (isContinuous(stateAxisHelper.getScale(0).type)) {
+                    isCategoryState = false;
                     stateFields.push(originalStateFields[s.id]);
                 }
                 else {
@@ -96455,7 +96504,7 @@ class DataFilterBaseComponent extends BaseComponent {
                 }
                 if (this._valueField) {
                     const valueField = s.type === 'link' ? ['from_yField'] : valueAxisHelper === xAxisHelper ? xField : yField;
-                    if (isValidateValueAxis) {
+                    if (isContinuous(valueAxisHelper.getScale(0).type)) {
                         valueFields.push(...valueField);
                     }
                 }
@@ -96487,7 +96536,8 @@ class DataFilterBaseComponent extends BaseComponent {
                 input: {
                     dataCollection: dataCollection,
                     stateFields,
-                    valueFields
+                    valueFields,
+                    isCategoryState
                 },
                 output: {
                     stateField: this._stateField,
@@ -103068,12 +103118,18 @@ class DomTooltipHandler extends BaseTooltipHandler {
         const rowStyle = this._domStyle.row;
         const chilren = [...this._rootDom.children];
         let titleDom = chilren.find(child => child.className.includes(TOOLTIP_TITLE_CLASS_NAME));
+        let contentDom = chilren.find(child => child.className.includes(TOOLTIP_CONTENT_BOX_CLASS_NAME));
         if (!titleDom && title.visible !== false) {
             titleDom = document.createElement('h2');
             const span = document.createElement('span');
             titleDom.appendChild(span);
             titleDom.classList.add(TOOLTIP_TITLE_CLASS_NAME);
-            this._rootDom.appendChild(titleDom);
+            if (this._rootDom.firstChild) {
+                this._rootDom.insertBefore(titleDom, this._rootDom.firstChild);
+            }
+            else {
+                this._rootDom.appendChild(titleDom);
+            }
         }
         if (titleDom && title.visible !== false) {
             setStyleToDom(titleDom, Object.assign(Object.assign(Object.assign({}, this._domStyle.title), (hasContent ? rowStyle : { marginBottom: '0px' })), { marginTop: '0px' }));
@@ -103082,7 +103138,6 @@ class DomTooltipHandler extends BaseTooltipHandler {
         else if (titleDom && title.visible === false) {
             titleDom.parentNode.removeChild(titleDom);
         }
-        let contentDom = chilren.find(child => child.className.includes(TOOLTIP_CONTENT_BOX_CLASS_NAME));
         const columns = ['shape', 'key', 'value'];
         if (!contentDom && hasContent) {
             contentDom = document.createElement('div');

package/build/index.js

@@ -64123,7 +64123,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.13.11-alpha.1";
+    const version = "1.13.11";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -67712,7 +67712,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     const getCartesianCrosshairTheme = (chartTheme, chartSpec) => {
         var _a, _b;
         const axes = array((_a = chartSpec.axes) !== null && _a !== void 0 ? _a : []);
-        const { bandField, linearField, xField, yField } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
+        const crosshairTheme = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
+        const { bandField, linearField, xField, yField, trigger, triggerOff } = crosshairTheme;
         const xAxis = axes.find(axis => isXAxis(axis.orient));
         let newXField;
         if (isValid$1(xAxis)) {
@@ -67731,13 +67732,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         return {
             xField: newXField,
-            yField: newYField
+            yField: newYField,
+            trigger,
+            triggerOff
         };
     };
     const getPolarCrosshairTheme = (chartTheme, chartSpec) => {
         var _a, _b;
         const axes = array((_a = chartSpec.axes) !== null && _a !== void 0 ? _a : []);
-        const { bandField, linearField, categoryField, valueField } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
+        const { bandField, linearField, categoryField, valueField, trigger, triggerOff } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
         const angleAxis = axes.find(axis => axis.orient === 'angle');
         let newAngleField;
         if (isValid$1(angleAxis)) {
@@ -67756,7 +67759,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         return {
             categoryField: newAngleField,
-            valueField: newRadiusField
+            valueField: newRadiusField,
+            trigger,
+            triggerOff
         };
     };
 
@@ -72742,6 +72747,26 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._barMarkType = "rect";
             this.transformerConstructor = BarSeriesSpecTransformer;
             this._bandPosition = 0;
+            this._getLinearBarRange = (start, end) => {
+                let [x, x1] = [start, end].sort((a, b) => a - b);
+                const realBarWidth = x1 - x;
+                if (this._spec.barGap) {
+                    const halfBarGap = this._spec.barGap * 0.5;
+                    const tempX = x + halfBarGap;
+                    const tempX1 = x1 - halfBarGap;
+                    x = tempX;
+                    x1 = tempX1;
+                }
+                const curBarWidth = x1 - x;
+                const barMinWidth = getActualNumValue(this._spec.barMinWidth || 2, realBarWidth);
+                if (curBarWidth < barMinWidth) {
+                    const widthDiff = barMinWidth - curBarWidth;
+                    const halfWidthDiff = widthDiff / 2;
+                    x -= halfWidthDiff;
+                    x1 += halfWidthDiff;
+                }
+                return [x, x1];
+            };
             this._getBarXStart = (datum, scale, useWholeRange) => {
                 if (this._shouldDoPreCalculate()) {
                     this._calculateStackRectPosition(false);
@@ -72759,6 +72784,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
                 return valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
             };
+            this._getLinearBarXRange = (datum, scale, useWholeRange) => {
+                const x = valueInScaleRange(this._dataToPosX(datum), scale, useWholeRange);
+                const x1 = valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
+                return this._getLinearBarRange(x, x1);
+            };
             this._getBarYStart = (datum, scale) => {
                 if (this._shouldDoPreCalculate()) {
                     this._calculateStackRectPosition(true);
@@ -72776,6 +72806,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
                 return valueInScaleRange(this._dataToPosY1(datum), scale);
             };
+            this._getLinearBarYRange = (datum, scale, useWholeRange) => {
+                const y = valueInScaleRange(this._dataToPosY(datum), scale, useWholeRange);
+                const y1 = valueInScaleRange(this._dataToPosY1(datum), scale, useWholeRange);
+                return this._getLinearBarRange(y, y1);
+            };
             this._getBarBackgroundXStart = (scale) => {
                 const range = scale.range();
                 const min = Math.min(range[0], range[range.length - 1]);
@@ -73143,8 +73178,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (this.direction === "horizontal") {
                 const yChannels = isValid$1(this._fieldY2)
                     ? {
-                        y: (datum) => valueInScaleRange(this._dataToPosY(datum), yScale, true),
-                        y1: (datum) => valueInScaleRange(this._dataToPosY1(datum), yScale, true)
+                        y: (datum) => this._getLinearBarYRange(datum, yScale, true)[0],
+                        y1: (datum) => this._getLinearBarYRange(datum, yScale, true)[1]
                     }
                     : {
                         y: (datum) => valueInScaleRange(this._dataToPosY(datum) - this._getBarWidth(this._yAxisHelper) / 2, yScale, true),
@@ -73156,8 +73191,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             else {
                 const xChannels = isValid$1(this._fieldX2)
                     ? {
-                        x: (datum) => valueInScaleRange(this._dataToPosX(datum), xScale, true),
-                        x1: (datum) => valueInScaleRange(this._dataToPosX1(datum), xScale, true)
+                        x: (datum) => this._getLinearBarXRange(datum, xScale, true)[0],
+                        x1: (datum) => this._getLinearBarXRange(datum, xScale, true)[1]
                     }
                     : {
                         x: (datum) => valueInScaleRange(this._dataToPosX(datum) - this._getBarWidth(this._xAxisHelper) / 2, xScale, true),
@@ -91661,7 +91696,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             spec.axes.forEach((axis) => (axis.type = 'linear'));
         }
         _getDefaultSeriesSpec(spec) {
-            return super._getDefaultSeriesSpec(spec, ['x2Field', 'y2Field', 'barMinHeight', 'barBackground']);
+            return super._getDefaultSeriesSpec(spec, ['x2Field', 'y2Field', 'barMinHeight', 'barBackground', 'barGap']);
         }
     }
 
@@ -94182,11 +94217,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return false;
         }
         _initTheme(spec, chartSpec) {
-            var _a;
+            var _a, _b, _c;
             const { spec: newSpec, theme } = super._initTheme(spec, chartSpec);
             newSpec.style = mergeSpec({}, this._theme, newSpec.style);
             newSpec.offset = mergeSpec({}, theme.offset, spec.offset);
             newSpec.transitionDuration = (_a = spec.transitionDuration) !== null && _a !== void 0 ? _a : theme.transitionDuration;
+            newSpec.trigger = (_b = spec.trigger) !== null && _b !== void 0 ? _b : theme.trigger;
+            newSpec.triggerOff = (_c = spec.triggerOff) !== null && _c !== void 0 ? _c : theme.triggerOff;
             return { spec: newSpec, theme };
         }
         _transformSpecAfterMergingTheme(spec, chartSpec, chartSpecInfo) {
@@ -96035,10 +96072,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         return data.filter(filter);
     };
     const dataFilterComputeDomain = (data, op) => {
-        const { stateFields, valueFields, dataCollection } = op.input;
+        const { stateFields, valueFields, dataCollection, isCategoryState } = op.input;
         const { stateField, valueField } = op.output;
         const resultObj = {};
         const resultData = [];
+        const stateValues = [];
+        let hasLockDomain = false;
         dataCollection.forEach((dv, i) => {
             var _a;
             if (isNil$1(stateFields[i])) {
@@ -96046,14 +96085,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             const stateFieldInfo = (_a = dv.getFields()) === null || _a === void 0 ? void 0 : _a[stateFields[i]];
             if (stateFieldInfo && stateFieldInfo.lockStatisticsByDomain) {
+                hasLockDomain = true;
                 stateFieldInfo.domain.forEach((d) => {
-                    resultObj[d] = 0;
+                    if (isNil$1(resultObj[d])) {
+                        stateValues.push(d);
+                        resultObj[d] = 0;
+                    }
                 });
             }
             dv.latestData.forEach((d) => {
                 array(stateFields[i]).forEach(state => {
                     if (!isNil$1(d[state])) {
                         if (isNil$1(resultObj[d[state]])) {
+                            stateValues.push(d[state]);
                             resultObj[d[state]] = 0;
                         }
                         if (!isNil$1(valueFields[i])) {
@@ -96063,10 +96107,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 });
             });
         });
-        Object.keys(resultObj).forEach((d, i) => {
-            const res = { [stateField]: d };
+        const sortedStateValues = hasLockDomain
+            ? stateValues
+            : isCategoryState === false
+                ? stateValues.sort((a, b) => a - b)
+                : Object.keys(resultObj);
+        sortedStateValues.forEach(state => {
+            const res = { [stateField]: state };
             if (valueField) {
-                res[valueField] = resultObj[d];
+                res[valueField] = resultObj[state];
             }
             resultData.push(res);
         });
@@ -96416,6 +96465,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const dataCollection = [];
             const stateFields = [];
             const valueFields = [];
+            let isCategoryState;
             if (this._relatedAxisComponent) {
                 const originalStateFields = {};
                 eachSeries(this._regions, s => {
@@ -96441,8 +96491,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                                 ? xAxisHelper
                                 : yAxisHelper;
                     const valueAxisHelper = stateAxisHelper === xAxisHelper ? yAxisHelper : xAxisHelper;
-                    const isValidateValueAxis = isContinuous(valueAxisHelper.getScale(0).type);
-                    const isValidateStateAxis = isContinuous(stateAxisHelper.getScale(0).type);
                     dataCollection.push(s.getRawData());
                     const seriesSpec = s.getSpec();
                     const xField = s.coordinate === 'cartesian'
@@ -96453,7 +96501,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         : array((_b = seriesSpec.radiusField) !== null && _b !== void 0 ? _b : seriesSpec.valueField);
                     originalStateFields[s.id] =
                         s.type === 'link' ? ['from_xField'] : stateAxisHelper === xAxisHelper ? xField : yField;
-                    if (isValidateStateAxis) {
+                    if (isContinuous(stateAxisHelper.getScale(0).type)) {
+                        isCategoryState = false;
                         stateFields.push(originalStateFields[s.id]);
                     }
                     else {
@@ -96461,7 +96510,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     }
                     if (this._valueField) {
                         const valueField = s.type === 'link' ? ['from_yField'] : valueAxisHelper === xAxisHelper ? xField : yField;
-                        if (isValidateValueAxis) {
+                        if (isContinuous(valueAxisHelper.getScale(0).type)) {
                             valueFields.push(...valueField);
                         }
                     }
@@ -96493,7 +96542,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     input: {
                         dataCollection: dataCollection,
                         stateFields,
-                        valueFields
+                        valueFields,
+                        isCategoryState
                     },
                     output: {
                         stateField: this._stateField,
@@ -103074,12 +103124,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const rowStyle = this._domStyle.row;
             const chilren = [...this._rootDom.children];
             let titleDom = chilren.find(child => child.className.includes(TOOLTIP_TITLE_CLASS_NAME));
+            let contentDom = chilren.find(child => child.className.includes(TOOLTIP_CONTENT_BOX_CLASS_NAME));
             if (!titleDom && title.visible !== false) {
                 titleDom = document.createElement('h2');
                 const span = document.createElement('span');
                 titleDom.appendChild(span);
                 titleDom.classList.add(TOOLTIP_TITLE_CLASS_NAME);
-                this._rootDom.appendChild(titleDom);
+                if (this._rootDom.firstChild) {
+                    this._rootDom.insertBefore(titleDom, this._rootDom.firstChild);
+                }
+                else {
+                    this._rootDom.appendChild(titleDom);
+                }
             }
             if (titleDom && title.visible !== false) {
                 setStyleToDom(titleDom, Object.assign(Object.assign(Object.assign({}, this._domStyle.title), (hasContent ? rowStyle : { marginBottom: '0px' })), { marginTop: '0px' }));
@@ -103088,7 +103144,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             else if (titleDom && title.visible === false) {
                 titleDom.parentNode.removeChild(titleDom);
             }
-            let contentDom = chilren.find(child => child.className.includes(TOOLTIP_CONTENT_BOX_CLASS_NAME));
             const columns = ['shape', 'key', 'value'];
             if (!contentDom && hasContent) {
                 contentDom = document.createElement('div');