@visactor/vseed 0.3.2 → 0.3.3

package/dist/umd/index.js

@@ -117,6 +117,7 @@
             FoldMeasureName: ()=>FoldMeasureName,
             darkTheme: ()=>darkTheme,
             isVTable: ()=>isVTable,
+            zBrush: ()=>zBrush,
             BoxPlotPivotIndicator: ()=>BoxPlotPivotIndicator,
             ORIGINAL_DATA: ()=>ORIGINAL_DATA,
             zMeasureSelector: ()=>zMeasureSelector,
@@ -137,6 +138,7 @@
             zSelectors: ()=>zSelectors,
             FoldYMeasureId: ()=>FoldYMeasureId,
             findMeasureById: ()=>findMeasureById,
+            zBrushConfig: ()=>zBrushConfig,
             AngleEncoding: ()=>AngleEncoding,
             areaPercentAdvancedPipeline: ()=>areaPercentAdvancedPipeline,
             zBackgroundColor: ()=>zBackgroundColor,
@@ -527,31 +529,6 @@
                     next: t
                 });
         }
-        const isMeasure = (measure)=>!('children' in measure);
-        const isMeasureGroup = (measure)=>'children' in measure;
-        const isMeasures = (measures)=>measures.every(isMeasure);
-        const isPositionMeasure = (measure)=>!measure.encoding || ![
-                'color',
-                'size',
-                'label',
-                'tooltip',
-                'detail'
-            ].includes(measure.encoding);
-        const isMeasureTreeWithParentId = (measures)=>{
-            if (!measures) return false;
-            return measures.some((measure)=>'parentId' in measure);
-        };
-        const isCommonMeasureEncoding = (encoding)=>[
-                'color',
-                'label',
-                'tooltip'
-            ].includes(encoding);
-        const ensureParentIdInitialized = (parentId, measuresByView, parentIds)=>{
-            if (!measuresByView[parentId]) {
-                measuresByView[parentId] = [];
-                parentIds.push(parentId);
-            }
-        };
         const DEFAULT_PARENT_ID = '__DefaultParentId__';
         const ChartTypeEnum = {
             Table: 'table',
@@ -578,6 +555,54 @@
             Histogram: 'histogram'
         };
         const DATUM_HIDE_KEY = '__VSEED_HideItem__';
+        const isMeasure = (measure)=>!('children' in measure);
+        const isMeasureGroup = (measure)=>'children' in measure;
+        const isMeasures = (measures)=>measures.every(isMeasure);
+        const isPositionMeasure = (measure, chartType)=>{
+            if (!measure.encoding) return true;
+            if (chartType === ChartTypeEnum.Funnel) return 'size' === measure.encoding;
+            if (chartType === ChartTypeEnum.Heatmap) return 'color' === measure.encoding;
+            if ([
+                ChartTypeEnum.Pie,
+                ChartTypeEnum.Donut,
+                ChartTypeEnum.Rose,
+                ChartTypeEnum.RoseParallel
+            ].includes(chartType)) return 'angle' === measure.encoding;
+            if (chartType === ChartTypeEnum.DualAxis) return [
+                'primaryYAxis',
+                'secondaryYAxis'
+            ].includes(measure.encoding);
+            if (ChartTypeEnum.Radar === chartType) return 'radius' === measure.encoding;
+            if ([
+                ChartTypeEnum.Line,
+                ChartTypeEnum.Area,
+                ChartTypeEnum.AreaPercent,
+                ChartTypeEnum.Column,
+                ChartTypeEnum.ColumnParallel,
+                ChartTypeEnum.ColumnPercent
+            ].includes(chartType)) return 'yAxis' === measure.encoding;
+            if ([
+                ChartTypeEnum.Bar,
+                ChartTypeEnum.BarParallel,
+                ChartTypeEnum.BarPercent
+            ].includes(chartType)) return 'xAxis' === measure.encoding;
+            return chartType === ChartTypeEnum.Boxplot && 'value' === measure.encoding;
+        };
+        const isMeasureTreeWithParentId = (measures)=>{
+            if (!measures) return false;
+            return measures.some((measure)=>'parentId' in measure);
+        };
+        const isCommonMeasureEncoding = (encoding)=>[
+                'color',
+                'label',
+                'tooltip'
+            ].includes(encoding);
+        const ensureParentIdInitialized = (parentId, measuresByView, parentIds)=>{
+            if (!measuresByView[parentId]) {
+                measuresByView[parentId] = [];
+                parentIds.push(parentId);
+            }
+        };
         const isTable = (vseed)=>vseed.chartType === ChartTypeEnum.Table;
         const isPivotTable = (vseed)=>vseed.chartType === ChartTypeEnum.PivotTable;
         const isRadar = (vseed)=>vseed.chartType === ChartTypeEnum.Radar;
@@ -596,12 +621,32 @@
             return isCombination(vseed);
         };
         const chatType_isPivot = (vseed)=>{
-            const { dimensions = [] } = vseed;
-            return dimensions && dimensions.some((dimension)=>'row' === dimension.encoding || 'column' === dimension.encoding);
+            const { dimensions = [], measures = [] } = vseed;
+            if (dimensions && dimensions.some((dimension)=>'row' === dimension.encoding || 'column' === dimension.encoding)) return true;
+            if (vseed.chartType === ChartTypeEnum.Scatter) {
+                const xCount = measures.filter((m)=>'xAxis' === m.encoding).length;
+                const yCount = measures.filter((m)=>'yAxis' === m.encoding).length;
+                const otherCount = measures.filter((m)=>![
+                        'size',
+                        'xAxis',
+                        'yAxis'
+                    ].includes(m.encoding) && !isCommonMeasureEncoding(m.encoding)).length;
+                let finalXCount;
+                let finalYCount;
+                if (xCount > 0) {
+                    finalXCount = xCount;
+                    finalYCount = yCount + otherCount;
+                } else {
+                    finalXCount = otherCount > 0 ? 1 : 0;
+                    finalYCount = yCount + Math.max(otherCount - 1, 0);
+                }
+                if (finalXCount > 1 || finalYCount > 1) return true;
+            }
+            return false;
         };
         const isCombination = (vseed)=>{
             if (isMeasureTreeWithParentId(vseed.measures)) {
-                const parentIds = vseed.measures?.filter(isPositionMeasure).map((measure)=>measure.parentId || DEFAULT_PARENT_ID);
+                const parentIds = vseed.measures?.filter((m)=>isPositionMeasure(m, vseed.chartType)).map((measure)=>measure.parentId || DEFAULT_PARENT_ID);
                 return parentIds && chunk_QJLMYOTX_i(parentIds).length > 1;
             }
             const { measures = [] } = vseed;
@@ -1740,14 +1785,10 @@
             };
             const result = new Array(dataset.length * measures.length);
             let index = 0;
-            const ids = measures.map((d)=>d.id);
             for(let i = 0; i < dataset.length; i++)for(let j = 0; j < measures.length; j++){
                 const datum = chunk_KI5X74E2_y({
                     ...dataset[i]
-                }, [
-                    ...ids,
-                    ...omitIds
-                ]);
+                }, omitIds);
                 datum[ORIGINAL_DATA] = dataset[i];
                 const measure = measures[j];
                 const { id, alias } = measure;
@@ -1755,7 +1796,17 @@
                 datum[measureId] = id;
                 datum[measureName] = alias || id;
                 datum[measureValue] = dataset[i][id];
-                if (colorMeasureId) {
+                const valueNumber = Number(datum[id]);
+                foldInfo.statistics.min = Math.min(foldInfo.statistics.min, valueNumber);
+                foldInfo.statistics.max = Math.max(foldInfo.statistics.max, valueNumber);
+                foldInfo.statistics.sum += valueNumber;
+                foldInfo.statistics.count++;
+                if ('color' === measure.encoding) {
+                    foldInfo.statistics.colorMin = foldInfo.statistics.min;
+                    foldInfo.statistics.colorMax = foldInfo.statistics.max;
+                    datum[ColorEncoding] = valueNumber;
+                    datum[ColorIdEncoding] = measure.id;
+                } else if (colorMeasureId) {
                     const value = datum[ORIGINAL_DATA][colorMeasureId];
                     datum[ColorEncoding] = value;
                     datum[ColorIdEncoding] = colorMeasureId;
@@ -1763,11 +1814,6 @@
                     foldInfo.statistics.colorMin = Math.min(foldInfo.statistics.colorMin, valueNumber);
                     foldInfo.statistics.colorMax = Math.max(foldInfo.statistics.colorMax, valueNumber);
                 }
-                const valueNumber = Number(datum[id]);
-                foldInfo.statistics.min = Math.min(foldInfo.statistics.min, valueNumber);
-                foldInfo.statistics.max = Math.max(foldInfo.statistics.max, valueNumber);
-                foldInfo.statistics.sum += valueNumber;
-                foldInfo.statistics.count++;
                 foldInfo.foldMap[id] = alias;
                 result[index++] = datum;
             }
@@ -2449,10 +2495,10 @@
             };
         }
         const isLinearColor = (advancedVSeed, vseed)=>{
-            const { encoding } = advancedVSeed;
+            const { encoding, chartType } = advancedVSeed;
             const measureIdList = (vseed.measures || advancedVSeed.measures).map((measure)=>measure.id);
-            const { color } = encoding;
-            return color?.length === 1 && measureIdList.includes(color[0]);
+            const { color = [] } = encoding;
+            return 'heatmap' === chartType ? color.length >= 1 && color.every((c)=>measureIdList.includes(c)) : 1 === color.length && measureIdList.includes(color[0]);
         };
         const getColorMeasureId = (advancedVSeed, vseed)=>{
             if (isLinearColor(advancedVSeed, vseed)) {
@@ -2467,11 +2513,13 @@
             };
             const { vseed } = context;
             const { dataset, chartType } = vseed;
-            const { encoding } = advancedVSeed;
+            const { encoding, reshapeMeasures = [] } = advancedVSeed;
+            const allMeasuresIds = (reshapeMeasures[0] ?? []).map((m)=>m.id);
             const colorMeasureId = getColorMeasureId(advancedVSeed, vseed);
             const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [], (item)=>item.id), T(advancedVSeed.reshapeMeasures?.[0] ?? [], (item)=>item.id), encoding, {
                 colorItemAsId: false,
-                colorMeasureId
+                colorMeasureId,
+                omitIds: allMeasuresIds
             });
             return {
                 ...result,
@@ -2603,6 +2651,7 @@
                 'xAxis',
                 'yAxis',
                 'crosshairLine',
+                'brush',
                 'dimensionLinkage'
             ]);
             const config = replaceNullToUndefined(pickedConfig);
@@ -3064,6 +3113,40 @@
             ];
             return result;
         };
+        const brush_brush = (spec, context)=>{
+            const result = {
+                ...spec
+            };
+            const { advancedVSeed, vseed } = context;
+            const { brush = {}, chartType } = vseed;
+            const theme = advancedVSeed.config?.[chartType]?.brush ?? {};
+            const enable = brush.enable ?? theme?.enable;
+            if (false === enable) return result;
+            result.brush = {
+                visible: true,
+                removeOnClick: brush.removeOnClick,
+                inBrush: {
+                    opacity: theme.inBrushStyle?.opacity,
+                    stroke: theme.inBrushStyle?.stroke,
+                    lineWidth: theme.inBrushStyle?.lineWidth
+                },
+                outOfBrush: {
+                    opacity: theme.outOfBrushStyle?.opacity,
+                    stroke: theme.outOfBrushStyle?.stroke,
+                    lineWidth: theme.outOfBrushStyle?.lineWidth
+                }
+            };
+            if (result.label && false !== result.label.visible) {
+                if (!result.label.state) result.label.state = {};
+                result.label.state.outOfBrush = {
+                    opacity: result.brush.outOfBrush.opacity
+                };
+                result.label.state.inBrush = {
+                    opacity: result.brush.inBrush.opacity
+                };
+            }
+            return result;
+        };
         const verticalCrosshairLine = (spec, context)=>{
             const result = {
                 ...spec
@@ -3599,6 +3682,7 @@
                     if (wrap) return result;
                     return result.join(' ');
                 },
+                syncState: true,
                 position: labelPosition,
                 style: {
                     stroke: labelStroke,
@@ -3609,6 +3693,7 @@
                 },
                 smartInvert: labelColorSmartInvert
             };
+            if (labelColorSmartInvert) result.style.lineWidth = 2;
             if (labelOverlap) result.overlap = {
                 hideOnHit: true,
                 clampForce: true
@@ -3723,21 +3808,26 @@
                     title: {
                         visible: true
                     },
-                    content: createDimensionContent(dimensions, measures, foldInfo, unfoldInfo, reshapeMeasures.length > 1)
+                    content: createDimensionContent(encoding.tooltip || [], measures, foldInfo, unfoldInfo, reshapeMeasures.length > 1)
                 },
                 updateElement: updateTooltipElement
             };
             return result;
         };
-        const createDimensionContent = (dimensions = [], measures = [], foldInfo, unfoldInfo, hasMultiMeasureGroup)=>{
+        const createDimensionContent = (tooltip, measures = [], foldInfo, unfoldInfo, hasMultiMeasureGroup)=>{
             const { measureId, measureValue, foldMap } = foldInfo;
             const { encodingColor } = unfoldInfo;
+            const hasMeasureTooltip = tooltip.some((d)=>measures.find((item)=>item.id === d));
             return [
                 {
                     visible: true,
                     shapeType: 'rectRound',
                     hasShape: true,
-                    key: dimensions.some((d)=>'color' === d.encoding) ? (v)=>{
+                    key: hasMeasureTooltip ? (v)=>{
+                        const datum = v;
+                        const key = datum && datum[measureId] || '';
+                        return foldMap[key] ?? key;
+                    } : (v)=>{
                         const datum = v;
                         const key = datum && datum[encodingColor] || '';
                         const colorKey = `${unfoldInfo.colorIdMap[key].alias ?? key}`;
@@ -3746,10 +3836,6 @@
                             return `${colorKey}-${foldMap[mId] ?? mId}`;
                         }
                         return colorKey;
-                    } : (v)=>{
-                        const datum = v;
-                        const key = datum && datum[measureId] || '';
-                        return foldMap[key] ?? key;
                     },
                     value: (v)=>{
                         const datum = v;
@@ -4917,9 +5003,9 @@
                         borderColor,
                         color: bodyFontColor,
                         borderLineWidth: (arg)=>{
-                            const noYAxis = 'pie' === chartType || 'rose' === chartType || 'donut' === chartType || 'funnel' === chartType || 'radar' === chartType || 'roseParallel' === chartType;
+                            const noYAxis = 'pie' === chartType || 'rose' === chartType || 'donut' === chartType || 'radar' === chartType || 'roseParallel' === chartType;
                             return [
-                                0 === arg.row ? outlineBorderLineWidth : 1,
+                                0 === arg.row || 'funnel' === chartType && 1 === arg.row && arg.table.rowCount <= 2 ? outlineBorderLineWidth : 1,
                                 outlineBorderLineWidth,
                                 0,
                                 0 === arg.col || noYAxis && 1 === arg.col && arg.table.colCount <= 2 ? outlineBorderLineWidth : 1
@@ -5212,7 +5298,7 @@
                 const result = axisStyle(spec, context);
                 if (result.axes) {
                     const { advancedVSeed } = context;
-                    const { config, chartType, encoding, reshapeMeasures } = advancedVSeed;
+                    const { config, chartType, encoding, reshapeMeasures, datasetReshapeInfo } = advancedVSeed;
                     const themConfig = config?.[chartType]?.pivotGrid ?? {};
                     result.axes.forEach((axis)=>{
                         axis.domainLine = {
@@ -5221,11 +5307,16 @@
                         if (themConfig.chartGridColor && axis.grid && axis.grid.visible && axis.grid.style) axis.grid.style.stroke = themConfig.chartGridColor;
                         if (themConfig.axisLabelColor && axis.label && axis.label.visible && axis.label.style) axis.label.style.fill = themConfig.axisLabelColor;
                         if ('band' === axis.type) {
-                            if ('left' === axis.orient || 'right' === axis.orient) axis.innerOffset = {
-                                top: 2,
-                                bottom: 2
-                            };
-                            else if ('top' === axis.orient || 'bottom' === axis.orient) axis.innerOffset = {
+                            if ('left' === axis.orient || 'right' === axis.orient) {
+                                axis.innerOffset = {
+                                    top: 2,
+                                    bottom: 2
+                                };
+                                if (reshapeMeasures && reshapeMeasures.length > 1 && chartType === ChartTypeEnum.Heatmap && common_isNil(axis.title.text)) {
+                                    axis.title.visible = true;
+                                    axis.title.text = Object.values(datasetReshapeInfo[0].foldInfo.foldMap)[0];
+                                }
+                            } else if ('top' === axis.orient || 'bottom' === axis.orient) axis.innerOffset = {
                                 left: 2,
                                 right: 2
                             };
@@ -5243,12 +5334,20 @@
             };
             const { advancedVSeed } = context;
             const dimensions = advancedVSeed.dimensions;
+            const measures = advancedVSeed.measures ?? [];
             if (!dimensions) return result;
             const rowDimensions = dimensions.filter((dim)=>'row' === dim.encoding);
-            const rows = rowDimensions.map((dim)=>({
+            const rows = rowDimensions.map((dim)=>{
+                const baseConfig = {
                     dimensionKey: dim.id,
-                    title: dim.alias || dim.id
-                }));
+                    title: dim.alias ?? dim.id
+                };
+                if (dim.id === FoldYMeasureId) baseConfig.headerFormat = (title)=>{
+                    const measure = measures.find((m)=>m.id === title);
+                    return measure ? measure.alias ?? measure.id : title;
+                };
+                return baseConfig;
+            });
             return {
                 ...result,
                 rows: rows
@@ -5260,12 +5359,20 @@
             };
             const { advancedVSeed } = context;
             const dimensions = advancedVSeed.dimensions;
+            const measures = advancedVSeed.measures ?? [];
             if (!dimensions) return result;
             const columnDimensions = dimensions.filter((dim)=>'column' === dim.encoding);
-            const columns = columnDimensions.map((dim)=>({
+            const columns = columnDimensions.map((dim)=>{
+                const baseConfig = {
                     dimensionKey: dim.id,
-                    title: dim.alias || dim.id
-                }));
+                    title: dim.alias ?? dim.id
+                };
+                if (dim.id === FoldXMeasureId) baseConfig.headerFormat = (title)=>{
+                    const measure = measures.find((m)=>m.id === title);
+                    return measure ? measure.alias ?? measure.id : title;
+                };
+                return baseConfig;
+            });
             return {
                 ...result,
                 columns: columns
@@ -5278,8 +5385,9 @@
             const { advancedVSeed } = context;
             const { config, chartType } = advancedVSeed;
             const themConfig = config?.[chartType]?.pivotGrid ?? {};
-            if (result.columns && result.columns.length > 0) result.title = {
-                text: spec.columns.map((entry)=>entry.title).join('/'),
+            const columns = result.columns?.filter((c)=>c.dimensionKey !== FoldXMeasureId);
+            if (columns && columns.length > 0) result.title = {
+                text: columns.map((entry)=>entry.title).join('/'),
                 align: 'center',
                 orient: 'top',
                 padding: [
@@ -5421,8 +5529,8 @@
             const baseConfig = advancedVSeed.config[chartType];
             if (!baseConfig || !baseConfig.legend) return result;
             const { datasetReshapeInfo } = advancedVSeed;
-            const max = Math.max(...datasetReshapeInfo.map((d)=>d.foldInfo.statistics.colorMin));
-            const min = Math.min(...datasetReshapeInfo.map((d)=>d.foldInfo.statistics.colorMax));
+            const max = Math.max(...datasetReshapeInfo.map((d)=>d.foldInfo.statistics.colorMax));
+            const min = Math.min(...datasetReshapeInfo.map((d)=>d.foldInfo.statistics.colorMin));
             const { legend, color } = baseConfig;
             const { colorScheme, linearColorScheme } = color;
             const { enable, position = 'bottom', labelFontColor, labelColor, labelFontSize = 12, labelFontWeight = 400 } = legend || {};
@@ -5552,6 +5660,7 @@
             progressive,
             xBand,
             yLinear,
+            brush_brush,
             verticalCrosshairLine,
             colorAdapter(discreteLegend, colorLegend),
             colorPointStyleFill(pointStyle_pointStyle),
@@ -5578,6 +5687,7 @@
                 progressive,
                 xBand,
                 pivotAxisStyle(yLinear),
+                brush_brush,
                 verticalCrosshairLine,
                 colorPointStyleFill(pointStyle_pointStyle),
                 pointStateDimensionHover,
@@ -5689,6 +5799,7 @@
                 'stackCornerRadius',
                 'barMaxWidth',
                 'barGapInGroup',
+                'brush',
                 'dimensionLinkage'
             ]);
             const config = replaceNullToUndefined(pickedConfig);
@@ -6538,6 +6649,7 @@
             xBand,
             yLinear,
             label_label,
+            brush_brush,
             tooltip_tooltip,
             verticalCrosshairRect,
             colorAdapter(discreteLegend, colorLegend),
@@ -6564,6 +6676,7 @@
                 progressive,
                 xBand,
                 pivotAxisStyle(yLinear),
+                brush_brush,
                 label_label,
                 tooltip_tooltip,
                 verticalCrosshairRect,
@@ -6598,7 +6711,8 @@
                 'color',
                 'label',
                 'legend',
-                'tooltip'
+                'tooltip',
+                'brush'
             ]);
             const config = replaceNullToUndefined(pickedConfig);
             result.config = {
@@ -6621,7 +6735,6 @@
         const roseParallelConfig = pieConfig;
         const radarConfig = pieConfig;
         const funnelConfig = pieConfig;
-        const heatmapConfig = pieConfig;
         const columnParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
@@ -6743,6 +6856,7 @@
             xBand,
             yLinear,
             label_label,
+            brush_brush,
             tooltip_tooltip,
             colorAdapter(discreteLegend, colorLegend),
             verticalCrosshairRect,
@@ -6767,6 +6881,7 @@
                 progressive,
                 xBand,
                 pivotAxisStyle(yLinear),
+                brush_brush,
                 label_label,
                 tooltip_tooltip,
                 verticalCrosshairRect,
@@ -6840,6 +6955,7 @@
             xBand,
             yLinear,
             label_label,
+            brush_brush,
             tooltip_tooltip,
             colorAdapter(discreteLegend, colorLegend),
             verticalCrosshairRect,
@@ -6866,6 +6982,7 @@
                 progressive,
                 xBand,
                 pivotAxisStyle(yLinear),
+                brush_brush,
                 label_label,
                 tooltip_tooltip,
                 verticalCrosshairRect,
@@ -7194,6 +7311,7 @@
             xLinear,
             yBand,
             label_label,
+            brush_brush,
             tooltip_tooltip,
             colorAdapter(discreteLegend, colorLegend),
             horizontalCrosshairRect,
@@ -7219,6 +7337,7 @@
                 xLinear,
                 pivotAxisStyle(yBand),
                 label_label,
+                brush_brush,
                 tooltip_tooltip,
                 colorBarStyleFill(barStyle_barStyle),
                 horizontalCrosshairRect,
@@ -7311,6 +7430,7 @@
             xLinear,
             yBand,
             label_label,
+            brush_brush,
             tooltip_tooltip,
             colorAdapter(discreteLegend, colorLegend),
             horizontalCrosshairRect,
@@ -7334,6 +7454,7 @@
                 datasetYX,
                 xLinear,
                 pivotAxisStyle(yBand),
+                brush_brush,
                 label_label,
                 tooltip_tooltip,
                 colorBarStyleFill(barStyle_barStyle),
@@ -7399,6 +7520,7 @@
             xLinear,
             yBand,
             label_label,
+            brush_brush,
             tooltip_tooltip,
             colorAdapter(discreteLegend, colorLegend),
             horizontalCrosshairRect,
@@ -7423,6 +7545,7 @@
                 datasetYX,
                 xLinear,
                 pivotAxisStyle(yBand),
+                brush_brush,
                 label_label,
                 tooltip_tooltip,
                 colorBarStyleFill(barStyle_barStyle),
@@ -7591,6 +7714,7 @@
             xBand,
             yLinear,
             label_label,
+            brush_brush,
             tooltip_tooltip,
             colorAdapter(discreteLegend, colorLegend),
             verticalCrosshairLine,
@@ -7619,6 +7743,7 @@
                 xBand,
                 pivotAxisStyle(yLinear),
                 label_label,
+                brush_brush,
                 tooltip_tooltip,
                 verticalCrosshairLine,
                 colorPointStyleFill(pointStyle_pointStyle),
@@ -7686,6 +7811,7 @@
             xBand,
             yLinear,
             label_label,
+            brush_brush,
             tooltip_tooltip,
             colorAdapter(discreteLegend, colorLegend),
             verticalCrosshairLine,
@@ -7714,6 +7840,7 @@
                 xBand,
                 pivotAxisStyle(yLinear),
                 label_label,
+                brush_brush,
                 tooltip_tooltip,
                 verticalCrosshairLine,
                 colorPointStyleFill(pointStyle_pointStyle),
@@ -7740,38 +7867,56 @@
         };
         const buildMeasuresForScatter = (advancedVSeed)=>{
             const { measures = [] } = advancedVSeed;
-            const measuresByView = {};
-            const parentIds = [];
+            const encodedMeasures = [];
             for(let index = 0; index < measures.length; index++){
                 const item = measures[index];
                 const encoding = item.encoding;
-                const parentId = item.parentId || DEFAULT_PARENT_ID;
                 const isYAxis = 'yAxis' === encoding;
                 const isXAxis = 'xAxis' === encoding;
                 const isOtherEncoding = item.encoding && isCommonMeasureEncoding(encoding);
-                ensureParentIdInitialized(parentId, measuresByView, parentIds);
-                if (isYAxis) measuresByView[parentId].push(item);
-                else if (isXAxis) measuresByView[parentId].push(item);
+                if (isYAxis) encodedMeasures.push(item);
+                else if (isXAxis) encodedMeasures.push(item);
                 else if (!isOtherEncoding && 'size' !== encoding) {
-                    const xCount = measuresByView[parentId].filter((m)=>'xAxis' === m.encoding).length;
+                    const xCount = encodedMeasures.filter((m)=>'xAxis' === m.encoding).length;
                     item.encoding = 0 === xCount ? 'xAxis' : 'yAxis';
-                    measuresByView[parentId].push(item);
+                    encodedMeasures.push(item);
                 }
             }
-            advancedVSeed.reshapeMeasures = parentIds.map((pid)=>{
-                const basicMeasures = measuresByView[pid];
-                const xCount = basicMeasures.filter((m)=>'xAxis' === m.encoding).length;
-                const yCount = basicMeasures.filter((m)=>'yAxis' === m.encoding).length;
-                if (0 === yCount && xCount > 0) {
-                    const cloneMeasure = chunk_BCBB46UE_d(basicMeasures[0]);
-                    cloneMeasure.encoding = 'yAxis';
-                    return [
-                        ...basicMeasures,
-                        cloneMeasure
-                    ];
+            const xCount = encodedMeasures.filter((m)=>'xAxis' === m.encoding).length;
+            const yCount = encodedMeasures.filter((m)=>'yAxis' === m.encoding).length;
+            if (0 === yCount && xCount > 0) {
+                const cloneMeasure = chunk_BCBB46UE_d(encodedMeasures[0]);
+                cloneMeasure.encoding = 'yAxis';
+                encodedMeasures.push(cloneMeasure);
+            }
+            advancedVSeed.reshapeMeasures = encodedMeasures.length > 0 ? [
+                encodedMeasures
+            ] : [];
+            return advancedVSeed;
+        };
+        const addPivotDimensionsForScatter = (advancedVSeed)=>{
+            const { reshapeMeasures = [] } = advancedVSeed;
+            if (reshapeMeasures[0]?.length >= 2) {
+                const dimensions = advancedVSeed.dimensions ?? [];
+                const xMeasures = reshapeMeasures[0].filter((m)=>'xAxis' === m.encoding);
+                const yMeasures = reshapeMeasures[0].filter((m)=>'yAxis' === m.encoding);
+                if (xMeasures.length > 1 || yMeasures.length > 1) {
+                    dimensions.push({
+                        id: FoldXMeasureId,
+                        alias: ' ',
+                        encoding: 'column'
+                    });
+                    dimensions.push({
+                        id: FoldYMeasureId,
+                        alias: ' ',
+                        encoding: 'row'
+                    });
                 }
-                return basicMeasures;
-            }).filter((m)=>m.length > 0);
+                return {
+                    ...advancedVSeed,
+                    dimensions
+                };
+            }
             return advancedVSeed;
         };
         const defaultEncodingForScatter = (advancedVSeed)=>{
@@ -7802,7 +7947,11 @@
             const dimensionsWithoutMeasureId = dimensions.filter((item)=>item.id !== MeasureId);
             const uniqueDimIds = chunk_QJLMYOTX_i(dimensionsWithoutMeasureId.map((d)=>d.id));
             encoding.detail = encoding.color;
-            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureId);
+            encoding.tooltip = uniqueDimIds.filter((d)=>![
+                    MeasureId,
+                    FoldYMeasureId,
+                    FoldXMeasureId
+                ].includes(d));
             encoding.label = [];
             encoding.row = [];
             encoding.column = [];
@@ -7814,7 +7963,11 @@
                 MeasureId
             ];
             encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
-            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureId);
+            encoding.tooltip = encoding.tooltip.filter((d)=>![
+                    MeasureId,
+                    FoldYMeasureId,
+                    FoldXMeasureId
+                ].includes(d));
             encoding.label = chunk_QJLMYOTX_i(dimensions.filter((item)=>'label' === item.encoding).map((item)=>item.id));
             encoding.label = encoding.label.filter((d)=>d !== MeasureId);
         };
@@ -7838,7 +7991,8 @@
                 ...encoding.tooltip || [],
                 ...label,
                 ...tooltip,
-                ...color
+                ...color,
+                ...encoding.size
             ]);
         };
         const scatterConfig = (advancedVSeed, context)=>{
@@ -7858,6 +8012,7 @@
                 'sizeRange',
                 'size',
                 'crosshairLine',
+                'brush',
                 'dimensionLinkage'
             ]);
             const config = replaceNullToUndefined(pickedConfig);
@@ -7880,6 +8035,7 @@
             const measures = reshapeMeasures?.[0] ?? [];
             const foldInfoList = [];
             const unfoldInfoList = [];
+            const sizeEncodingIds = encoding?.size ?? [];
             const datasets = [];
             const xMeasures = measures.filter((m)=>'xAxis' === m.encoding);
             const yMeasures = measures.filter((m)=>'yAxis' === m.encoding);
@@ -7887,7 +8043,8 @@
                 foldMeasureValue: FoldXMeasureValue,
                 foldMeasureId: FoldXMeasureId,
                 colorItemAsId: true,
-                colorMeasureId: getColorMeasureId(advancedVSeed, vseed)
+                colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
+                omitIds: xMeasures.map((m)=>m.id).filter((id)=>!sizeEncodingIds.includes(id))
             });
             datasets.push(xResult.dataset);
             foldInfoList.push(xResult.foldInfo);
@@ -7896,7 +8053,8 @@
                 foldMeasureValue: FoldYMeasureValue,
                 foldMeasureId: FoldYMeasureId,
                 colorItemAsId: true,
-                colorMeasureId: getColorMeasureId(advancedVSeed, vseed)
+                colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
+                omitIds: yMeasures.map((m)=>m.id).filter((id)=>!sizeEncodingIds.includes(id))
             });
             datasets[0] = yResult.dataset;
             foldInfoList.push(yResult.foldInfo);
@@ -7932,7 +8090,8 @@
             const { encoding, chartType } = advancedVSeed;
             const reshapeMeasures = advancedVSeed.reshapeMeasures ?? [];
             const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
-            const allMeasuresIds = reshapeMeasures.flatMap((measureGroup)=>measureGroup.map((m)=>m.id));
+            let allMeasuresIds = chunk_QJLMYOTX_i(reshapeMeasures.flatMap((measureGroup)=>measureGroup.map((m)=>m.id)));
+            if (encoding?.size?.length) allMeasuresIds = allMeasuresIds.filter((mId)=>!encoding.size.includes(mId));
             const datasetList = [];
             const datasetReshapeInfo = [];
             reshapeMeasures.forEach((measures, index)=>{
@@ -7943,6 +8102,7 @@
                 const yMeasures = measures.filter((m)=>'yAxis' === m.encoding);
                 const xResult = dataReshapeByEncoding(dataset, dimensions, xMeasures, encoding, {
                     foldMeasureValue: `${FoldXMeasureValue}${index}`,
+                    foldMeasureId: FoldXMeasureId,
                     colorItemAsId: true,
                     colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
                     omitIds: allMeasuresIds
@@ -7952,6 +8112,7 @@
                 unfoldInfoList.push(xResult.unfoldInfo);
                 const yResult = dataReshapeByEncoding(dataset, dimensions, yMeasures, encoding, {
                     foldMeasureValue: `${FoldYMeasureValue}${index}`,
+                    foldMeasureId: FoldYMeasureId,
                     colorItemAsId: true,
                     colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
                     omitIds: allMeasuresIds
@@ -7975,10 +8136,10 @@
                     unfoldInfo: unfoldInfo
                 };
                 datasetReshapeInfo.push(reshapeInfo);
-                datasetList.push(datasets[0].map((d, index)=>({
-                        ...d,
-                        ...datasets[1]?.[index] || {}
-                    })));
+                datasetList.push(datasets[0].flatMap((d)=>datasets[1].filter((yDatum)=>yDatum[ORIGINAL_DATA] === d[ORIGINAL_DATA]).map((yDatum)=>({
+                            ...d,
+                            ...yDatum
+                        }))));
             });
             return {
                 ...result,
@@ -7993,9 +8154,11 @@
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
                 buildMeasuresForScatter,
+                addPivotDimensionsForScatter,
                 defaultEncodingForScatter
             ], [
                 buildMeasuresForScatter,
+                addPivotDimensionsForScatter,
                 encodingForScatter,
                 pickDimensionsForReshape
             ]),
@@ -8097,7 +8260,8 @@
                     title: {
                         visible: false
                     },
-                    content: tooltipScatter_createMarkContent(encoding.tooltip || [], dimensions, vseed.measures, locale, foldInfoList)
+                    content: tooltipScatter_createMarkContent(encoding.tooltip || [], dimensions, vseed.measures, locale, foldInfoList),
+                    updateContent: (prev = [])=>T(prev, (entry)=>`${String(entry.key)}::${String(entry.value)}`)
                 },
                 dimension: {
                     visible: false
@@ -8144,7 +8308,13 @@
                     visible: true,
                     hasShape: true,
                     shapeType: 'rectRound',
-                    key: Object.values(foldInfo.foldMap)[0],
+                    key: (v)=>{
+                        const { measureId, foldMap } = foldInfo;
+                        const datum = v;
+                        if (!datum) return '';
+                        const id = datum[measureId];
+                        return foldMap[id] ?? id;
+                    },
                     value: (v)=>{
                         const { measureId, measureValue } = foldInfo;
                         const datum = v;
@@ -8662,6 +8832,7 @@
             progressive,
             xLinear,
             yLinear,
+            brush_brush,
             scatterSize,
             labelScatter,
             tooltipScatter,
@@ -8692,6 +8863,7 @@
                 progressive,
                 xLinear,
                 pivotAxisStyle(yLinear),
+                brush_brush,
                 scatterSize,
                 labelScatter,
                 tooltipScatter,
@@ -8826,6 +8998,7 @@
             const { encoding, chartType } = advancedVSeed;
             const measures = advancedVSeed.reshapeMeasures?.[0] ?? [];
             const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
+            const allMeasuresIds = measures.map((m)=>m.id);
             const foldInfoList = [];
             const unfoldInfoList = [];
             const datasets = [];
@@ -8839,7 +9012,8 @@
                 const primaryResult = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(primaryMeasures.filter((m)=>m.chartType === chartType), (item)=>item.id), encoding, {
                     colorItemAsId: false,
                     foldMeasureValue: FoldPrimaryMeasureValue,
-                    colorMeasureId: getColorMeasureId(advancedVSeed, vseed)
+                    colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
+                    omitIds: allMeasuresIds
                 });
                 primaryResult.dataset.forEach((row)=>{
                     row[DimAxisType] = 'primaryYAxis';
@@ -8852,7 +9026,8 @@
                 const secondaryResult = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(secondaryMeasures.filter((m)=>m.chartType === chartType), (item)=>item.id), encoding, {
                     colorItemAsId: false,
                     foldMeasureValue: FoldSecondaryMeasureValue,
-                    colorMeasureId: getColorMeasureId(advancedVSeed, vseed)
+                    colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
+                    omitIds: allMeasuresIds
                 });
                 secondaryResult.dataset.forEach((row)=>{
                     row[DimAxisType] = 'secondaryYAxis';
@@ -9231,7 +9406,7 @@
                         title: {
                             visible: true
                         },
-                        content: createDimensionContent(dimensions, measures, options.foldInfo, unfoldInfo, reshapeMeasures.length > 1)
+                        content: createDimensionContent(encoding.tooltip || [], measures, options.foldInfo, unfoldInfo, reshapeMeasures.length > 1)
                     }
                 };
                 return result;
@@ -9403,21 +9578,21 @@
         };
         const isObjectLike = (value)=>"object" == typeof value && null !== value;
         const common_isObjectLike = isObjectLike;
-        const isPlainObject = function(value) {
+        const isPlainObject_isPlainObject = function(value) {
             if (!common_isObjectLike(value) || !isType(value, "Object")) return !1;
             if (null === Object.getPrototypeOf(value)) return !0;
             let proto = value;
             for(; null !== Object.getPrototypeOf(proto);)proto = Object.getPrototypeOf(proto);
             return Object.getPrototypeOf(value) === proto;
         };
-        const common_isPlainObject = isPlainObject;
+        const isPlainObject = isPlainObject_isPlainObject;
         const isString = (value, fuzzy = !1)=>{
             const type = typeof value;
             return fuzzy ? "string" === type : "string" === type || isType(value, "String");
         };
         const common_isString = isString;
         function pickWithout(obj, keys) {
-            if (!obj || !common_isPlainObject(obj)) return obj;
+            if (!obj || !isPlainObject(obj)) return obj;
             const result = {};
             return Object.keys(obj).forEach((k)=>{
                 const v = obj[k];
@@ -9715,6 +9890,7 @@
             background_backgroundColor,
             datasetXY,
             progressive,
+            brush_brush,
             colorPieStyleFill(pieStyle),
             colorAdapter(discreteLegend, colorLegend),
             labelPie,
@@ -9736,6 +9912,7 @@
                 background_backgroundColor,
                 datasetXY,
                 progressive,
+                brush_brush,
                 colorPieStyleFill(pieStyle),
                 labelPie,
                 tooltip_tooltip,
@@ -9812,6 +9989,7 @@
             background_backgroundColor,
             datasetXY,
             progressive,
+            brush_brush,
             labelPie,
             colorPieStyleFill(pieStyle),
             colorAdapter(discreteLegend, colorLegend),
@@ -9834,6 +10012,7 @@
                 background_backgroundColor,
                 datasetXY,
                 progressive,
+                brush_brush,
                 labelPie,
                 colorPieStyleFill(pieStyle),
                 tooltip_tooltip,
@@ -10610,11 +10789,12 @@
         const pivotFunnel = [
             initPivot,
             pivotGridStyle,
-            pivotIndicatorsAsRow,
+            pivotIndicatorsAsCol,
             pivotHideIndicatorName,
             datasetPivot,
             pivotIndicators_pivotIndicators([
                 initFunnel,
+                addRegionPadding,
                 background_backgroundColor,
                 datasetXY,
                 colorAdapter(color_color, linearColor),
@@ -10693,15 +10873,11 @@
         };
         const heatmap_generateDefaultMeasureEncoding = (measures, encoding)=>{
             const colorDims = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding || !item.encoding).map((item)=>item.id));
-            if (colorDims.length > 0) encoding.color = [
-                colorDims[0]
-            ];
+            if (colorDims.length > 0) encoding.color = colorDims;
         };
         const heatmap_generateMeasureEncoding = (measures, encoding)=>{
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            if (color.length > 0) encoding.color = [
-                color[0]
-            ];
+            if (color.length > 0) encoding.color = color;
             const label = chunk_QJLMYOTX_i(measures.filter((item)=>'label' === item.encoding).map((item)=>item.id));
             encoding.label = chunk_QJLMYOTX_i([
                 ...encoding.label || [],
@@ -10714,6 +10890,32 @@
                 ...tooltip
             ]);
         };
+        const heatmapConfig = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { chartType } = vseed;
+            const result = {
+                ...advancedVSeed
+            };
+            const pickedConfig = chunk_2T7K3PFL_i(vseed, [
+                'backgroundColor',
+                'color',
+                'label',
+                'legend',
+                'tooltip',
+                'xAxis',
+                'yAxis',
+                'brush',
+                'dimensionLinkage'
+            ]);
+            const config = replaceNullToUndefined(pickedConfig);
+            result.config = {
+                ...result.config || {},
+                [chartType]: {
+                    ...config
+                }
+            };
+            return result;
+        };
         const heatmapAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
@@ -10778,37 +10980,32 @@
             };
             return result;
         };
-        const colorCellStyleFill = (stylePipe)=>(spec, context)=>{
-                const result = stylePipe(spec, context);
-                const { advancedVSeed, vseed } = context;
-                const { datasetReshapeInfo } = advancedVSeed;
-                const { unfoldInfo } = datasetReshapeInfo[0];
-                if (isLinearColor(advancedVSeed, vseed)) {
-                    if (result?.cell?.style) result.cell.style.fill = {
-                        field: unfoldInfo.encodingColor,
-                        scale: 'color'
-                    };
-                }
-                return result;
-            };
         const markStyle_cellStyle_cellStyle = (spec, context)=>{
-            const result = {
-                ...spec,
-                cell: {
-                    style: {}
-                }
-            };
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
             const cell = advancedVSeed.config?.[chartType]?.cell;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo } = datasetReshapeInfo[0];
             return {
-                ...result,
+                ...spec,
                 cell: {
                     style: {
                         visible: (datum)=>datum?.[DATUM_HIDE_KEY] !== true,
                         shape: 'rect',
                         stroke: cell?.stroke,
-                        lineWidth: cell?.lineWidth ?? 1
+                        lineWidth: cell?.lineWidth ?? 1,
+                        fill: {
+                            field: isLinearColor(advancedVSeed, vseed) ? unfoldInfo.encodingColor : unfoldInfo.encodingColorId,
+                            scale: 'color'
+                        }
+                    },
+                    state: {
+                        hover: {
+                            shadowColor: cell?.hoverShadowColor,
+                            shadowBlur: 5,
+                            shadowOffsetX: 0,
+                            shadowOffsetY: 0
+                        }
                     }
                 }
             };
@@ -10904,6 +11101,21 @@
                 ...meaContent
             ];
         };
+        const heatmapColorDomain = (spec, context)=>{
+            const { advancedVSeed } = context;
+            const indicators = spec.indicators;
+            if (!indicators || !indicators.length || indicators.every((ind)=>ind.chartSpec.color?.type !== 'linear')) return spec;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const max = Math.max(...datasetReshapeInfo.map((d)=>d.foldInfo.statistics.colorMax));
+            const min = Math.min(...datasetReshapeInfo.map((d)=>d.foldInfo.statistics.colorMin));
+            indicators.forEach((ind)=>{
+                if (ind.chartSpec.color?.type === 'linear') ind.chartSpec.color.domain = [
+                    min,
+                    max
+                ];
+            });
+            return spec;
+        };
         const initHeatmap = (spec, context)=>{
             const result = {
                 ...spec
@@ -10933,8 +11145,9 @@
             colorAdapter(color_color, linearColor),
             label_label,
             heatmapBandAxis,
+            brush_brush,
             colorAdapter(discreteLegend, heatmapColorLegend),
-            colorCellStyleFill(markStyle_cellStyle_cellStyle),
+            markStyle_cellStyle_cellStyle,
             tooltipHeatmap,
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
@@ -10947,19 +11160,21 @@
             pivotIndicatorsAsRow,
             datasetPivot,
             pivotIndicators_pivotIndicators([
-                pivotAxisStyle(initHeatmap),
+                initHeatmap,
                 background_backgroundColor,
                 datasetXY,
                 colorAdapter(color_color, linearColor),
                 label_label,
-                heatmapBandAxis,
+                pivotAxisStyle(heatmapBandAxis),
+                brush_brush,
                 tooltipHeatmap,
-                colorCellStyleFill(markStyle_cellStyle_cellStyle),
+                markStyle_cellStyle_cellStyle,
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
                 annotationHorizontalLine_annotationHorizontalLine,
                 annotationArea_annotationArea
             ]),
+            heatmapColorDomain,
             pivotRowDimensions,
             pivotColumnDimensions,
             pivotTitle,
@@ -11790,7 +12005,7 @@
                     const length = objValue.length;
                     for(; ++index < length;)newValue[index] = objValue[index];
                 }
-            } else common_isPlainObject(srcValue) ? (newValue = null != objValue ? objValue : {}, "function" != typeof objValue && "object" == typeof objValue || (newValue = {})) : isCommon = !1;
+            } else isPlainObject(srcValue) ? (newValue = null != objValue ? objValue : {}, "function" != typeof objValue && "object" == typeof objValue || (newValue = {})) : isCommon = !1;
             isCommon && baseMerge(newValue, srcValue, shallowArray, skipTargetArray), assignMergeValue(target, key, newValue);
         }
         function assignMergeValue(target, key, value) {
@@ -11824,6 +12039,7 @@
                 'binCount',
                 'binStep',
                 'binValueType',
+                'brush',
                 'dimensionLinkage'
             ]);
             let config = replaceNullToUndefined(pickedConfig);
@@ -12160,7 +12376,8 @@
             } else if (encoding.x0?.length && encoding.x1?.length && encoding.y?.length) {
                 const res = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), measures.filter((item)=>encoding.y?.includes(item.id)).slice(0, 1), encoding, {
                     colorItemAsId: false,
-                    colorMeasureId
+                    colorMeasureId,
+                    omitIds: []
                 });
                 res.dataset.forEach((datum)=>{
                     datum[BinStartMeasureId] = datum[encoding.x0[0]];
@@ -12263,7 +12480,8 @@
                 } else if (encoding.x0?.length && encoding.x1?.length && encoding.y?.length) {
                     const res = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), subMeasures.filter((item)=>encoding.y?.includes(item.id)).slice(0, 1), encoding, {
                         colorItemAsId: false,
-                        colorMeasureId
+                        colorMeasureId,
+                        omitIds: []
                     });
                     res.dataset.forEach((datum)=>{
                         datum[BinStartMeasureId] = datum[encoding.x0[0]];
@@ -12905,6 +13123,7 @@
             histogramXLinear,
             yLinear,
             label_label,
+            brush_brush,
             tooltipHistogram,
             colorAdapter(discreteLegend, colorLegend),
             histogramVerticalCrosshairRect,
@@ -12928,6 +13147,7 @@
                 progressive,
                 histogramXLinear,
                 pivotAxisStyle(yLinear),
+                brush_brush,
                 label_label,
                 tooltipHistogram,
                 colorBarStyleFill(barStyle_barStyle),
@@ -13040,6 +13260,14 @@
                 ...getDefaultLabel(),
                 labelStroke: '#fff'
             });
+        const getFunnelDarkLabel = ()=>({
+                ...getDefaultLabel(),
+                labelColor: '#fff'
+            });
+        const getFunnelLightLabel = ()=>({
+                ...getDefaultLabel(),
+                labelColor: '#fff'
+            });
         const getDefaultLegend = ()=>({
                 enable: true,
                 border: true,
@@ -13073,6 +13301,24 @@
                 handlerBorderColor: '#fff',
                 railBackgroundColor: '#f1f3f4'
             });
+        const getLightBrushConfig = ()=>({
+                enable: false,
+                inBrushStyle: {
+                    opacity: 1
+                },
+                outOfBrushStyle: {
+                    opacity: 0.2
+                }
+            });
+        const getDarkBrushConfig = ()=>({
+                enable: false,
+                inBrushStyle: {
+                    opacity: 1
+                },
+                outOfBrushStyle: {
+                    opacity: 0.25
+                }
+            });
         const getDefaultTableConfig = ()=>({
                 bodyFontSize: 12,
                 bodyBackgroundColor: 'transparent',
@@ -13423,10 +13669,12 @@
                 textColor: '#888C93'
             });
         const getLightHeatmapCellTheme = ()=>({
-                stroke: '#fff'
+                stroke: '#fff',
+                hoverShadowColor: '#404349'
             });
         const getDarkHeatmapCellTheme = ()=>({
-                stroke: '#404349'
+                stroke: '#404349',
+                hoverShadowColor: '#404349'
             });
         const getDefaultRegressionLine = ()=>({
                 lineWidth: 2,
@@ -13542,7 +13790,8 @@
                 color: getLightColor(),
                 label: getLightLabel(),
                 legend: getLightLegend(),
-                tooltip: getLightTooltip()
+                tooltip: getLightTooltip(),
+                brush: getLightBrushConfig()
             };
             const tableConfig = getLightTableConfig();
             return {
@@ -13752,6 +14001,7 @@
                     },
                     funnel: {
                         ...baseConfig,
+                        label: getFunnelLightLabel(),
                         transform: getLightFunnelTransformTheme(),
                         pivotGrid: getLightPivotChartGridConfig()
                     },
@@ -13812,7 +14062,8 @@
                 color: getDarkColor(),
                 label: getDarkLabel(),
                 legend: getDarkLegend(),
-                tooltip: getDarkTooltip()
+                tooltip: getDarkTooltip(),
+                brush: getDarkBrushConfig()
             };
             const tableConfig = getDarkTableConfig();
             return {
@@ -14016,6 +14267,7 @@
                     },
                     funnel: {
                         ...baseConfig,
+                        label: getFunnelDarkLabel(),
                         transform: getDarkFunnelTransformTheme(),
                         pivotGrid: getDarkPivotChartGridConfig()
                     },
@@ -18240,6 +18492,23 @@
             showTooltip: schemas_boolean().nullish(),
             showLabel: schemas_boolean().nullish()
         });
+        const zBrushConfig = schemas_object({
+            enable: schemas_boolean().optional().default(false),
+            inBrushStyle: schemas_object({
+                opacity: schemas_number().optional(),
+                stroke: schemas_string().optional(),
+                lineWidth: schemas_number().optional()
+            }).optional(),
+            outOfBrushStyle: schemas_object({
+                opacity: schemas_number().optional(),
+                stroke: schemas_string().optional(),
+                lineWidth: schemas_number().optional()
+            }).optional()
+        });
+        const zBrush = schemas_object({
+            enable: schemas_boolean().optional().default(false),
+            removeOnClick: schemas_boolean().optional().default(true)
+        });
         const zLineConfig = schemas_object({
             backgroundColor: zBackgroundColor.nullish(),
             label: zLabel.nullish(),
@@ -18251,7 +18520,8 @@
             crosshairLine: zCrosshairLine.nullish(),
             pivotGrid: zPivotChartGridConfig.nullish(),
             annotation: zAnnotationConfig.nullish(),
-            dimensionLinkage: zDimensionLinkage.nullish()
+            dimensionLinkage: zDimensionLinkage.nullish(),
+            brush: zBrushConfig.nullish()
         });
         const zStackCornerRadius = schemas_number().or(schemas_array(schemas_number())).default([
             3,
@@ -18308,7 +18578,8 @@
             barGapInGroup: zBarGapInGroup.nullish(),
             pivotGrid: zPivotChartGridConfig.nullish(),
             annotation: zAnnotationConfig.nullish(),
-            dimensionLinkage: zDimensionLinkage.nullish()
+            dimensionLinkage: zDimensionLinkage.nullish(),
+            brush: zBrushConfig.nullish()
         });
         const zColumnConfig = zColumnParallelConfig.extend({
             regressionLine: zRegressionLine.nullish()
@@ -18326,7 +18597,8 @@
             stackCornerRadius: zStackCornerRadius.nullish(),
             pivotGrid: zPivotChartGridConfig.nullish(),
             annotation: zAnnotationConfig.nullish(),
-            dimensionLinkage: zDimensionLinkage.nullish()
+            dimensionLinkage: zDimensionLinkage.nullish(),
+            brush: zBrushConfig.nullish()
         });
         const zBarParallelConfig = zBarConfig;
         const zBarPercentConfig = zBarConfig;
@@ -18341,7 +18613,8 @@
             crosshairLine: zCrosshairLine.nullish(),
             pivotGrid: zPivotChartGridConfig.nullish(),
             annotation: zAnnotationConfig.nullish(),
-            dimensionLinkage: zDimensionLinkage.nullish()
+            dimensionLinkage: zDimensionLinkage.nullish(),
+            brush: zBrushConfig.nullish()
         });
         const zAreaPercentConfig = zAreaConfig;
         const zScatterConfig = schemas_object({
@@ -18358,7 +18631,8 @@
             pivotGrid: zPivotChartGridConfig.nullish(),
             annotation: zAnnotationConfig.nullish(),
             regressionLine: zRegressionLine.nullish(),
-            dimensionLinkage: zDimensionLinkage.nullish()
+            dimensionLinkage: zDimensionLinkage.nullish(),
+            brush: zBrushConfig.nullish()
         });
         const zDualAxisConfig = schemas_object({
             backgroundColor: zBackgroundColor.nullish(),
@@ -18389,7 +18663,8 @@
             tooltip: zTooltip.nullish(),
             legend: zLegend.nullish(),
             pivotGrid: zPivotChartGridConfig.nullish(),
-            cornerRadius: schemas_number().nullish()
+            cornerRadius: schemas_number().nullish(),
+            brush: zBrushConfig.nullish()
         });
         const zDonutConfig = zPieConfig;
         const zRadarConfig = zPieConfig;
@@ -18418,7 +18693,8 @@
         const zHeatmapCell = schemas_object({
             stroke: schemas_string().nullish(),
             lineWidth: schemas_number().nullish(),
-            cornerRadius: schemas_number().nullish()
+            cornerRadius: schemas_number().nullish(),
+            hoverShadowColor: schemas_string().nullish()
         });
         const zHeatmapConfig = schemas_object({
             backgroundColor: zBackgroundColor.nullish(),
@@ -18429,7 +18705,8 @@
             pivotGrid: zPivotChartGridConfig.nullish(),
             cell: zHeatmapCell.nullish(),
             xAxis: zXBandAxis.nullish(),
-            yAxis: zYBandAxis.nullish()
+            yAxis: zYBandAxis.nullish(),
+            brush: zBrushConfig.nullish()
         });
         const zPivotTableConfig = zTableConfig;
         const zWhiskersConfig = schemas_number().or(schemas_array(schemas_number())).default(1.5);
@@ -18502,7 +18779,8 @@
             binStep: schemas_number().positive().nullish(),
             binValueType: literal('count').or(literal('percentage')).nullish(),
             regressionLine: zRegressionLine.nullish(),
-            dimensionLinkage: zDimensionLinkage.nullish()
+            dimensionLinkage: zDimensionLinkage.nullish(),
+            brush: zBrushConfig.nullish()
         });
         const zConfig = schemas_object({
             table: zTableConfig.nullish(),
@@ -18750,6 +19028,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXBandAxis.nullish(),
             yAxis: zYLinearAxis.nullish(),
             crosshairLine: zCrosshairLine.nullish(),
@@ -18776,6 +19055,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXBandAxis.nullish(),
             yAxis: zYLinearAxis.nullish(),
             sort: zSort.nullish(),
@@ -18804,6 +19084,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXBandAxis.nullish(),
             yAxis: zYLinearAxis.nullish(),
             crosshairRect: zCrosshairRect.nullish(),
@@ -18830,6 +19111,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXBandAxis.nullish(),
             yAxis: zYLinearAxis.nullish(),
             crosshairRect: zCrosshairRect.nullish(),
@@ -18855,6 +19137,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXLinearAxis.nullish(),
             yAxis: zYBandAxis.nullish(),
             crosshairRect: zCrosshairRect.nullish(),
@@ -18880,6 +19163,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXLinearAxis.nullish(),
             yAxis: zYBandAxis.nullish(),
             crosshairRect: zCrosshairRect.nullish(),
@@ -18906,6 +19190,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXLinearAxis.nullish(),
             yAxis: zYBandAxis.nullish(),
             crosshairRect: zCrosshairRect.nullish(),
@@ -18931,6 +19216,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXBandAxis.nullish(),
             yAxis: zYLinearAxis.nullish(),
             crosshairLine: zCrosshairLine.nullish(),
@@ -18956,6 +19242,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXBandAxis.nullish(),
             yAxis: zYLinearAxis.nullish(),
             crosshairLine: zCrosshairLine.nullish(),
@@ -18983,6 +19270,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXLinearAxis.nullish(),
             yAxis: zYLinearAxis.nullish(),
             crosshairLine: zCrosshairLine.nullish(),
@@ -19013,6 +19301,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             crosshairRect: zCrosshairRect.nullish(),
             sort: zSort.nullish(),
             sortLegend: zSortLegend.nullish(),
@@ -19041,6 +19330,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXLinearAxis.nullish(),
             yAxis: zYLinearAxis.nullish(),
             crosshairRect: zCrosshairRect.nullish(),
@@ -19069,6 +19359,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             theme: zTheme.nullish(),
             locale: zLocale.nullish()
         });
@@ -19083,6 +19374,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             theme: zTheme.nullish(),
             locale: zLocale.nullish()
         });
@@ -19097,6 +19389,7 @@
             label: zPieLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             theme: zTheme.nullish(),
             locale: zLocale.nullish()
         });
@@ -19111,6 +19404,7 @@
             label: zPieLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             theme: zTheme.nullish(),
             locale: zLocale.nullish()
         });
@@ -19125,6 +19419,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             theme: zTheme.nullish(),
             locale: zLocale.nullish()
         });
@@ -19139,6 +19434,7 @@
             label: zLabel.nullish(),
             legend: zColorLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             theme: zTheme.nullish(),
             locale: zLocale.nullish()
         });
@@ -19152,6 +19448,7 @@
             label: zLabel.nullish(),
             legend: zColorLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             theme: zTheme.nullish(),
             locale: zLocale.nullish()
         });
@@ -19166,6 +19463,7 @@
             label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
+            brush: zBrush.nullish(),
             xAxis: zXBandAxis.nullish(),
             yAxis: zYLinearAxis.nullish(),
             sort: zSort.nullish(),