@visactor/vchart 1.5.4 → 1.6.0

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 { valueInScaleRange, mergeSpec } from '../../util';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum } from '../interface/type';\nimport { SeriesTypeEnum } from '../interface';\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';\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    >,\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 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\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)\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)\n        )\n      );\n    }\n\n    if (this._symbolMark) {\n      this._symbolMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('scaleInOut')?.(),\n          userAnimationConfig(SeriesMarkNameEnum.point, this._spec)\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  getDefaultShapeType() {\n    return 'square';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._areaMark, this._symbolMark, this._lineMark];\n  }\n\n  getSeriesStyle(datum: Datum) {\n    return (attribute: string) => {\n      let result = this._seriesMark?.getAttribute(attribute as any, datum) ?? undefined;\n      if (attribute === 'fill' && !result) {\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  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';\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"]}

package/cjs/series/area/constant.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.areaSeriesMark = void 0;
 
-const interface_1 = require("../../mark/interface"), constant_1 = require("../base/constant"), type_1 = require("../interface/type"), constant_2 = require("../mixin/constant");
+const type_1 = require("../../mark/interface/type"), constant_1 = require("../base/constant"), type_2 = require("../interface/type"), constant_2 = require("../mixin/constant");
 
 exports.areaSeriesMark = Object.assign(Object.assign(Object.assign({}, constant_1.baseSeriesMark), constant_2.lineLikeSeriesMark), {
-    [type_1.SeriesMarkNameEnum.area]: {
-        name: type_1.SeriesMarkNameEnum.area,
-        type: interface_1.MarkTypeEnum.area
+    [type_2.SeriesMarkNameEnum.area]: {
+        name: type_2.SeriesMarkNameEnum.area,
+        type: type_1.MarkTypeEnum.area
     }
 });
 //# sourceMappingURL=constant.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/area/constant.ts"],"names":[],"mappings":";;;AAAA,oDAAoD;AACpD,+CAAkD;AAElD,4CAAuD;AAEvD,gDAAuD;AAE1C,QAAA,cAAc,iDACtB,yBAAc,GACd,6BAAkB,KACrB,CAAC,yBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,yBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,wBAAY,CAAC,IAAI,EAAE,IACrF","file":"constant.js","sourcesContent":["import { MarkTypeEnum } from '../../mark/interface';\nimport { baseSeriesMark } from '../base/constant';\nimport type { SeriesMarkMap } from '../interface/common';\nimport { SeriesMarkNameEnum } from '../interface/type';\n\nimport { lineLikeSeriesMark } from '../mixin/constant';\n\nexport const areaSeriesMark: SeriesMarkMap = {\n  ...baseSeriesMark,\n  ...lineLikeSeriesMark,\n  [SeriesMarkNameEnum.area]: { name: SeriesMarkNameEnum.area, type: MarkTypeEnum.area }\n};\n"]}
+{"version":3,"sources":["../src/series/area/constant.ts"],"names":[],"mappings":";;;AAAA,oDAAyD;AACzD,+CAAkD;AAElD,4CAAuD;AAEvD,gDAAuD;AAE1C,QAAA,cAAc,iDACtB,yBAAc,GACd,6BAAkB,KACrB,CAAC,yBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,yBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,mBAAY,CAAC,IAAI,EAAE,IACrF","file":"constant.js","sourcesContent":["import { MarkTypeEnum } from '../../mark/interface/type';\nimport { baseSeriesMark } from '../base/constant';\nimport type { SeriesMarkMap } from '../interface/common';\nimport { SeriesMarkNameEnum } from '../interface/type';\n\nimport { lineLikeSeriesMark } from '../mixin/constant';\n\nexport const areaSeriesMark: SeriesMarkMap = {\n  ...baseSeriesMark,\n  ...lineLikeSeriesMark,\n  [SeriesMarkNameEnum.area]: { name: SeriesMarkNameEnum.area, type: MarkTypeEnum.area }\n};\n"]}

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

@@ -1,21 +1,22 @@
-import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface';
+import type { ICartesianSeriesSpec } from '../cartesian/interface';
 import type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';
 import type { ISymbolMarkSpec, ILineMarkSpec, IAreaMarkSpec } from '../../typings/visual';
 import type { SeriesMarkNameEnum } from '../interface/type';
-import type { ILineLikeSeriesTheme } from '../mixin/line-mixin';
+import type { ILineLikeLabelSpec, ILineLikeSeriesTheme } from '../mixin/line-mixin';
 import type { IAnimationSpec } from '../../animation/spec';
 import type { AreaAppearPreset } from './animation';
-import type { IMarkProgressiveConfig } from '../../mark/interface';
-export interface IAreaSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<string, AreaAppearPreset>, IMarkProgressiveConfig {
+import type { IDataSamping, IMarkOverlap, IMarkProgressiveConfig } from '../../mark/interface';
+export interface IAreaSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<string, AreaAppearPreset>, IMarkProgressiveConfig, IDataSamping, IMarkOverlap {
     type: 'area';
     xField: string | string[];
     yField: string | string[];
     [SeriesMarkNameEnum.point]?: IMarkSpec<ISymbolMarkSpec>;
     [SeriesMarkNameEnum.line]?: IMarkSpec<ILineMarkSpec>;
     [SeriesMarkNameEnum.area]?: IMarkSpec<IAreaMarkSpec>;
+    [SeriesMarkNameEnum.label]?: ILineLikeLabelSpec;
     seriesMark?: 'point' | 'line' | 'area';
     activePoint?: boolean;
 }
-export interface IAreaSeriesTheme extends ICartesianSeriesTheme, ILineLikeSeriesTheme {
+export interface IAreaSeriesTheme extends ILineLikeSeriesTheme {
     [SeriesMarkNameEnum.area]?: Partial<IMarkTheme<IAreaMarkSpec>>;
 }

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, ICartesianSeriesTheme } 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 { ILineLikeSeriesTheme } from '../mixin/line-mixin';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { AreaAppearPreset } from './animation';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\n\nexport interface IAreaSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<string, AreaAppearPreset>,\n    IMarkProgressiveConfig {\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   * 系列主 mark 类型配置，该配置会影响图例的展示\n   * @default 'area'\n   * @since 1.2.0\n   */\n  seriesMark?: 'point' | 'line' | 'area';\n\n  /**\n   * 是否使用额外的 activePoint 显示交互点，可以在点隐藏时显示被交互的点\n   * @default false\n   * @since 1.3.0\n   */\n  activePoint?: boolean;\n}\n\nexport interface IAreaSeriesTheme extends ICartesianSeriesTheme, 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';\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"]}

package/cjs/series/area/tooltip-helpter.js

@@ -4,16 +4,16 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.AreaSeriesTooltipHelper = void 0;
 
-const tooltip_helper_1 = require("../base/tooltip-helper"), util_1 = require("../../util");
+const tooltip_helper_1 = require("../base/tooltip-helper"), vutils_1 = require("@visactor/vutils");
 
 class AreaSeriesTooltipHelper extends tooltip_helper_1.BaseSeriesTooltipHelper {
     constructor() {
         super(...arguments), this._getSeriesStyle = (datum, styleKey, defaultValue) => {
             var _a, _b, _c, _d;
-            for (const key of (0, util_1.array)(styleKey)) {
+            for (const key of (0, vutils_1.array)(styleKey)) {
                 let value = null === (_a = this.series.getSeriesStyle(datum)) || void 0 === _a ? void 0 : _a(key);
                 if (!1 !== value || "fill" !== key && "stroke" !== key || (value = "fill" === key ? null === (_c = null === (_b = this.series.getSeriesStyle(datum)) || void 0 === _b ? void 0 : _b("stroke")) || void 0 === _c ? void 0 : _c[0] : null === (_d = this.series.getSeriesStyle(datum)) || void 0 === _d ? void 0 : _d("fill")), 
-                (0, util_1.isValid)(value)) return value;
+                (0, vutils_1.isValid)(value)) return value;
             }
             return defaultValue;
         };

package/cjs/series/area/tooltip-helpter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/area/tooltip-helpter.ts"],"names":[],"mappings":";;;AACA,2DAAiE;AACjE,qCAA4C;AAE5C,MAAa,uBAAwB,SAAQ,wCAAuB;IAApE;;QACY,oBAAe,GAAG,CAAC,KAAU,EAAE,QAA2B,EAAE,YAAkB,EAAE,EAAE;;YAC1F,KAAK,MAAM,GAAG,IAAI,IAAA,YAAK,EAAC,QAAQ,CAAC,EAAE;gBACjC,IAAI,KAAK,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,0CAAG,GAAG,CAAC,CAAC;gBAGrD,IAAI,KAAK,KAAK,KAAK,IAAI,CAAC,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,QAAQ,CAAC,EAAE;oBAC3D,IAAI,GAAG,KAAK,MAAM,EAAE;wBAClB,KAAK,GAAG,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,0CAAG,QAAQ,CAAC,0CAAG,CAAC,CAAC,CAAC;qBAC5D;yBAAM;wBACL,KAAK,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,0CAAG,MAAM,CAAC,CAAC;qBACrD;iBACF;gBACD,IAAI,IAAA,cAAO,EAAC,KAAK,CAAC,EAAE;oBAClB,OAAO,KAAK,CAAC;iBACd;aACF;YACD,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC;IACJ,CAAC;CAAA;AAnBD,0DAmBC","file":"tooltip-helpter.js","sourcesContent":["import type { ISeriesTooltipHelper } from '../interface';\nimport { BaseSeriesTooltipHelper } from '../base/tooltip-helper';\nimport { array, isValid } from '../../util';\n\nexport class AreaSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {\n  protected _getSeriesStyle = (datum: any, styleKey: string | string[], defaultValue?: any) => {\n    for (const key of array(styleKey)) {\n      let value = this.series.getSeriesStyle(datum)?.(key);\n      // because of line mark merge into area mark\n      // TODO: if tooltip symbol use mark fill & stroke ,remove this code\n      if (value === false && (key === 'fill' || key === 'stroke')) {\n        if (key === 'fill') {\n          value = this.series.getSeriesStyle(datum)?.('stroke')?.[0];\n        } else {\n          value = this.series.getSeriesStyle(datum)?.('fill');\n        }\n      }\n      if (isValid(value)) {\n        return value;\n      }\n    }\n    return defaultValue;\n  };\n}\n"]}
+{"version":3,"sources":["../src/series/area/tooltip-helpter.ts"],"names":[],"mappings":";;;AACA,2DAAiE;AACjE,6CAAkD;AAElD,MAAa,uBAAwB,SAAQ,wCAAuB;IAApE;;QACY,oBAAe,GAAG,CAAC,KAAU,EAAE,QAA2B,EAAE,YAAkB,EAAE,EAAE;;YAC1F,KAAK,MAAM,GAAG,IAAI,IAAA,cAAK,EAAC,QAAQ,CAAC,EAAE;gBACjC,IAAI,KAAK,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,0CAAG,GAAG,CAAC,CAAC;gBAGrD,IAAI,KAAK,KAAK,KAAK,IAAI,CAAC,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,QAAQ,CAAC,EAAE;oBAC3D,IAAI,GAAG,KAAK,MAAM,EAAE;wBAClB,KAAK,GAAG,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,0CAAG,QAAQ,CAAC,0CAAG,CAAC,CAAC,CAAC;qBAC5D;yBAAM;wBACL,KAAK,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,0CAAG,MAAM,CAAC,CAAC;qBACrD;iBACF;gBACD,IAAI,IAAA,gBAAO,EAAC,KAAK,CAAC,EAAE;oBAClB,OAAO,KAAK,CAAC;iBACd;aACF;YACD,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC;IACJ,CAAC;CAAA;AAnBD,0DAmBC","file":"tooltip-helpter.js","sourcesContent":["import type { ISeriesTooltipHelper } from '../interface';\nimport { BaseSeriesTooltipHelper } from '../base/tooltip-helper';\nimport { array, isValid } from '@visactor/vutils';\n\nexport class AreaSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {\n  protected _getSeriesStyle = (datum: any, styleKey: string | string[], defaultValue?: any) => {\n    for (const key of array(styleKey)) {\n      let value = this.series.getSeriesStyle(datum)?.(key);\n      // because of line mark merge into area mark\n      // TODO: if tooltip symbol use mark fill & stroke ,remove this code\n      if (value === false && (key === 'fill' || key === 'stroke')) {\n        if (key === 'fill') {\n          value = this.series.getSeriesStyle(datum)?.('stroke')?.[0];\n        } else {\n          value = this.series.getSeriesStyle(datum)?.('fill');\n        }\n      }\n      if (isValid(value)) {\n        return value;\n      }\n    }\n    return defaultValue;\n  };\n}\n"]}

package/cjs/series/bar/animation.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerBar3dAnimation = exports.registerBarAnimation = exports.barPresetAnimation = exports.barGrowOut = exports.barGrowIn = void 0;
 
-const factory_1 = require("../../core/factory"), typings_1 = require("../../typings");
+const factory_1 = require("../../core/factory"), space_1 = require("../../typings/space");
 
 function barGrowOption(barParams, isOverall = !0) {
     return (datum, element, params) => {
@@ -20,14 +20,14 @@ function barGrowOption(barParams, isOverall = !0) {
 }
 
 const barGrowIn = (params, isOverall = !0) => ({
-    type: params.direction === typings_1.Direction.horizontal ? "growWidthIn" : "growHeightIn",
+    type: params.direction === space_1.Direction.horizontal ? "growWidthIn" : "growHeightIn",
     options: barGrowOption(params, isOverall)
 });
 
 exports.barGrowIn = barGrowIn;
 
 const barGrowOut = (params, isOverall = !0) => ({
-    type: params.direction === typings_1.Direction.horizontal ? "growWidthOut" : "growHeightOut",
+    type: params.direction === space_1.Direction.horizontal ? "growWidthOut" : "growHeightOut",
     options: barGrowOption(params, isOverall)
 });
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/bar/animation.ts"],"names":[],"mappings":"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","file":"animation.js","sourcesContent":["import { Factory } from '../../core/factory';\nimport { Direction } from '../../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport type { Datum, DirectionType } from '../../typings';\nimport type { IElement, IAnimationTypeConfig } from '@visactor/vgrammar-core';\n\nexport interface IBarAnimationParams {\n  xField: string;\n  yField: string;\n  direction: DirectionType;\n  // growHeightOverall，需要知道一起生长的起始点\n  // 即 x轴 在canvas上的y（ 或 y轴 在canvas上的x ）。\n  growFrom: () => number;\n}\n\nexport type BarAppearPreset = 'grow' | 'fadeIn' | 'scaleIn';\n\n/**\n * grow生长option\n * 在appear时，所有柱子一起从同一个位置生长，需要growXXXOverall效果；\n * 在enter时，柱子应该从自身位置生长；\n * @param params\n * @param isOverall\n * @returns\n */\nfunction barGrowOption(barParams: IBarAnimationParams, isOverall = true) {\n  return (datum: Datum, element: IElement, params: any) => {\n    const field = barParams.direction === 'vertical' ? barParams.yField : barParams.xField;\n    const data = datum?.[field];\n    if (barParams.direction === 'vertical') {\n      return {\n        overall: isOverall ? barParams.growFrom() : isOverall,\n        orient: data > 0 ? 'negative' : 'positive'\n      };\n    }\n    return {\n      overall: isOverall ? barParams.growFrom() : false,\n      orient: data > 0 ? 'positive' : 'negative'\n    };\n  };\n}\nexport const barGrowIn = (params: IBarAnimationParams, isOverall: boolean = true): IAnimationTypeConfig => {\n  return {\n    type: params.direction === Direction.horizontal ? 'growWidthIn' : 'growHeightIn',\n    options: barGrowOption(params, isOverall)\n  };\n};\n\nexport const barGrowOut = (params: IBarAnimationParams, isOverall: boolean = true): IAnimationTypeConfig => {\n  return {\n    type: params.direction === Direction.horizontal ? 'growWidthOut' : 'growHeightOut',\n    options: barGrowOption(params, isOverall)\n  };\n};\n\nconst Appear_FadeIn: IAnimationTypeConfig = {\n  type: 'fadeIn'\n};\n\nconst Appear_ScaleIn: IAnimationTypeConfig = {\n  type: 'growCenterIn'\n};\n\nexport function barPresetAnimation(\n  params: IBarAnimationParams,\n  preset: BarAppearPreset | boolean\n): IAnimationTypeConfig {\n  if (preset === false) {\n    return {};\n  }\n  switch (preset) {\n    case 'fadeIn':\n      return Appear_FadeIn;\n    case 'scaleIn':\n      return Appear_ScaleIn;\n    default:\n      return barGrowIn(params);\n  }\n}\n\nexport const registerBarAnimation = () => {\n  Factory.registerAnimation('bar', (params: IBarAnimationParams, preset: BarAppearPreset) => {\n    return {\n      appear: barPresetAnimation(params, preset),\n      enter: barGrowIn(params, false),\n      exit: barGrowOut(params, false),\n      disappear: barGrowOut(params)\n    };\n  });\n};\n\nexport const registerBar3dAnimation = () => {\n  Factory.registerAnimation('bar3d', (params: IBarAnimationParams, preset: BarAppearPreset) => {\n    return {\n      appear: barPresetAnimation(params, preset),\n      enter: barGrowIn(params, false),\n      exit: barGrowOut(params, false),\n      disappear: barGrowOut(params)\n    };\n  });\n};\n"]}
+{"version":3,"sources":["../src/series/bar/animation.ts"],"names":[],"mappings":"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","file":"animation.js","sourcesContent":["import { Factory } from '../../core/factory';\nimport { Direction } from '../../typings/space';\n// eslint-disable-next-line no-duplicate-imports\nimport type { Datum, DirectionType } from '../../typings';\nimport type { IElement, IAnimationTypeConfig } from '@visactor/vgrammar-core';\n\nexport interface IBarAnimationParams {\n  xField: string;\n  yField: string;\n  direction: DirectionType;\n  // growHeightOverall，需要知道一起生长的起始点\n  // 即 x轴 在canvas上的y（ 或 y轴 在canvas上的x ）。\n  growFrom: () => number;\n}\n\nexport type BarAppearPreset = 'grow' | 'fadeIn' | 'scaleIn';\n\n/**\n * grow生长option\n * 在appear时，所有柱子一起从同一个位置生长，需要growXXXOverall效果；\n * 在enter时，柱子应该从自身位置生长；\n * @param params\n * @param isOverall\n * @returns\n */\nfunction barGrowOption(barParams: IBarAnimationParams, isOverall = true) {\n  return (datum: Datum, element: IElement, params: any) => {\n    const field = barParams.direction === 'vertical' ? barParams.yField : barParams.xField;\n    const data = datum?.[field];\n    if (barParams.direction === 'vertical') {\n      return {\n        overall: isOverall ? barParams.growFrom() : isOverall,\n        orient: data > 0 ? 'negative' : 'positive'\n      };\n    }\n    return {\n      overall: isOverall ? barParams.growFrom() : false,\n      orient: data > 0 ? 'positive' : 'negative'\n    };\n  };\n}\nexport const barGrowIn = (params: IBarAnimationParams, isOverall: boolean = true): IAnimationTypeConfig => {\n  return {\n    type: params.direction === Direction.horizontal ? 'growWidthIn' : 'growHeightIn',\n    options: barGrowOption(params, isOverall)\n  };\n};\n\nexport const barGrowOut = (params: IBarAnimationParams, isOverall: boolean = true): IAnimationTypeConfig => {\n  return {\n    type: params.direction === Direction.horizontal ? 'growWidthOut' : 'growHeightOut',\n    options: barGrowOption(params, isOverall)\n  };\n};\n\nconst Appear_FadeIn: IAnimationTypeConfig = {\n  type: 'fadeIn'\n};\n\nconst Appear_ScaleIn: IAnimationTypeConfig = {\n  type: 'growCenterIn'\n};\n\nexport function barPresetAnimation(\n  params: IBarAnimationParams,\n  preset: BarAppearPreset | boolean\n): IAnimationTypeConfig {\n  if (preset === false) {\n    return {};\n  }\n  switch (preset) {\n    case 'fadeIn':\n      return Appear_FadeIn;\n    case 'scaleIn':\n      return Appear_ScaleIn;\n    default:\n      return barGrowIn(params);\n  }\n}\n\nexport const registerBarAnimation = () => {\n  Factory.registerAnimation('bar', (params: IBarAnimationParams, preset: BarAppearPreset) => {\n    return {\n      appear: barPresetAnimation(params, preset),\n      enter: barGrowIn(params, false),\n      exit: barGrowOut(params, false),\n      disappear: barGrowOut(params)\n    };\n  });\n};\n\nexport const registerBar3dAnimation = () => {\n  Factory.registerAnimation('bar3d', (params: IBarAnimationParams, preset: BarAppearPreset) => {\n    return {\n      appear: barPresetAnimation(params, preset),\n      enter: barGrowIn(params, false),\n      exit: barGrowOut(params, false),\n      disappear: barGrowOut(params)\n    };\n  });\n};\n"]}

package/cjs/series/bar/bar-3d.d.ts

@@ -1,4 +1,4 @@
-import { MarkTypeEnum } from '../../mark/interface';
+import { MarkTypeEnum } from '../../mark/interface/type';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum, SeriesMarkNameEnum } from '../interface/type';
 import { BarSeries } from './bar';

package/cjs/series/bar/bar-3d.js

@@ -4,16 +4,16 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerBar3dSeries = exports.Bar3dSeries = void 0;
 
-const interface_1 = require("../../mark/interface"), type_1 = require("../interface/type"), bar_1 = require("./bar"), rect_3d_1 = require("../../mark/rect-3d"), constant_1 = require("./constant"), factory_1 = require("../../core/factory"), animation_1 = require("./animation");
+const type_1 = require("../../mark/interface/type"), type_2 = require("../interface/type"), bar_1 = require("./bar"), rect_3d_1 = require("../../mark/rect-3d"), constant_1 = require("./constant"), factory_1 = require("../../core/factory"), animation_1 = require("./animation");
 
 class Bar3dSeries extends bar_1.BarSeries {
     constructor() {
-        super(...arguments), this.type = type_1.SeriesTypeEnum.bar3d, this._barMarkName = type_1.SeriesMarkNameEnum.bar3d, 
-        this._barMarkType = interface_1.MarkTypeEnum.rect3d;
+        super(...arguments), this.type = type_2.SeriesTypeEnum.bar3d, this._barMarkName = type_2.SeriesMarkNameEnum.bar3d, 
+        this._barMarkType = type_1.MarkTypeEnum.rect3d;
     }
 }
 
-exports.Bar3dSeries = Bar3dSeries, Bar3dSeries.type = type_1.SeriesTypeEnum.bar3d, 
+exports.Bar3dSeries = Bar3dSeries, Bar3dSeries.type = type_2.SeriesTypeEnum.bar3d, 
 Bar3dSeries.mark = constant_1.bar3dSeriesMark;
 
 const registerBar3dSeries = () => {

package/cjs/series/bar/bar-3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/bar/bar-3d.ts"],"names":[],"mappings":";;;AACA,oDAAoD;AAEpD,4CAAuE;AACvE,+BAAkC;AAClC,gDAAgD;AAGhD,yCAA6C;AAC7C,gDAA6C;AAC7C,2CAAqD;AAErD,MAAa,WAA2D,SAAQ,eAAkC;IAAlH;;QAEE,SAAI,GAAG,qBAAc,CAAC,KAAK,CAAC;QAIlB,iBAAY,GAAuB,yBAAkB,CAAC,KAAK,CAAC;QAC5D,iBAAY,GAAiB,wBAAY,CAAC,MAAM,CAAC;IAC7D,CAAC;;AARD,kCAQC;AAPiB,gBAAI,GAAW,qBAAc,CAAC,KAAK,CAAC;AAGpC,gBAAI,GAAkB,0BAAe,CAAC;AAMjD,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,iBAAO,CAAC,YAAY,CAAC,oBAAU,CAAC,IAAI,EAAE,oBAAU,CAAC,CAAC;IAClD,iBAAO,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACtD,IAAA,kCAAsB,GAAE,CAAC;AAC3B,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B","file":"bar-3d.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { MarkTypeEnum } from '../../mark/interface';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesTypeEnum, SeriesMarkNameEnum } from '../interface/type';\nimport { BarSeries } from './bar';\nimport { Rect3dMark } from '../../mark/rect-3d';\nimport type { IBar3dSeriesSpec } from './interface';\nimport type { AdaptiveSpec } from '../../typings';\nimport { bar3dSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { registerBar3dAnimation } from './animation';\n\nexport class Bar3dSeries<T extends IBar3dSeriesSpec = IBar3dSeriesSpec> extends BarSeries<AdaptiveSpec<T, 'type'>> {\n  static readonly type: string = SeriesTypeEnum.bar3d;\n  type = SeriesTypeEnum.bar3d;\n\n  static readonly mark: SeriesMarkMap = bar3dSeriesMark;\n\n  protected _barMarkName: SeriesMarkNameEnum = SeriesMarkNameEnum.bar3d;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect3d;\n}\n\nexport const registerBar3dSeries = () => {\n  Factory.registerMark(Rect3dMark.type, Rect3dMark);\n  Factory.registerSeries(Bar3dSeries.type, Bar3dSeries);\n  registerBar3dAnimation();\n};\n"]}
+{"version":3,"sources":["../src/series/bar/bar-3d.ts"],"names":[],"mappings":";;;AACA,oDAAyD;AAEzD,4CAAuE;AACvE,+BAAkC;AAClC,gDAAgD;AAGhD,yCAA6C;AAC7C,gDAA6C;AAC7C,2CAAqD;AAErD,MAAa,WAA2D,SAAQ,eAAkC;IAAlH;;QAEE,SAAI,GAAG,qBAAc,CAAC,KAAK,CAAC;QAIlB,iBAAY,GAAuB,yBAAkB,CAAC,KAAK,CAAC;QAC5D,iBAAY,GAAiB,mBAAY,CAAC,MAAM,CAAC;IAC7D,CAAC;;AARD,kCAQC;AAPiB,gBAAI,GAAW,qBAAc,CAAC,KAAK,CAAC;AAGpC,gBAAI,GAAkB,0BAAe,CAAC;AAMjD,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,iBAAO,CAAC,YAAY,CAAC,oBAAU,CAAC,IAAI,EAAE,oBAAU,CAAC,CAAC;IAClD,iBAAO,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACtD,IAAA,kCAAsB,GAAE,CAAC;AAC3B,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B","file":"bar-3d.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { MarkTypeEnum } from '../../mark/interface/type';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesTypeEnum, SeriesMarkNameEnum } from '../interface/type';\nimport { BarSeries } from './bar';\nimport { Rect3dMark } from '../../mark/rect-3d';\nimport type { IBar3dSeriesSpec } from './interface';\nimport type { AdaptiveSpec } from '../../typings';\nimport { bar3dSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { registerBar3dAnimation } from './animation';\n\nexport class Bar3dSeries<T extends IBar3dSeriesSpec = IBar3dSeriesSpec> extends BarSeries<AdaptiveSpec<T, 'type'>> {\n  static readonly type: string = SeriesTypeEnum.bar3d;\n  type = SeriesTypeEnum.bar3d;\n\n  static readonly mark: SeriesMarkMap = bar3dSeriesMark;\n\n  protected _barMarkName: SeriesMarkNameEnum = SeriesMarkNameEnum.bar3d;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect3d;\n}\n\nexport const registerBar3dSeries = () => {\n  Factory.registerMark(Rect3dMark.type, Rect3dMark);\n  Factory.registerSeries(Bar3dSeries.type, Bar3dSeries);\n  registerBar3dAnimation();\n};\n"]}

package/cjs/series/bar/bar.d.ts

@@ -1,6 +1,6 @@
 import { CartesianSeries } from '../cartesian/cartesian';
 import type { IMark, IMarkProgressiveConfig } from '../../mark/interface';
-import { MarkTypeEnum } from '../../mark/interface';
+import { MarkTypeEnum } from '../../mark/interface/type';
 import type { Maybe, Datum, DirectionType } from '../../typings';
 import type { IBarSeriesSpec, IBarSeriesTheme } from './interface';
 import type { IAxisHelper } from '../../component/axis/cartesian/interface';
@@ -8,8 +8,7 @@ import type { IRectMark } from '../../mark/rect';
 import type { IModelInitOption } from '../../model/interface';
 import type { ITextMark } from '../../mark/text';
 import type { SeriesMarkMap } from '../interface';
-import { SeriesMarkNameEnum } from '../interface/type';
-import { SeriesTypeEnum } from '../interface';
+import { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';
 import { SeriesData } from '../base/series-data';
 import { DataView } from '@visactor/vdataset';
 export declare const DefaultBandWidth = 6;
@@ -42,6 +41,7 @@ export declare class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extend
     protected _getBarWidth(axisHelper: IAxisHelper): number;
     protected _getPosition(direction: DirectionType, datum: Datum): number;
     onLayoutEnd(ctx: any): void;
+    compile(): void;
     getDefaultShapeType(): string;
     getActiveMarks(): IMark[];
     compileData(): void;

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"), interface_1 = require("../../mark/interface"), constant_1 = require("../../constant"), util_1 = require("../../util"), animation_1 = require("./animation"), utils_1 = require("../../animation/utils"), type_1 = require("../interface/type"), interface_2 = require("../interface"), 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");
+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");
 
 exports.DefaultBandWidth = 6;
 
@@ -12,8 +12,8 @@ const RECT_X = `${index_1.PREFIX}_rect_x`, RECT_X1 = `${index_1.PREFIX}_rect_x1`
 
 class BarSeries extends cartesian_1.CartesianSeries {
     constructor() {
-        super(...arguments), this.type = interface_2.SeriesTypeEnum.bar, this._barMarkName = type_1.SeriesMarkNameEnum.bar, 
-        this._barMarkType = interface_1.MarkTypeEnum.rect, this._supportStack = !0, this._bandPosition = 0;
+        super(...arguments), this.type = type_2.SeriesTypeEnum.bar, this._barMarkName = type_2.SeriesMarkNameEnum.bar, 
+        this._barMarkType = type_1.MarkTypeEnum.rect, this._supportStack = !0, this._bandPosition = 0;
     }
     initMark() {
         const progressive = {
@@ -26,11 +26,11 @@ class BarSeries extends cartesian_1.CartesianSeries {
             name: this._barMarkName,
             type: this._barMarkType
         }), {
-            morph: (0, utils_1.shouldDoMorph)(this._spec.animation, this._spec.morph, (0, utils_1.userAnimationConfig)(this.type, this._spec)),
+            morph: (0, utils_1.shouldMarkDoMorph)(this._spec, this._barMarkName),
             defaultMorphElementKey: this.getDimensionField()[0],
             groupKey: this._seriesField,
             isSeriesMark: !0,
-            label: (0, util_1.mergeSpec)({
+            label: (0, merge_spec_1.mergeSpec)({
                 animation: this._spec.animation
             }, this._spec.label),
             progressive: progressive
@@ -85,8 +85,8 @@ class BarSeries extends cartesian_1.CartesianSeries {
         }, !1).transform({
             type: "addVChartProperty",
             options: {
-                beforeCall: data_key_1.initKeyMap,
-                call: data_key_1.addDataKey.bind(this)
+                beforeCall: data_key_1.initKeyMap.bind(this),
+                call: data_key_1.addDataKey
             }
         }, !1);
         null === (_b = this._viewDataStatistics) || void 0 === _b || _b.target.addListener("change", barBackgroundData.reRunAllTransform), 
@@ -98,7 +98,7 @@ class BarSeries extends cartesian_1.CartesianSeries {
     }
     _shouldDoPreCalculate() {
         const region = this.getRegion();
-        return this._stack && region.getSeries().filter((s => s.type === interface_2.SeriesTypeEnum.bar && s.getSpec().barMinHeight)).length;
+        return this._stack && region.getSeries().filter((s => s.type === type_2.SeriesTypeEnum.bar && s.getSpec().barMinHeight)).length;
     }
     _calculateStackRectPosition(isVertical) {
         const region = this.getRegion();
@@ -107,7 +107,7 @@ class BarSeries extends cartesian_1.CartesianSeries {
         region._bar_series_position_calculated = !0, isVertical ? (start = RECT_Y1, end = RECT_Y, 
         startMethod = "dataToPositionY1", endMethod = "dataToPositionY", axisHelper = "_yAxisHelper") : (start = RECT_X1, 
         end = RECT_X, startMethod = "dataToPositionX1", endMethod = "dataToPositionX", axisHelper = "_xAxisHelper");
-        const stackValueGroup = (0, util_1.getRegionStackGroup)(region, !1, (s => s.type === interface_2.SeriesTypeEnum.bar));
+        const stackValueGroup = (0, data_1.getRegionStackGroup)(region, !1, (s => s.type === type_2.SeriesTypeEnum.bar));
         for (const stackValue in stackValueGroup) for (const key in stackValueGroup[stackValue].nodes) (0, 
         stack_1.stackWithMinHeight)(stackValueGroup[stackValue].nodes[key], region.getStackInverse(), {
             isVertical: isVertical,
@@ -124,7 +124,7 @@ class BarSeries extends cartesian_1.CartesianSeries {
         isVertical ? (startMethod = "dataToPositionY1", endMethod = "dataToPositionY", axisHelper = "_yAxisHelper") : (startMethod = "dataToPositionX1", 
         endMethod = "dataToPositionX", axisHelper = "_xAxisHelper");
         const seriesScale = null === (_b = (_a = this[axisHelper]).getScale) || void 0 === _b ? void 0 : _b.call(_a, 0), inverse = this[axisHelper].isInverse(), barMinHeight = this._spec.barMinHeight, y1 = (0, 
-        util_1.valueInScaleRange)(this[startMethod](datum), seriesScale), y = (0, util_1.valueInScaleRange)(this[endMethod](datum), seriesScale);
+        scale_1.valueInScaleRange)(this[startMethod](datum), seriesScale), y = (0, scale_1.valueInScaleRange)(this[endMethod](datum), seriesScale);
         let height = Math.abs(y1 - y);
         height < barMinHeight && (height = barMinHeight);
         let flag = 1;
@@ -137,18 +137,18 @@ class BarSeries extends cartesian_1.CartesianSeries {
         this.direction === space_1.Direction.horizontal ? this.setMarkStyle(this._barMark, {
             x: datum => this._shouldDoPreCalculate() ? (this._calculateStackRectPosition(!1), 
             datum[RECT_X]) : this._spec.barMinHeight ? this._calculateRectPosition(datum, !1) : (0, 
-            util_1.valueInScaleRange)(this.dataToPositionX(datum), xScale),
+            scale_1.valueInScaleRange)(this.dataToPositionX(datum), xScale),
             x1: datum => this._shouldDoPreCalculate() ? (this._calculateStackRectPosition(!1), 
-            datum[RECT_X1]) : (0, util_1.valueInScaleRange)(this.dataToPositionX1(datum), xScale),
+            datum[RECT_X1]) : (0, scale_1.valueInScaleRange)(this.dataToPositionX1(datum), xScale),
             y: datum => this._getPosition(this.direction, datum),
             height: () => this._getBarWidth(this._yAxisHelper)
         }, "normal", constant_1.AttributeLevel.Series) : this.setMarkStyle(this._barMark, {
             x: datum => this._getPosition(this.direction, datum),
             y: (datum, ctx, opt, dataView) => this._shouldDoPreCalculate() ? (this._calculateStackRectPosition(!0), 
             datum[RECT_Y]) : this._spec.barMinHeight ? this._calculateRectPosition(datum, !0) : (0, 
-            util_1.valueInScaleRange)(this.dataToPositionY(datum), yScale),
+            scale_1.valueInScaleRange)(this.dataToPositionY(datum), yScale),
             y1: datum => this._shouldDoPreCalculate() ? (this._calculateStackRectPosition(!0), 
-            datum[RECT_Y1]) : (0, util_1.valueInScaleRange)(this.dataToPositionY1(datum), yScale),
+            datum[RECT_Y1]) : (0, scale_1.valueInScaleRange)(this.dataToPositionY1(datum), yScale),
             width: () => this._getBarWidth(this._xAxisHelper)
         }, "normal", constant_1.AttributeLevel.Series), this._initBarBackgroundMarkStyle();
     }
@@ -184,21 +184,21 @@ class BarSeries extends cartesian_1.CartesianSeries {
         var _a, _b, _c, _d;
         const xScale = null === (_b = null === (_a = this._xAxisHelper) || void 0 === _a ? void 0 : _a.getScale) || void 0 === _b ? void 0 : _b.call(_a, 0), yScale = null === (_d = null === (_c = this._yAxisHelper) || void 0 === _c ? void 0 : _c.getScale) || void 0 === _d ? void 0 : _d.call(_c, 0);
         this.direction === space_1.Direction.vertical ? this.setMarkStyle(this._barMark, {
-            x: datum => (0, util_1.valueInScaleRange)(this.dataToPositionX(datum), xScale),
-            x1: datum => (0, util_1.valueInScaleRange)(this.dataToPositionX1(datum), xScale),
+            x: datum => (0, scale_1.valueInScaleRange)(this.dataToPositionX(datum), xScale),
+            x1: datum => (0, scale_1.valueInScaleRange)(this.dataToPositionX1(datum), xScale),
             y: (datum, ctx, opt, dataView) => this._shouldDoPreCalculate() ? (this._calculateStackRectPosition(!0), 
             datum[RECT_Y]) : this._spec.barMinHeight ? this._calculateRectPosition(datum, !0) : (0, 
-            util_1.valueInScaleRange)(this.dataToPositionY(datum), yScale),
+            scale_1.valueInScaleRange)(this.dataToPositionY(datum), yScale),
             y1: datum => this._shouldDoPreCalculate() ? (this._calculateStackRectPosition(!0), 
-            datum[RECT_Y1]) : (0, util_1.valueInScaleRange)(this.dataToPositionY1(datum), yScale)
+            datum[RECT_Y1]) : (0, scale_1.valueInScaleRange)(this.dataToPositionY1(datum), yScale)
         }, "normal", constant_1.AttributeLevel.Series) : this.setMarkStyle(this._barMark, {
             x: datum => this._shouldDoPreCalculate() ? (this._calculateStackRectPosition(!1), 
             datum[RECT_X]) : this._spec.barMinHeight ? this._calculateRectPosition(datum, !1) : (0, 
-            util_1.valueInScaleRange)(this.dataToPositionX(datum), xScale),
+            scale_1.valueInScaleRange)(this.dataToPositionX(datum), xScale),
             x1: datum => this._shouldDoPreCalculate() ? (this._calculateStackRectPosition(!1), 
-            datum[RECT_X1]) : (0, util_1.valueInScaleRange)(this.dataToPositionX1(datum), xScale),
-            y: datum => (0, util_1.valueInScaleRange)(this.dataToPositionY(datum), yScale),
-            y1: datum => (0, util_1.valueInScaleRange)(this.dataToPositionY1(datum), yScale)
+            datum[RECT_X1]) : (0, scale_1.valueInScaleRange)(this.dataToPositionX1(datum), xScale),
+            y: datum => (0, scale_1.valueInScaleRange)(this.dataToPositionY(datum), yScale),
+            y1: datum => (0, scale_1.valueInScaleRange)(this.dataToPositionY1(datum), yScale)
         }, "normal", constant_1.AttributeLevel.Series);
     }
     initAnimation() {
@@ -213,7 +213,7 @@ class BarSeries extends cartesian_1.CartesianSeries {
             }
         }, appearPreset = null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.animationAppear) || void 0 === _b ? void 0 : _b.preset;
         this._barMark.setAnimationConfig((0, utils_1.animationConfig)(null === (_c = factory_1.Factory.getAnimationInKey("bar")) || void 0 === _c ? void 0 : _c(animationParams, appearPreset), (0, 
-        utils_1.userAnimationConfig)(this._barMarkName, this._spec), {
+        utils_1.userAnimationConfig)(this._barMarkName, this._spec, this._markAttributeContext), {
             dataIndex: datum => {
                 var _a, _b, _c;
                 const xValue = null == datum ? void 0 : datum[this._fieldX[0]];
@@ -224,11 +224,11 @@ class BarSeries extends cartesian_1.CartesianSeries {
     _getBarWidth(axisHelper) {
         var _a, _b;
         const hasBarWidth = void 0 !== this._spec.barWidth, bandWidth = null !== (_b = null === (_a = axisHelper.getBandwidth) || void 0 === _a ? void 0 : _a.call(axisHelper, this._groups ? this._groups.fields.length - 1 : 0)) && void 0 !== _b ? _b : exports.DefaultBandWidth;
-        if (hasBarWidth) return (0, util_1.getActualNumValue)(this._spec.barWidth, bandWidth);
+        if (hasBarWidth) return (0, space_2.getActualNumValue)(this._spec.barWidth, bandWidth);
         const hasBarMinWidth = void 0 !== this._spec.barMinWidth, hasBarMaxWidth = void 0 !== this._spec.barMaxWidth;
         let width = bandWidth;
-        return hasBarMinWidth && (width = Math.max(width, (0, util_1.getActualNumValue)(this._spec.barMinWidth, bandWidth))), 
-        hasBarMaxWidth && (width = Math.min(width, (0, util_1.getActualNumValue)(this._spec.barMaxWidth, bandWidth))), 
+        return hasBarMinWidth && (width = Math.max(width, (0, space_2.getActualNumValue)(this._spec.barMinWidth, bandWidth))), 
+        hasBarMaxWidth && (width = Math.min(width, (0, space_2.getActualNumValue)(this._spec.barMaxWidth, bandWidth))), 
         width;
     }
     _getPosition(direction, datum) {
@@ -244,7 +244,7 @@ class BarSeries extends cartesian_1.CartesianSeries {
             let totalWidth = 0, offSet = 0;
             for (let index = groupFields.length - 1; index >= 1; index--) {
                 const groupField = groupFields[index], groupValues = null !== (_h = null === (_g = null === (_f = null === (_e = this.getViewDataStatistics()) || void 0 === _e ? void 0 : _e.latestData) || void 0 === _f ? void 0 : _f[groupField]) || void 0 === _g ? void 0 : _g.values) && void 0 !== _h ? _h : [], groupCount = groupValues.length, gap = (0, 
-                util_1.getActualNumValue)(null !== (_j = barInGroup[index - 1]) && void 0 !== _j ? _j : (0, 
+                space_2.getActualNumValue)(null !== (_j = barInGroup[index - 1]) && void 0 !== _j ? _j : (0, 
                 vutils_1.last)(barInGroup), bandWidth), i = groupValues.indexOf(datum[groupField]);
                 index === groupFields.length - 1 ? (totalWidth += groupCount * size + (groupCount - 1) * gap, 
                 offSet += i * (size + gap)) : (offSet += i * (totalWidth + gap), totalWidth += totalWidth + (groupCount - 1) * gap);
@@ -256,7 +256,20 @@ class BarSeries extends cartesian_1.CartesianSeries {
     }
     onLayoutEnd(ctx) {
         super.onLayoutEnd(ctx);
-        this.getRegion()._bar_series_position_calculated = !1;
+        this.getRegion()._bar_series_position_calculated = !1, this._spec.sampling && this.compile();
+    }
+    compile() {
+        if (super.compile(), this._spec.sampling) {
+            const {width: width, height: height} = this._region.getLayoutRect(), samplingTrans = [], fieldsY = this._fieldY, fieldsX = this._fieldX;
+            samplingTrans.push({
+                type: "sampling",
+                size: this._direction === space_1.Direction.vertical ? width : height,
+                factor: this._spec.samplingFactor,
+                yfield: this._direction === space_1.Direction.vertical ? fieldsY[0] : fieldsX[0],
+                groupBy: this._seriesField,
+                mode: this._spec.sampling
+            }), this._data.getProduct().transform(samplingTrans);
+        }
     }
     getDefaultShapeType() {
         return "square";
@@ -284,12 +297,11 @@ class BarSeries extends cartesian_1.CartesianSeries {
     }
 }
 
-exports.BarSeries = BarSeries, BarSeries.type = interface_2.SeriesTypeEnum.bar, 
-BarSeries.mark = constant_2.barSeriesMark;
+exports.BarSeries = BarSeries, BarSeries.type = type_2.SeriesTypeEnum.bar, BarSeries.mark = constant_2.barSeriesMark;
 
 const registerBarSeries = () => {
-    factory_1.Factory.registerMark(rect_1.RectMark.type, rect_1.RectMark), factory_1.Factory.registerSeries(BarSeries.type, BarSeries), 
-    (0, animation_1.registerBarAnimation)();
+    (0, vgrammar_core_1.registerSampleTransform)(), factory_1.Factory.registerMark(rect_1.RectMark.type, rect_1.RectMark), 
+    factory_1.Factory.registerSeries(BarSeries.type, BarSeries), (0, animation_1.registerBarAnimation)();
 };
 
 exports.registerBarSeries = registerBarSeries;