@visactor/vseed 0.1.7 → 0.1.8

package/dist/index.cjs

@@ -56,7 +56,7 @@ __webpack_require__.d(__webpack_exports__, {
     zYLinearAxis: ()=>zYLinearAxis,
     zMarkStyle: ()=>zMarkStyle,
     registerFunnel: ()=>registerFunnel,
-    Separator: ()=>Separator,
+    Separator: ()=>"-",
     columnAdvancedPipeline: ()=>columnAdvancedPipeline,
     zLabel: ()=>zLabel,
     registerColumn: ()=>registerColumn,
@@ -85,12 +85,13 @@ __webpack_require__.d(__webpack_exports__, {
     FoldMeasureId: ()=>FoldMeasureId,
     zColumnParallelConfig: ()=>zColumnParallelConfig,
     donutSpecPipeline: ()=>donutSpecPipeline,
+    FoldXMeasureId: ()=>FoldXMeasureId,
     registerAreaPercent: ()=>registerAreaPercent,
-    zHeatmap: ()=>zHeatmap,
     zBarPercent: ()=>zBarPercent,
+    zHeatmap: ()=>zHeatmap,
     zScatterMeasure: ()=>zScatterMeasure,
-    zTheme: ()=>zTheme,
     zDatum: ()=>zDatum,
+    zTheme: ()=>zTheme,
     barAdvancedPipeline: ()=>barAdvancedPipeline,
     zCustomThemeConfig: ()=>zCustomThemeConfig,
     registerColumnPercent: ()=>registerColumnPercent,
@@ -180,6 +181,7 @@ __webpack_require__.d(__webpack_exports__, {
     zTableConfig: ()=>zTableConfig,
     zXBandAxis: ()=>zXBandAxis,
     zColumnPercentConfig: ()=>zColumnPercentConfig,
+    FoldYMeasureId: ()=>FoldYMeasureId,
     findMeasureById: ()=>findMeasureById,
     zVSeed: ()=>zVSeed,
     AngleEncoding: ()=>AngleEncoding,
@@ -923,7 +925,6 @@ const registerTable = ()=>{
     Builder._specPipelineMap.table = tableSpecPipeline;
 };
 const ORIGINAL_DATA = '__OriginalData__';
-const Separator = '-';
 const FoldMeasureName = '__MeaName__';
 const FoldMeasureId = '__MeaId__';
 const FoldMeasureValue = '__MeaValue__';
@@ -932,6 +933,8 @@ const FoldPrimaryMeasureValue = '__MeaPrimaryValue__';
 const FoldSecondaryMeasureValue = '__MeaSecondaryValue__';
 const FoldXMeasureValue = '__MeaXValue__';
 const FoldYMeasureValue = '__MeaYValue__';
+const FoldXMeasureId = '__MeaXId__';
+const FoldYMeasureId = '__MeaYId__';
 const XEncoding = '__Dim_X__';
 const YEncoding = '__Dim_Y__';
 const AngleEncoding = '__Dim_Angle__';
@@ -1433,6 +1436,25 @@ const defaultMeasureName_defaultMeasureName = (advancedVSeed)=>{
     if (!result.dimensions?.some((dim)=>dim.id === MeasureName)) result.dimensions?.push(MeaName);
     return result;
 };
+const encodingAdapter = (noEncodingPipeline, hasEncodingPipeline)=>(advancedVSeed, context)=>{
+        const { dimensions = [], measures = [] } = advancedVSeed;
+        const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+        const hasMeasureEncoding = measures.some((item)=>item.encoding);
+        const hasEncoding = hasDimensionEncoding || hasMeasureEncoding;
+        if (hasEncoding) return execPipeline(hasEncodingPipeline, context, advancedVSeed);
+        return execPipeline(noEncodingPipeline, context, advancedVSeed);
+    };
+const defaultEncodingForLine = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
+    const encoding = {};
+    line_generateDefaultDimensionEncoding(dimensions, encoding);
+    line_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
 const encodingForLine = (advancedVSeed)=>{
     const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
     const measures = findAllMeasures(vseedMeasures);
@@ -1452,7 +1474,7 @@ const line_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = (0, external_remeda_namespaceObject.unique)(dimensions.map((d)=>d.id));
     encoding.x = uniqueDimIds.slice(0, 1);
     encoding.color = uniqueDimIds.slice(1);
-    encoding.tooltip = uniqueDimIds;
+    encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
     encoding.detail = [];
     encoding.label = [];
     encoding.row = [];
@@ -1460,27 +1482,32 @@ const line_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
 };
 const line_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const line_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(measures.map((item)=>item.id));
     encoding.y = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const line_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
     encoding.y = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
+    const tooltip = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const isMeasureTreeWithChildren = (vseed)=>{
     const { measures } = vseed;
@@ -1492,6 +1519,37 @@ const isMeasureTreeWithParentId = (vseed)=>{
     if (!measures) return false;
     return measures.some((measure)=>'parentId' in measure);
 };
+const normalizeMeasureTree = (measures)=>{
+    const createEmptyMeasureGroup = ()=>({
+            id: 'group',
+            alias: '',
+            children: []
+        });
+    let currentGroup = createEmptyMeasureGroup();
+    const measureGroups = [];
+    for (const measure of measures)if ('children' in measure) {
+        if (currentGroup.children?.length) {
+            currentGroup.id = [
+                currentGroup.id,
+                ...currentGroup.children.map((item)=>item.id)
+            ].join('-');
+            currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
+            measureGroups.push(currentGroup);
+            currentGroup = createEmptyMeasureGroup();
+        }
+        measureGroups.push(measure);
+    } else currentGroup.children?.push(measure);
+    if (currentGroup.children?.length) {
+        currentGroup.id = [
+            currentGroup.id,
+            ...currentGroup.children.map((item)=>item.id)
+        ].join('-');
+        currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
+        measureGroups.push(currentGroup);
+        currentGroup = createEmptyMeasureGroup();
+    }
+    return measureGroups;
+};
 const measureDepth = (measures = [])=>{
     if (!measures) return 0;
     let depth = 1;
@@ -1543,7 +1601,7 @@ const isPivotChart = (vseed)=>{
 const buildMeasures = (advancedVSeed, context)=>{
     const { vseed } = context;
     if (isMeasureTreeWithChildren(vseed)) {
-        advancedVSeed.measures = vseed.measures;
+        advancedVSeed.measures = normalizeMeasureTree(vseed.measures);
         return advancedVSeed;
     }
     if (isMeasureTreeWithParentId(vseed)) {
@@ -1645,7 +1703,7 @@ const dataReshapeByEncoding = (dataset, dimensions, measures, encoding, options)
     });
     const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dimensions, encoding, {
         foldMeasureId,
-        separator: Separator,
+        separator: "-",
         colorItemAsId
     });
     return {
@@ -1934,8 +1992,13 @@ const lineAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForLine,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForLine,
+        buildMeasures
+    ], [
+        encodingForLine,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -2210,10 +2273,6 @@ const xBand = (spec, context)=>{
     ];
     return result;
 };
-const ANNOTATION_Z_INDEX = 1000;
-const LINEAR_AXIS_INNER_OFFSET_TOP = 7;
-const DUAL_AXIS_CHART_COLUMN_Z_INDEX = 1000;
-const DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX = 1001;
 const yLinear = (spec, context)=>{
     const result = {
         ...spec
@@ -2287,7 +2346,7 @@ const yLinear = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            top: 7
         }
     };
     result.axes = [
@@ -2843,78 +2902,133 @@ const tooltip_tooltip = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { measures, datasetReshapeInfo, chartType, locale, dimensions } = advancedVSeed;
+    const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
     const baseConfig = advancedVSeed.config[chartType];
     const { tooltip = {
         enable: true
     } } = baseConfig;
     const { enable } = tooltip;
-    const { measureId, measureValue, measureName } = datasetReshapeInfo[0].foldInfo;
-    const { encodingColor: colorName } = datasetReshapeInfo[0].unfoldInfo;
+    const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
     result.tooltip = {
         visible: enable,
         mark: {
             title: {
-                visible: true
+                visible: false
             },
-            content: [
-                ...dimensions.map((item)=>({
-                        visible: true,
-                        hasShape: true,
-                        shapeType: 'rectRound',
-                        key: (datum)=>{
-                            if (item.alias || item.id) return item.alias || item.id;
-                            return datum && datum[item.id];
-                        },
-                        value: (datum)=>datum && datum[item.id]
-                    })),
-                {
-                    visible: true,
-                    hasShape: true,
-                    key: (datum)=>datum && datum[measureName || colorName] || '',
-                    value: (datum)=>{
-                        if (!datum) return '';
-                        const value = datum[measureValue];
-                        const id = datum[measureId];
-                        const measure = findMeasureById(measures, id);
-                        if (!measure) return String(value);
-                        const { format = {}, autoFormat = true } = measure;
-                        if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
-                            const formatter = createFormatter(format);
-                            return formatter(value);
-                        }
-                        if (autoFormat) return autoFormatter(value, locale);
-                        return String(value);
-                    }
-                }
-            ]
+            content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfo, unfoldInfo)
         },
         dimension: {
-            content: [
-                {
-                    visible: true,
-                    key: (datum)=>datum && datum[colorName] || '',
-                    value: (datum)=>{
-                        if (!datum) return '';
-                        const value = datum[measureValue];
-                        const id = datum[measureId];
-                        const measure = findMeasureById(measures, id);
-                        if (!measure) return String(value);
-                        const { format = {}, autoFormat = true } = measure;
-                        if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
-                            const formatter = createFormatter(format);
-                            return formatter(value);
-                        }
-                        if (autoFormat) return autoFormatter(value, locale);
-                        return String(value);
-                    },
-                    shapeType: 'rectRound'
-                }
-            ]
+            title: {
+                visible: true
+            },
+            content: createDimensionContent(measures, foldInfo, unfoldInfo, locale)
         }
     };
     return result;
 };
+const createDimensionContent = (measures, foldInfo, unfoldInfo, locale)=>{
+    const { measureId, measureValue } = foldInfo;
+    const { encodingColor } = unfoldInfo;
+    return [
+        {
+            visible: true,
+            shapeType: 'rectRound',
+            hasShape: true,
+            key: (v)=>{
+                const datum = v;
+                return datum && datum[encodingColor] || '';
+            },
+            value: (v)=>{
+                const datum = v;
+                if (!datum) return '';
+                const value = datum[measureValue];
+                const id = datum[measureId];
+                const measure = findMeasureById(measures, id);
+                if (!measure) return String(value);
+                const { format = {}, autoFormat = true } = measure;
+                if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
+                    const formatter = createFormatter(format);
+                    return formatter(value);
+                }
+                if (autoFormat) return autoFormatter(value, locale);
+                return String(value);
+            }
+        }
+    ];
+};
+const createMarkContent = (tooltip, dimensions, measures, locale, foldInfo, unfoldInfo)=>{
+    const dims = dimensions.filter((item)=>tooltip.includes(item.id));
+    const meas = measures.filter((item)=>tooltip.includes(item.id));
+    const dimContent = dims.map((item)=>({
+            visible: true,
+            hasShape: true,
+            shapeType: 'rectRound',
+            key: (v)=>{
+                const datum = v;
+                if (item.alias || item.id) return item.alias || item.id;
+                return datum && datum[item.id];
+            },
+            value: (v)=>{
+                const datum = v;
+                return datum && datum[item.id];
+            }
+        }));
+    const meaContent = meas.map((item)=>({
+            visible: true,
+            hasShape: true,
+            shapeType: 'rectRound',
+            key: item.alias || item.id,
+            value: (v)=>{
+                const datum = v;
+                if (!datum) return '';
+                const id = item.id;
+                if (!datum || !datum[ORIGINAL_DATA] || !datum[ORIGINAL_DATA]) return '';
+                const originalData = datum[ORIGINAL_DATA];
+                const value = originalData[id];
+                const measure = findMeasureById(measures, id);
+                if (!measure) return String(value);
+                const { format = {}, autoFormat = true } = measure;
+                if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
+                    const formatter = createFormatter(format);
+                    return formatter(value);
+                }
+                if (autoFormat) return autoFormatter(value, locale);
+                return String(value);
+            }
+        }));
+    const defaultContent = {
+        visible: true,
+        hasShape: true,
+        shapeType: 'rectRound',
+        key: (v)=>{
+            const { measureName } = foldInfo;
+            const { encodingColor: colorName } = unfoldInfo;
+            const datum = v;
+            return datum && datum[measureName || colorName] || '';
+        },
+        value: (v)=>{
+            const { measureId, measureValue } = foldInfo;
+            const datum = v;
+            if (!datum) return '';
+            const value = datum[measureValue];
+            const id = datum[measureId];
+            const measure = findMeasureById(measures, id);
+            if (!measure) return String(value);
+            const { format = {}, autoFormat = true } = measure;
+            if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
+                const formatter = createFormatter(format);
+                return formatter(value);
+            }
+            if (autoFormat) return autoFormatter(value, locale);
+            return String(value);
+        }
+    };
+    return [
+        ...dimContent,
+        defaultContent,
+        ...meaContent
+    ];
+};
 const isSubset = (sub, obj)=>Object.entries(sub).every(([key, value])=>{
         if ('string' == typeof value) return obj[key] === value;
         if ('number' == typeof value) return obj[key] === value;
@@ -2933,7 +3047,7 @@ const annotationPoint_annotationPoint = (spec, context)=>{
         const dataset = advancedVSeed.dataset.flat();
         const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
         return selectedData.map((datum)=>({
-                zIndex: ANNOTATION_Z_INDEX,
+                zIndex: 1000,
                 regionRelative: true,
                 position: (data, context)=>{
                     const targetDatum = data.find((item)=>isSubset(datum, item));
@@ -3006,7 +3120,7 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
         const dataset = advancedVSeed.dataset.flat();
         const generateOneMarkLine = (x)=>({
                 x: x,
-                zIndex: ANNOTATION_Z_INDEX,
+                zIndex: 1000,
                 line: {
                     style: {
                         visible: lineVisible,
@@ -3104,7 +3218,7 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
         const dataset = advancedVSeed.dataset.flat();
         const generateOneMarkLine = (y)=>({
                 y,
-                zIndex: ANNOTATION_Z_INDEX,
+                zIndex: 1000,
                 line: {
                     style: {
                         visible: lineVisible,
@@ -3205,7 +3319,7 @@ const annotationArea_annotationArea = (spec, context)=>{
         const labelPosition = positionMap[textPosition || 'top'];
         const isBottom = labelPosition.toLocaleLowerCase().includes('bottom');
         return {
-            zIndex: ANNOTATION_Z_INDEX,
+            zIndex: 1000,
             regionRelative: true,
             positions: (data, context)=>{
                 const positionData = data.filter((item)=>selectedData.some((datum)=>isSubset(datum, item)));
@@ -3821,6 +3935,17 @@ const registerLine = ()=>{
     Builder._advancedPipelineMap.line = lineAdvancedPipeline;
     Builder._specPipelineMap.line = lineSpecPipeline;
 };
+const defaultEncodingForColumn = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
+    const encoding = {};
+    column_generateDefaultDimensionEncoding(dimensions, encoding);
+    column_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
 const encodingForColumn = (advancedVSeed)=>{
     const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
     const measures = findAllMeasures(vseedMeasures);
@@ -3842,43 +3967,52 @@ const column_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = uniqueDimIds.slice(0, 1);
     encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
     encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-    encoding.tooltip = uniqueDimIds;
+    encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
     encoding.label = [];
     encoding.row = [];
     encoding.column = [];
 };
 const column_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const column_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(measures.map((item)=>item.id));
     encoding.y = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const column_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
     encoding.y = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
-    return encoding;
+    const tooltip = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const columnAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForColumn,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForColumn,
+        buildMeasures
+    ], [
+        encodingForColumn,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4075,7 +4209,7 @@ const annotationAreaBand = (spec, context)=>{
         const dataset = advancedVSeed.dataset.flat();
         const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
         return {
-            zIndex: ANNOTATION_Z_INDEX,
+            zIndex: 1000,
             regionRelative: true,
             positions: (data, context)=>{
                 const positionData = data.filter((item)=>selectedData.some((datum)=>isSubset(datum, item)));
@@ -4241,8 +4375,13 @@ const columnParallelAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForColumn,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForColumn,
+        buildMeasures
+    ], [
+        encodingForColumn,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4340,8 +4479,13 @@ const columnPercentAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForColumn,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForColumn,
+        buildMeasures
+    ], [
+        encodingForColumn,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4418,6 +4562,17 @@ const registerColumnPercent = ()=>{
     Builder._advancedPipelineMap.columnPercent = columnPercentAdvancedPipeline;
     Builder._specPipelineMap.columnPercent = columnPercentSpecPipeline;
 };
+const defaultEncodingForBar = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
+    const encoding = {};
+    bar_generateDefaultDimensionEncoding(dimensions, encoding);
+    bar_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
 const encodingForBar = (advancedVSeed)=>{
     const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
     const measures = findAllMeasures(vseedMeasures);
@@ -4439,35 +4594,39 @@ const bar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.y = uniqueDimIds.slice(0, 1);
     encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
     encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-    encoding.tooltip = uniqueDimIds;
+    encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
     encoding.label = [];
     encoding.row = [];
     encoding.column = [];
 };
 const bar_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.y = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.y.length) encoding.y = [
         dimensions[0].id
     ];
+    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const bar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(measures.map((item)=>item.id));
     encoding.x = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const bar_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
     encoding.x = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
-    return encoding;
+    const tooltip = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const sortYBandAxis = (advancedVSeed, context)=>{
     const result = {
@@ -4490,8 +4649,13 @@ const barAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForBar,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForBar,
+        buildMeasures
+    ], [
+        encodingForBar,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4642,7 +4806,7 @@ const xLinear = (spec, context)=>{
             }
         },
         innerOffset: {
-            right: LINEAR_AXIS_INNER_OFFSET_TOP
+            right: 7
         }
     };
     result.axes = [
@@ -4845,8 +5009,13 @@ const barParallelAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForBar,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForBar,
+        buildMeasures
+    ], [
+        encodingForBar,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4943,8 +5112,13 @@ const barPercentAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForBar,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForBar,
+        buildMeasures
+    ], [
+        encodingForBar,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -5016,8 +5190,13 @@ const areaAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForLine,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForLine,
+        buildMeasures
+    ], [
+        encodingForLine,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -5176,8 +5355,13 @@ const areaPercentAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForLine,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForLine,
+        buildMeasures
+    ], [
+        encodingForLine,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -5251,6 +5435,17 @@ const registerAreaPercent = ()=>{
     Builder._advancedPipelineMap.areaPercent = areaPercentAdvancedPipeline;
     Builder._specPipelineMap.areaPercent = areaPercentSpecPipeline;
 };
+const defaultEncodingForScatter = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
+    const encoding = {};
+    scatter_generateDefaultDimensionEncoding(dimensions, encoding);
+    scatter_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
 const encodingForScatter = (advancedVSeed)=>{
     const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
     const measures = findAllMeasures(vseedMeasures);
@@ -5271,23 +5466,24 @@ const scatter_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = (0, external_remeda_namespaceObject.unique)(dimensionsWithoutMeasureName.map((d)=>d.id));
     encoding.color = uniqueDimIds.slice(0);
     encoding.detail = uniqueDimIds.slice(0);
-    encoding.tooltip = uniqueDimIds;
+    encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
     encoding.label = [];
     encoding.row = [];
     encoding.column = [];
 };
 const scatter_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const scatter_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(measures.map((item)=>item.id));
     encoding.y = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const scatter_generateMeasureEncoding = (measures, encoding)=>{
@@ -5297,6 +5493,11 @@ const scatter_generateMeasureEncoding = (measures, encoding)=>{
     if (color.length > 0) encoding.color = [
         color[0]
     ];
+    const tooltip = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const buildMeasuresForScatter = (advancedVSeed, context)=>{
     const { vseed } = context;
@@ -5327,6 +5528,7 @@ const basicMeasuresToScatterMeasures = (basicMeasures)=>{
         else if (0 !== index) yMeasures.push(item);
         else xMeasures.push(item);
     }
+    if (0 === yMeasures.length && xMeasures.length > 0) yMeasures.push(xMeasures[0]);
     return [
         {
             id: 'scatterMeasures',
@@ -5415,6 +5617,7 @@ const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
     if (xMeasures && xMeasures.children) {
         const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, (0, external_remeda_namespaceObject.uniqueBy)(dimensions, (d)=>d.id), (0, external_remeda_namespaceObject.uniqueBy)(xMeasures.children, (d)=>d.id), encoding, {
             foldMeasureValue: FoldXMeasureValue,
+            foldMeasureId: FoldXMeasureId,
             colorItemAsId: true,
             colorMeasureId: getColorMeasureId(advancedVSeed)
         });
@@ -5425,6 +5628,7 @@ const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
     if (yMeasures && yMeasures.children) {
         const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(datasets[0], (0, external_remeda_namespaceObject.uniqueBy)(dimensions, (d)=>d.id), (0, external_remeda_namespaceObject.uniqueBy)(yMeasures.children, (d)=>d.id), encoding, {
             foldMeasureValue: FoldYMeasureValue,
+            foldMeasureId: FoldYMeasureId,
             colorItemAsId: true,
             colorMeasureId: getColorMeasureId(advancedVSeed)
         });
@@ -5530,8 +5734,13 @@ const scatterAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForScatter,
-    buildMeasuresForScatter,
+    encodingAdapter([
+        defaultEncodingForScatter,
+        buildMeasuresForScatter
+    ], [
+        encodingForScatter,
+        buildMeasuresForScatter
+    ]),
     pivotAdapter([
         reshapeWithScatterEncoding
     ], [
@@ -5577,6 +5786,105 @@ const datasetScatter = (spec, context)=>{
         }
     };
 };
+const tooltipScatter = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+    const baseConfig = advancedVSeed.config[chartType];
+    const { tooltip = {
+        enable: true
+    } } = baseConfig;
+    const { enable } = tooltip;
+    const { foldInfoList } = datasetReshapeInfo[0];
+    result.tooltip = {
+        visible: enable,
+        mark: {
+            title: {
+                visible: false
+            },
+            content: tooltipScatter_createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList)
+        },
+        dimension: {
+            visible: false
+        }
+    };
+    return result;
+};
+const tooltipScatter_createMarkContent = (tooltip, dimensions, measures, locale, foldInfoList)=>{
+    const dims = dimensions.filter((item)=>tooltip.includes(item.id));
+    const meas = measures.filter((item)=>tooltip.includes(item.id));
+    const dimContent = dims.map((item)=>({
+            visible: true,
+            hasShape: true,
+            shapeType: 'rectRound',
+            key: (v)=>{
+                const datum = v;
+                if (item.alias || item.id) return item.alias || item.id;
+                return datum && datum[item.id];
+            },
+            value: (v)=>{
+                const datum = v;
+                return datum && datum[item.id];
+            }
+        }));
+    const meaContent = meas.map((item)=>({
+            visible: true,
+            hasShape: true,
+            shapeType: 'rectRound',
+            key: item.alias || item.id,
+            value: (v)=>{
+                const datum = v;
+                if (!datum) return '';
+                const id = item.id;
+                if (!datum || !datum[ORIGINAL_DATA] || !datum[ORIGINAL_DATA]) return '';
+                const originalData = datum[ORIGINAL_DATA];
+                const value = originalData[id];
+                const measure = findMeasureById(measures, id);
+                if (!measure) return String(value);
+                const { format = {}, autoFormat = true } = measure;
+                if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
+                    const formatter = createFormatter(format);
+                    return formatter(value);
+                }
+                if (autoFormat) return autoFormatter(value, locale);
+                return String(value);
+            }
+        }));
+    const foldMeaContent = foldInfoList.map((foldInfo)=>({
+            visible: true,
+            hasShape: true,
+            shapeType: 'rectRound',
+            key: (v)=>{
+                const { measureId, foldMap } = foldInfo;
+                const datum = v;
+                const id = datum[measureId];
+                return foldMap[id] || id;
+            },
+            value: (v)=>{
+                const { measureId, measureValue } = foldInfo;
+                const datum = v;
+                if (!datum) return '';
+                const value = datum[measureValue];
+                const id = datum[measureId];
+                const measure = findMeasureById(measures, id);
+                if (!measure) return String(value);
+                const { format = {}, autoFormat = true } = measure;
+                if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
+                    const formatter = createFormatter(format);
+                    return formatter(value);
+                }
+                if (autoFormat) return autoFormatter(value, locale);
+                return String(value);
+            }
+        }));
+    return [
+        ...dimContent,
+        ...foldMeaContent,
+        ...meaContent
+    ];
+};
 const horizontalCrosshairLine = (spec, context)=>{
     const result = {
         ...spec
@@ -5630,7 +5938,7 @@ const scatter = [
     xLinear,
     yLinear,
     label_label,
-    tooltip_tooltip,
+    tooltipScatter,
     colorAdapter(discreteLegend, colorLegend),
     verticalCrosshairLine,
     horizontalCrosshairLine,
@@ -5655,7 +5963,7 @@ const pivotScatter = [
         xLinear,
         yLinear,
         label_label,
-        tooltip_tooltip,
+        tooltipScatter,
         verticalCrosshairLine,
         horizontalCrosshairLine,
         colorPointStyleFill(pointStyle_pointStyle),
@@ -5676,6 +5984,17 @@ const registerScatter = ()=>{
     Builder._advancedPipelineMap.scatter = scatterAdvancedPipeline;
     Builder._specPipelineMap.scatter = scatterSpecPipeline;
 };
+const defaultEncodingForDualAxis = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
+    const encoding = {};
+    dualAxis_generateDefaultDimensionEncoding(dimensions, encoding);
+    dualAxis_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
 const encodingForDualAxis = (advancedVSeed)=>{
     const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
     const measures = findAllMeasures(vseedMeasures);
@@ -5697,35 +6016,39 @@ const dualAxis_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = uniqueDimIds.slice(0, 1);
     encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
     encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-    encoding.tooltip = uniqueDimIds;
+    encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
     encoding.label = [];
     encoding.row = [];
     encoding.column = [];
 };
 const dualAxis_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const dualAxis_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(measures.map((item)=>item.id));
     encoding.y = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const dualAxis_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
     encoding.y = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
-    return encoding;
+    const tooltip = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
     const { vseed } = context;
@@ -5982,8 +6305,13 @@ const dualAxisAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForDualAxis,
-    buildMeasuresForDualAxis,
+    encodingAdapter([
+        defaultEncodingForDualAxis,
+        buildMeasuresForDualAxis
+    ], [
+        encodingForDualAxis,
+        buildMeasuresForDualAxis
+    ]),
     pivotAdapter([
         reshapeWithDualEncoding
     ], [
@@ -6075,7 +6403,7 @@ const initDualAxisSecondary = (spec, context)=>{
 const dualChartTypePrimary = (spec, context)=>{
     const result = {
         ...spec,
-        zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX
+        zIndex: 1001
     };
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
@@ -6095,7 +6423,7 @@ const dualChartTypePrimary = (spec, context)=>{
             break;
         case 'column':
             result.type = 'bar';
-            result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+            result.zIndex = 1000;
             break;
         case 'columnParallel':
             {
@@ -6106,7 +6434,7 @@ const dualChartTypePrimary = (spec, context)=>{
                     datasetReshapeInfo[0].unfoldInfo.encodingDetail
                 ];
                 columnSpec.type = 'bar';
-                result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                result.zIndex = 1000;
                 break;
             }
         case 'columnPercent':
@@ -6131,7 +6459,7 @@ const dualChartTypePrimary = (spec, context)=>{
 const dualChartTypeSecondary = (spec, context)=>{
     const result = {
         ...spec,
-        zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX
+        zIndex: 1001
     };
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
@@ -6151,7 +6479,7 @@ const dualChartTypeSecondary = (spec, context)=>{
             break;
         case 'column':
             result.type = 'bar';
-            result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+            result.zIndex = 1000;
             break;
         case 'columnParallel':
             {
@@ -6162,7 +6490,7 @@ const dualChartTypeSecondary = (spec, context)=>{
                     datasetReshapeInfo[0].unfoldInfo.encodingDetail
                 ];
                 columnSpec.type = 'bar';
-                result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                result.zIndex = 1000;
                 break;
             }
         case 'columnPercent':
@@ -6340,7 +6668,7 @@ const tooltipPrimary = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { measures, datasetReshapeInfo, chartType, locale, dimensions } = advancedVSeed;
+    const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
     const baseConfig = advancedVSeed.config[chartType];
     const { tooltip = {
         enable: true
@@ -6348,68 +6676,19 @@ const tooltipPrimary = (spec, context)=>{
     const { enable } = tooltip;
     const foldInfoList = datasetReshapeInfo[0].foldInfoList;
     const unfoldInfo = datasetReshapeInfo[0].unfoldInfo;
-    const { measureId, measureValue, measureName } = foldInfoList[0];
-    const { encodingColor: colorName } = unfoldInfo;
     result.tooltip = {
         visible: enable,
         mark: {
             title: {
-                visible: true
+                visible: false
             },
-            content: [
-                ...dimensions.map((item)=>({
-                        visible: true,
-                        hasShape: true,
-                        shapeType: 'rectRound',
-                        key: (datum)=>{
-                            if (item.alias || item.id) return item.alias || item.id;
-                            return datum && datum[item.id];
-                        },
-                        value: (datum)=>datum && datum[item.id]
-                    })),
-                {
-                    visible: true,
-                    hasShape: true,
-                    key: (datum)=>datum && datum[measureName || colorName] || '',
-                    value: (datum)=>{
-                        if (!datum) return '';
-                        const value = datum[measureValue];
-                        const id = datum[measureId];
-                        const measure = findMeasureById(measures, id);
-                        if (!measure) return String(value);
-                        const { format = {}, autoFormat = true } = measure;
-                        if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
-                            const formatter = createFormatter(format);
-                            return formatter(value);
-                        }
-                        if (autoFormat) return autoFormatter(value, locale);
-                        return String(value);
-                    }
-                }
-            ]
+            content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList[0], unfoldInfo)
         },
         dimension: {
-            content: [
-                {
-                    visible: true,
-                    key: (datum)=>datum && datum[colorName] || '',
-                    value: (datum)=>{
-                        if (!datum) return '';
-                        const value = datum[measureValue];
-                        const id = datum[measureId];
-                        const measure = findMeasureById(measures, id);
-                        if (!measure) return String(value);
-                        const { format = {}, autoFormat = true } = measure;
-                        if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
-                            const formatter = createFormatter(format);
-                            return formatter(value);
-                        }
-                        if (autoFormat) return autoFormatter(value, locale);
-                        return String(value);
-                    },
-                    shapeType: 'rectRound'
-                }
-            ]
+            title: {
+                visible: true
+            },
+            content: createDimensionContent(measures, foldInfoList[0], unfoldInfo, locale)
         }
     };
     return result;
@@ -6419,7 +6698,7 @@ const tooltipSecondary = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { measures, datasetReshapeInfo, chartType, locale, dimensions } = advancedVSeed;
+    const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
     const baseConfig = advancedVSeed.config[chartType];
     const { tooltip = {
         enable: true
@@ -6428,68 +6707,19 @@ const tooltipSecondary = (spec, context)=>{
     if ((0, external_remeda_namespaceObject.isNullish)(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
     const foldInfoList = datasetReshapeInfo[0].foldInfoList;
     const unfoldInfo = datasetReshapeInfo[0].unfoldInfo;
-    const { measureId, measureValue, measureName } = foldInfoList[1];
-    const { encodingColorId } = unfoldInfo;
     result.tooltip = {
         visible: enable,
         mark: {
             title: {
-                visible: true
+                visible: false
             },
-            content: [
-                ...dimensions.map((item)=>({
-                        visible: true,
-                        hasShape: true,
-                        shapeType: 'rectRound',
-                        key: (datum)=>{
-                            if (item.alias || item.id) return item.alias || item.id;
-                            return datum && datum[item.id];
-                        },
-                        value: (datum)=>datum && datum[item.id]
-                    })),
-                {
-                    visible: true,
-                    hasShape: true,
-                    key: (datum)=>datum && datum[measureName || encodingColorId] || '',
-                    value: (datum)=>{
-                        if (!datum) return '';
-                        const value = datum[measureValue];
-                        const id = datum[measureId];
-                        const measure = findMeasureById(measures, id);
-                        if (!measure) return String(value);
-                        const { format = {}, autoFormat = true } = measure;
-                        if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
-                            const formatter = createFormatter(format);
-                            return formatter(value);
-                        }
-                        if (autoFormat) return autoFormatter(value, locale);
-                        return String(value);
-                    }
-                }
-            ]
+            content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList[1], unfoldInfo)
         },
         dimension: {
-            content: [
-                {
-                    visible: true,
-                    key: (datum)=>datum && datum[encodingColorId] || '',
-                    value: (datum)=>{
-                        if (!datum) return '';
-                        const value = datum[measureValue];
-                        const id = datum[measureId];
-                        const measure = findMeasureById(measures, id);
-                        if (!measure) return String(value);
-                        const { format = {}, autoFormat = true } = measure;
-                        if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
-                            const formatter = createFormatter(format);
-                            return formatter(value);
-                        }
-                        if (autoFormat) return autoFormatter(value, locale);
-                        return String(value);
-                    },
-                    shapeType: 'rectRound'
-                }
-            ]
+            title: {
+                visible: true
+            },
+            content: createDimensionContent(measures, foldInfoList[1], unfoldInfo, locale)
         }
     };
     return result;
@@ -6506,7 +6736,8 @@ const yLinearPrimary = (spec, context)=>{
     const yAxisConfig = Array.isArray(primaryYAxis) ? primaryYAxis[index] || primaryYAxis[0] : primaryYAxis;
     const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
     const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
-    if (foldInfoList?.[0] && (0, external_remeda_namespaceObject.isEmpty)(foldInfoList[0].foldMap)) return result;
+    if ((0, external_remeda_namespaceObject.isNullish)(foldInfoList?.[0])) return result;
+    const isEmptySecondary = (0, external_remeda_namespaceObject.isEmpty)(foldInfoList?.[0].foldMap);
     const id = `${reshapeInfoId}-primary-axis`;
     const seriesIds = [
         `${reshapeInfoId}-primary-series`,
@@ -6529,7 +6760,7 @@ const yLinearPrimary = (spec, context)=>{
     }
     const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10 } = yAxisConfig;
     const linearAxis = {
-        visible,
+        visible: isEmptySecondary ? false : visible,
         id,
         seriesId,
         type: log ? 'log' : 'linear',
@@ -6582,7 +6813,7 @@ const yLinearPrimary = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            top: 7
         }
     };
     result.axes = [
@@ -6604,6 +6835,8 @@ const yLinearSecondary = (spec, context)=>{
     const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
     const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
     if ((0, external_remeda_namespaceObject.isNullish)(foldInfoList?.[1])) return result;
+    const isEmptySecondary = (0, external_remeda_namespaceObject.isEmpty)(foldInfoList?.[1].foldMap);
+    const onlySecondary = (0, external_remeda_namespaceObject.isEmpty)(foldInfoList?.[0].foldMap) && !isEmptySecondary;
     const sync = {
         axisId: `${reshapeInfoId}-primary-axis`,
         zeroAlign: true
@@ -6631,7 +6864,7 @@ const yLinearSecondary = (spec, context)=>{
     }
     const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10 } = yAxisConfig;
     const linearAxis = {
-        visible,
+        visible: isEmptySecondary ? false : visible,
         id,
         seriesId,
         sync,
@@ -6671,7 +6904,7 @@ const yLinearSecondary = (spec, context)=>{
             }
         },
         grid: {
-            visible: grid?.visible,
+            visible: onlySecondary ? true : grid?.visible,
             style: {
                 lineWidth: grid?.gridWidth,
                 stroke: grid?.gridColor
@@ -6685,7 +6918,7 @@ const yLinearSecondary = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            top: 7
         }
     };
     result.axes = [
@@ -6816,6 +7049,17 @@ const registerDualAxis = ()=>{
     Builder._advancedPipelineMap.dualAxis = dualAxisAdvancedPipeline;
     Builder._specPipelineMap.dualAxis = dualAxisSpecPipeline;
 };
+const defaultEncodingForPie = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
+    const encoding = {};
+    pie_generateDefaultDimensionEncoding(dimensions, encoding);
+    pie_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
 const encodingForPie = (advancedVSeed)=>{
     const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
     const measures = findAllMeasures(vseedMeasures);
@@ -6835,38 +7079,48 @@ const pie_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = (0, external_remeda_namespaceObject.unique)(dimensions.map((d)=>d.id));
     encoding.color = uniqueDimIds.slice(0);
     encoding.detail = uniqueDimIds.slice(0);
-    encoding.tooltip = uniqueDimIds;
+    encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
     encoding.label = [];
     encoding.row = [];
     encoding.column = [];
 };
 const pie_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const pie_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(measures.map((item)=>item.id));
     encoding.angle = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const pie_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
     encoding.angle = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
+    const tooltip = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const pieAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForPie,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForPie,
+        buildMeasures
+    ], [
+        encodingForPie,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -6985,8 +7239,13 @@ const donutAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    buildMeasures,
-    encodingForPie,
+    encodingAdapter([
+        defaultEncodingForPie,
+        buildMeasures
+    ], [
+        encodingForPie,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7062,6 +7321,17 @@ const registerDonut = ()=>{
     Builder._advancedPipelineMap.donut = donutAdvancedPipeline;
     Builder._specPipelineMap.donut = donutSpecPipeline;
 };
+const defaultEncodingForRose = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
+    const encoding = {};
+    rose_generateDefaultDimensionEncoding(dimensions, encoding);
+    rose_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
 const encodingForRose = (advancedVSeed)=>{
     const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
     const measures = findAllMeasures(vseedMeasures);
@@ -7083,42 +7353,52 @@ const rose_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.angle = uniqueDimIds.slice(0, 1);
     encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
     encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-    encoding.tooltip = uniqueDimIds;
+    encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
     encoding.label = [];
     encoding.row = [];
     encoding.column = [];
 };
 const rose_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.angle = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
-    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.angle.length) encoding.angle = [
         dimensions[0].id
     ];
+    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const rose_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(measures.map((item)=>item.id));
     encoding.radius = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const rose_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
     encoding.radius = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
+    const tooltip = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const roseAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForRose,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForRose,
+        buildMeasures
+    ], [
+        encodingForRose,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7317,8 +7597,13 @@ const roseParallelAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForRose,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForRose,
+        buildMeasures
+    ], [
+        encodingForRose,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7424,6 +7709,17 @@ const registerRoseParallel = ()=>{
     Builder._advancedPipelineMap.roseParallel = roseParallelAdvancedPipeline;
     Builder._specPipelineMap.roseParallel = roseParallelSpecPipeline;
 };
+const defaultEncodingForRadar = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
+    const encoding = {};
+    radar_generateDefaultDimensionEncoding(dimensions, encoding);
+    radar_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
 const encodingForRadar = (advancedVSeed)=>{
     const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
     const measures = findAllMeasures(vseedMeasures);
@@ -7443,7 +7739,7 @@ const radar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = (0, external_remeda_namespaceObject.unique)(dimensions.map((d)=>d.id));
     encoding.angle = uniqueDimIds.slice(0, 1);
     encoding.color = uniqueDimIds.slice(1);
-    encoding.tooltip = uniqueDimIds;
+    encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
     encoding.detail = [];
     encoding.label = [];
     encoding.row = [];
@@ -7451,35 +7747,45 @@ const radar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
 };
 const radar_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.angle = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
-    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = [];
     if (0 === encoding.angle.length) encoding.angle = [
         dimensions[0].id
     ];
+    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = [];
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(measures.map((item)=>item.id));
     encoding.radius = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const radar_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
     encoding.radius = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
+    const tooltip = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const radarAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForRadar,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForRadar,
+        buildMeasures
+    ], [
+        encodingForRadar,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7613,6 +7919,17 @@ const registerRadar = ()=>{
     Builder._advancedPipelineMap.radar = radarAdvancedPipeline;
     Builder._specPipelineMap.radar = radarSpecPipeline;
 };
+const defaultEncodingForFunnel = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
+    const encoding = {};
+    funnel_generateDefaultDimensionEncoding(dimensions, encoding);
+    funnel_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
 const encodingForFunnel = (advancedVSeed)=>{
     const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
     const measures = findAllMeasures(vseedMeasures);
@@ -7632,40 +7949,50 @@ const funnel_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = (0, external_remeda_namespaceObject.unique)(dimensions.map((d)=>d.id));
     encoding.color = uniqueDimIds.slice(0);
     encoding.detail = uniqueDimIds.slice(0);
-    encoding.tooltip = uniqueDimIds;
+    encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
     encoding.label = [];
     encoding.row = [];
     encoding.column = [];
 };
 const funnel_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const funnel_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(measures.map((item)=>item.id));
     encoding.size = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const funnel_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
     encoding.size = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = [
         color[0]
     ];
+    const tooltip = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const funnelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForFunnel,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForFunnel,
+        buildMeasures
+    ], [
+        encodingForFunnel,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7778,6 +8105,17 @@ const registerFunnel = ()=>{
     Builder._advancedPipelineMap.funnel = funnelAdvancedPipeline;
     Builder._specPipelineMap.funnel = funnelSpecPipeline;
 };
+const defaultEncodingForHeatmap = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
+    const encoding = {};
+    heatmap_generateDefaultDimensionEncoding(dimensions, encoding);
+    heatmap_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
 const encodingForHeatmap = (advancedVSeed)=>{
     const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
     const measures = findAllMeasures(vseedMeasures);
@@ -7800,50 +8138,59 @@ const heatmap_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.y = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
     encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
     encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-    encoding.tooltip = uniqueDimIds;
+    encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
     encoding.label = [];
     encoding.row = [];
     encoding.column = [];
 };
 const heatmap_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.y = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.y = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
     if (0 === encoding.y.length) if (dimensions.length > 1) encoding.y = dimensions.slice(1).map((item)=>item.id);
     else encoding.y = dimensions.slice(0).map((item)=>item.id);
+    encoding.color = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = (0, external_remeda_namespaceObject.unique)(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const heatmap_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = (0, external_remeda_namespaceObject.unique)(measures.map((item)=>item.id));
     const colorDims = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'color' === item.encoding || !item.encoding).map((item)=>item.id));
     if (colorDims.length > 0) encoding.color = [
         colorDims[0]
     ];
 };
 const heatmap_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
     const color = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = [
         color[0]
     ];
-    return encoding;
+    const tooltip = (0, external_remeda_namespaceObject.unique)(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = (0, external_remeda_namespaceObject.unique)([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const heatmapAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForHeatmap,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForHeatmap,
+        buildMeasures
+    ], [
+        encodingForHeatmap,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7896,6 +8243,107 @@ const cellStyle = (spec)=>{
         }
     };
 };
+const tooltipHeatmap = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+    const baseConfig = advancedVSeed.config[chartType];
+    const { tooltip = {
+        enable: true
+    } } = baseConfig;
+    const { enable } = tooltip;
+    const { foldInfo } = datasetReshapeInfo[0];
+    result.tooltip = {
+        visible: enable,
+        mark: {
+            title: {
+                visible: false
+            },
+            content: tooltipHeatmap_createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfo)
+        },
+        dimension: {
+            visible: false
+        }
+    };
+    return result;
+};
+const tooltipHeatmap_createMarkContent = (tooltip, dimensions, measures, locale, foldInfo)=>{
+    const dims = dimensions.filter((item)=>tooltip.includes(item.id));
+    const meas = measures.filter((item)=>tooltip.includes(item.id));
+    const dimContent = dims.map((item)=>({
+            visible: true,
+            hasShape: true,
+            shapeType: 'rectRound',
+            key: (v)=>{
+                const datum = v;
+                if (item.alias || item.id) return item.alias || item.id;
+                return datum && datum[item.id];
+            },
+            value: (v)=>{
+                const datum = v;
+                return datum && datum[item.id];
+            }
+        }));
+    const meaContent = meas.map((item)=>({
+            visible: true,
+            hasShape: true,
+            shapeType: 'rectRound',
+            key: item.alias || item.id,
+            value: (v)=>{
+                const datum = v;
+                if (!datum) return '';
+                const id = item.id;
+                if (!datum || !datum[ORIGINAL_DATA] || !datum[ORIGINAL_DATA]) return '';
+                const originalData = datum[ORIGINAL_DATA];
+                const value = originalData[id];
+                const measure = findMeasureById(measures, id);
+                if (!measure) return String(value);
+                const { format = {}, autoFormat = true } = measure;
+                if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
+                    const formatter = createFormatter(format);
+                    return formatter(value);
+                }
+                if (autoFormat) return autoFormatter(value, locale);
+                return String(value);
+            }
+        }));
+    const foldMeaContent = [
+        foldInfo
+    ].map((foldInfo)=>({
+            visible: true,
+            hasShape: true,
+            shapeType: 'rectRound',
+            key: (v)=>{
+                const { measureId, foldMap } = foldInfo;
+                const datum = v;
+                const id = datum[measureId];
+                return foldMap[id] || id;
+            },
+            value: (v)=>{
+                const { measureId, measureValue } = foldInfo;
+                const datum = v;
+                if (!datum) return '';
+                const value = datum[measureValue];
+                const id = datum[measureId];
+                const measure = findMeasureById(measures, id);
+                if (!measure) return String(value);
+                const { format = {}, autoFormat = true } = measure;
+                if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
+                    const formatter = createFormatter(format);
+                    return formatter(value);
+                }
+                if (autoFormat) return autoFormatter(value, locale);
+                return String(value);
+            }
+        }));
+    return [
+        ...dimContent,
+        ...foldMeaContent,
+        ...meaContent
+    ];
+};
 const initHeatmap = (spec, context)=>{
     const result = {
         ...spec
@@ -7939,7 +8387,7 @@ const heatmap = [
     labelColorInversion,
     colorAdapter(discreteLegend, colorLegend),
     colorCellStyleFill(cellStyle),
-    tooltip_tooltip,
+    tooltipHeatmap,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
@@ -7958,7 +8406,7 @@ const pivotHeatmap = [
         label_label,
         labelColorInversion,
         discreteLegend,
-        tooltip_tooltip,
+        tooltipHeatmap,
         colorCellStyleFill(cellStyle),
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
@@ -9982,7 +10430,9 @@ exports.FoldMeasureName = __webpack_exports__.FoldMeasureName;
 exports.FoldMeasureValue = __webpack_exports__.FoldMeasureValue;
 exports.FoldPrimaryMeasureValue = __webpack_exports__.FoldPrimaryMeasureValue;
 exports.FoldSecondaryMeasureValue = __webpack_exports__.FoldSecondaryMeasureValue;
+exports.FoldXMeasureId = __webpack_exports__.FoldXMeasureId;
 exports.FoldXMeasureValue = __webpack_exports__.FoldXMeasureValue;
+exports.FoldYMeasureId = __webpack_exports__.FoldYMeasureId;
 exports.FoldYMeasureValue = __webpack_exports__.FoldYMeasureValue;
 exports.MeasureName = __webpack_exports__.MeasureName;
 exports.ORIGINAL_DATA = __webpack_exports__.ORIGINAL_DATA;
@@ -10192,7 +10642,9 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "FoldMeasureValue",
     "FoldPrimaryMeasureValue",
     "FoldSecondaryMeasureValue",
+    "FoldXMeasureId",
     "FoldXMeasureValue",
+    "FoldYMeasureId",
     "FoldYMeasureValue",
     "MeasureName",
     "ORIGINAL_DATA",