@visactor/vseed 0.1.7 → 0.1.8

package/dist/index.js

@@ -688,7 +688,6 @@ const registerTable = ()=>{
     Builder._specPipelineMap.table = tableSpecPipeline;
 };
 const ORIGINAL_DATA = '__OriginalData__';
-const Separator = '-';
 const FoldMeasureName = '__MeaName__';
 const FoldMeasureId = '__MeaId__';
 const FoldMeasureValue = '__MeaValue__';
@@ -697,6 +696,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__';
@@ -1198,6 +1199,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);
@@ -1217,7 +1237,7 @@ const line_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = 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 = [];
@@ -1225,27 +1245,32 @@ const line_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
 };
 const line_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const line_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
     encoding.y = 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 = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const isMeasureTreeWithChildren = (vseed)=>{
     const { measures } = vseed;
@@ -1257,6 +1282,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;
@@ -1308,7 +1364,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)) {
@@ -1410,7 +1466,7 @@ const dataReshapeByEncoding = (dataset, dimensions, measures, encoding, options)
     });
     const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dimensions, encoding, {
         foldMeasureId,
-        separator: Separator,
+        separator: "-",
         colorItemAsId
     });
     return {
@@ -1699,8 +1755,13 @@ const lineAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForLine,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForLine,
+        buildMeasures
+    ], [
+        encodingForLine,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -1975,10 +2036,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
@@ -2052,7 +2109,7 @@ const yLinear = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            top: 7
         }
     };
     result.axes = [
@@ -2608,78 +2665,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 (!external_remeda_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 (!external_remeda_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 (!external_remeda_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 (!external_remeda_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 (!external_remeda_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;
@@ -2698,7 +2810,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));
@@ -2771,7 +2883,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,
@@ -2869,7 +2981,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,
@@ -2970,7 +3082,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)));
@@ -3586,6 +3698,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);
@@ -3607,43 +3730,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 = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const column_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
     encoding.y = 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 = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
-    return encoding;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const columnAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForColumn,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForColumn,
+        buildMeasures
+    ], [
+        encodingForColumn,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -3840,7 +3972,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)));
@@ -4006,8 +4138,13 @@ const columnParallelAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForColumn,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForColumn,
+        buildMeasures
+    ], [
+        encodingForColumn,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4105,8 +4242,13 @@ const columnPercentAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForColumn,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForColumn,
+        buildMeasures
+    ], [
+        encodingForColumn,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4183,6 +4325,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);
@@ -4204,35 +4357,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 = unique(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.y.length) encoding.y = [
         dimensions[0].id
     ];
+    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const bar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
     encoding.x = 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 = unique(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
-    return encoding;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const sortYBandAxis = (advancedVSeed, context)=>{
     const result = {
@@ -4255,8 +4412,13 @@ const barAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForBar,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForBar,
+        buildMeasures
+    ], [
+        encodingForBar,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4407,7 +4569,7 @@ const xLinear = (spec, context)=>{
             }
         },
         innerOffset: {
-            right: LINEAR_AXIS_INNER_OFFSET_TOP
+            right: 7
         }
     };
     result.axes = [
@@ -4610,8 +4772,13 @@ const barParallelAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForBar,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForBar,
+        buildMeasures
+    ], [
+        encodingForBar,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4708,8 +4875,13 @@ const barPercentAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForBar,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForBar,
+        buildMeasures
+    ], [
+        encodingForBar,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4781,8 +4953,13 @@ const areaAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForLine,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForLine,
+        buildMeasures
+    ], [
+        encodingForLine,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4941,8 +5118,13 @@ const areaPercentAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForLine,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForLine,
+        buildMeasures
+    ], [
+        encodingForLine,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -5016,6 +5198,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);
@@ -5036,23 +5229,24 @@ const scatter_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = 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 = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const scatter_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
     encoding.y = unique(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const scatter_generateMeasureEncoding = (measures, encoding)=>{
@@ -5062,6 +5256,11 @@ const scatter_generateMeasureEncoding = (measures, encoding)=>{
     if (color.length > 0) encoding.color = [
         color[0]
     ];
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const buildMeasuresForScatter = (advancedVSeed, context)=>{
     const { vseed } = context;
@@ -5092,6 +5291,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',
@@ -5180,6 +5380,7 @@ const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
     if (xMeasures && xMeasures.children) {
         const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, uniqueBy(dimensions, (d)=>d.id), uniqueBy(xMeasures.children, (d)=>d.id), encoding, {
             foldMeasureValue: FoldXMeasureValue,
+            foldMeasureId: FoldXMeasureId,
             colorItemAsId: true,
             colorMeasureId: getColorMeasureId(advancedVSeed)
         });
@@ -5190,6 +5391,7 @@ const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
     if (yMeasures && yMeasures.children) {
         const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(datasets[0], uniqueBy(dimensions, (d)=>d.id), uniqueBy(yMeasures.children, (d)=>d.id), encoding, {
             foldMeasureValue: FoldYMeasureValue,
+            foldMeasureId: FoldYMeasureId,
             colorItemAsId: true,
             colorMeasureId: getColorMeasureId(advancedVSeed)
         });
@@ -5295,8 +5497,13 @@ const scatterAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForScatter,
-    buildMeasuresForScatter,
+    encodingAdapter([
+        defaultEncodingForScatter,
+        buildMeasuresForScatter
+    ], [
+        encodingForScatter,
+        buildMeasuresForScatter
+    ]),
     pivotAdapter([
         reshapeWithScatterEncoding
     ], [
@@ -5342,6 +5549,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 (!external_remeda_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 (!external_remeda_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
@@ -5395,7 +5701,7 @@ const scatter = [
     xLinear,
     yLinear,
     label_label,
-    tooltip_tooltip,
+    tooltipScatter,
     colorAdapter(discreteLegend, colorLegend),
     verticalCrosshairLine,
     horizontalCrosshairLine,
@@ -5420,7 +5726,7 @@ const pivotScatter = [
         xLinear,
         yLinear,
         label_label,
-        tooltip_tooltip,
+        tooltipScatter,
         verticalCrosshairLine,
         horizontalCrosshairLine,
         colorPointStyleFill(pointStyle_pointStyle),
@@ -5441,6 +5747,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);
@@ -5462,35 +5779,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 = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const dualAxis_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
     encoding.y = 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 = unique(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
-    return encoding;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
     const { vseed } = context;
@@ -5747,8 +6068,13 @@ const dualAxisAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForDualAxis,
-    buildMeasuresForDualAxis,
+    encodingAdapter([
+        defaultEncodingForDualAxis,
+        buildMeasuresForDualAxis
+    ], [
+        encodingForDualAxis,
+        buildMeasuresForDualAxis
+    ]),
     pivotAdapter([
         reshapeWithDualEncoding
     ], [
@@ -5840,7 +6166,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;
@@ -5860,7 +6186,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':
             {
@@ -5871,7 +6197,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':
@@ -5896,7 +6222,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;
@@ -5916,7 +6242,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':
             {
@@ -5927,7 +6253,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':
@@ -6105,7 +6431,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
@@ -6113,68 +6439,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 (!external_remeda_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 (!external_remeda_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;
@@ -6184,7 +6461,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
@@ -6193,68 +6470,19 @@ const tooltipSecondary = (spec, context)=>{
     if (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 (!external_remeda_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 (!external_remeda_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;
@@ -6271,7 +6499,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] && external_remeda_isEmpty(foldInfoList[0].foldMap)) return result;
+    if (isNullish(foldInfoList?.[0])) return result;
+    const isEmptySecondary = external_remeda_isEmpty(foldInfoList?.[0].foldMap);
     const id = `${reshapeInfoId}-primary-axis`;
     const seriesIds = [
         `${reshapeInfoId}-primary-series`,
@@ -6294,7 +6523,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',
@@ -6347,7 +6576,7 @@ const yLinearPrimary = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            top: 7
         }
     };
     result.axes = [
@@ -6369,6 +6598,8 @@ const yLinearSecondary = (spec, context)=>{
     const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
     const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
     if (isNullish(foldInfoList?.[1])) return result;
+    const isEmptySecondary = external_remeda_isEmpty(foldInfoList?.[1].foldMap);
+    const onlySecondary = external_remeda_isEmpty(foldInfoList?.[0].foldMap) && !isEmptySecondary;
     const sync = {
         axisId: `${reshapeInfoId}-primary-axis`,
         zeroAlign: true
@@ -6396,7 +6627,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,
@@ -6436,7 +6667,7 @@ const yLinearSecondary = (spec, context)=>{
             }
         },
         grid: {
-            visible: grid?.visible,
+            visible: onlySecondary ? true : grid?.visible,
             style: {
                 lineWidth: grid?.gridWidth,
                 stroke: grid?.gridColor
@@ -6450,7 +6681,7 @@ const yLinearSecondary = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            top: 7
         }
     };
     result.axes = [
@@ -6581,6 +6812,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);
@@ -6600,38 +6842,48 @@ const pie_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = 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 = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const pie_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
     encoding.angle = 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 = unique(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const pieAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForPie,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForPie,
+        buildMeasures
+    ], [
+        encodingForPie,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -6750,8 +7002,13 @@ const donutAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    buildMeasures,
-    encodingForPie,
+    encodingAdapter([
+        defaultEncodingForPie,
+        buildMeasures
+    ], [
+        encodingForPie,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -6827,6 +7084,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);
@@ -6848,42 +7116,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 = unique(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.angle.length) encoding.angle = [
         dimensions[0].id
     ];
+    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const rose_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
     encoding.radius = 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 = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const roseAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForRose,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForRose,
+        buildMeasures
+    ], [
+        encodingForRose,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7082,8 +7360,13 @@ const roseParallelAdvancedPipeline = [
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForRose,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForRose,
+        buildMeasures
+    ], [
+        encodingForRose,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7189,6 +7472,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);
@@ -7208,7 +7502,7 @@ const radar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = 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 = [];
@@ -7216,35 +7510,45 @@ const radar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
 };
 const radar_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.angle = unique(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
-    encoding.color = 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 = 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 = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
     encoding.radius = 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 = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const radarAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForRadar,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForRadar,
+        buildMeasures
+    ], [
+        encodingForRadar,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7378,6 +7682,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);
@@ -7397,40 +7712,50 @@ const funnel_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = 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 = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const funnel_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
     encoding.size = 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 = unique(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = [
         color[0]
     ];
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const funnelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForFunnel,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForFunnel,
+        buildMeasures
+    ], [
+        encodingForFunnel,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7543,6 +7868,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);
@@ -7565,50 +7901,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 = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.y = unique(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.y = 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 = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.detail.length) encoding.detail = [
         MeasureName
     ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const heatmap_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
     const colorDims = 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 = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = [
         color[0]
     ];
-    return encoding;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const heatmapAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     default_defaultMeasures_defaultMeasures,
     defaultDimensions_defaultDimensions,
     defaultMeasureName_defaultMeasureName,
-    encodingForHeatmap,
-    buildMeasures,
+    encodingAdapter([
+        defaultEncodingForHeatmap,
+        buildMeasures
+    ], [
+        encodingForHeatmap,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7661,6 +8006,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 (!external_remeda_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 (!external_remeda_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
@@ -7704,7 +8150,7 @@ const heatmap = [
     labelColorInversion,
     colorAdapter(discreteLegend, colorLegend),
     colorCellStyleFill(cellStyle),
-    tooltip_tooltip,
+    tooltipHeatmap,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
@@ -7723,7 +8169,7 @@ const pivotHeatmap = [
         label_label,
         labelColorInversion,
         discreteLegend,
-        tooltip_tooltip,
+        tooltipHeatmap,
         colorCellStyleFill(cellStyle),
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
@@ -9736,6 +10182,7 @@ const zAdvancedVSeed = z.object({
     annotation: zAnnotation,
     locale: zLocale
 });
-export { AngleEncoding, Builder, ColorEncoding, ColorIdEncoding, DetailEncoding, FoldMeasureId, FoldMeasureName, FoldMeasureValue, FoldPrimaryMeasureValue, FoldSecondaryMeasureValue, FoldXMeasureValue, FoldYMeasureValue, MeasureName, ORIGINAL_DATA, Separator, XEncoding, YEncoding, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeByEncoding, donutAdvancedPipeline, donutSpecPipeline, dualAxisAdvancedPipeline, dualAxisSpecPipeline, execPipeline, findAllDimensions, findAllMeasures, findFirstMeasure, findMeasureById, foldMeasures, funnelAdvancedPipeline, funnelSpecPipeline, heatmapAdvancedPipeline, heatmapSpecPipeline, i18n, intl, isDimensionSelector, isMeasure, isMeasureGroup, isMeasureSelector, isMeasures, isPartialDatumSelector, isPivotChart, isPivotTable, isTable, isVChart, isVTable, isValueSelector, lightTheme, lineAdvancedPipeline, lineSpecPipeline, measureDepth, pieAdvancedPipeline, pieSpecPipeline, pivotTableAdvancedPipeline, pivotTableSpecPipeline, preorderTraverse, radarAdvancedPipeline, radarSpecPipeline, registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerDonut, registerFunnel, registerHeatmap, registerLightTheme, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable, roseAdvancedPipeline, roseParallelAdvancedPipeline, roseParallelSpecPipeline, roseSpecPipeline, scatterAdvancedPipeline, scatterSpecPipeline, selector_selector as selector, tableAdvancedPipeline, tableSpecPipeline, unfoldDimensions, updateAdvanced, updateSpec, zAdvancedVSeed, zAnalysis, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zArea, zAreaConfig, zAreaPercent, zAreaPercentConfig, zAreaStyle, zAxis, zBackgroundColor, zBar, zBarConfig, zBarParallel, zBarParallelConfig, zBarPercent, zBarPercentConfig, zBarStyle, zChartType, zColor, zColorLegend, zColumn, zColumnConfig, zColumnParallel, zColumnParallelConfig, zColumnPercent, zColumnPercentConfig, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensionGroup, zDimensionTree, zDimensions, zDonut, zDonutConfig, zDualAxis, zDualAxisConfig, zDualChartType, zDualMeasure, zDualMeasures, zEncoding, zFoldInfo, zFunnel, zFunnelConfig, zHeatmap, zHeatmapConfig, zLabel, zLegend, zLine, zLineConfig, zLineStyle, zLinearColor, zLocale, zMarkStyle, zMeasure, zMeasureGroup, zMeasureTree, zMeasures, zNumFormat, zPie, zPieConfig, zPivotTable, zPivotTableConfig, zPointStyle, zRadar, zRadarConfig, zRose, zRoseConfig, zRoseParallel, zRoseParallelConfig, zScatter, zScatterConfig, zScatterMeasure, zScatterMeasures, zSort, zSortLegend, zStackCornerRadius, zTable, zTableConfig, zTheme, zTooltip, zUnfoldInfo, zVSeed, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
+var __webpack_exports__Separator = "-";
+export { AngleEncoding, Builder, ColorEncoding, ColorIdEncoding, DetailEncoding, FoldMeasureId, FoldMeasureName, FoldMeasureValue, FoldPrimaryMeasureValue, FoldSecondaryMeasureValue, FoldXMeasureId, FoldXMeasureValue, FoldYMeasureId, FoldYMeasureValue, MeasureName, ORIGINAL_DATA, XEncoding, YEncoding, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeByEncoding, donutAdvancedPipeline, donutSpecPipeline, dualAxisAdvancedPipeline, dualAxisSpecPipeline, execPipeline, findAllDimensions, findAllMeasures, findFirstMeasure, findMeasureById, foldMeasures, funnelAdvancedPipeline, funnelSpecPipeline, heatmapAdvancedPipeline, heatmapSpecPipeline, i18n, intl, isDimensionSelector, isMeasure, isMeasureGroup, isMeasureSelector, isMeasures, isPartialDatumSelector, isPivotChart, isPivotTable, isTable, isVChart, isVTable, isValueSelector, lightTheme, lineAdvancedPipeline, lineSpecPipeline, measureDepth, pieAdvancedPipeline, pieSpecPipeline, pivotTableAdvancedPipeline, pivotTableSpecPipeline, preorderTraverse, radarAdvancedPipeline, radarSpecPipeline, registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerDonut, registerFunnel, registerHeatmap, registerLightTheme, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable, roseAdvancedPipeline, roseParallelAdvancedPipeline, roseParallelSpecPipeline, roseSpecPipeline, scatterAdvancedPipeline, scatterSpecPipeline, selector_selector as selector, tableAdvancedPipeline, tableSpecPipeline, unfoldDimensions, updateAdvanced, updateSpec, zAdvancedVSeed, zAnalysis, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zArea, zAreaConfig, zAreaPercent, zAreaPercentConfig, zAreaStyle, zAxis, zBackgroundColor, zBar, zBarConfig, zBarParallel, zBarParallelConfig, zBarPercent, zBarPercentConfig, zBarStyle, zChartType, zColor, zColorLegend, zColumn, zColumnConfig, zColumnParallel, zColumnParallelConfig, zColumnPercent, zColumnPercentConfig, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensionGroup, zDimensionTree, zDimensions, zDonut, zDonutConfig, zDualAxis, zDualAxisConfig, zDualChartType, zDualMeasure, zDualMeasures, zEncoding, zFoldInfo, zFunnel, zFunnelConfig, zHeatmap, zHeatmapConfig, zLabel, zLegend, zLine, zLineConfig, zLineStyle, zLinearColor, zLocale, zMarkStyle, zMeasure, zMeasureGroup, zMeasureTree, zMeasures, zNumFormat, zPie, zPieConfig, zPivotTable, zPivotTableConfig, zPointStyle, zRadar, zRadarConfig, zRose, zRoseConfig, zRoseParallel, zRoseParallelConfig, zScatter, zScatterConfig, zScatterMeasure, zScatterMeasures, zSort, zSortLegend, zStackCornerRadius, zTable, zTableConfig, zTheme, zTooltip, zUnfoldInfo, zVSeed, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis, __webpack_exports__Separator as Separator };
 
 //# sourceMappingURL=index.js.map