@visactor/vchart 1.7.0-alpha.0 → 1.7.0-alpha.2

package/cjs/series/area/area.js

@@ -28,7 +28,7 @@ class AreaSeries extends cartesian_1.CartesianSeries {
         areaSpec.visible = !(!isAreaVisible && !isLineVisible);
     }
     initMark() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const progressive = {
             progressiveStep: this._spec.progressiveStep,
             progressiveThreshold: this._spec.progressiveThreshold,
@@ -39,10 +39,11 @@ class AreaSeries extends cartesian_1.CartesianSeries {
             groupKey: this._seriesField,
             defaultMorphElementKey: this.getDimensionField()[0],
             progressive: progressive,
-            isSeriesMark: isAreaVisible && "point" !== seriesMark
-        }), !isPointVisible && this._areaMark && this._areaMark.setLabelSpec((0, merge_spec_1.mergeSpec)({
-            animation: this._spec.animation
-        }, this._spec.label)), this.initSymbolMark(progressive, "point" === seriesMark);
+            isSeriesMark: isAreaVisible && "point" !== seriesMark,
+            customShape: null === (_h = this._spec.area) || void 0 === _h ? void 0 : _h.customShape
+        }), this._areaMark && (null === (_k = null === (_j = this._spec) || void 0 === _j ? void 0 : _j.areaLabel) || void 0 === _k ? void 0 : _k.visible) && this._areaMark.addLabelSpec(this._preprocessLabelSpec(this._spec.areaLabel, this.initLineLabelMarkStyle), !0), 
+        !isPointVisible && this._areaMark && (null === (_l = this._spec.label) || void 0 === _l ? void 0 : _l.visible) && this._areaMark.addLabelSpec(this._preprocessLabelSpec(this._spec.label)), 
+        this.initSymbolMark(progressive, "point" === seriesMark);
     }
     initMarkStyle() {
         var _a, _b, _c, _d, _e;
@@ -75,8 +76,7 @@ class AreaSeries extends cartesian_1.CartesianSeries {
         }, "normal", constant_1.AttributeLevel.Built_In), this._trigger.registerMark(areaMark), 
         Object.keys(areaMark.stateStyle).forEach((state => {
             areaMark.stateStyle[state].stroke && areaMark.setPostProcess("stroke", (result => [ result, !1, !1, !1 ]), state);
-        }))), this.initLineMarkStyle(this._direction, userCurveType), this.initSymbolMarkStyle(), 
-        this.initLabelMarkStyle();
+        }))), this.initLineMarkStyle(this._direction, userCurveType), this.initSymbolMarkStyle();
     }
     initAnimation() {
         var _a, _b, _c, _d, _e;

package/cjs/series/area/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/area/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isValid, isArray } from '@visactor/vutils';\n/* eslint-disable no-duplicate-imports */\nimport { LineLikeSeriesMixin } from '../mixin/line-mixin';\nimport type { IAreaMark } from '../../mark/area';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum, ConvertToMarkStyleSpec, IAreaMarkSpec, InterpolateType } from '../../typings';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport { valueInScaleRange } from '../../util/scale';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport { mixin } from '@visactor/vutils';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_SMOOTH_INTERPOLATE } from '../../typings/interpolate';\nimport type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';\nimport type { IMarkAnimateSpec } from '../../animation/spec';\nimport { LineMark } from '../../mark/line';\nimport { AreaMark } from '../../mark/area';\nimport { TextMark } from '../../mark/text';\nimport { SymbolMark } from '../../mark/symbol';\nimport { AreaSeriesTooltipHelper } from './tooltip-helpter';\nimport { areaSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { registerAreaAnimation } from './animation';\nimport type { IMark } from '../../mark/interface';\nimport { registerSampleTransform, registerMarkOverlapTransform } from '@visactor/vgrammar-core';\n\nexport interface AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec>\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | 'encodeDefined'\n      | '_lineMark'\n      | '_symbolMark'\n      | 'addSamplingCompile'\n      | 'addOverlapCompile'\n      | 'reCompileSampling'\n    >,\n    CartesianSeries<T> {}\n\nexport class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.area;\n  type = SeriesTypeEnum.area;\n\n  static readonly mark: SeriesMarkMap = areaSeriesMark;\n\n  protected declare _theme: Maybe<IAreaSeriesTheme>;\n\n  protected _areaMark!: IAreaMark;\n  protected _supportStack: boolean = true;\n  protected _sortDataByAxis: boolean = false;\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    const isLineVisible = this._spec.line?.visible !== false && this._spec.line?.style?.visible !== false;\n    // merge line to area\n    const areaSpec = this._spec.area ?? {};\n    const lineSpec = this._spec.line ?? {};\n    areaSpec.interactive = areaSpec.interactive || lineSpec.interactive;\n    areaSpec.support3d = areaSpec.support3d || lineSpec.support3d;\n    areaSpec.zIndex =\n      isValid(areaSpec.zIndex) || isValid(lineSpec.zIndex)\n        ? Math.max(areaSpec.zIndex ?? 0, lineSpec.zIndex ?? 0)\n        : undefined;\n\n    // remove area stroke\n    if (areaSpec.style) {\n      delete areaSpec.style.stroke;\n    }\n    if (areaSpec.state) {\n      Object.keys(areaSpec.state).forEach(state => {\n        if ('style' in areaSpec.state[state]) {\n          delete areaSpec.state[state].style.stroke;\n        } else {\n          delete (<ConvertToMarkStyleSpec<IAreaMarkSpec>>areaSpec.state[state]).stroke;\n        }\n      });\n    }\n    // check which one is main\n    let mainSpec = areaSpec;\n    let subSpec = lineSpec;\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    if (seriesMark === 'line' || (isLineVisible && !isAreaVisible)) {\n      mainSpec = lineSpec;\n      subSpec = areaSpec;\n    }\n    areaSpec.style = mergeSpec({}, subSpec.style, mainSpec.style);\n    areaSpec.state = mergeSpec({}, subSpec.state, mainSpec.state);\n    if (!isAreaVisible) {\n      areaSpec.style.fill = false;\n    }\n    if (!isLineVisible) {\n      areaSpec.style.stroke = false;\n    }\n    areaSpec.visible = !(!isAreaVisible && !isLineVisible);\n  }\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    const isPointVisible = this._spec.point?.visible !== false && this._spec.point?.style?.visible !== false;\n\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    // area\n    this._areaMark = this._createMark(AreaSeries.mark.area, {\n      groupKey: this._seriesField,\n      defaultMorphElementKey: this.getDimensionField()[0],\n      progressive,\n      isSeriesMark: isAreaVisible && seriesMark !== 'point'\n    }) as IAreaMark;\n    if (!isPointVisible && this._areaMark) {\n      this._areaMark.setLabelSpec(mergeSpec({ animation: this._spec.animation }, this._spec.label));\n    }\n    this.initSymbolMark(progressive, seriesMark === 'point');\n  }\n\n  initMarkStyle(): void {\n    // FIXME 是不是应该把curveType提前到上层配置\n    // 不允许area和line的curveType不一致\n    const userCurveType = (this.getSpec().area?.style?.curveType ??\n      this.getSpec().line?.style?.curveType) as InterpolateType;\n    const curveType =\n      userCurveType === DEFAULT_SMOOTH_INTERPOLATE\n        ? this._direction === Direction.vertical\n          ? 'monotoneX'\n          : 'monotoneY'\n        : userCurveType;\n\n    // area\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      if (this._direction === Direction.vertical) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            y1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionY1(datum), this._yAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionX1(datum), this._xAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null,\n            orient: this._direction\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          fill: this.getColorAttribute(),\n          stroke: this.getColorAttribute()\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      if (this._invalidType !== 'zero') {\n        this.setMarkStyle(\n          areaMark,\n          {\n            defined: this._getInvalidDefined,\n            connectedType: this._getInvalidConnectType()\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          curveType\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n      this._trigger.registerMark(areaMark);\n\n      // change stroke to area stoke = [lineStroke,false,false,false]\n      Object.keys(areaMark.stateStyle).forEach(state => {\n        if (areaMark.stateStyle[state].stroke) {\n          areaMark.setPostProcess(\n            'stroke',\n            result => {\n              return [result, false, false, false];\n            },\n            state\n          );\n        }\n      });\n    }\n\n    this.initLineMarkStyle(this._direction, userCurveType);\n    this.initSymbolMarkStyle();\n    this.initLabelMarkStyle();\n  }\n\n  initAnimation() {\n    const animationParams = { direction: this.direction };\n    const appearPreset = (this._spec?.animationAppear as IMarkAnimateSpec<string>)?.preset;\n\n    if (this._lineMark) {\n      this._lineMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('line')?.(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.line, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n\n    if (this._areaMark) {\n      this._areaMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('area')?.(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.area, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n\n    if (this._symbolMark) {\n      this._symbolMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('scaleInOut')?.(),\n          userAnimationConfig(SeriesMarkNameEnum.point, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new AreaSeriesTooltipHelper(this);\n    this._areaMark && this._tooltipHelper.activeTriggerSet.dimension.add(this._areaMark);\n    this._lineMark && this._tooltipHelper.activeTriggerSet.dimension.add(this._lineMark);\n    this._symbolMark && this._tooltipHelper.activeTriggerSet.mark.add(this._symbolMark);\n  }\n\n  viewDataStatisticsUpdate(d: DataView) {\n    super.viewDataStatisticsUpdate(d);\n    this.encodeDefined(this._areaMark, 'defined');\n  }\n\n  compile(): void {\n    super.compile();\n    this.addSamplingCompile();\n    this.addOverlapCompile();\n  }\n\n  getDefaultShapeType() {\n    return 'square';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._areaMark, this._symbolMark, this._lineMark];\n  }\n\n  onLayoutEnd(ctx: any): void {\n    super.onLayoutEnd(ctx);\n    this.reCompileSampling();\n  }\n\n  getSeriesStyle(datum: Datum) {\n    return (attribute: string) => {\n      const seriesMarkType = this._spec.seriesMark ?? 'area';\n\n      let result = this._seriesMark?.getAttribute(attribute as any, datum) ?? undefined;\n      if (attribute === 'fill' && (!result || seriesMarkType === 'line')) {\n        attribute = 'stroke';\n        result = this._seriesMark?.getAttribute(attribute, datum) ?? undefined;\n      }\n      if (attribute === 'stroke' && isArray(result)) {\n        return result[0];\n      }\n      return result;\n    };\n  }\n}\n\nmixin(AreaSeries, LineLikeSeriesMixin);\n\nexport const registerAreaSeries = () => {\n  registerSampleTransform();\n  registerMarkOverlapTransform();\n  Factory.registerMark(LineMark.type, LineMark);\n  Factory.registerMark(AreaMark.type, AreaMark);\n  Factory.registerMark(TextMark.type, TextMark);\n  Factory.registerMark(SymbolMark.type, SymbolMark);\n  Factory.registerSeries(AreaSeries.type, AreaSeries);\n  registerAreaAnimation();\n};\n"]}
+{"version":3,"sources":["../src/series/area/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isValid, isArray } from '@visactor/vutils';\n/* eslint-disable no-duplicate-imports */\nimport { LineLikeSeriesMixin } from '../mixin/line-mixin';\nimport type { IAreaMark } from '../../mark/area';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum, ConvertToMarkStyleSpec, IAreaMarkSpec, InterpolateType } from '../../typings';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport { valueInScaleRange } from '../../util/scale';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport { mixin } from '@visactor/vutils';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_SMOOTH_INTERPOLATE } from '../../typings/interpolate';\nimport type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';\nimport type { IMarkAnimateSpec } from '../../animation/spec';\nimport { LineMark } from '../../mark/line';\nimport { AreaMark } from '../../mark/area';\nimport { TextMark } from '../../mark/text';\nimport { SymbolMark } from '../../mark/symbol';\nimport { AreaSeriesTooltipHelper } from './tooltip-helpter';\nimport { areaSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { registerAreaAnimation } from './animation';\nimport type { IMark } from '../../mark/interface';\nimport { registerSampleTransform, registerMarkOverlapTransform } from '@visactor/vgrammar-core';\nimport type { ILabelSpec } from '../../component';\n\nexport interface AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec>\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | 'encodeDefined'\n      | '_lineMark'\n      | '_symbolMark'\n      | 'addSamplingCompile'\n      | 'addOverlapCompile'\n      | 'reCompileSampling'\n      | 'initLineLabelMarkStyle'\n    >,\n    CartesianSeries<T> {}\n\nexport class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.area;\n  type = SeriesTypeEnum.area;\n\n  static readonly mark: SeriesMarkMap = areaSeriesMark;\n\n  protected declare _theme: Maybe<IAreaSeriesTheme>;\n\n  protected _areaMark!: IAreaMark;\n  protected _supportStack: boolean = true;\n  protected _sortDataByAxis: boolean = false;\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    const isLineVisible = this._spec.line?.visible !== false && this._spec.line?.style?.visible !== false;\n    // merge line to area\n    const areaSpec = this._spec.area ?? {};\n    const lineSpec = this._spec.line ?? {};\n    areaSpec.interactive = areaSpec.interactive || lineSpec.interactive;\n    areaSpec.support3d = areaSpec.support3d || lineSpec.support3d;\n    areaSpec.zIndex =\n      isValid(areaSpec.zIndex) || isValid(lineSpec.zIndex)\n        ? Math.max(areaSpec.zIndex ?? 0, lineSpec.zIndex ?? 0)\n        : undefined;\n\n    // remove area stroke\n    if (areaSpec.style) {\n      delete areaSpec.style.stroke;\n    }\n    if (areaSpec.state) {\n      Object.keys(areaSpec.state).forEach(state => {\n        if ('style' in areaSpec.state[state]) {\n          delete areaSpec.state[state].style.stroke;\n        } else {\n          delete (<ConvertToMarkStyleSpec<IAreaMarkSpec>>areaSpec.state[state]).stroke;\n        }\n      });\n    }\n    // check which one is main\n    let mainSpec = areaSpec;\n    let subSpec = lineSpec;\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    if (seriesMark === 'line' || (isLineVisible && !isAreaVisible)) {\n      mainSpec = lineSpec;\n      subSpec = areaSpec;\n    }\n    areaSpec.style = mergeSpec({}, subSpec.style, mainSpec.style);\n    areaSpec.state = mergeSpec({}, subSpec.state, mainSpec.state);\n    if (!isAreaVisible) {\n      areaSpec.style.fill = false;\n    }\n    if (!isLineVisible) {\n      areaSpec.style.stroke = false;\n    }\n    areaSpec.visible = !(!isAreaVisible && !isLineVisible);\n  }\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    const isPointVisible = this._spec.point?.visible !== false && this._spec.point?.style?.visible !== false;\n\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    // area\n    this._areaMark = this._createMark(AreaSeries.mark.area, {\n      groupKey: this._seriesField,\n      defaultMorphElementKey: this.getDimensionField()[0],\n      progressive,\n      isSeriesMark: isAreaVisible && seriesMark !== 'point',\n      customShape: this._spec.area?.customShape\n    }) as IAreaMark;\n    if (this._areaMark && this._spec?.areaLabel?.visible) {\n      this._areaMark.addLabelSpec(\n        this._preprocessLabelSpec(this._spec.areaLabel as ILabelSpec, this.initLineLabelMarkStyle),\n        true\n      );\n    }\n    if (!isPointVisible && this._areaMark && this._spec.label?.visible) {\n      this._areaMark.addLabelSpec(this._preprocessLabelSpec(this._spec.label as ILabelSpec));\n    }\n    this.initSymbolMark(progressive, seriesMark === 'point');\n  }\n\n  initMarkStyle(): void {\n    // FIXME 是不是应该把curveType提前到上层配置\n    // 不允许area和line的curveType不一致\n    const userCurveType = (this.getSpec().area?.style?.curveType ??\n      this.getSpec().line?.style?.curveType) as InterpolateType;\n    const curveType =\n      userCurveType === DEFAULT_SMOOTH_INTERPOLATE\n        ? this._direction === Direction.vertical\n          ? 'monotoneX'\n          : 'monotoneY'\n        : userCurveType;\n\n    // area\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      if (this._direction === Direction.vertical) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            y1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionY1(datum), this._yAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionX1(datum), this._xAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null,\n            orient: this._direction\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          fill: this.getColorAttribute(),\n          stroke: this.getColorAttribute()\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      if (this._invalidType !== 'zero') {\n        this.setMarkStyle(\n          areaMark,\n          {\n            defined: this._getInvalidDefined,\n            connectedType: this._getInvalidConnectType()\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          curveType\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n      this._trigger.registerMark(areaMark);\n\n      // change stroke to area stoke = [lineStroke,false,false,false]\n      Object.keys(areaMark.stateStyle).forEach(state => {\n        if (areaMark.stateStyle[state].stroke) {\n          areaMark.setPostProcess(\n            'stroke',\n            result => {\n              return [result, false, false, false];\n            },\n            state\n          );\n        }\n      });\n    }\n\n    this.initLineMarkStyle(this._direction, userCurveType);\n    this.initSymbolMarkStyle();\n  }\n\n  initAnimation() {\n    const animationParams = { direction: this.direction };\n    const appearPreset = (this._spec?.animationAppear as IMarkAnimateSpec<string>)?.preset;\n    if (this._lineMark) {\n      this._lineMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('line')?.(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.line, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n\n    if (this._areaMark) {\n      this._areaMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('area')?.(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.area, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n\n    if (this._symbolMark) {\n      this._symbolMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('scaleInOut')?.(),\n          userAnimationConfig(SeriesMarkNameEnum.point, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new AreaSeriesTooltipHelper(this);\n    this._areaMark && this._tooltipHelper.activeTriggerSet.dimension.add(this._areaMark);\n    this._lineMark && this._tooltipHelper.activeTriggerSet.dimension.add(this._lineMark);\n    this._symbolMark && this._tooltipHelper.activeTriggerSet.mark.add(this._symbolMark);\n  }\n\n  viewDataStatisticsUpdate(d: DataView) {\n    super.viewDataStatisticsUpdate(d);\n    this.encodeDefined(this._areaMark, 'defined');\n  }\n\n  compile(): void {\n    super.compile();\n    this.addSamplingCompile();\n    this.addOverlapCompile();\n  }\n\n  getDefaultShapeType() {\n    return 'square';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._areaMark, this._symbolMark, this._lineMark];\n  }\n\n  onLayoutEnd(ctx: any): void {\n    super.onLayoutEnd(ctx);\n    this.reCompileSampling();\n  }\n\n  getSeriesStyle(datum: Datum) {\n    return (attribute: string) => {\n      const seriesMarkType = this._spec.seriesMark ?? 'area';\n\n      let result = this._seriesMark?.getAttribute(attribute as any, datum) ?? undefined;\n      if (attribute === 'fill' && (!result || seriesMarkType === 'line')) {\n        attribute = 'stroke';\n        result = this._seriesMark?.getAttribute(attribute, datum) ?? undefined;\n      }\n      if (attribute === 'stroke' && isArray(result)) {\n        return result[0];\n      }\n      return result;\n    };\n  }\n}\n\nmixin(AreaSeries, LineLikeSeriesMixin);\n\nexport const registerAreaSeries = () => {\n  registerSampleTransform();\n  registerMarkOverlapTransform();\n  Factory.registerMark(LineMark.type, LineMark);\n  Factory.registerMark(AreaMark.type, AreaMark);\n  Factory.registerMark(TextMark.type, TextMark);\n  Factory.registerMark(SymbolMark.type, SymbolMark);\n  Factory.registerSeries(AreaSeries.type, AreaSeries);\n  registerAreaAnimation();\n};\n"]}

package/cjs/series/area/interface.d.ts

@@ -6,6 +6,7 @@ import type { ILineLikeLabelSpec, ILineLikeSeriesTheme } from '../mixin/line-mix
 import type { IAnimationSpec } from '../../animation/spec';
 import type { AreaAppearPreset } from './animation';
 import type { IDataSamping, IMarkOverlap, IMarkProgressiveConfig } from '../../mark/interface';
+import type { ILabelSpec } from '../../component';
 export interface IAreaSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<string, AreaAppearPreset>, IMarkProgressiveConfig, IDataSamping, IMarkOverlap {
     type: 'area';
     xField: string | string[];
@@ -14,6 +15,9 @@ export interface IAreaSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<st
     [SeriesMarkNameEnum.line]?: IMarkSpec<ILineMarkSpec>;
     [SeriesMarkNameEnum.area]?: IMarkSpec<IAreaMarkSpec>;
     [SeriesMarkNameEnum.label]?: ILineLikeLabelSpec;
+    [SeriesMarkNameEnum.areaLabel]?: Omit<ILabelSpec, 'position'> & {
+        position?: 'start' | 'end';
+    };
     seriesMark?: 'point' | 'line' | 'area';
     activePoint?: boolean;
 }

package/cjs/series/area/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/area/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ICartesianSeriesSpec } from '../cartesian/interface';\nimport type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';\nimport type { ISymbolMarkSpec, ILineMarkSpec, IAreaMarkSpec } from '../../typings/visual';\nimport type { SeriesMarkNameEnum } from '../interface/type';\nimport type { ILineLikeLabelSpec, ILineLikeSeriesTheme } from '../mixin/line-mixin';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { AreaAppearPreset } from './animation';\nimport type { IDataSamping, IMarkOverlap, IMarkProgressiveConfig } from '../../mark/interface';\nexport interface IAreaSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<string, AreaAppearPreset>,\n    IMarkProgressiveConfig,\n    IDataSamping,\n    IMarkOverlap {\n  /**\n   * 系列类型\n   */\n  type: 'area';\n  /**\n   * x轴字段\n   */\n  xField: string | string[];\n  /**\n   * y轴字段\n   */\n  yField: string | string[];\n  /**\n   * 点图元配置\n   */\n  [SeriesMarkNameEnum.point]?: IMarkSpec<ISymbolMarkSpec>;\n  /**\n   * 线图元配置\n   */\n  [SeriesMarkNameEnum.line]?: IMarkSpec<ILineMarkSpec>;\n  /**\n   * 面积图元配置\n   */\n  [SeriesMarkNameEnum.area]?: IMarkSpec<IAreaMarkSpec>;\n  /**\n   * 标签配置\n   */\n  [SeriesMarkNameEnum.label]?: ILineLikeLabelSpec;\n  /**\n   * 系列主 mark 类型配置，该配置会影响图例的展示\n   * @default 'area'\n   * @since 1.2.0\n   */\n  seriesMark?: 'point' | 'line' | 'area';\n  /**\n   * 是否使用额外的 activePoint 显示交互点，可以在点隐藏时显示被交互的点\n   * @default false\n   * @since 1.3.0\n   */\n  activePoint?: boolean;\n}\n\nexport interface IAreaSeriesTheme extends ILineLikeSeriesTheme {\n  [SeriesMarkNameEnum.area]?: Partial<IMarkTheme<IAreaMarkSpec>>;\n}\n"]}
+{"version":3,"sources":["../src/series/area/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ICartesianSeriesSpec } from '../cartesian/interface';\nimport type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';\nimport type { ISymbolMarkSpec, ILineMarkSpec, IAreaMarkSpec } from '../../typings/visual';\nimport type { SeriesMarkNameEnum } from '../interface/type';\nimport type { ILineLikeLabelSpec, ILineLikeSeriesTheme } from '../mixin/line-mixin';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { AreaAppearPreset } from './animation';\nimport type { IDataSamping, IMarkOverlap, IMarkProgressiveConfig } from '../../mark/interface';\nimport type { ILabelSpec } from '../../component';\nexport interface IAreaSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<string, AreaAppearPreset>,\n    IMarkProgressiveConfig,\n    IDataSamping,\n    IMarkOverlap {\n  /**\n   * 系列类型\n   */\n  type: 'area';\n  /**\n   * x轴字段\n   */\n  xField: string | string[];\n  /**\n   * y轴字段\n   */\n  yField: string | string[];\n  /**\n   * 点图元配置\n   */\n  [SeriesMarkNameEnum.point]?: IMarkSpec<ISymbolMarkSpec>;\n  /**\n   * 线图元配置\n   */\n  [SeriesMarkNameEnum.line]?: IMarkSpec<ILineMarkSpec>;\n  /**\n   * 面积图元配置\n   */\n  [SeriesMarkNameEnum.area]?: IMarkSpec<IAreaMarkSpec>;\n  /**\n   * 标签配置\n   */\n  [SeriesMarkNameEnum.label]?: ILineLikeLabelSpec;\n  /**\n   * 面积图元标签配置\n   * @since 1.7.0\n   */\n  [SeriesMarkNameEnum.areaLabel]?: Omit<ILabelSpec, 'position'> & {\n    position?: 'start' | 'end';\n  };\n  /**\n   * 系列主 mark 类型配置，该配置会影响图例的展示\n   * @default 'area'\n   * @since 1.2.0\n   */\n  seriesMark?: 'point' | 'line' | 'area';\n  /**\n   * 是否使用额外的 activePoint 显示交互点，可以在点隐藏时显示被交互的点\n   * @default false\n   * @since 1.3.0\n   */\n  activePoint?: boolean;\n}\n\nexport interface IAreaSeriesTheme extends ILineLikeSeriesTheme {\n  [SeriesMarkNameEnum.area]?: Partial<IMarkTheme<IAreaMarkSpec>>;\n}\n"]}

package/cjs/series/bar/bar.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerBarSeries = exports.BarSeries = exports.DefaultBandWidth = void 0;
 
-const index_1 = require("./../../constant/index"), vscale_1 = require("@visactor/vscale"), space_1 = require("../../typings/space"), cartesian_1 = require("../cartesian/cartesian"), type_1 = require("../../mark/interface/type"), constant_1 = require("../../constant"), merge_spec_1 = require("../../util/spec/merge-spec"), scale_1 = require("../../util/scale"), data_1 = require("../../util/data"), space_2 = require("../../util/space"), animation_1 = require("./animation"), utils_1 = require("../../animation/utils"), type_2 = require("../interface/type"), rect_1 = require("../../mark/rect"), vutils_1 = require("@visactor/vutils"), constant_2 = require("./constant"), stack_1 = require("../util/stack"), factory_1 = require("../../core/factory"), register_1 = require("../../data/register"), series_data_1 = require("../base/series-data"), vdataset_1 = require("@visactor/vdataset"), add_property_1 = require("../../data/transforms/add-property"), data_key_1 = require("../../data/transforms/data-key"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const index_1 = require("./../../constant/index"), vscale_1 = require("@visactor/vscale"), space_1 = require("../../typings/space"), cartesian_1 = require("../cartesian/cartesian"), type_1 = require("../../mark/interface/type"), constant_1 = require("../../constant"), scale_1 = require("../../util/scale"), data_1 = require("../../util/data"), space_2 = require("../../util/space"), animation_1 = require("./animation"), utils_1 = require("../../animation/utils"), type_2 = require("../interface/type"), rect_1 = require("../../mark/rect"), vutils_1 = require("@visactor/vutils"), constant_2 = require("./constant"), stack_1 = require("../util/stack"), factory_1 = require("../../core/factory"), register_1 = require("../../data/register"), series_data_1 = require("../base/series-data"), vdataset_1 = require("@visactor/vdataset"), add_property_1 = require("../../data/transforms/add-property"), data_key_1 = require("../../data/transforms/data-key"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 exports.DefaultBandWidth = 6;
 
@@ -16,6 +16,7 @@ class BarSeries extends cartesian_1.CartesianSeries {
         this._barMarkType = type_1.MarkTypeEnum.rect, this._supportStack = !0, this._bandPosition = 0;
     }
     initMark() {
+        var _a;
         const progressive = {
             progressiveStep: this._spec.progressiveStep,
             progressiveThreshold: this._spec.progressiveThreshold,
@@ -30,18 +31,18 @@ class BarSeries extends cartesian_1.CartesianSeries {
             defaultMorphElementKey: this.getDimensionField()[0],
             groupKey: this._seriesField,
             isSeriesMark: !0,
-            label: (0, merge_spec_1.mergeSpec)({
-                animation: this._spec.animation
-            }, this._spec.label),
-            progressive: progressive
+            label: this._preprocessLabelSpec(this._spec.label),
+            progressive: progressive,
+            customShape: null === (_a = this._spec.bar) || void 0 === _a ? void 0 : _a.customShape
         });
     }
     _initBarBackgroundMark(progressive) {
-        var _a;
+        var _a, _b;
         (null === (_a = this._spec.barBackground) || void 0 === _a ? void 0 : _a.visible) && (this._barBackgroundMark = this._createMark(BarSeries.mark.barBackground, {
             dataView: this._barBackgroundViewData.getDataView(),
             dataProductId: this._barBackgroundViewData.getProductId(),
-            progressive: progressive
+            progressive: progressive,
+            customShape: null === (_b = this._spec.barBackground) || void 0 === _b ? void 0 : _b.customShape
         }));
     }
     initMarkStyle() {

package/cjs/series/bar/bar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/bar/bar.ts"],"names":[],"mappings":";;;AAAA,kDAAgD;AAEhD,6CAAgD;AAChD,+CAAgD;AAChD,sDAAyD;AAEzD,oDAAyD;AACzD,6CAAgD;AAEhD,2DAAuD;AACvD,4CAAqD;AACrD,0CAAsD;AACtD,4CAAqD;AACrD,2CAAmG;AACnG,iDAAgG;AAOhG,4CAAuE;AAEvE,0CAA2C;AAC3C,6CAAwD;AACxD,yCAA2C;AAC3C,yCAAmD;AACnD,gDAA6C;AAC7C,kDAAuE;AACvE,qDAAiD;AACjD,iDAA8C;AAC9C,qEAAuE;AACvE,6DAAwE;AACxE,2DAAkE;AAErD,QAAA,gBAAgB,GAAG,CAAC,CAAC;AAClC,MAAM,MAAM,GAAG,GAAG,cAAM,SAAS,CAAC;AAClC,MAAM,OAAO,GAAG,GAAG,cAAM,UAAU,CAAC;AACpC,MAAM,MAAM,GAAG,GAAG,cAAM,SAAS,CAAC;AAClC,MAAM,OAAO,GAAG,GAAG,cAAM,UAAU,CAAC;AAEpC,MAAa,SAAqD,SAAQ,2BAAkB;IAA5F;;QAEE,SAAI,GAAG,qBAAc,CAAC,GAAG,CAAC;QAChB,iBAAY,GAAuB,yBAAkB,CAAC,GAAG,CAAC;QAC1D,iBAAY,GAAiB,mBAAY,CAAC,IAAI,CAAC;QAM/C,kBAAa,GAAY,IAAI,CAAC;QAC9B,kBAAa,GAAG,CAAC,CAAC;IAqkB9B,CAAC;IA/jBC,QAAQ;QACN,MAAM,WAAW,GAAG;YAClB,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe;YAC3C,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB;YACrD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;YACvB,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc;SAC1C,CAAC;QAEF,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;QAEzC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,iCAEzB,SAAS,CAAC,IAAI,CAAC,GAAG,KACrB,IAAI,EAAE,IAAI,CAAC,YAAY,EACvB,IAAI,EAAE,IAAI,CAAC,YAAY,KAEzB;YACE,KAAK,EAAE,IAAA,yBAAiB,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC;YACvD,sBAAsB,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;YACnD,QAAQ,EAAE,IAAI,CAAC,YAAY;YAC3B,YAAY,EAAE,IAAI;YAClB,KAAK,EAAE,IAAA,sBAAS,EAAC,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YACvE,WAAW;SACZ,CACW,CAAC;IACjB,CAAC;IAES,sBAAsB,CAAC,WAAoC;;QACnE,IAAI,MAAA,IAAI,CAAC,KAAK,CAAC,aAAa,0CAAE,OAAO,EAAE;YACrC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE;gBACvE,QAAQ,EAAE,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE;gBACnD,aAAa,EAAE,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE;gBACzD,WAAW;aACZ,CAAc,CAAC;SACjB;IACH,CAAC;IAED,aAAa;QACX,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,QAAQ,EACb;gBACE,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE;aAC/B,EACD,QAAQ,EACR,yBAAc,CAAC,MAAM,CACtB,CAAC;YAEF,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,kBAAkB,CAAC,QAAmB;QACpC,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QACD,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE;YAC1B,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE;YAC9B,IAAI,EAAE,CAAC,KAAY,EAAE,EAAE;gBACrB,OAAO,KAAK,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;YAC1C,CAAC;YACD,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;SACzD,CAAC,CAAC;IACL,CAAC;IAES,WAAW;QACnB,KAAK,CAAC,WAAW,EAAE,CAAC;QAEpB,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChF,CAAC;IAES,kBAAkB;;QAC1B,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAE3B,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,aAAa,0CAAE,OAAO,CAAA,EAAE;YACtC,OAAO;SACR;QAKD,MAAM,cAAc,GAAG,CAAC,CAAC,IAAI,CAAa,EAAE,EAAU,EAAE,EAAE;;YACxD,IAAI,WAAW,GAAU,CAAC,EAAE,CAAC,CAAC;YAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,0CAAE,MAAM,CAAC;gBAC9C,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,EAAE;oBACnB,SAAS;iBACV;gBACD,MAAM,cAAc,GAAU,EAAE,CAAC;gBACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC3C,cAAc,CAAC,IAAI,iCACd,WAAW,CAAC,CAAC,CAAC,KACjB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,IAClB,CAAC;qBACJ;iBACF;gBACD,WAAW,GAAG,cAAc,CAAC;aAC9B;YACD,OAAO,WAAW,CAAC;QACrB,CAAC,CAAC;QAEF,IAAA,2CAAgC,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,EAAE,gCAAiB,CAAC,CAAC;QAC/F,IAAA,2CAAgC,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAEzF,MAAM,iBAAiB,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;aACzD,KAAK,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;YACjC,IAAI,EAAE,UAAU;SACjB,CAAC;aACD,SAAS,CACR;YACE,IAAI,EAAE,gBAAgB;SACvB,EACD,KAAK,CACN;aACA,SAAS,CACR;YACE,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE;gBACP,UAAU,EAAE,qBAAU,CAAC,IAAI,CAAC,IAAI,CAAC;gBACjC,IAAI,EAAE,qBAAU;aACjB;SACF,EACD,KAAK,CACN,CAAC;QAEJ,MAAA,IAAI,CAAC,mBAAmB,0CAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QAC5F,IAAI,CAAC,sBAAsB,GAAG,IAAI,wBAAU,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAChF,CAAC;IAED,IAAI,CAAC,MAAwB;;QAC3B,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnB,IAAI,IAAI,CAAC,SAAS,KAAK,UAAU,EAAE;YACjC,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,QAAQ,CAAC,CAAC,EAAE,IAAI,MAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;SAChH;aAAM;YACL,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,QAAQ,CAAC,CAAC,EAAE,IAAI,MAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;SAChH;IACH,CAAC;IAEO,qBAAqB;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,OAAO,CACL,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAc,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC,CAAC,MAAM,CAChH,CAAC;IACJ,CAAC;IAEO,2BAA2B,CAAC,UAAmB;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAGhC,IAAI,MAAM,CAAC,+BAA+B,EAAE;YAC1C,OAAO;SACR;QAED,MAAM,CAAC,+BAA+B,GAAG,IAAI,CAAC;QAC9C,IAAI,KAAa,CAAC;QAClB,IAAI,GAAW,CAAC;QAChB,IAAI,WAAmB,CAAC;QACxB,IAAI,SAAiB,CAAC;QACtB,IAAI,UAAkB,CAAC;QACvB,IAAI,UAAU,EAAE;YACd,KAAK,GAAG,OAAO,CAAC;YAChB,GAAG,GAAG,MAAM,CAAC;YACb,WAAW,GAAG,kBAAkB,CAAC;YACjC,SAAS,GAAG,iBAAiB,CAAC;YAC9B,UAAU,GAAG,cAAc,CAAC;SAC7B;aAAM;YACL,KAAK,GAAG,OAAO,CAAC;YAChB,GAAG,GAAG,MAAM,CAAC;YACb,WAAW,GAAG,kBAAkB,CAAC;YACjC,SAAS,GAAG,iBAAiB,CAAC;YAC9B,UAAU,GAAG,cAAc,CAAC;SAC7B;QAGD,MAAM,eAAe,GAAG,IAAA,0BAAmB,EAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAc,CAAC,GAAG,CAAC,CAAC;QAG/F,KAAK,MAAM,UAAU,IAAI,eAAe,EAAE;YACxC,KAAK,MAAM,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE;gBACnD,IAAA,0BAAkB,EAAC,eAAe,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,eAAe,EAAE,EAAE;oBACnF,UAAU;oBACV,KAAK;oBACL,GAAG;oBACH,WAAW;oBACX,SAAS;oBACT,UAAU;iBACX,CAAC,CAAC;aACJ;SACF;IACH,CAAC;IAEO,sBAAsB,CAAC,KAAY,EAAE,UAAmB;;QAC9D,IAAI,WAAmB,CAAC;QACxB,IAAI,SAAiB,CAAC;QACtB,IAAI,UAAkB,CAAC;QACvB,IAAI,UAAU,EAAE;YACd,WAAW,GAAG,kBAAkB,CAAC;YACjC,SAAS,GAAG,iBAAiB,CAAC;YAC9B,UAAU,GAAG,cAAc,CAAC;SAC7B;aAAM;YACL,WAAW,GAAG,kBAAkB,CAAC;YACjC,SAAS,GAAG,iBAAiB,CAAC;YAC9B,UAAU,GAAG,cAAc,CAAC;SAC7B;QAED,MAAM,WAAW,GAAG,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,EAAC,QAAQ,mDAAG,CAAC,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,SAAS,EAAE,CAAC;QAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;QAC7C,MAAM,EAAE,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,CAAC;QACpE,MAAM,CAAC,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,CAAC;QAEjE,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC9B,IAAI,MAAM,GAAG,YAAY,EAAE;YACzB,MAAM,GAAG,YAAY,CAAC;SACvB;QAED,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,IAAI,CAAC,GAAG,EAAE,EAAE;YACV,IAAI,GAAG,CAAC,CAAC,CAAC;SACX;aAAM,IAAI,CAAC,KAAK,EAAE,EAAE;YACnB,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3D;QACD,OAAO,EAAE,GAAG,IAAI,GAAG,MAAM,CAAC;IAC5B,CAAC;IAED,qBAAqB;;QACnB,MAAM,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,QAAQ,mDAAG,CAAC,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,QAAQ,mDAAG,CAAC,CAAC,CAAC;QAGhD,IAAI,IAAI,CAAC,SAAS,KAAK,iBAAS,CAAC,UAAU,EAAE;YAC3C,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,QAAQ,EACb;gBACE,CAAC,EAAE,CAAC,KAAY,EAAE,EAAE;oBAClB,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;wBAChC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;wBACxC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;qBACtB;oBAED,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE;wBAC3B,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;qBAClD;oBAED,OAAO,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;gBAChE,CAAC;gBACD,EAAE,EAAE,CAAC,KAAY,EAAE,EAAE;oBACnB,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;wBAChC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;wBACxC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;qBACvB;oBAED,OAAO,IAAA,yBAAiB,EAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;gBACjE,CAAC;gBACD,CAAC,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC;gBAC7D,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC;aACnD,EACD,QAAQ,EACR,yBAAc,CAAC,MAAM,CACtB,CAAC;SACH;aAAM;YACL,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,QAAQ,EACb;gBACE,CAAC,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC;gBAC7D,CAAC,EAAE,CAAC,KAAY,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;oBACtC,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;wBAChC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;wBACvC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;qBACtB;oBAED,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE;wBAC3B,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;qBACjD;oBAED,OAAO,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;gBAChE,CAAC;gBACD,EAAE,EAAE,CAAC,KAAY,EAAE,EAAE;oBACnB,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;wBAChC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;wBACvC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;qBACvB;oBACD,OAAO,IAAA,yBAAiB,EAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;gBACjE,CAAC;gBACD,KAAK,EAAE,GAAG,EAAE;oBACV,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC9C,CAAC;aACF,EACD,QAAQ,EACR,yBAAc,CAAC,MAAM,CACtB,CAAC;SACH;QACD,IAAI,CAAC,2BAA2B,EAAE,CAAC;IACrC,CAAC;IAES,2BAA2B;;QACnC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,OAAO;SACR;QAED,MAAM,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,QAAQ,mDAAG,CAAC,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,QAAQ,mDAAG,CAAC,CAAC,CAAC;QAGhD,IAAI,IAAI,CAAC,SAAS,KAAK,iBAAS,CAAC,UAAU,EAAE;YAC3C,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,kBAAkB,EACvB;gBACE,CAAC,EAAE,GAAG,EAAE;oBACN,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;oBAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;oBACxD,OAAO,GAAG,CAAC;gBACb,CAAC;gBACD,EAAE,EAAE,GAAG,EAAE;oBACP,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;oBAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;oBACxD,OAAO,GAAG,CAAC;gBACb,CAAC;gBACD,CAAC,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC;gBAC7D,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC;aACnD,EACD,QAAQ,EACR,yBAAc,CAAC,MAAM,CACtB,CAAC;SACH;aAAM;YACL,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,kBAAkB,EACvB;gBACE,CAAC,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC;gBAC7D,CAAC,EAAE,GAAG,EAAE;oBACN,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;oBAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;oBACxD,OAAO,GAAG,CAAC;gBACb,CAAC;gBACD,EAAE,EAAE,GAAG,EAAE;oBACP,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;oBAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;oBACxD,OAAO,GAAG,CAAC;gBACb,CAAC;gBACD,KAAK,EAAE,GAAG,EAAE;oBACV,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC9C,CAAC;aACF,EACD,QAAQ,EACR,yBAAc,CAAC,MAAM,CACtB,CAAC;SACH;IACH,CAAC;IAED,uBAAuB;;QACrB,MAAM,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,QAAQ,mDAAG,CAAC,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,QAAQ,mDAAG,CAAC,CAAC,CAAC;QAEhD,IAAI,IAAI,CAAC,SAAS,KAAK,iBAAS,CAAC,QAAQ,EAAE;YACzC,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,QAAQ,EACb;gBACE,CAAC,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;gBAC3E,EAAE,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;gBAC7E,CAAC,EAAE,CAAC,KAAY,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;oBACtC,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;wBAChC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;wBACvC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;qBACtB;oBAED,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE;wBAC3B,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;qBACjD;oBAED,OAAO,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;gBAChE,CAAC;gBACD,EAAE,EAAE,CAAC,KAAY,EAAE,EAAE;oBACnB,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;wBAChC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;wBACvC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;qBACvB;oBACD,OAAO,IAAA,yBAAiB,EAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;gBACjE,CAAC;aACF,EACD,QAAQ,EACR,yBAAc,CAAC,MAAM,CACtB,CAAC;SACH;aAAM;YACL,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,QAAQ,EACb;gBACE,CAAC,EAAE,CAAC,KAAY,EAAE,EAAE;oBAClB,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;wBAChC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;wBAExC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;qBACtB;oBAED,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE;wBAC3B,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;qBAClD;oBAED,OAAO,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;gBAChE,CAAC;gBACD,EAAE,EAAE,CAAC,KAAY,EAAE,EAAE;oBACnB,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;wBAChC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;wBACxC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;qBACvB;oBACD,OAAO,IAAA,yBAAiB,EAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;gBACjE,CAAC;gBACD,CAAC,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;gBAC3E,EAAE,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;aAC9E,EACD,QAAQ,EACR,yBAAc,CAAC,MAAM,CACtB,CAAC;SACH;IACH,CAAC;IAED,aAAa;;QAGX,MAAM,eAAe,GAAwB;YAC3C,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACvB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,GAAG,EAAE;;gBACb,OAAA,IAAI,CAAC,SAAS,KAAK,YAAY;oBAC7B,CAAC,CAAC,MAAA,IAAI,CAAC,YAAY,0CAAE,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;oBACzC,CAAC,CAAC,MAAA,IAAI,CAAC,YAAY,0CAAE,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;aAAA;SAC9C,CAAC;QACF,MAAM,YAAY,GAAG,MAAC,MAAA,IAAI,CAAC,KAAK,0CAAE,eAAsD,0CAAE,MAAM,CAAC;QAEjG,MAAM,SAAS,GAAG,CAAC,KAAU,EAAE,EAAE;;YAC/B,MAAM,MAAM,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACxC,MAAM,MAAM,GAAG,MAAA,MAAA,MAAA,IAAI,CAAC,qBAAqB,EAAE,0CAAE,UAAU,0CAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,0CAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAEnG,OAAO,MAAM,IAAI,CAAC,CAAC;QACrB,CAAC,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAC9B,IAAA,uBAAe,EACb,MAAA,iBAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,0CAAG,eAAe,EAAE,YAAY,CAAC,EACjE,IAAA,2BAAmB,EAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,EAC9E,EAAE,SAAS,EAAE,CACd,CACF,CAAC;IACJ,CAAC;IAES,YAAY,CAAC,UAAuB;;QAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC;QACtD,MAAM,SAAS,GAAG,MAAA,MAAA,UAAU,CAAC,YAAY,2DAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mCAAI,wBAAgB,CAAC;QAEnH,IAAI,WAAW,EAAE;YACf,OAAO,IAAA,yBAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;SAC1D;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC;QAC5D,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC;QAC5D,IAAI,KAAK,GAAG,SAAS,CAAC;QACtB,IAAI,cAAc,EAAE;YAClB,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAA,yBAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;SAC/E;QACD,IAAI,cAAc,EAAE;YAClB,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAA,yBAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;SAC/E;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAES,YAAY,CAAC,SAAwB,EAAE,KAAY;;QAC3D,IAAI,UAAU,CAAC;QACf,IAAI,aAAa,CAAC;QAClB,IAAI,cAAc,CAAC;QACnB,IAAI,SAAS,KAAK,iBAAS,CAAC,UAAU,EAAE;YACtC,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YACnC,aAAa,GAAG,QAAQ,CAAC;YACzB,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClD;aAAM;YACL,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YACnC,aAAa,GAAG,OAAO,CAAC;YACxB,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClD;QACD,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAW,CAAC;QACxE,MAAM,SAAS,GAAG,MAAA,MAAA,UAAU,CAAC,YAAY,2DAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mCAAI,wBAAgB,CAAC;QACnH,IAAI,CAAA,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,0CAAE,MAAM,IAAG,CAAC,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;YAEzE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YACxC,MAAM,UAAU,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACnD,IAAI,UAAU,GAAW,CAAC,CAAC;YAC3B,IAAI,MAAM,GAAW,CAAC,CAAC;YAEvB,KAAK,IAAI,KAAK,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE;gBAC5D,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;gBACtC,MAAM,WAAW,GAAG,MAAA,MAAA,MAAA,MAAA,IAAI,CAAC,qBAAqB,EAAE,0CAAE,UAAU,0CAAG,UAAU,CAAC,0CAAE,MAAM,mCAAI,EAAE,CAAC;gBACzF,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC;gBACtC,MAAM,GAAG,GAAG,IAAA,yBAAiB,EAAC,MAAA,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC,mCAAI,IAAA,aAAI,EAAC,UAAU,CAAC,EAAE,SAAS,CAAC,CAAC;gBACpF,MAAM,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;gBACjD,IAAI,KAAK,KAAK,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpC,UAAU,IAAI,UAAU,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;oBACzD,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC;iBAC5B;qBAAM;oBACL,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC;oBACjC,UAAU,IAAI,UAAU,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;iBACnD;aACF;YAED,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACnF,OAAO,MAAM,GAAG,UAAU,GAAG,CAAC,GAAG,MAAM,CAAC;SACzC;QAED,MAAM,UAAU,GAAG,IAAA,qBAAY,EAAC,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO,GAAG,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,WAAW,CAAC,GAAQ;QAClB,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAEhC,MAAM,CAAC,+BAA+B,GAAG,KAAK,CAAC;QAC/C,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YACvB,IAAI,CAAC,OAAO,EAAE,CAAC;SAChB;IACH,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAEhB,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YACvB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YACvD,MAAM,aAAa,GAAG,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAE7B,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,IAAI,CAAC,UAAU,KAAK,iBAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;gBAC7D,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc;gBACjC,MAAM,EAAE,IAAI,CAAC,UAAU,KAAK,iBAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;gBACxE,OAAO,EAAE,IAAI,CAAC,YAAY;gBAC1B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;aAC1B,CAAC,CAAC;YACH,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;SAClD;IACH,CAAC;IAED,mBAAmB;QACjB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;IAED,WAAW;;QACT,KAAK,CAAC,WAAW,EAAE,CAAC;QACpB,MAAA,IAAI,CAAC,sBAAsB,0CAAE,OAAO,EAAE,CAAC;IACzC,CAAC;IAED,QAAQ;;QACN,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,MAAA,MAAA,IAAI,CAAC,sBAAsB,0CAAE,WAAW,EAAE,0CAAE,iBAAiB,EAAE,CAAC;IAClE,CAAC;IAED,cAAc,CAAC,CAAW;;QACxB,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACxB,MAAA,MAAA,IAAI,CAAC,sBAAsB,0CAAE,WAAW,EAAE,0CAAE,iBAAiB,EAAE,CAAC;QAChE,MAAA,IAAI,CAAC,sBAAsB,0CAAE,UAAU,EAAE,CAAC;IAC5C,CAAC;IAED,OAAO;;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,MAAA,IAAI,CAAC,sBAAsB,0CAAE,OAAO,EAAE,CAAC;QACvC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;IACrC,CAAC;;AA/kBH,8BAglBC;AA/kBiB,cAAI,GAAW,qBAAc,CAAC,GAAG,CAAC;AAKlC,cAAI,GAAkB,wBAAa,CAAC;AA4kB/C,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,IAAA,uCAAuB,GAAE,CAAC;IAC1B,iBAAO,CAAC,YAAY,CAAC,eAAQ,CAAC,IAAI,EAAE,eAAQ,CAAC,CAAC;IAC9C,iBAAO,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAClD,IAAA,gCAAoB,GAAE,CAAC;AACzB,CAAC,CAAC;AALW,QAAA,iBAAiB,qBAK5B","file":"bar.js","sourcesContent":["import { PREFIX } from './../../constant/index';\n/* eslint-disable no-duplicate-imports */\nimport { isContinuous } from '@visactor/vscale';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport type { IMark, IMarkProgressiveConfig } from '../../mark/interface';\nimport { MarkTypeEnum } from '../../mark/interface/type';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum, DirectionType } from '../../typings';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport { valueInScaleRange } from '../../util/scale';\nimport { getRegionStackGroup } from '../../util/data';\nimport { getActualNumValue } from '../../util/space';\nimport { registerBarAnimation, type BarAppearPreset, type IBarAnimationParams } from './animation';\nimport { animationConfig, shouldMarkDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IBarSeriesSpec, IBarSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { IRectMark } from '../../mark/rect';\nimport type { IModelInitOption } from '../../model/interface';\nimport type { ITextMark } from '../../mark/text';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { RectMark } from '../../mark/rect';\nimport { array, isValid, last } from '@visactor/vutils';\nimport { barSeriesMark } from './constant';\nimport { stackWithMinHeight } from '../util/stack';\nimport { Factory } from '../../core/factory';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport { SeriesData } from '../base/series-data';\nimport { DataView } from '@visactor/vdataset';\nimport { addVChartProperty } from '../../data/transforms/add-property';\nimport { addDataKey, initKeyMap } from '../../data/transforms/data-key';\nimport { registerSampleTransform } from '@visactor/vgrammar-core';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\nconst RECT_X = `${PREFIX}_rect_x`;\nconst RECT_X1 = `${PREFIX}_rect_x1`;\nconst RECT_Y = `${PREFIX}_rect_y`;\nconst RECT_Y1 = `${PREFIX}_rect_y1`;\n\nexport class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.bar;\n  type = SeriesTypeEnum.bar;\n  protected _barMarkName: SeriesMarkNameEnum = SeriesMarkNameEnum.bar;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect;\n\n  static readonly mark: SeriesMarkMap = barSeriesMark;\n\n  protected declare _theme: Maybe<IBarSeriesTheme>;\n\n  protected _supportStack: boolean = true;\n  protected _bandPosition = 0;\n  protected _barMark!: IRectMark;\n  protected _barBackgroundMark!: IRectMark;\n\n  protected _barBackgroundViewData: SeriesData;\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    this._initBarBackgroundMark(progressive);\n\n    this._barMark = this._createMark(\n      {\n        ...BarSeries.mark.bar,\n        name: this._barMarkName,\n        type: this._barMarkType\n      },\n      {\n        morph: shouldMarkDoMorph(this._spec, this._barMarkName),\n        defaultMorphElementKey: this.getDimensionField()[0],\n        groupKey: this._seriesField,\n        isSeriesMark: true,\n        label: mergeSpec({ animation: this._spec.animation }, this._spec.label),\n        progressive\n      }\n    ) as IRectMark;\n  }\n\n  protected _initBarBackgroundMark(progressive?: IMarkProgressiveConfig): void {\n    if (this._spec.barBackground?.visible) {\n      this._barBackgroundMark = this._createMark(BarSeries.mark.barBackground, {\n        dataView: this._barBackgroundViewData.getDataView(),\n        dataProductId: this._barBackgroundViewData.getProductId(),\n        progressive\n      }) as IRectMark;\n    }\n  }\n\n  initMarkStyle(): void {\n    if (this._barMark) {\n      this.setMarkStyle(\n        this._barMark,\n        {\n          fill: this.getColorAttribute()\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      this._trigger.registerMark(this._barMark);\n    }\n  }\n\n  initLabelMarkStyle(textMark: ITextMark) {\n    if (!textMark) {\n      return;\n    }\n    this.setMarkStyle(textMark, {\n      fill: this.getColorAttribute(),\n      text: (datum: Datum) => {\n        return datum[this.getStackValueField()];\n      },\n      z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n    });\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n\n    this._barMark && this._tooltipHelper.activeTriggerSet.mark.add(this._barMark);\n  }\n\n  protected _statisticViewData(): void {\n    super._statisticViewData();\n\n    if (!this._spec.barBackground?.visible) {\n      return;\n    }\n\n    /**\n     * @description 准备 barBackground 数据\n     */\n    const dimensionItems = ([data]: DataView[], op: string) => {\n      let dataCollect: any[] = [{}];\n      const fields = this.getDimensionField();\n      // 将维度轴的所有层级 field 的对应数据做笛卡尔积\n      for (let i = 0; i < fields.length; i++) {\n        const field = fields[i];\n        const values = data.latestData[field]?.values;\n        if (!values?.length) {\n          continue;\n        }\n        const newDataCollect: any[] = [];\n        for (let j = 0; j < values.length; j++) {\n          for (let k = 0; k < dataCollect.length; k++) {\n            newDataCollect.push({\n              ...dataCollect[k],\n              [field]: values[j]\n            });\n          }\n        }\n        dataCollect = newDataCollect;\n      }\n      return dataCollect;\n    };\n\n    registerDataSetInstanceTransform(this._option.dataSet, 'addVChartProperty', addVChartProperty);\n    registerDataSetInstanceTransform(this._option.dataSet, 'dimensionItems', dimensionItems);\n\n    const barBackgroundData = new DataView(this._option.dataSet)\n      .parse([this._viewDataStatistics], {\n        type: 'dataview'\n      })\n      .transform(\n        {\n          type: 'dimensionItems'\n        },\n        false\n      )\n      .transform(\n        {\n          type: 'addVChartProperty',\n          options: {\n            beforeCall: initKeyMap.bind(this),\n            call: addDataKey\n          }\n        },\n        false\n      );\n\n    this._viewDataStatistics?.target.addListener('change', barBackgroundData.reRunAllTransform);\n    this._barBackgroundViewData = new SeriesData(this._option, barBackgroundData);\n  }\n\n  init(option: IModelInitOption): void {\n    super.init(option);\n    if (this.direction === 'vertical') {\n      this._xAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    } else {\n      this._yAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    }\n  }\n\n  private _shouldDoPreCalculate() {\n    const region = this.getRegion();\n    return (\n      this._stack && region.getSeries().filter(s => s.type === SeriesTypeEnum.bar && s.getSpec().barMinHeight).length\n    );\n  }\n\n  private _calculateStackRectPosition(isVertical: boolean) {\n    const region = this.getRegion();\n\n    // @ts-ignore\n    if (region._bar_series_position_calculated) {\n      return;\n    }\n    // @ts-ignore\n    region._bar_series_position_calculated = true; // 因为是 region 内堆叠矩形的计算，所以加一个 hack 标识位用于避免重复计算\n    let start: string;\n    let end: string;\n    let startMethod: string;\n    let endMethod: string;\n    let axisHelper: string;\n    if (isVertical) {\n      start = RECT_Y1;\n      end = RECT_Y;\n      startMethod = 'dataToPositionY1';\n      endMethod = 'dataToPositionY';\n      axisHelper = '_yAxisHelper';\n    } else {\n      start = RECT_X1;\n      end = RECT_X;\n      startMethod = 'dataToPositionX1';\n      endMethod = 'dataToPositionX';\n      axisHelper = '_xAxisHelper';\n    }\n\n    // only reCompute bar\n    const stackValueGroup = getRegionStackGroup(region, false, s => s.type === SeriesTypeEnum.bar);\n\n    // 按照堆积逻辑 重新计算一次图形的堆积位置并设置到数据上\n    for (const stackValue in stackValueGroup) {\n      for (const key in stackValueGroup[stackValue].nodes) {\n        stackWithMinHeight(stackValueGroup[stackValue].nodes[key], region.getStackInverse(), {\n          isVertical,\n          start,\n          end,\n          startMethod,\n          endMethod,\n          axisHelper\n        });\n      }\n    }\n  }\n\n  private _calculateRectPosition(datum: Datum, isVertical: boolean) {\n    let startMethod: string;\n    let endMethod: string;\n    let axisHelper: string;\n    if (isVertical) {\n      startMethod = 'dataToPositionY1';\n      endMethod = 'dataToPositionY';\n      axisHelper = '_yAxisHelper';\n    } else {\n      startMethod = 'dataToPositionX1';\n      endMethod = 'dataToPositionX';\n      axisHelper = '_xAxisHelper';\n    }\n\n    const seriesScale = this[axisHelper].getScale?.(0);\n    const inverse = this[axisHelper].isInverse();\n    const barMinHeight = this._spec.barMinHeight;\n    const y1 = valueInScaleRange(this[startMethod](datum), seriesScale);\n    const y = valueInScaleRange(this[endMethod](datum), seriesScale);\n\n    let height = Math.abs(y1 - y);\n    if (height < barMinHeight) {\n      height = barMinHeight;\n    }\n\n    let flag = 1;\n    if (y < y1) {\n      flag = -1;\n    } else if (y === y1) {\n      flag = isVertical ? (inverse ? 1 : -1) : inverse ? -1 : 1;\n    }\n    return y1 + flag * height;\n  }\n\n  initBandRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n\n    // guess the direction which the user want\n    if (this.direction === Direction.horizontal) {\n      this.setMarkStyle(\n        this._barMark,\n        {\n          x: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(false);\n              return datum[RECT_X];\n            }\n\n            if (this._spec.barMinHeight) {\n              return this._calculateRectPosition(datum, false);\n            }\n\n            return valueInScaleRange(this.dataToPositionX(datum), xScale);\n          },\n          x1: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(false);\n              return datum[RECT_X1];\n            }\n\n            return valueInScaleRange(this.dataToPositionX1(datum), xScale);\n          },\n          y: (datum: Datum) => this._getPosition(this.direction, datum),\n          height: () => this._getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._barMark,\n        {\n          x: (datum: Datum) => this._getPosition(this.direction, datum),\n          y: (datum: Datum, ctx, opt, dataView) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(true);\n              return datum[RECT_Y];\n            }\n\n            if (this._spec.barMinHeight) {\n              return this._calculateRectPosition(datum, true);\n            }\n\n            return valueInScaleRange(this.dataToPositionY(datum), yScale);\n          },\n          y1: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(true);\n              return datum[RECT_Y1];\n            }\n            return valueInScaleRange(this.dataToPositionY1(datum), yScale);\n          },\n          width: () => {\n            return this._getBarWidth(this._xAxisHelper);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n    this._initBarBackgroundMarkStyle();\n  }\n\n  protected _initBarBackgroundMarkStyle() {\n    if (!this._barBackgroundMark) {\n      return;\n    }\n\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n\n    // guess the direction which the user want\n    if (this.direction === Direction.horizontal) {\n      this.setMarkStyle(\n        this._barBackgroundMark,\n        {\n          x: () => {\n            const range = xScale.range();\n            const min = Math.min(range[0], range[range.length - 1]);\n            return min;\n          },\n          x1: () => {\n            const range = xScale.range();\n            const max = Math.max(range[0], range[range.length - 1]);\n            return max;\n          },\n          y: (datum: Datum) => this._getPosition(this.direction, datum),\n          height: () => this._getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._barBackgroundMark,\n        {\n          x: (datum: Datum) => this._getPosition(this.direction, datum),\n          y: () => {\n            const range = yScale.range();\n            const min = Math.min(range[0], range[range.length - 1]);\n            return min;\n          },\n          y1: () => {\n            const range = yScale.range();\n            const max = Math.max(range[0], range[range.length - 1]);\n            return max;\n          },\n          width: () => {\n            return this._getBarWidth(this._xAxisHelper);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initLinearRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n\n    if (this.direction === Direction.vertical) {\n      this.setMarkStyle(\n        this._barMark,\n        {\n          x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n          x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n          y: (datum: Datum, ctx, opt, dataView) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(true);\n              return datum[RECT_Y];\n            }\n\n            if (this._spec.barMinHeight) {\n              return this._calculateRectPosition(datum, true);\n            }\n\n            return valueInScaleRange(this.dataToPositionY(datum), yScale);\n          },\n          y1: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(true);\n              return datum[RECT_Y1];\n            }\n            return valueInScaleRange(this.dataToPositionY1(datum), yScale);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._barMark,\n        {\n          x: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(false);\n\n              return datum[RECT_X];\n            }\n\n            if (this._spec.barMinHeight) {\n              return this._calculateRectPosition(datum, false);\n            }\n\n            return valueInScaleRange(this.dataToPositionX(datum), xScale);\n          },\n          x1: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(false);\n              return datum[RECT_X1];\n            }\n            return valueInScaleRange(this.dataToPositionX1(datum), xScale);\n          },\n          y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n          y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initAnimation() {\n    // 这个数据在这个时候拿不到，因为组件还没创建结束，统计和筛选也还没添加。\n    // 而且这个值理论上是动态的，建议 监听 viewDataStatisticsUpdate 消息动态更新\n    const animationParams: IBarAnimationParams = {\n      yField: this._fieldY[0],\n      xField: this._fieldX[0],\n      direction: this.direction,\n      growFrom: () =>\n        this.direction === 'horizontal'\n          ? this._xAxisHelper?.getScale(0).scale(0)\n          : this._yAxisHelper?.getScale(0).scale(0)\n    };\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<BarAppearPreset>)?.preset;\n    // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n    const dataIndex = (datum: any) => {\n      const xValue = datum?.[this._fieldX[0]];\n      const xIndex = this.getViewDataStatistics()?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n      // 不应该出现xIndex === -1 || undefined的情况\n      return xIndex || 0;\n    };\n\n    this._barMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('bar')?.(animationParams, appearPreset),\n        userAnimationConfig(this._barMarkName, this._spec, this._markAttributeContext),\n        { dataIndex }\n      )\n    );\n  }\n\n  protected _getBarWidth(axisHelper: IAxisHelper) {\n    const hasBarWidth = this._spec.barWidth !== undefined;\n    const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n\n    if (hasBarWidth) {\n      return getActualNumValue(this._spec.barWidth, bandWidth);\n    }\n    const hasBarMinWidth = this._spec.barMinWidth !== undefined;\n    const hasBarMaxWidth = this._spec.barMaxWidth !== undefined;\n    let width = bandWidth;\n    if (hasBarMinWidth) {\n      width = Math.max(width, getActualNumValue(this._spec.barMinWidth, bandWidth));\n    }\n    if (hasBarMaxWidth) {\n      width = Math.min(width, getActualNumValue(this._spec.barMaxWidth, bandWidth));\n    }\n    return width;\n  }\n\n  protected _getPosition(direction: DirectionType, datum: Datum) {\n    let axisHelper;\n    let sizeAttribute;\n    let dataToPosition;\n    if (direction === Direction.horizontal) {\n      axisHelper = this.getYAxisHelper();\n      sizeAttribute = 'height';\n      dataToPosition = this.dataToPositionY.bind(this);\n    } else {\n      axisHelper = this.getXAxisHelper();\n      sizeAttribute = 'width';\n      dataToPosition = this.dataToPositionX.bind(this);\n    }\n    const scale = axisHelper.getScale(0);\n    const size = this._barMark.getAttribute(sizeAttribute, datum) as number;\n    const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n    if (this._groups?.fields?.length > 1 && isValid(this._spec.barGapInGroup)) {\n      // 自里向外计算，沿着第一层分组的中心点进行位置调整\n      const groupFields = this._groups.fields;\n      const barInGroup = array(this._spec.barGapInGroup);\n      let totalWidth: number = 0;\n      let offSet: number = 0;\n\n      for (let index = groupFields.length - 1; index >= 1; index--) {\n        const groupField = groupFields[index];\n        const groupValues = this.getViewDataStatistics()?.latestData?.[groupField]?.values ?? [];\n        const groupCount = groupValues.length;\n        const gap = getActualNumValue(barInGroup[index - 1] ?? last(barInGroup), bandWidth);\n        const i = groupValues.indexOf(datum[groupField]);\n        if (index === groupFields.length - 1) {\n          totalWidth += groupCount * size + (groupCount - 1) * gap;\n          offSet += i * (size + gap);\n        } else {\n          offSet += i * (totalWidth + gap);\n          totalWidth += totalWidth + (groupCount - 1) * gap;\n        }\n      }\n\n      const center = scale.scale(datum[groupFields[0]]) + axisHelper.getBandwidth(0) / 2;\n      return center - totalWidth / 2 + offSet;\n    }\n\n    const continuous = isContinuous(scale.type || 'band');\n    const pos = dataToPosition(datum);\n    return pos + (bandWidth - size) * 0.5 + (continuous ? -bandWidth / 2 : 0);\n  }\n\n  onLayoutEnd(ctx: any): void {\n    super.onLayoutEnd(ctx);\n    const region = this.getRegion();\n    // @ts-ignore\n    region._bar_series_position_calculated = false;\n    if (this._spec.sampling) {\n      this.compile();\n    }\n  }\n\n  compile(): void {\n    super.compile();\n\n    if (this._spec.sampling) {\n      const { width, height } = this._region.getLayoutRect();\n      const samplingTrans = [];\n      const fieldsY = this._fieldY;\n      const fieldsX = this._fieldX;\n\n      samplingTrans.push({\n        type: 'sampling',\n        size: this._direction === Direction.vertical ? width : height,\n        factor: this._spec.samplingFactor,\n        yfield: this._direction === Direction.vertical ? fieldsY[0] : fieldsX[0],\n        groupBy: this._seriesField,\n        mode: this._spec.sampling\n      });\n      this._data.getProduct().transform(samplingTrans);\n    }\n  }\n\n  getDefaultShapeType(): string {\n    return 'square';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._barMark];\n  }\n\n  compileData() {\n    super.compileData();\n    this._barBackgroundViewData?.compile();\n  }\n\n  fillData() {\n    super.fillData();\n    this._barBackgroundViewData?.getDataView()?.reRunAllTransform();\n  }\n\n  viewDataUpdate(d: DataView): void {\n    super.viewDataUpdate(d);\n    this._barBackgroundViewData?.getDataView()?.reRunAllTransform();\n    this._barBackgroundViewData?.updateData();\n  }\n\n  release() {\n    super.release();\n    this._barBackgroundViewData?.release();\n    this._barBackgroundViewData = null;\n  }\n}\n\nexport const registerBarSeries = () => {\n  registerSampleTransform();\n  Factory.registerMark(RectMark.type, RectMark);\n  Factory.registerSeries(BarSeries.type, BarSeries);\n  registerBarAnimation();\n};\n"]}
+{"version":3,"sources":["../src/series/bar/bar.ts"],"names":[],"mappings":"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","file":"bar.js","sourcesContent":["import { PREFIX } from './../../constant/index';\n/* eslint-disable no-duplicate-imports */\nimport { isContinuous } from '@visactor/vscale';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport type { IMark, IMarkProgressiveConfig } from '../../mark/interface';\nimport { MarkTypeEnum } from '../../mark/interface/type';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum, DirectionType } from '../../typings';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport { valueInScaleRange } from '../../util/scale';\nimport { getRegionStackGroup } from '../../util/data';\nimport { getActualNumValue } from '../../util/space';\nimport { registerBarAnimation, type BarAppearPreset, type IBarAnimationParams } from './animation';\nimport { animationConfig, shouldMarkDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IBarSeriesSpec, IBarSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { IRectMark } from '../../mark/rect';\nimport type { IModelInitOption } from '../../model/interface';\nimport type { ITextMark } from '../../mark/text';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { RectMark } from '../../mark/rect';\nimport { array, isValid, last } from '@visactor/vutils';\nimport { barSeriesMark } from './constant';\nimport { stackWithMinHeight } from '../util/stack';\nimport { Factory } from '../../core/factory';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport { SeriesData } from '../base/series-data';\nimport { DataView } from '@visactor/vdataset';\nimport { addVChartProperty } from '../../data/transforms/add-property';\nimport { addDataKey, initKeyMap } from '../../data/transforms/data-key';\nimport { registerSampleTransform } from '@visactor/vgrammar-core';\nimport type { ILabelSpec } from '../../component';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\nconst RECT_X = `${PREFIX}_rect_x`;\nconst RECT_X1 = `${PREFIX}_rect_x1`;\nconst RECT_Y = `${PREFIX}_rect_y`;\nconst RECT_Y1 = `${PREFIX}_rect_y1`;\n\nexport class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.bar;\n  type = SeriesTypeEnum.bar;\n  protected _barMarkName: SeriesMarkNameEnum = SeriesMarkNameEnum.bar;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect;\n\n  static readonly mark: SeriesMarkMap = barSeriesMark;\n\n  protected declare _theme: Maybe<IBarSeriesTheme>;\n\n  protected _supportStack: boolean = true;\n  protected _bandPosition = 0;\n  protected _barMark!: IRectMark;\n  protected _barBackgroundMark!: IRectMark;\n\n  protected _barBackgroundViewData: SeriesData;\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    this._initBarBackgroundMark(progressive);\n\n    this._barMark = this._createMark(\n      {\n        ...BarSeries.mark.bar,\n        name: this._barMarkName,\n        type: this._barMarkType\n      },\n      {\n        morph: shouldMarkDoMorph(this._spec, this._barMarkName),\n        defaultMorphElementKey: this.getDimensionField()[0],\n        groupKey: this._seriesField,\n        isSeriesMark: true,\n        label: this._preprocessLabelSpec(this._spec.label as ILabelSpec),\n        progressive,\n        customShape: this._spec.bar?.customShape\n      }\n    ) as IRectMark;\n  }\n\n  protected _initBarBackgroundMark(progressive?: IMarkProgressiveConfig): void {\n    if (this._spec.barBackground?.visible) {\n      this._barBackgroundMark = this._createMark(BarSeries.mark.barBackground, {\n        dataView: this._barBackgroundViewData.getDataView(),\n        dataProductId: this._barBackgroundViewData.getProductId(),\n        progressive,\n        customShape: this._spec.barBackground?.customShape\n      }) as IRectMark;\n    }\n  }\n\n  initMarkStyle(): void {\n    if (this._barMark) {\n      this.setMarkStyle(\n        this._barMark,\n        {\n          fill: this.getColorAttribute()\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      this._trigger.registerMark(this._barMark);\n    }\n  }\n\n  initLabelMarkStyle(textMark: ITextMark) {\n    if (!textMark) {\n      return;\n    }\n    this.setMarkStyle(textMark, {\n      fill: this.getColorAttribute(),\n      text: (datum: Datum) => {\n        return datum[this.getStackValueField()];\n      },\n      z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n    });\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n\n    this._barMark && this._tooltipHelper.activeTriggerSet.mark.add(this._barMark);\n  }\n\n  protected _statisticViewData(): void {\n    super._statisticViewData();\n\n    if (!this._spec.barBackground?.visible) {\n      return;\n    }\n\n    /**\n     * @description 准备 barBackground 数据\n     */\n    const dimensionItems = ([data]: DataView[], op: string) => {\n      let dataCollect: any[] = [{}];\n      const fields = this.getDimensionField();\n      // 将维度轴的所有层级 field 的对应数据做笛卡尔积\n      for (let i = 0; i < fields.length; i++) {\n        const field = fields[i];\n        const values = data.latestData[field]?.values;\n        if (!values?.length) {\n          continue;\n        }\n        const newDataCollect: any[] = [];\n        for (let j = 0; j < values.length; j++) {\n          for (let k = 0; k < dataCollect.length; k++) {\n            newDataCollect.push({\n              ...dataCollect[k],\n              [field]: values[j]\n            });\n          }\n        }\n        dataCollect = newDataCollect;\n      }\n      return dataCollect;\n    };\n\n    registerDataSetInstanceTransform(this._option.dataSet, 'addVChartProperty', addVChartProperty);\n    registerDataSetInstanceTransform(this._option.dataSet, 'dimensionItems', dimensionItems);\n\n    const barBackgroundData = new DataView(this._option.dataSet)\n      .parse([this._viewDataStatistics], {\n        type: 'dataview'\n      })\n      .transform(\n        {\n          type: 'dimensionItems'\n        },\n        false\n      )\n      .transform(\n        {\n          type: 'addVChartProperty',\n          options: {\n            beforeCall: initKeyMap.bind(this),\n            call: addDataKey\n          }\n        },\n        false\n      );\n\n    this._viewDataStatistics?.target.addListener('change', barBackgroundData.reRunAllTransform);\n    this._barBackgroundViewData = new SeriesData(this._option, barBackgroundData);\n  }\n\n  init(option: IModelInitOption): void {\n    super.init(option);\n    if (this.direction === 'vertical') {\n      this._xAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    } else {\n      this._yAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    }\n  }\n\n  private _shouldDoPreCalculate() {\n    const region = this.getRegion();\n    return (\n      this._stack && region.getSeries().filter(s => s.type === SeriesTypeEnum.bar && s.getSpec().barMinHeight).length\n    );\n  }\n\n  private _calculateStackRectPosition(isVertical: boolean) {\n    const region = this.getRegion();\n\n    // @ts-ignore\n    if (region._bar_series_position_calculated) {\n      return;\n    }\n    // @ts-ignore\n    region._bar_series_position_calculated = true; // 因为是 region 内堆叠矩形的计算，所以加一个 hack 标识位用于避免重复计算\n    let start: string;\n    let end: string;\n    let startMethod: string;\n    let endMethod: string;\n    let axisHelper: string;\n    if (isVertical) {\n      start = RECT_Y1;\n      end = RECT_Y;\n      startMethod = 'dataToPositionY1';\n      endMethod = 'dataToPositionY';\n      axisHelper = '_yAxisHelper';\n    } else {\n      start = RECT_X1;\n      end = RECT_X;\n      startMethod = 'dataToPositionX1';\n      endMethod = 'dataToPositionX';\n      axisHelper = '_xAxisHelper';\n    }\n\n    // only reCompute bar\n    const stackValueGroup = getRegionStackGroup(region, false, s => s.type === SeriesTypeEnum.bar);\n\n    // 按照堆积逻辑 重新计算一次图形的堆积位置并设置到数据上\n    for (const stackValue in stackValueGroup) {\n      for (const key in stackValueGroup[stackValue].nodes) {\n        stackWithMinHeight(stackValueGroup[stackValue].nodes[key], region.getStackInverse(), {\n          isVertical,\n          start,\n          end,\n          startMethod,\n          endMethod,\n          axisHelper\n        });\n      }\n    }\n  }\n\n  private _calculateRectPosition(datum: Datum, isVertical: boolean) {\n    let startMethod: string;\n    let endMethod: string;\n    let axisHelper: string;\n    if (isVertical) {\n      startMethod = 'dataToPositionY1';\n      endMethod = 'dataToPositionY';\n      axisHelper = '_yAxisHelper';\n    } else {\n      startMethod = 'dataToPositionX1';\n      endMethod = 'dataToPositionX';\n      axisHelper = '_xAxisHelper';\n    }\n\n    const seriesScale = this[axisHelper].getScale?.(0);\n    const inverse = this[axisHelper].isInverse();\n    const barMinHeight = this._spec.barMinHeight;\n    const y1 = valueInScaleRange(this[startMethod](datum), seriesScale);\n    const y = valueInScaleRange(this[endMethod](datum), seriesScale);\n\n    let height = Math.abs(y1 - y);\n    if (height < barMinHeight) {\n      height = barMinHeight;\n    }\n\n    let flag = 1;\n    if (y < y1) {\n      flag = -1;\n    } else if (y === y1) {\n      flag = isVertical ? (inverse ? 1 : -1) : inverse ? -1 : 1;\n    }\n    return y1 + flag * height;\n  }\n\n  initBandRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n\n    // guess the direction which the user want\n    if (this.direction === Direction.horizontal) {\n      this.setMarkStyle(\n        this._barMark,\n        {\n          x: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(false);\n              return datum[RECT_X];\n            }\n\n            if (this._spec.barMinHeight) {\n              return this._calculateRectPosition(datum, false);\n            }\n\n            return valueInScaleRange(this.dataToPositionX(datum), xScale);\n          },\n          x1: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(false);\n              return datum[RECT_X1];\n            }\n\n            return valueInScaleRange(this.dataToPositionX1(datum), xScale);\n          },\n          y: (datum: Datum) => this._getPosition(this.direction, datum),\n          height: () => this._getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._barMark,\n        {\n          x: (datum: Datum) => this._getPosition(this.direction, datum),\n          y: (datum: Datum, ctx, opt, dataView) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(true);\n              return datum[RECT_Y];\n            }\n\n            if (this._spec.barMinHeight) {\n              return this._calculateRectPosition(datum, true);\n            }\n\n            return valueInScaleRange(this.dataToPositionY(datum), yScale);\n          },\n          y1: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(true);\n              return datum[RECT_Y1];\n            }\n            return valueInScaleRange(this.dataToPositionY1(datum), yScale);\n          },\n          width: () => {\n            return this._getBarWidth(this._xAxisHelper);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n    this._initBarBackgroundMarkStyle();\n  }\n\n  protected _initBarBackgroundMarkStyle() {\n    if (!this._barBackgroundMark) {\n      return;\n    }\n\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n\n    // guess the direction which the user want\n    if (this.direction === Direction.horizontal) {\n      this.setMarkStyle(\n        this._barBackgroundMark,\n        {\n          x: () => {\n            const range = xScale.range();\n            const min = Math.min(range[0], range[range.length - 1]);\n            return min;\n          },\n          x1: () => {\n            const range = xScale.range();\n            const max = Math.max(range[0], range[range.length - 1]);\n            return max;\n          },\n          y: (datum: Datum) => this._getPosition(this.direction, datum),\n          height: () => this._getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._barBackgroundMark,\n        {\n          x: (datum: Datum) => this._getPosition(this.direction, datum),\n          y: () => {\n            const range = yScale.range();\n            const min = Math.min(range[0], range[range.length - 1]);\n            return min;\n          },\n          y1: () => {\n            const range = yScale.range();\n            const max = Math.max(range[0], range[range.length - 1]);\n            return max;\n          },\n          width: () => {\n            return this._getBarWidth(this._xAxisHelper);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initLinearRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n\n    if (this.direction === Direction.vertical) {\n      this.setMarkStyle(\n        this._barMark,\n        {\n          x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n          x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n          y: (datum: Datum, ctx, opt, dataView) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(true);\n              return datum[RECT_Y];\n            }\n\n            if (this._spec.barMinHeight) {\n              return this._calculateRectPosition(datum, true);\n            }\n\n            return valueInScaleRange(this.dataToPositionY(datum), yScale);\n          },\n          y1: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(true);\n              return datum[RECT_Y1];\n            }\n            return valueInScaleRange(this.dataToPositionY1(datum), yScale);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._barMark,\n        {\n          x: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(false);\n\n              return datum[RECT_X];\n            }\n\n            if (this._spec.barMinHeight) {\n              return this._calculateRectPosition(datum, false);\n            }\n\n            return valueInScaleRange(this.dataToPositionX(datum), xScale);\n          },\n          x1: (datum: Datum) => {\n            if (this._shouldDoPreCalculate()) {\n              this._calculateStackRectPosition(false);\n              return datum[RECT_X1];\n            }\n            return valueInScaleRange(this.dataToPositionX1(datum), xScale);\n          },\n          y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n          y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initAnimation() {\n    // 这个数据在这个时候拿不到，因为组件还没创建结束，统计和筛选也还没添加。\n    // 而且这个值理论上是动态的，建议 监听 viewDataStatisticsUpdate 消息动态更新\n    const animationParams: IBarAnimationParams = {\n      yField: this._fieldY[0],\n      xField: this._fieldX[0],\n      direction: this.direction,\n      growFrom: () =>\n        this.direction === 'horizontal'\n          ? this._xAxisHelper?.getScale(0).scale(0)\n          : this._yAxisHelper?.getScale(0).scale(0)\n    };\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<BarAppearPreset>)?.preset;\n    // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n    const dataIndex = (datum: any) => {\n      const xValue = datum?.[this._fieldX[0]];\n      const xIndex = this.getViewDataStatistics()?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n      // 不应该出现xIndex === -1 || undefined的情况\n      return xIndex || 0;\n    };\n\n    this._barMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('bar')?.(animationParams, appearPreset),\n        userAnimationConfig(this._barMarkName, this._spec, this._markAttributeContext),\n        { dataIndex }\n      )\n    );\n  }\n\n  protected _getBarWidth(axisHelper: IAxisHelper) {\n    const hasBarWidth = this._spec.barWidth !== undefined;\n    const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n\n    if (hasBarWidth) {\n      return getActualNumValue(this._spec.barWidth, bandWidth);\n    }\n    const hasBarMinWidth = this._spec.barMinWidth !== undefined;\n    const hasBarMaxWidth = this._spec.barMaxWidth !== undefined;\n    let width = bandWidth;\n    if (hasBarMinWidth) {\n      width = Math.max(width, getActualNumValue(this._spec.barMinWidth, bandWidth));\n    }\n    if (hasBarMaxWidth) {\n      width = Math.min(width, getActualNumValue(this._spec.barMaxWidth, bandWidth));\n    }\n    return width;\n  }\n\n  protected _getPosition(direction: DirectionType, datum: Datum) {\n    let axisHelper;\n    let sizeAttribute;\n    let dataToPosition;\n    if (direction === Direction.horizontal) {\n      axisHelper = this.getYAxisHelper();\n      sizeAttribute = 'height';\n      dataToPosition = this.dataToPositionY.bind(this);\n    } else {\n      axisHelper = this.getXAxisHelper();\n      sizeAttribute = 'width';\n      dataToPosition = this.dataToPositionX.bind(this);\n    }\n    const scale = axisHelper.getScale(0);\n    const size = this._barMark.getAttribute(sizeAttribute, datum) as number;\n    const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n    if (this._groups?.fields?.length > 1 && isValid(this._spec.barGapInGroup)) {\n      // 自里向外计算，沿着第一层分组的中心点进行位置调整\n      const groupFields = this._groups.fields;\n      const barInGroup = array(this._spec.barGapInGroup);\n      let totalWidth: number = 0;\n      let offSet: number = 0;\n\n      for (let index = groupFields.length - 1; index >= 1; index--) {\n        const groupField = groupFields[index];\n        const groupValues = this.getViewDataStatistics()?.latestData?.[groupField]?.values ?? [];\n        const groupCount = groupValues.length;\n        const gap = getActualNumValue(barInGroup[index - 1] ?? last(barInGroup), bandWidth);\n        const i = groupValues.indexOf(datum[groupField]);\n        if (index === groupFields.length - 1) {\n          totalWidth += groupCount * size + (groupCount - 1) * gap;\n          offSet += i * (size + gap);\n        } else {\n          offSet += i * (totalWidth + gap);\n          totalWidth += totalWidth + (groupCount - 1) * gap;\n        }\n      }\n\n      const center = scale.scale(datum[groupFields[0]]) + axisHelper.getBandwidth(0) / 2;\n      return center - totalWidth / 2 + offSet;\n    }\n\n    const continuous = isContinuous(scale.type || 'band');\n    const pos = dataToPosition(datum);\n    return pos + (bandWidth - size) * 0.5 + (continuous ? -bandWidth / 2 : 0);\n  }\n\n  onLayoutEnd(ctx: any): void {\n    super.onLayoutEnd(ctx);\n    const region = this.getRegion();\n    // @ts-ignore\n    region._bar_series_position_calculated = false;\n    if (this._spec.sampling) {\n      this.compile();\n    }\n  }\n\n  compile(): void {\n    super.compile();\n\n    if (this._spec.sampling) {\n      const { width, height } = this._region.getLayoutRect();\n      const samplingTrans = [];\n      const fieldsY = this._fieldY;\n      const fieldsX = this._fieldX;\n\n      samplingTrans.push({\n        type: 'sampling',\n        size: this._direction === Direction.vertical ? width : height,\n        factor: this._spec.samplingFactor,\n        yfield: this._direction === Direction.vertical ? fieldsY[0] : fieldsX[0],\n        groupBy: this._seriesField,\n        mode: this._spec.sampling\n      });\n      this._data.getProduct().transform(samplingTrans);\n    }\n  }\n\n  getDefaultShapeType(): string {\n    return 'square';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._barMark];\n  }\n\n  compileData() {\n    super.compileData();\n    this._barBackgroundViewData?.compile();\n  }\n\n  fillData() {\n    super.fillData();\n    this._barBackgroundViewData?.getDataView()?.reRunAllTransform();\n  }\n\n  viewDataUpdate(d: DataView): void {\n    super.viewDataUpdate(d);\n    this._barBackgroundViewData?.getDataView()?.reRunAllTransform();\n    this._barBackgroundViewData?.updateData();\n  }\n\n  release() {\n    super.release();\n    this._barBackgroundViewData?.release();\n    this._barBackgroundViewData = null;\n  }\n}\n\nexport const registerBarSeries = () => {\n  registerSampleTransform();\n  Factory.registerMark(RectMark.type, RectMark);\n  Factory.registerSeries(BarSeries.type, BarSeries);\n  registerBarAnimation();\n};\n"]}

package/cjs/series/base/base-series.d.ts

@@ -12,6 +12,9 @@ import type { StatisticOperations } from '../../data/transforms/dimension-statis
 import { SeriesData } from './series-data';
 import type { IGroupMark } from '../../mark/group';
 import type { ISeriesMarkAttributeContext } from '../../compile/mark';
+import type { ILabelSpec } from '../../component';
+import type { ILabelMark } from '../../mark/label';
+import type { TransformedLabelSpec } from '../../component/label';
 export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseModel<T> implements ISeries {
     readonly specKey: string;
     readonly type: string;
@@ -192,4 +195,5 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     getMarkInfoList(): import("../../model/interface").IModelMarkInfo[];
     protected _getInvalidConnectType(): "none" | "zero" | "connect";
     protected _getInvalidDefined: (datum: Datum) => boolean;
+    protected _preprocessLabelSpec(spec: ILabelSpec, styleHandler?: (mark: ILabelMark) => void, hasAnimation?: boolean): TransformedLabelSpec;
 }

package/cjs/series/base/base-series.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseSeries = void 0;
 
-const event_1 = require("../../constant/event"), index_1 = require("../../constant/index"), theme_1 = require("../interface/theme"), vdataset_1 = require("@visactor/vdataset"), type_1 = require("../../mark/interface/type"), base_model_1 = require("../../model/base-model"), initialize_1 = require("../../data/initialize"), data_1 = require("../../util/data"), type_2 = require("../../util/type"), merge_spec_1 = require("../../util/spec/merge-spec"), preprocess_1 = require("../../util/spec/preprocess"), add_property_1 = require("../../data/transforms/add-property"), trigger_1 = require("../../interaction/trigger"), register_1 = require("../../data/register"), tooltip_helper_1 = require("./tooltip-helper"), dimension_statistics_1 = require("../../data/transforms/dimension-statistics"), invalid_travel_1 = require("../../data/transforms/invalid-travel"), util_1 = require("../../theme/color-scheme/util"), series_data_1 = require("./series-data"), data_key_1 = require("../../data/transforms/data-key"), vutils_1 = require("@visactor/vutils"), util_2 = require("../../theme/util"), spec_1 = require("../util/spec"), color_ordinal_scale_1 = require("../../scale/color-ordinal-scale"), constant_1 = require("./constant"), utils_1 = require("../../animation/utils");
+const event_1 = require("../../constant/event"), index_1 = require("../../constant/index"), theme_1 = require("../interface/theme"), vdataset_1 = require("@visactor/vdataset"), type_1 = require("../../mark/interface/type"), base_model_1 = require("../../model/base-model"), initialize_1 = require("../../data/initialize"), data_1 = require("../../util/data"), type_2 = require("../../util/type"), merge_spec_1 = require("../../util/spec/merge-spec"), add_property_1 = require("../../data/transforms/add-property"), trigger_1 = require("../../interaction/trigger"), register_1 = require("../../data/register"), tooltip_helper_1 = require("./tooltip-helper"), dimension_statistics_1 = require("../../data/transforms/dimension-statistics"), invalid_travel_1 = require("../../data/transforms/invalid-travel"), util_1 = require("../../theme/color-scheme/util"), series_data_1 = require("./series-data"), data_key_1 = require("../../data/transforms/data-key"), vutils_1 = require("@visactor/vutils"), spec_1 = require("../util/spec"), color_ordinal_scale_1 = require("../../scale/color-ordinal-scale"), constant_1 = require("./constant"), utils_1 = require("../../animation/utils"), merge_theme_1 = require("../../util/spec/merge-theme");
 
 class BaseSeries extends base_model_1.BaseModel {
     getTrigger() {
@@ -320,9 +320,13 @@ class BaseSeries extends base_model_1.BaseModel {
         }, {
             markSpec: spec,
             parent: parentMark,
-            dataView: !1
+            dataView: !1,
+            customShape: null == spec ? void 0 : spec.customShape
         });
-        if (mark) if ("group" === spec.type) namePrefix = `${namePrefix}_${index}`, null === (_a = spec.children) || void 0 === _a || _a.forEach(((s, i) => {
+        if (!mark) return;
+        const config = (0, utils_1.animationConfig)({}, (0, utils_1.userAnimationConfig)(spec.type, spec, this._markAttributeContext));
+        if (mark.setAnimationConfig(config), "group" === spec.type) namePrefix = `${namePrefix}_${index}`, 
+        null === (_a = spec.children) || void 0 === _a || _a.forEach(((s, i) => {
             this._createExtensionMark(s, mark, namePrefix, i);
         })); else if (!(parentMark || (0, vutils_1.isNil)(spec.dataId) && (0, vutils_1.isNil)(spec.dataIndex))) {
             const dataView = this._option.getSeriesData(spec.id, spec.dataIndex);
@@ -530,14 +534,15 @@ class BaseSeries extends base_model_1.BaseModel {
     }
     onMarkTreePositionUpdate(marks) {}
     _getTheme() {
-        const direction = (0, spec_1.getDirectionFromSeriesSpec)(this._spec), theme = (0, 
-        util_2.getThemeFromOption)(`series.${this.type}`, this._option), themeWithDirection = (0, 
-        util_2.getThemeFromOption)(`series.${this.type}_${direction}`, this._option);
-        return (0, preprocess_1.preprocessSpecOrTheme)("theme", (0, merge_spec_1.mergeSpec)({}, theme, themeWithDirection), this.getColorScheme(), this._spec);
+        var _a;
+        const direction = (0, spec_1.getDirectionFromSeriesSpec)(this._spec), chartTheme = null === (_a = this._option) || void 0 === _a ? void 0 : _a.getTheme(), {markByName: markByName, mark: mark} = chartTheme, theme = (0, 
+        merge_theme_1.transformSeriesThemeToMerge)((0, vutils_1.get)(chartTheme, `series.${this.type}`), this.type, mark, markByName), themeWithDirection = (0, 
+        merge_theme_1.transformSeriesThemeToMerge)((0, vutils_1.get)(chartTheme, `series.${this.type}_${direction}`), `${this.type}_${direction}`, mark, markByName);
+        return (0, merge_spec_1.mergeSpec)({}, theme, themeWithDirection);
     }
     _createMark(markInfo, option = {}) {
         var _a, _b, _c, _d;
-        const {key: key, groupKey: groupKey, skipBeforeLayouted: skipBeforeLayouted, themeSpec: themeSpec = {}, markSpec: markSpec, dataView: dataView, dataProductId: dataProductId, parent: parent, isSeriesMark: isSeriesMark, depend: depend, label: label, progressive: progressive, support3d: support3d = this._spec.support3d || !!this._spec.zField, morph: morph = !1} = option, m = super._createMark(markInfo, {
+        const {key: key, groupKey: groupKey, skipBeforeLayouted: skipBeforeLayouted, themeSpec: themeSpec = {}, markSpec: markSpec, dataView: dataView, dataProductId: dataProductId, parent: parent, isSeriesMark: isSeriesMark, depend: depend, label: label, progressive: progressive, support3d: support3d = this._spec.support3d || !!this._spec.zField, morph: morph = !1, customShape: customShape} = option, m = super._createMark(markInfo, {
             key: null != key ? key : this._getDataIdKey(),
             support3d: support3d,
             seriesId: this.id,
@@ -556,7 +561,8 @@ class BaseSeries extends base_model_1.BaseModel {
             m.setMorph(morph), m.setMorphKey((null === (_b = spec.morph) || void 0 === _b ? void 0 : _b.morphKey) || `${this._specIndex}`), 
             m.setMorphElementKey(null !== (_d = null === (_c = spec.morph) || void 0 === _c ? void 0 : _c.morphElementKey) && void 0 !== _d ? _d : option.defaultMorphElementKey), 
             (0, vutils_1.isNil)(progressive) || m.setProgressiveConfig(progressive), (0, vutils_1.isNil)(groupKey) || m.setGroupKey(groupKey), 
-            this.initMarkStyleWithSpec(m, (0, merge_spec_1.mergeSpec)({}, themeSpec, markSpec || spec[m.name]));
+            customShape && m.setCustomizedShapeCallback(customShape), this.initMarkStyleWithSpec(m, (0, 
+            merge_spec_1.mergeSpec)({}, themeSpec, markSpec || spec[m.name]));
         }
         return m;
     }
@@ -605,6 +611,13 @@ class BaseSeries extends base_model_1.BaseModel {
     _getInvalidConnectType() {
         return "zero" === this._invalidType ? "zero" : "link" === this._invalidType ? "connect" : "none";
     }
+    _preprocessLabelSpec(spec, styleHandler, hasAnimation) {
+        return Object.assign(Object.assign({
+            animation: null != hasAnimation ? hasAnimation : this._spec.animation
+        }, spec), {
+            styleHandler: null != styleHandler ? styleHandler : this.initLabelMarkStyle
+        });
+    }
 }
 
 exports.BaseSeries = BaseSeries, BaseSeries.mark = constant_1.baseSeriesMark;