@visactor/vchart 1.12.9 → 1.12.10-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (225) hide show
  1. package/build/es5/index.js +1 -1
  2. package/build/index.js +309 -339
  3. package/build/index.min.js +1 -1
  4. package/build/tsconfig.tsbuildinfo +1 -1
  5. package/cjs/animation/utils.js +1 -1
  6. package/cjs/animation/utils.js.map +1 -1
  7. package/cjs/compile/compilable-base.js +1 -2
  8. package/cjs/compile/mark/compilable-mark.d.ts +6 -35
  9. package/cjs/compile/mark/compilable-mark.js +15 -78
  10. package/cjs/compile/mark/compilable-mark.js.map +1 -1
  11. package/cjs/compile/mark/interface.d.ts +4 -23
  12. package/cjs/compile/mark/interface.js.map +1 -1
  13. package/cjs/compile/util.js +2 -1
  14. package/cjs/component/axis/base-axis.js +24 -10
  15. package/cjs/component/axis/base-axis.js.map +1 -1
  16. package/cjs/component/data-zoom/data-filter-base-component.js +3 -1
  17. package/cjs/component/data-zoom/data-filter-base-component.js.map +1 -1
  18. package/cjs/component/geo/geo-coordinate.d.ts +7 -0
  19. package/cjs/component/geo/geo-coordinate.js +5 -0
  20. package/cjs/component/geo/geo-coordinate.js.map +1 -1
  21. package/cjs/component/label/label.js +11 -7
  22. package/cjs/component/label/label.js.map +1 -1
  23. package/cjs/component/label/total-label.js +2 -1
  24. package/cjs/component/label/total-label.js.map +1 -1
  25. package/cjs/component/title/interface/theme.d.ts +1 -1
  26. package/cjs/component/title/interface/theme.js.map +1 -1
  27. package/cjs/component/tooltip/interface/spec.d.ts +12 -2
  28. package/cjs/component/tooltip/interface/spec.js.map +1 -1
  29. package/cjs/component/tooltip/tooltip.js +29 -15
  30. package/cjs/component/tooltip/tooltip.js.map +1 -1
  31. package/cjs/core/factory.js +3 -1
  32. package/cjs/core/factory.js.map +1 -1
  33. package/cjs/core/index.d.ts +1 -1
  34. package/cjs/core/index.js +1 -1
  35. package/cjs/core/index.js.map +1 -1
  36. package/cjs/mark/base/base-line.js +3 -1
  37. package/cjs/mark/base/base-line.js.map +1 -1
  38. package/cjs/mark/base/base-mark.js +3 -3
  39. package/cjs/mark/base/base-mark.js.map +1 -1
  40. package/cjs/mark/group.js +1 -1
  41. package/cjs/mark/group.js.map +1 -1
  42. package/cjs/mark/interface/common.d.ts +10 -0
  43. package/cjs/mark/interface/common.js.map +1 -1
  44. package/cjs/model/base-model.d.ts +2 -2
  45. package/cjs/model/base-model.js +2 -2
  46. package/cjs/model/base-model.js.map +1 -1
  47. package/cjs/region/region.js +8 -4
  48. package/cjs/region/region.js.map +1 -1
  49. package/cjs/series/area/area.js +4 -4
  50. package/cjs/series/area/area.js.map +1 -1
  51. package/cjs/series/bar/bar.d.ts +2 -2
  52. package/cjs/series/bar/bar.js +53 -48
  53. package/cjs/series/bar/bar.js.map +1 -1
  54. package/cjs/series/base/base-series.d.ts +2 -2
  55. package/cjs/series/base/base-series.js +18 -13
  56. package/cjs/series/base/base-series.js.map +1 -1
  57. package/cjs/series/box-plot/box-plot.js +3 -5
  58. package/cjs/series/box-plot/box-plot.js.map +1 -1
  59. package/cjs/series/circle-packing/circle-packing.js +3 -2
  60. package/cjs/series/circle-packing/circle-packing.js.map +1 -1
  61. package/cjs/series/correlation/correlation.js +12 -6
  62. package/cjs/series/correlation/correlation.js.map +1 -1
  63. package/cjs/series/dot/dot.js +7 -3
  64. package/cjs/series/dot/dot.js.map +1 -1
  65. package/cjs/series/funnel/3d/funnel-3d.js +2 -1
  66. package/cjs/series/funnel/3d/funnel-3d.js.map +1 -1
  67. package/cjs/series/funnel/funnel.js +8 -6
  68. package/cjs/series/funnel/funnel.js.map +1 -1
  69. package/cjs/series/heatmap/heatmap.js +10 -10
  70. package/cjs/series/heatmap/heatmap.js.map +1 -1
  71. package/cjs/series/interface/common.d.ts +1 -9
  72. package/cjs/series/interface/common.js.map +1 -1
  73. package/cjs/series/link/link.js +7 -3
  74. package/cjs/series/link/link.js.map +1 -1
  75. package/cjs/series/liquid/liquid.js +11 -6
  76. package/cjs/series/liquid/liquid.js.map +1 -1
  77. package/cjs/series/map/map.js +3 -2
  78. package/cjs/series/map/map.js.map +1 -1
  79. package/cjs/series/mixin/line-mixin.d.ts +2 -2
  80. package/cjs/series/mixin/line-mixin.js +15 -14
  81. package/cjs/series/mixin/line-mixin.js.map +1 -1
  82. package/cjs/series/pie/3d/pie-3d.js +3 -1
  83. package/cjs/series/pie/3d/pie-3d.js.map +1 -1
  84. package/cjs/series/pie/pie.js +5 -4
  85. package/cjs/series/pie/pie.js.map +1 -1
  86. package/cjs/series/polar/progress-like/progress-like.js +29 -24
  87. package/cjs/series/polar/progress-like/progress-like.js.map +1 -1
  88. package/cjs/series/progress/circular/circular.js +6 -4
  89. package/cjs/series/progress/circular/circular.js.map +1 -1
  90. package/cjs/series/progress/linear/linear.js +6 -4
  91. package/cjs/series/progress/linear/linear.js.map +1 -1
  92. package/cjs/series/radar/radar.js +4 -4
  93. package/cjs/series/radar/radar.js.map +1 -1
  94. package/cjs/series/range-area/range-area.js +3 -2
  95. package/cjs/series/range-area/range-area.js.map +1 -1
  96. package/cjs/series/range-column/range-column.js +5 -4
  97. package/cjs/series/range-column/range-column.js.map +1 -1
  98. package/cjs/series/rose/rose.js +5 -4
  99. package/cjs/series/rose/rose.js.map +1 -1
  100. package/cjs/series/sankey/sankey.js +12 -6
  101. package/cjs/series/sankey/sankey.js.map +1 -1
  102. package/cjs/series/scatter/scatter.js +8 -10
  103. package/cjs/series/scatter/scatter.js.map +1 -1
  104. package/cjs/series/sunburst/sunburst.js +3 -2
  105. package/cjs/series/sunburst/sunburst.js.map +1 -1
  106. package/cjs/series/treemap/treemap.js +6 -4
  107. package/cjs/series/treemap/treemap.js.map +1 -1
  108. package/cjs/series/waterfall/waterfall.js +3 -2
  109. package/cjs/series/waterfall/waterfall.js.map +1 -1
  110. package/cjs/series/word-cloud/base.js +2 -1
  111. package/cjs/series/word-cloud/base.js.map +1 -1
  112. package/cjs/series/word-cloud/word-cloud-3d.js +2 -1
  113. package/cjs/series/word-cloud/word-cloud-3d.js.map +1 -1
  114. package/cjs/theme/builtin/common/component/title.js.map +1 -1
  115. package/esm/animation/utils.js +1 -1
  116. package/esm/animation/utils.js.map +1 -1
  117. package/esm/compile/compilable-base.js +1 -2
  118. package/esm/compile/mark/compilable-mark.d.ts +6 -35
  119. package/esm/compile/mark/compilable-mark.js +15 -78
  120. package/esm/compile/mark/compilable-mark.js.map +1 -1
  121. package/esm/compile/mark/interface.d.ts +4 -23
  122. package/esm/compile/mark/interface.js.map +1 -1
  123. package/esm/compile/util.js +2 -1
  124. package/esm/component/axis/base-axis.js +23 -10
  125. package/esm/component/axis/base-axis.js.map +1 -1
  126. package/esm/component/data-zoom/data-filter-base-component.js +3 -1
  127. package/esm/component/data-zoom/data-filter-base-component.js.map +1 -1
  128. package/esm/component/geo/geo-coordinate.d.ts +7 -0
  129. package/esm/component/geo/geo-coordinate.js +6 -1
  130. package/esm/component/geo/geo-coordinate.js.map +1 -1
  131. package/esm/component/label/label.js +11 -7
  132. package/esm/component/label/label.js.map +1 -1
  133. package/esm/component/label/total-label.js +2 -1
  134. package/esm/component/label/total-label.js.map +1 -1
  135. package/esm/component/title/interface/theme.d.ts +1 -1
  136. package/esm/component/title/interface/theme.js.map +1 -1
  137. package/esm/component/tooltip/interface/spec.d.ts +12 -2
  138. package/esm/component/tooltip/interface/spec.js.map +1 -1
  139. package/esm/component/tooltip/tooltip.js +29 -16
  140. package/esm/component/tooltip/tooltip.js.map +1 -1
  141. package/esm/core/factory.js +3 -1
  142. package/esm/core/factory.js.map +1 -1
  143. package/esm/core/index.d.ts +1 -1
  144. package/esm/core/index.js +1 -1
  145. package/esm/core/index.js.map +1 -1
  146. package/esm/mark/base/base-line.js +3 -1
  147. package/esm/mark/base/base-line.js.map +1 -1
  148. package/esm/mark/base/base-mark.js +2 -2
  149. package/esm/mark/base/base-mark.js.map +1 -1
  150. package/esm/mark/group.js +1 -1
  151. package/esm/mark/group.js.map +1 -1
  152. package/esm/mark/interface/common.d.ts +10 -0
  153. package/esm/mark/interface/common.js.map +1 -1
  154. package/esm/model/base-model.d.ts +2 -2
  155. package/esm/model/base-model.js +2 -2
  156. package/esm/model/base-model.js.map +1 -1
  157. package/esm/region/region.js +8 -4
  158. package/esm/region/region.js.map +1 -1
  159. package/esm/series/area/area.js +4 -4
  160. package/esm/series/area/area.js.map +1 -1
  161. package/esm/series/bar/bar.d.ts +2 -2
  162. package/esm/series/bar/bar.js +52 -47
  163. package/esm/series/bar/bar.js.map +1 -1
  164. package/esm/series/base/base-series.d.ts +2 -2
  165. package/esm/series/base/base-series.js +18 -13
  166. package/esm/series/base/base-series.js.map +1 -1
  167. package/esm/series/box-plot/box-plot.js +3 -5
  168. package/esm/series/box-plot/box-plot.js.map +1 -1
  169. package/esm/series/circle-packing/circle-packing.js +3 -2
  170. package/esm/series/circle-packing/circle-packing.js.map +1 -1
  171. package/esm/series/correlation/correlation.js +12 -6
  172. package/esm/series/correlation/correlation.js.map +1 -1
  173. package/esm/series/dot/dot.js +7 -3
  174. package/esm/series/dot/dot.js.map +1 -1
  175. package/esm/series/funnel/3d/funnel-3d.js +2 -1
  176. package/esm/series/funnel/3d/funnel-3d.js.map +1 -1
  177. package/esm/series/funnel/funnel.js +8 -6
  178. package/esm/series/funnel/funnel.js.map +1 -1
  179. package/esm/series/heatmap/heatmap.js +10 -10
  180. package/esm/series/heatmap/heatmap.js.map +1 -1
  181. package/esm/series/interface/common.d.ts +1 -9
  182. package/esm/series/interface/common.js.map +1 -1
  183. package/esm/series/link/link.js +7 -3
  184. package/esm/series/link/link.js.map +1 -1
  185. package/esm/series/liquid/liquid.js +11 -6
  186. package/esm/series/liquid/liquid.js.map +1 -1
  187. package/esm/series/map/map.js +3 -2
  188. package/esm/series/map/map.js.map +1 -1
  189. package/esm/series/mixin/line-mixin.d.ts +2 -2
  190. package/esm/series/mixin/line-mixin.js +15 -14
  191. package/esm/series/mixin/line-mixin.js.map +1 -1
  192. package/esm/series/pie/3d/pie-3d.js +3 -1
  193. package/esm/series/pie/3d/pie-3d.js.map +1 -1
  194. package/esm/series/pie/pie.js +5 -4
  195. package/esm/series/pie/pie.js.map +1 -1
  196. package/esm/series/polar/progress-like/progress-like.js +28 -23
  197. package/esm/series/polar/progress-like/progress-like.js.map +1 -1
  198. package/esm/series/progress/circular/circular.js +6 -4
  199. package/esm/series/progress/circular/circular.js.map +1 -1
  200. package/esm/series/progress/linear/linear.js +6 -4
  201. package/esm/series/progress/linear/linear.js.map +1 -1
  202. package/esm/series/radar/radar.js +4 -4
  203. package/esm/series/radar/radar.js.map +1 -1
  204. package/esm/series/range-area/range-area.js +3 -2
  205. package/esm/series/range-area/range-area.js.map +1 -1
  206. package/esm/series/range-column/range-column.js +5 -4
  207. package/esm/series/range-column/range-column.js.map +1 -1
  208. package/esm/series/rose/rose.js +5 -4
  209. package/esm/series/rose/rose.js.map +1 -1
  210. package/esm/series/sankey/sankey.js +12 -6
  211. package/esm/series/sankey/sankey.js.map +1 -1
  212. package/esm/series/scatter/scatter.js +8 -10
  213. package/esm/series/scatter/scatter.js.map +1 -1
  214. package/esm/series/sunburst/sunburst.js +3 -2
  215. package/esm/series/sunburst/sunburst.js.map +1 -1
  216. package/esm/series/treemap/treemap.js +6 -4
  217. package/esm/series/treemap/treemap.js.map +1 -1
  218. package/esm/series/waterfall/waterfall.js +3 -2
  219. package/esm/series/waterfall/waterfall.js.map +1 -1
  220. package/esm/series/word-cloud/base.js +2 -1
  221. package/esm/series/word-cloud/base.js.map +1 -1
  222. package/esm/series/word-cloud/word-cloud-3d.js +2 -1
  223. package/esm/series/word-cloud/word-cloud-3d.js.map +1 -1
  224. package/esm/theme/builtin/common/component/title.js.map +1 -1
  225. package/package.json +4 -4
package/build/index.js CHANGED
@@ -45851,7 +45851,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
45851
45851
  const MarkConstructor = Factory._marks[markType];
45852
45852
  const markInstance = new MarkConstructor(name, options);
45853
45853
  if (markInstance.type === "group") {
45854
- markInstance.setInteractive(false);
45854
+ markInstance.setMarkConfig({ interactive: false });
45855
45855
  }
45856
45856
  return markInstance;
45857
45857
  }
@@ -57612,10 +57612,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
57612
57612
  m.compile({ group });
57613
57613
  });
57614
57614
  }
57615
- _createMark(markInfo, option = {}) {
57615
+ _createMark(markInfo, option = {}, config) {
57616
57616
  const { type, name } = markInfo;
57617
57617
  const m = Factory$1.createMark(type, name, Object.assign({ model: this, map: this._option.map, getCompiler: this.getCompiler, globalScale: this._option.globalScale }, option));
57618
- m === null || m === void 0 ? void 0 : m.created();
57618
+ if (m) {
57619
+ m.created();
57620
+ config && m.setMarkConfig(config);
57621
+ }
57619
57622
  return m;
57620
57623
  }
57621
57624
  _getDataIdKey() {
@@ -58173,8 +58176,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
58173
58176
  this._groupMark.addMark(mark);
58174
58177
  }
58175
58178
  });
58176
- this._backgroundMark && this._backgroundMark.setZIndex(LayoutZIndex.SeriesGroup - 1);
58177
- this._foregroundMark && this._foregroundMark.setZIndex(LayoutZIndex.Mark + 1);
58179
+ this._backgroundMark && this._backgroundMark.setMarkConfig({ zIndex: LayoutZIndex.SeriesGroup - 1 });
58180
+ this._foregroundMark && this._foregroundMark.setMarkConfig({ zIndex: LayoutZIndex.Mark + 1 });
58178
58181
  }
58179
58182
  this.createTrigger();
58180
58183
  }
@@ -58182,7 +58185,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
58182
58185
  var _a, _b;
58183
58186
  const groupMark = this._createMark({ type: "group", name });
58184
58187
  groupMark.setUserId(userId);
58185
- groupMark.setZIndex(zIndex);
58188
+ groupMark.setMarkConfig({ zIndex });
58186
58189
  const clip = (_a = this._spec.clip) !== null && _a !== void 0 ? _a : this._getClipDefaultValue();
58187
58190
  this.setMarkStyle(groupMark, {
58188
58191
  x: () => this.getLayoutStartPoint().x,
@@ -59356,29 +59359,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
59356
59359
  }
59357
59360
 
59358
59361
  class CompilableMark extends GrammarItem {
59359
- getSkipTheme() {
59360
- return this._skipTheme;
59361
- }
59362
- setSkipTheme(skipTheme) {
59363
- this._skipTheme = skipTheme;
59364
- }
59365
- getSupport3d() {
59366
- return this._support3d;
59367
- }
59368
- setSupport3d(support3d) {
59369
- this._support3d = support3d;
59370
- }
59371
- getInteractive() {
59372
- return this._interactive;
59373
- }
59374
- setInteractive(interactive) {
59375
- this._interactive = interactive;
59362
+ getMarkConfig() {
59363
+ return this._markConfig;
59376
59364
  }
59377
- getZIndex() {
59378
- return this._zIndex;
59379
- }
59380
- setZIndex(zIndex) {
59381
- this._zIndex = zIndex;
59365
+ setMarkConfig(config) {
59366
+ Object.keys(config).forEach(key => {
59367
+ this._markConfig[key] = config[key];
59368
+ });
59382
59369
  }
59383
59370
  getVisible() {
59384
59371
  return this._visible;
@@ -59431,48 +59418,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
59431
59418
  getSkipBeforeLayouted() {
59432
59419
  return this._skipBeforeLayouted;
59433
59420
  }
59434
- getMorph() {
59435
- return this._morph;
59436
- }
59437
- setMorph(morph) {
59438
- this._morph = morph;
59439
- }
59440
- getMorphKey() {
59441
- return this._morphKey;
59442
- }
59443
- setMorphKey(morphKey) {
59444
- this._morphKey = morphKey;
59445
- }
59446
- getMorphElementKey() {
59447
- return this._morphElementKey;
59448
- }
59449
- setMorphElementKey(key) {
59450
- this._morphElementKey = key;
59451
- }
59452
59421
  getGroupKey() {
59453
59422
  return this._groupKey;
59454
59423
  }
59455
59424
  setGroupKey(groupKey) {
59456
59425
  this._groupKey = groupKey;
59457
59426
  }
59458
- getProgressiveConfig() {
59459
- return this._progressiveConfig;
59460
- }
59461
- setProgressiveConfig(config) {
59462
- this._progressiveConfig = config;
59463
- }
59464
- setCustomizedShapeCallback(callback) {
59465
- this._setCustomizedShape = callback;
59466
- }
59467
- setEnableSegments(enable) {
59468
- this._enableSegments = enable;
59469
- }
59470
- getClip() {
59471
- return this._clip;
59472
- }
59473
- setClip(clip) {
59474
- this._clip = clip;
59475
- }
59476
59427
  setStateSortCallback(stateSort) {
59477
59428
  this._stateSort = stateSort;
59478
59429
  }
@@ -59481,19 +59432,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
59481
59432
  this.grammarType = GrammarType.mark;
59482
59433
  this.type = undefined;
59483
59434
  this.name = 'mark';
59484
- this._interactive = true;
59485
- this._zIndex = LayoutZIndex.Mark;
59435
+ this._markConfig = {
59436
+ zIndex: LayoutZIndex.Mark,
59437
+ morph: false
59438
+ };
59486
59439
  this._visible = true;
59487
59440
  this.stateStyle = {};
59488
59441
  this._unCompileChannel = {};
59489
59442
  this._skipBeforeLayouted = false;
59490
- this._morph = false;
59491
59443
  this.name = name;
59492
59444
  this.model = model;
59493
59445
  this.key = option.key;
59494
59446
  this.state = new MarkStateManager(Object.assign(Object.assign({}, option), { stateKeyToSignalName: this.stateKeyToSignalName.bind(this) }), this);
59495
- this._option.support3d && this.setSupport3d(true);
59496
- this._option.skipTheme && this.setSkipTheme(true);
59497
59447
  this._event = new Event$1(model.getOption().eventDispatcher, model.getOption().mode);
59498
59448
  }
59499
59449
  setTransform(transform) {
@@ -59647,28 +59597,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
59647
59597
  }
59648
59598
  }
59649
59599
  compileContext(extraContext) {
59650
- const config = {
59651
- interactive: this.getInteractive(),
59652
- zIndex: this.getZIndex(),
59653
- context: Object.assign({ markId: this.id, modelId: this.model.id, markUserId: this._userId, modelUserId: this.model.userId }, extraContext),
59654
- skipTheme: this.getSkipTheme(),
59655
- support3d: this.getSupport3d(),
59656
- enableSegments: !!this._enableSegments,
59657
- clip: this._clip ? true : this._clip === false ? false : undefined,
59658
- clipPath: this._clip || undefined
59659
- };
59660
- if (this._progressiveConfig) {
59661
- config.progressiveStep = this._progressiveConfig.progressiveStep;
59662
- config.progressiveThreshold = this._progressiveConfig.progressiveThreshold;
59663
- config.large = this._progressiveConfig.large;
59664
- config.largeThreshold = this._progressiveConfig.largeThreshold;
59665
- }
59666
- config.morph = this._morph;
59667
- config.morphKey = this._morphKey;
59668
- config.morphElementKey = this._morphElementKey;
59669
- if (this._setCustomizedShape) {
59670
- config.setCustomizedShape = this._setCustomizedShape;
59671
- }
59600
+ const config = Object.assign(Object.assign({}, this._markConfig), { context: Object.assign({ markId: this.id, modelId: this.model.id, markUserId: this._userId, modelUserId: this.model.userId }, extraContext) });
59672
59601
  this._product.configure(config);
59673
59602
  }
59674
59603
  compileSignal() {
@@ -59774,10 +59703,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
59774
59703
  this._userId = spec.id;
59775
59704
  }
59776
59705
  if (isBoolean$1(spec.interactive)) {
59777
- this._interactive = spec.interactive;
59706
+ this._markConfig.interactive = spec.interactive;
59778
59707
  }
59779
59708
  if (isValid$1(spec.zIndex)) {
59780
- this.setZIndex(spec.zIndex);
59709
+ this._markConfig.zIndex = spec.zIndex;
59781
59710
  }
59782
59711
  if (isBoolean$1(spec.visible)) {
59783
59712
  this.setVisible(spec.visible);
@@ -60153,7 +60082,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
60153
60082
  _compileProduct(option) {
60154
60083
  super._compileProduct(option);
60155
60084
  this._product.configure({
60156
- zIndex: this.getZIndex()
60085
+ zIndex: this._markConfig.zIndex
60157
60086
  });
60158
60087
  if (!(option === null || option === void 0 ? void 0 : option.ignoreChildren)) {
60159
60088
  this.getMarks().forEach(mark => {
@@ -61645,7 +61574,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
61645
61574
  };
61646
61575
  registerVChartCore();
61647
61576
 
61648
- const version = "1.12.9";
61577
+ const version = "1.12.10-alpha.0";
61649
61578
 
61650
61579
  const addVChartProperty = (data, op) => {
61651
61580
  const context = op.beforeCall();
@@ -62652,7 +62581,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
62652
62581
  }
62653
62582
  let animationThreshold = (_a = seriesSpec.animationThreshold) !== null && _a !== void 0 ? _a : Number.MAX_SAFE_INTEGER;
62654
62583
  (_b = series.getMarks()) === null || _b === void 0 ? void 0 : _b.forEach(m => {
62655
- const config = m.getProgressiveConfig();
62584
+ const config = m.getMarkConfig();
62656
62585
  if (config) {
62657
62586
  if (config.large && config.largeThreshold) {
62658
62587
  animationThreshold = Math.min(animationThreshold, config.largeThreshold);
@@ -63229,7 +63158,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
63229
63158
  parent: (_b = (_a = this._region).getGroupMark) === null || _b === void 0 ? void 0 : _b.call(_a),
63230
63159
  dataView: false
63231
63160
  });
63232
- this._rootMark.setZIndex(this.layoutZIndex);
63161
+ this._rootMark.setMarkConfig({ zIndex: this.layoutZIndex });
63233
63162
  }
63234
63163
  _getExtensionMarkNamePrefix() {
63235
63164
  return `${this.type}_${this.id}_extensionMark`;
@@ -63252,10 +63181,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
63252
63181
  markSpec: spec,
63253
63182
  parent: parentMark,
63254
63183
  dataView: false,
63255
- customShape: spec === null || spec === void 0 ? void 0 : spec.customShape,
63256
63184
  componentType: spec.componentType,
63257
63185
  depend: options.depend,
63258
63186
  key: spec.dataKey
63187
+ }, {
63188
+ setCustomizedShape: spec === null || spec === void 0 ? void 0 : spec.customShape
63259
63189
  });
63260
63190
  if (!mark) {
63261
63191
  return;
@@ -63710,18 +63640,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
63710
63640
  }
63711
63641
  onMarkTreePositionUpdate(marks) {
63712
63642
  }
63713
- _createMark(markInfo, option = {}) {
63714
- var _a, _b, _c, _d;
63715
- const { key, groupKey, skipBeforeLayouted, themeSpec = {}, markSpec, dataView, dataProductId, parent, isSeriesMark, depend, progressive, support3d = this._spec.support3d || !!this._spec.zField, morph = false, clip, customShape, stateSort, noSeparateStyle = false } = option;
63643
+ _createMark(markInfo, option = {}, config = {}) {
63644
+ var _a, _b, _c, _d, _e, _f;
63645
+ const { key, groupKey, skipBeforeLayouted, themeSpec = {}, markSpec, dataView, dataProductId, parent, isSeriesMark, depend, stateSort, noSeparateStyle = false } = option;
63716
63646
  const m = super._createMark(markInfo, {
63717
63647
  key: key !== null && key !== void 0 ? key : this._getDataIdKey(),
63718
- support3d,
63719
63648
  seriesId: this.id,
63720
63649
  attributeContext: this._markAttributeContext,
63721
63650
  componentType: option.componentType,
63722
63651
  noSeparateStyle
63723
63652
  });
63724
63653
  if (isValid$1(m)) {
63654
+ const spec = this.getSpec() || {};
63725
63655
  this._marks.addMark(m, { name: markInfo.name });
63726
63656
  if (isSeriesMark) {
63727
63657
  this._seriesMark = m;
@@ -63745,25 +63675,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
63745
63675
  if (isValid$1(depend)) {
63746
63676
  m.setDepend(...array(depend));
63747
63677
  }
63748
- const spec = this.getSpec() || {};
63749
- m.setMorph(morph);
63750
- m.setMorphKey(((_b = spec.morph) === null || _b === void 0 ? void 0 : _b.morphKey) || `${this.getSpecIndex()}_${this.getMarks().length}`);
63751
- m.setMorphElementKey((_d = (_c = spec.morph) === null || _c === void 0 ? void 0 : _c.morphElementKey) !== null && _d !== void 0 ? _d : option.defaultMorphElementKey);
63752
- if (!isNil$1(progressive)) {
63753
- m.setProgressiveConfig(progressive);
63754
- }
63755
63678
  if (!isNil$1(groupKey)) {
63756
63679
  m.setGroupKey(groupKey);
63757
63680
  }
63758
- if (customShape) {
63759
- m.setCustomizedShapeCallback(customShape);
63760
- }
63761
63681
  if (stateSort) {
63762
63682
  m.setStateSortCallback(stateSort);
63763
63683
  }
63764
- if (clip) {
63765
- m.setClip(clip);
63766
- }
63684
+ const markConfig = Object.assign(Object.assign({}, config), { morph: (_b = config.morph) !== null && _b !== void 0 ? _b : false, support3d: (_c = config.support3d) !== null && _c !== void 0 ? _c : (spec.support3d || !!spec.zField), morphKey: ((_d = spec.morph) === null || _d === void 0 ? void 0 : _d.morphKey) || `${this.getSpecIndex()}_${this.getMarks().length}`, morphElementKey: (_f = (_e = spec.morph) === null || _e === void 0 ? void 0 : _e.morphElementKey) !== null && _f !== void 0 ? _f : config.morphElementKey });
63685
+ m.setMarkConfig(markConfig);
63767
63686
  this.initMarkStyleWithSpec(m, mergeSpec({}, themeSpec, markSpec || spec[m.name]));
63768
63687
  }
63769
63688
  return m;
@@ -64393,13 +64312,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
64393
64312
  initLineMark(progressive, isSeriesMark) {
64394
64313
  var _a, _b;
64395
64314
  this._lineMark = this._createMark(lineLikeSeriesMark.line, {
64396
- defaultMorphElementKey: this.getDimensionField()[0],
64397
64315
  groupKey: this._seriesField,
64398
64316
  isSeriesMark: isSeriesMark !== null && isSeriesMark !== void 0 ? isSeriesMark : true,
64399
- progressive,
64400
- customShape: (_a = this._spec.line) === null || _a === void 0 ? void 0 : _a.customShape,
64401
- stateSort: (_b = this._spec.line) === null || _b === void 0 ? void 0 : _b.stateSort
64402
- });
64317
+ stateSort: (_a = this._spec.line) === null || _a === void 0 ? void 0 : _a.stateSort
64318
+ }, Object.assign(Object.assign({}, progressive), { setCustomizedShape: (_b = this._spec.line) === null || _b === void 0 ? void 0 : _b.customShape, morphElementKey: this.getDimensionField()[0] }));
64403
64319
  return this._lineMark;
64404
64320
  }
64405
64321
  initLineMarkStyle(direction, areaCurveType) {
@@ -64474,26 +64390,23 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
64474
64390
  const pointSpec = this._spec.point || {};
64475
64391
  if (pointSpec.visible !== false) {
64476
64392
  this._symbolMark = this._createMark(lineLikeSeriesMark.point, {
64477
- morph: shouldMarkDoMorph(this._spec, lineLikeSeriesMark.point.name),
64478
- defaultMorphElementKey: this.getDimensionField()[0],
64479
64393
  groupKey: this._seriesField,
64480
- progressive,
64481
64394
  isSeriesMark: !!isSeriesMark,
64482
- customShape: pointSpec.customShape,
64483
64395
  stateSort: pointSpec.stateSort
64484
- });
64396
+ }, Object.assign(Object.assign({}, progressive), { setCustomizedShape: pointSpec.customShape, morph: shouldMarkDoMorph(this._spec, lineLikeSeriesMark.point.name), morphElementKey: this.getDimensionField()[0] }));
64485
64397
  }
64486
64398
  if (this._spec.activePoint === true) {
64487
64399
  const activeData = new DataView(this._option.dataSet, { name: `${PREFIX}_series_${this.id}_active_point` });
64488
64400
  activeData.parse([]);
64489
64401
  this._symbolActiveMark = this._createMark({ name: `active_point_${this.id}`, type: "symbol" }, {
64490
- morph: false,
64491
64402
  groupKey: this._seriesField,
64492
64403
  isSeriesMark: false,
64493
64404
  dataView: activeData,
64494
64405
  parent: this._region.getInteractionMark(),
64495
- customShape: pointSpec.customShape,
64496
64406
  stateSort: pointSpec.stateSort
64407
+ }, {
64408
+ setCustomizedShape: pointSpec.customShape,
64409
+ morph: false
64497
64410
  });
64498
64411
  this._symbolActiveMark.setVisible(false);
64499
64412
  }
@@ -64512,6 +64425,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
64512
64425
  for (const state in this._symbolMark.stateStyle) {
64513
64426
  this._symbolActiveMark.stateStyle[state] = {};
64514
64427
  for (const key in this._symbolMark.stateStyle[state]) {
64428
+ if (key === 'visible') {
64429
+ continue;
64430
+ }
64515
64431
  this._symbolActiveMark.stateStyle[state][key] = {
64516
64432
  style: null,
64517
64433
  level: AttributeLevel.Series,
@@ -64675,7 +64591,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
64675
64591
  this.setAttribute(attr, styleConverter, state, level, stateStyle);
64676
64592
  });
64677
64593
  if (enableSegments) {
64678
- this.setEnableSegments(enableSegments);
64594
+ this.setMarkConfig({
64595
+ enableSegments: true
64596
+ });
64679
64597
  }
64680
64598
  }
64681
64599
  }
@@ -65517,11 +65435,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
65517
65435
  const axisMark = this._createMark({ type: 'component', name: `axis-${this.getOrient()}` }, {
65518
65436
  componentType: this.getOrient() === 'angle' ? 'circleAxis' : 'axis',
65519
65437
  mode: this._spec.mode,
65520
- noSeparateStyle: true,
65438
+ noSeparateStyle: true
65439
+ }, {
65521
65440
  skipTheme: true
65522
65441
  });
65523
65442
  this._axisMark = axisMark;
65524
- axisMark.setZIndex(this.layoutZIndex);
65443
+ axisMark.setMarkConfig({ zIndex: this.layoutZIndex });
65525
65444
  if (isValid$1(this._spec.id)) {
65526
65445
  axisMark.setUserId(this._spec.id);
65527
65446
  }
@@ -65530,16 +65449,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
65530
65449
  const gridMark = this._createMark({ type: 'component', name: `axis-${this.getOrient()}-grid` }, {
65531
65450
  componentType: this.getOrient() === 'angle' ? GridEnum.circleAxisGrid : GridEnum.lineAxisGrid,
65532
65451
  mode: this._spec.mode,
65533
- noSeparateStyle: true,
65452
+ noSeparateStyle: true
65453
+ }, {
65534
65454
  skipTheme: true
65535
65455
  });
65536
- gridMark.setZIndex((_f = (_d = (_c = (_b = this._spec.grid) === null || _b === void 0 ? void 0 : _b.style) === null || _c === void 0 ? void 0 : _c.zIndex) !== null && _d !== void 0 ? _d : (_e = this._spec.grid) === null || _e === void 0 ? void 0 : _e.zIndex) !== null && _f !== void 0 ? _f : LayoutZIndex.Axis_Grid);
65537
- gridMark.setInteractive(false);
65456
+ gridMark.setMarkConfig({
65457
+ zIndex: (_f = (_d = (_c = (_b = this._spec.grid) === null || _b === void 0 ? void 0 : _b.style) === null || _c === void 0 ? void 0 : _c.zIndex) !== null && _d !== void 0 ? _d : (_e = this._spec.grid) === null || _e === void 0 ? void 0 : _e.zIndex) !== null && _f !== void 0 ? _f : LayoutZIndex.Axis_Grid,
65458
+ interactive: false
65459
+ });
65538
65460
  this._marks.addMark(gridMark);
65539
65461
  this._gridMark = gridMark;
65540
65462
  }
65541
65463
  if (isBoolean$1(this._spec.interactive)) {
65542
- this._marks.forEach(m => m.setInteractive(this._spec.interactive));
65464
+ this._marks.forEach(m => m.setMarkConfig({ interactive: this._spec.interactive }));
65543
65465
  }
65544
65466
  if (this._option.animation !== false &&
65545
65467
  get$1(this._option.getChart().getSpec(), 'animation') !== false &&
@@ -65671,7 +65593,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
65671
65593
  super.onLayoutEnd(ctx);
65672
65594
  }
65673
65595
  computeData(updateType) {
65674
- if (this._tickData && this._tickData.length && (updateType === 'force' || !isEqual(this._scale.range(), [0, 1]))) {
65596
+ if (updateType === 'force' && (!this._tickData || !this._tickData.length)) {
65597
+ eachSeries(this._regions, s => {
65598
+ var _a;
65599
+ (_a = s.getViewData()) === null || _a === void 0 ? void 0 : _a.reRunAllTransform();
65600
+ }, {
65601
+ userId: this._seriesUserId,
65602
+ specIndex: this._seriesIndex
65603
+ });
65604
+ }
65605
+ else if (this._tickData &&
65606
+ this._tickData.length &&
65607
+ (updateType === 'force' || !isEqual(this._scale.range(), [0, 1]))) {
65675
65608
  this._tickData.forEach(tickData => {
65676
65609
  tickData.getDataView().reRunAllTransform();
65677
65610
  tickData.updateData();
@@ -69772,12 +69705,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
69772
69705
  const seriesMark = (_b = this._spec.seriesMark) !== null && _b !== void 0 ? _b : 'area';
69773
69706
  this._areaMark = this._createMark(AreaSeries.mark.area, {
69774
69707
  groupKey: this._seriesField,
69775
- defaultMorphElementKey: this.getDimensionField()[0],
69776
- progressive,
69777
69708
  isSeriesMark: isAreaVisible && seriesMark !== 'point',
69778
- customShape: areaSpec.customShape,
69779
69709
  stateSort: areaSpec.stateSort
69780
- });
69710
+ }, Object.assign(Object.assign({}, progressive), { morphElementKey: this.getDimensionField()[0], setCustomizedShape: areaSpec.customShape }));
69781
69711
  this.initSymbolMark(progressive, seriesMark === 'point');
69782
69712
  }
69783
69713
  initMarkStyle() {
@@ -70175,31 +70105,33 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
70175
70105
  }
70176
70106
  initMark() {
70177
70107
  var _a, _b;
70178
- const progressive = {
70108
+ this._initBarBackgroundMark();
70109
+ this._barMark = this._createMark(Object.assign(Object.assign({}, BarSeries.mark.bar), { name: this._barMarkName, type: this._barMarkType }), {
70110
+ groupKey: this._seriesField,
70111
+ isSeriesMark: true,
70112
+ stateSort: (_a = this._spec.bar) === null || _a === void 0 ? void 0 : _a.stateSort
70113
+ }, {
70179
70114
  progressiveStep: this._spec.progressiveStep,
70180
70115
  progressiveThreshold: this._spec.progressiveThreshold,
70181
70116
  large: this._spec.large,
70182
- largeThreshold: this._spec.largeThreshold
70183
- };
70184
- this._initBarBackgroundMark(progressive);
70185
- this._barMark = this._createMark(Object.assign(Object.assign({}, BarSeries.mark.bar), { name: this._barMarkName, type: this._barMarkType }), {
70117
+ largeThreshold: this._spec.largeThreshold,
70118
+ morphElementKey: this.getDimensionField()[0],
70186
70119
  morph: shouldMarkDoMorph(this._spec, this._barMarkName),
70187
- defaultMorphElementKey: this.getDimensionField()[0],
70188
- groupKey: this._seriesField,
70189
- isSeriesMark: true,
70190
- progressive,
70191
- customShape: (_a = this._spec.bar) === null || _a === void 0 ? void 0 : _a.customShape,
70192
- stateSort: (_b = this._spec.bar) === null || _b === void 0 ? void 0 : _b.stateSort
70120
+ setCustomizedShape: (_b = this._spec.bar) === null || _b === void 0 ? void 0 : _b.customShape
70193
70121
  });
70194
70122
  }
70195
- _initBarBackgroundMark(progressive) {
70123
+ _initBarBackgroundMark() {
70196
70124
  if (this._spec.barBackground && this._spec.barBackground.visible) {
70197
70125
  this._barBackgroundMark = this._createMark(BarSeries.mark.barBackground, {
70198
70126
  dataView: this._barBackgroundViewData.getDataView(),
70199
70127
  dataProductId: this._barBackgroundViewData.getProductId(),
70200
- progressive,
70201
- customShape: this._spec.barBackground.customShape,
70202
70128
  stateSort: this._spec.barBackground.stateSort
70129
+ }, {
70130
+ setCustomizedShape: this._spec.barBackground.customShape,
70131
+ progressiveStep: this._spec.progressiveStep,
70132
+ progressiveThreshold: this._spec.progressiveThreshold,
70133
+ large: this._spec.large,
70134
+ largeThreshold: this._spec.largeThreshold
70203
70135
  });
70204
70136
  }
70205
70137
  }
@@ -70452,51 +70384,54 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
70452
70384
  }
70453
70385
  const xScale = (_b = (_a = this._xAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0);
70454
70386
  const yScale = (_d = (_c = this._yAxisHelper) === null || _c === void 0 ? void 0 : _c.getScale) === null || _d === void 0 ? void 0 : _d.call(_c, 0);
70455
- this._barMark.setClip(() => {
70456
- const rectPaths = [];
70457
- this._forEachStackGroup(node => {
70458
- let min = Infinity;
70459
- let max = -Infinity;
70460
- let hasPercent = false;
70461
- let minPercent = Infinity;
70462
- let maxPercent = -Infinity;
70463
- node.values.forEach(datum => {
70464
- const start = datum[STACK_FIELD_START];
70465
- const end = datum[STACK_FIELD_END];
70466
- const startPercent = datum[STACK_FIELD_START_PERCENT];
70467
- const endPercent = datum[STACK_FIELD_END_PERCENT];
70468
- min = Math.min(min, start, end);
70469
- max = Math.max(max, start, end);
70470
- if (isValid$1(startPercent) && isValid$1(endPercent)) {
70471
- hasPercent = true;
70472
- minPercent = Math.min(minPercent, startPercent, endPercent);
70473
- maxPercent = Math.max(maxPercent, startPercent, endPercent);
70474
- }
70387
+ this._barMark.setMarkConfig({
70388
+ clip: true,
70389
+ clipPath: () => {
70390
+ const rectPaths = [];
70391
+ this._forEachStackGroup(node => {
70392
+ let min = Infinity;
70393
+ let max = -Infinity;
70394
+ let hasPercent = false;
70395
+ let minPercent = Infinity;
70396
+ let maxPercent = -Infinity;
70397
+ node.values.forEach(datum => {
70398
+ const start = datum[STACK_FIELD_START];
70399
+ const end = datum[STACK_FIELD_END];
70400
+ const startPercent = datum[STACK_FIELD_START_PERCENT];
70401
+ const endPercent = datum[STACK_FIELD_END_PERCENT];
70402
+ min = Math.min(min, start, end);
70403
+ max = Math.max(max, start, end);
70404
+ if (isValid$1(startPercent) && isValid$1(endPercent)) {
70405
+ hasPercent = true;
70406
+ minPercent = Math.min(minPercent, startPercent, endPercent);
70407
+ maxPercent = Math.max(maxPercent, startPercent, endPercent);
70408
+ }
70409
+ });
70410
+ const mockDatum = Object.assign(Object.assign(Object.assign({}, node.values[0]), { [STACK_FIELD_START]: min, [STACK_FIELD_END]: max }), (hasPercent
70411
+ ? {
70412
+ [STACK_FIELD_START_PERCENT]: minPercent,
70413
+ [STACK_FIELD_END_PERCENT]: maxPercent
70414
+ }
70415
+ : undefined));
70416
+ const rectAttr = this.direction === "horizontal"
70417
+ ? {
70418
+ x: this._getBarXStart(mockDatum, xScale),
70419
+ x1: this._getBarXEnd(mockDatum, xScale),
70420
+ y: this._getPosition(this.direction, mockDatum),
70421
+ height: this._getBarWidth(this._yAxisHelper)
70422
+ }
70423
+ : {
70424
+ y: this._getBarYStart(mockDatum, yScale),
70425
+ y1: this._getBarYEnd(mockDatum, yScale),
70426
+ x: this._getPosition(this.direction, mockDatum),
70427
+ width: this._getBarWidth(this._xAxisHelper)
70428
+ };
70429
+ rectPaths.push(createRect(Object.assign(Object.assign({}, rectAttr), { cornerRadius: isFunction$1(this._spec.stackCornerRadius)
70430
+ ? this._spec.stackCornerRadius(rectAttr, mockDatum, this._markAttributeContext)
70431
+ : this._spec.stackCornerRadius, fill: true })));
70475
70432
  });
70476
- const mockDatum = Object.assign(Object.assign(Object.assign({}, node.values[0]), { [STACK_FIELD_START]: min, [STACK_FIELD_END]: max }), (hasPercent
70477
- ? {
70478
- [STACK_FIELD_START_PERCENT]: minPercent,
70479
- [STACK_FIELD_END_PERCENT]: maxPercent
70480
- }
70481
- : undefined));
70482
- const rectAttr = this.direction === "horizontal"
70483
- ? {
70484
- x: this._getBarXStart(mockDatum, xScale),
70485
- x1: this._getBarXEnd(mockDatum, xScale),
70486
- y: this._getPosition(this.direction, mockDatum),
70487
- height: this._getBarWidth(this._yAxisHelper)
70488
- }
70489
- : {
70490
- y: this._getBarYStart(mockDatum, yScale),
70491
- y1: this._getBarYEnd(mockDatum, yScale),
70492
- x: this._getPosition(this.direction, mockDatum),
70493
- width: this._getBarWidth(this._xAxisHelper)
70494
- };
70495
- rectPaths.push(createRect(Object.assign(Object.assign({}, rectAttr), { cornerRadius: isFunction$1(this._spec.stackCornerRadius)
70496
- ? this._spec.stackCornerRadius(rectAttr, mockDatum, this._markAttributeContext)
70497
- : this._spec.stackCornerRadius, fill: true })));
70498
- });
70499
- return rectPaths;
70433
+ return rectPaths;
70434
+ }
70500
70435
  });
70501
70436
  }
70502
70437
  initLinearRectMarkStyle() {
@@ -70968,20 +70903,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
70968
70903
  }
70969
70904
  initMark() {
70970
70905
  var _a, _b;
70971
- const progressive = {
70906
+ this._symbolMark = this._createMark(ScatterSeries.mark.point, {
70907
+ groupKey: this._seriesField,
70908
+ isSeriesMark: true,
70909
+ stateSort: (_a = this._spec.point) === null || _a === void 0 ? void 0 : _a.stateSort
70910
+ }, {
70972
70911
  progressiveStep: this._spec.progressiveStep,
70973
70912
  progressiveThreshold: this._spec.progressiveThreshold,
70974
70913
  large: this._spec.large,
70975
- largeThreshold: this._spec.largeThreshold
70976
- };
70977
- this._symbolMark = this._createMark(ScatterSeries.mark.point, {
70914
+ largeThreshold: this._spec.largeThreshold,
70978
70915
  morph: shouldMarkDoMorph(this._spec, ScatterSeries.mark.point.name),
70979
- defaultMorphElementKey: this.getDimensionField()[0],
70980
- groupKey: this._seriesField,
70981
- progressive,
70982
- isSeriesMark: true,
70983
- customShape: (_a = this._spec.point) === null || _a === void 0 ? void 0 : _a.customShape,
70984
- stateSort: (_b = this._spec.point) === null || _b === void 0 ? void 0 : _b.stateSort
70916
+ morphElementKey: this.getDimensionField()[0],
70917
+ setCustomizedShape: (_b = this._spec.point) === null || _b === void 0 ? void 0 : _b.customShape
70985
70918
  });
70986
70919
  }
70987
70920
  initMarkStyle() {
@@ -72273,6 +72206,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
72273
72206
  });
72274
72207
  });
72275
72208
  }
72209
+ _compareSpec(spec, prevSpec) {
72210
+ const result = super._compareSpec(spec, prevSpec);
72211
+ if (!result.reMake) {
72212
+ result.reMake = ['roam', 'longitudeField', 'latitudeField', 'projection', 'zoomLimit'].some(k => {
72213
+ return !isEqual(prevSpec === null || prevSpec === void 0 ? void 0 : prevSpec[k], spec[k]);
72214
+ });
72215
+ }
72216
+ return result;
72217
+ }
72276
72218
  release() {
72277
72219
  super.release();
72278
72220
  this._centerCache && this._centerCache.clear();
@@ -72370,13 +72312,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
72370
72312
  }
72371
72313
  initMark() {
72372
72314
  this._pathMark = this._createMark(MapSeries.mark.area, {
72373
- morph: shouldMarkDoMorph(this._spec, MapSeries.mark.area.name),
72374
- defaultMorphElementKey: this.getDimensionField()[0],
72375
72315
  groupKey: this.getDimensionField()[0],
72376
72316
  isSeriesMark: true,
72377
72317
  skipBeforeLayouted: true,
72378
72318
  dataView: this._mapViewData.getDataView(),
72379
72319
  dataProductId: this._mapViewData.getProductId()
72320
+ }, {
72321
+ morph: shouldMarkDoMorph(this._spec, MapSeries.mark.area.name),
72322
+ morphElementKey: this.getDimensionField()[0]
72380
72323
  });
72381
72324
  }
72382
72325
  initMarkStyle() {
@@ -73412,8 +73355,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
73412
73355
  super.initMark();
73413
73356
  const leaderLine = this._createMark(WaterfallSeries.mark.leaderLine, {
73414
73357
  key: 'index',
73415
- customShape: (_a = this._spec.leaderLine) === null || _a === void 0 ? void 0 : _a.customShape,
73416
- stateSort: (_b = this._spec.leaderLine) === null || _b === void 0 ? void 0 : _b.stateSort
73358
+ stateSort: (_a = this._spec.leaderLine) === null || _a === void 0 ? void 0 : _a.stateSort
73359
+ }, {
73360
+ setCustomizedShape: (_b = this._spec.leaderLine) === null || _b === void 0 ? void 0 : _b.customShape
73417
73361
  });
73418
73362
  if (leaderLine) {
73419
73363
  this._leaderLineMark = leaderLine;
@@ -73805,15 +73749,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
73805
73749
  largeThreshold: this._spec.largeThreshold
73806
73750
  };
73807
73751
  this._boxPlotMark = this._createMark(BoxPlotSeries.mark.boxPlot, {
73808
- isSeriesMark: true,
73809
- progressive
73810
- });
73752
+ isSeriesMark: true
73753
+ }, progressive);
73811
73754
  this._outlierMark = this._createMark(BoxPlotSeries.mark.outlier, {
73812
- progressive,
73813
73755
  key: DEFAULT_DATA_INDEX,
73814
73756
  dataView: this._outlierDataView.getDataView(),
73815
73757
  dataProductId: this._outlierDataView.getProductId()
73816
- });
73758
+ }, progressive);
73817
73759
  }
73818
73760
  initMarkStyle() {
73819
73761
  var _a, _b, _c, _d, _e;
@@ -74257,12 +74199,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
74257
74199
  this._initBarBackgroundMark();
74258
74200
  const labelPosition = (_a = this._spec.label) === null || _a === void 0 ? void 0 : _a.position;
74259
74201
  this._barMark = this._createMark(RangeColumnSeries.mark.bar, {
74260
- morph: shouldMarkDoMorph(this._spec, RangeColumnSeries.mark.bar.name),
74261
- defaultMorphElementKey: this.getDimensionField()[0],
74262
74202
  groupKey: this._seriesField,
74263
74203
  isSeriesMark: true,
74264
- customShape: (_b = this._spec.bar) === null || _b === void 0 ? void 0 : _b.customShape,
74265
- stateSort: (_c = this._spec.bar) === null || _c === void 0 ? void 0 : _c.stateSort
74204
+ stateSort: (_b = this._spec.bar) === null || _b === void 0 ? void 0 : _b.stateSort
74205
+ }, {
74206
+ setCustomizedShape: (_c = this._spec.bar) === null || _c === void 0 ? void 0 : _c.customShape,
74207
+ morph: shouldMarkDoMorph(this._spec, RangeColumnSeries.mark.bar.name),
74208
+ morphElementKey: this.getDimensionField()[0]
74266
74209
  });
74267
74210
  if (((_d = this._spec.label) === null || _d === void 0 ? void 0 : _d.visible) !== false && labelPosition === "bothEnd") {
74268
74211
  if (((_f = (_e = this._spec.label) === null || _e === void 0 ? void 0 : _e.minLabel) === null || _f === void 0 ? void 0 : _f.visible) !== false) {
@@ -74449,11 +74392,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
74449
74392
  var _a;
74450
74393
  const { customShape, stateSort } = (_a = this._spec.area) !== null && _a !== void 0 ? _a : {};
74451
74394
  this._areaMark = this._createMark(RangeAreaSeries.mark.area, {
74452
- defaultMorphElementKey: this.getDimensionField()[0],
74453
74395
  groupKey: this._seriesField,
74454
74396
  isSeriesMark: true,
74455
- customShape,
74456
74397
  stateSort
74398
+ }, {
74399
+ setCustomizedShape: customShape,
74400
+ morphElementKey: this.getDimensionField()[0]
74457
74401
  });
74458
74402
  }
74459
74403
  initMarkStyle() {
@@ -75211,14 +75155,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
75211
75155
  initMark() {
75212
75156
  var _a, _b;
75213
75157
  this._pieMark = this._createMark(Object.assign(Object.assign({}, BasePieSeries.mark.pie), { name: this._pieMarkName, type: this._pieMarkType }), {
75214
- morph: shouldMarkDoMorph(this._spec, this._pieMarkName),
75215
- defaultMorphElementKey: this._seriesField,
75216
75158
  key: DEFAULT_DATA_KEY,
75217
75159
  groupKey: this._seriesField,
75218
75160
  skipBeforeLayouted: true,
75219
75161
  isSeriesMark: true,
75220
- customShape: (_a = this._spec.pie) === null || _a === void 0 ? void 0 : _a.customShape,
75221
- stateSort: (_b = this._spec.pie) === null || _b === void 0 ? void 0 : _b.stateSort
75162
+ stateSort: (_a = this._spec.pie) === null || _a === void 0 ? void 0 : _a.stateSort
75163
+ }, {
75164
+ setCustomizedShape: (_b = this._spec.pie) === null || _b === void 0 ? void 0 : _b.customShape,
75165
+ morph: shouldMarkDoMorph(this._spec, this._pieMarkName),
75166
+ morphElementKey: this._seriesField
75222
75167
  });
75223
75168
  if (this._showEmptyCircle) {
75224
75169
  this._emptyArcMark = this._createMark({
@@ -75526,7 +75471,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
75526
75471
  }
75527
75472
  super.initLabelMarkStyle(textMark);
75528
75473
  const params3d = {};
75529
- textMark.setSupport3d(true);
75474
+ textMark.setMarkConfig({ support3d: true });
75530
75475
  params3d.beta = this._angle3d;
75531
75476
  params3d.anchor3d = (datum) => {
75532
75477
  const { x, y } = this.getCenter();
@@ -76161,12 +76106,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
76161
76106
  initRoseMark() {
76162
76107
  var _a, _b;
76163
76108
  this._roseMark = this._createMark(RoseSeries.mark.rose, {
76164
- morph: shouldMarkDoMorph(this._spec, RoseSeries.mark.rose.name),
76165
- defaultMorphElementKey: this.getDimensionField()[0],
76166
76109
  groupKey: this._seriesField,
76167
76110
  isSeriesMark: true,
76168
- customShape: (_a = this._spec.rose) === null || _a === void 0 ? void 0 : _a.customShape,
76169
- stateSort: (_b = this._spec.rose) === null || _b === void 0 ? void 0 : _b.stateSort
76111
+ stateSort: (_a = this._spec.rose) === null || _a === void 0 ? void 0 : _a.stateSort
76112
+ }, {
76113
+ setCustomizedShape: (_b = this._spec.rose) === null || _b === void 0 ? void 0 : _b.customShape,
76114
+ morph: shouldMarkDoMorph(this._spec, RoseSeries.mark.rose.name),
76115
+ morphElementKey: this.getDimensionField()[0]
76170
76116
  });
76171
76117
  }
76172
76118
  getRoseAngle() {
@@ -76515,11 +76461,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
76515
76461
  var _a, _b;
76516
76462
  this._areaMark = this._createMark(RadarSeries.mark.area, {
76517
76463
  groupKey: this._seriesField,
76518
- progressive,
76519
76464
  isSeriesMark,
76520
- customShape: (_a = this._spec.area) === null || _a === void 0 ? void 0 : _a.customShape,
76521
- stateSort: (_b = this._spec.area) === null || _b === void 0 ? void 0 : _b.stateSort
76522
- });
76465
+ stateSort: (_a = this._spec.area) === null || _a === void 0 ? void 0 : _a.stateSort
76466
+ }, Object.assign(Object.assign({}, progressive), { setCustomizedShape: (_b = this._spec.area) === null || _b === void 0 ? void 0 : _b.customShape }));
76523
76467
  }
76524
76468
  initAreaMarkStyle() {
76525
76469
  const areaMark = this._areaMark;
@@ -76839,17 +76783,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
76839
76783
  x: -this._spec.leftAppendPadding,
76840
76784
  y: 0,
76841
76785
  width: 10000,
76842
- height: this._spec.clipHeight,
76843
- clip: true
76786
+ height: this._spec.clipHeight
76844
76787
  }, 'normal', AttributeLevel.Series);
76845
- clipMark.setInteractive(false);
76788
+ clipMark.setMarkConfig({ interactive: false, clip: true });
76846
76789
  }
76847
76790
  const containerMark = this._containerMark;
76848
76791
  if (containerMark) {
76849
76792
  this.setMarkStyle(containerMark, {
76850
76793
  x: this._spec.leftAppendPadding
76851
76794
  }, 'normal', AttributeLevel.Series);
76852
- containerMark.setInteractive(false);
76795
+ containerMark.setMarkConfig({ interactive: false });
76853
76796
  }
76854
76797
  const gridBackgroundMark = this._gridBackgroundMark;
76855
76798
  if (gridBackgroundMark) {
@@ -77201,10 +77144,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
77201
77144
  x: -this._spec.leftAppendPadding,
77202
77145
  y: 0,
77203
77146
  width: 10000,
77204
- height: this._spec.clipHeight,
77205
- clip: true
77147
+ height: this._spec.clipHeight
77206
77148
  }, 'normal', AttributeLevel.Series);
77207
- clipMark.setInteractive(false);
77149
+ clipMark.setMarkConfig({ interactive: false, clip: true });
77208
77150
  }
77209
77151
  const containerMark = this._containerMark;
77210
77152
  if (containerMark) {
@@ -77212,7 +77154,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
77212
77154
  x: this._spec.leftAppendPadding,
77213
77155
  width: this.getLayoutRect().width
77214
77156
  }, 'normal', AttributeLevel.Series);
77215
- containerMark.setInteractive(false);
77157
+ containerMark.setMarkConfig({ interactive: false });
77216
77158
  }
77217
77159
  const linkMark = this._linkMark;
77218
77160
  if (linkMark) {
@@ -77510,38 +77452,41 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
77510
77452
  }
77511
77453
  _initArcGroupMarkStyle() {
77512
77454
  const groupMark = this._arcGroupMark;
77513
- groupMark.setZIndex(this.layoutZIndex);
77514
77455
  groupMark.created();
77515
77456
  this.setMarkStyle(groupMark, {
77516
77457
  x: 0,
77517
77458
  y: 0
77518
77459
  }, 'normal', AttributeLevel.Series);
77519
- groupMark.setClip(() => {
77520
- const axis = this._getAngleAxis();
77521
- if (this._isTickMaskVisible(axis)) {
77522
- const { tickMask } = this._spec;
77523
- const { angle, offsetAngle, style = {} } = tickMask;
77524
- const subTickData = this._getAngleAxisSubTickData(axis);
77525
- const { x, y } = this.angleAxisHelper.center();
77526
- const radius = this._computeLayoutRadius();
77527
- const markStyle = style;
77528
- return subTickData.map(({ value }) => {
77529
- const pos = this.angleAxisHelper.dataToPosition([value]) + degreeToRadian(offsetAngle);
77530
- const angleUnit = degreeToRadian(angle) / 2;
77531
- return createArc(Object.assign(Object.assign({}, markStyle), { x,
77532
- y, startAngle: pos - angleUnit, endAngle: pos + angleUnit, innerRadius: radius * this._innerRadius, outerRadius: radius * this._outerRadius, fill: true }));
77533
- });
77460
+ this._arcGroupMark.setMarkConfig({
77461
+ interactive: false,
77462
+ zIndex: this.layoutZIndex,
77463
+ clip: true,
77464
+ clipPath: () => {
77465
+ const axis = this._getAngleAxis();
77466
+ if (this._isTickMaskVisible(axis)) {
77467
+ const { tickMask } = this._spec;
77468
+ const { angle, offsetAngle, style = {} } = tickMask;
77469
+ const subTickData = this._getAngleAxisSubTickData(axis);
77470
+ const { x, y } = this.angleAxisHelper.center();
77471
+ const radius = this._computeLayoutRadius();
77472
+ const markStyle = style;
77473
+ return subTickData.map(({ value }) => {
77474
+ const pos = this.angleAxisHelper.dataToPosition([value]) + degreeToRadian(offsetAngle);
77475
+ const angleUnit = degreeToRadian(angle) / 2;
77476
+ return createArc(Object.assign(Object.assign({}, markStyle), { x,
77477
+ y, startAngle: pos - angleUnit, endAngle: pos + angleUnit, innerRadius: radius * this._innerRadius, outerRadius: radius * this._outerRadius, fill: true }));
77478
+ });
77479
+ }
77480
+ const { width, height } = this.getLayoutRect();
77481
+ return [
77482
+ createRect({
77483
+ width,
77484
+ height,
77485
+ fill: true
77486
+ })
77487
+ ];
77534
77488
  }
77535
- const { width, height } = this.getLayoutRect();
77536
- return [
77537
- createRect({
77538
- width,
77539
- height,
77540
- fill: true
77541
- })
77542
- ];
77543
77489
  });
77544
- this._arcGroupMark.setInteractive(false);
77545
77490
  }
77546
77491
  _getAngleAxis() {
77547
77492
  if (!this.angleAxisHelper) {
@@ -77677,8 +77622,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
77677
77622
  this._progressMark = this._createMark(CircularProgressSeries.mark.progress, {
77678
77623
  parent: this._arcGroupMark,
77679
77624
  isSeriesMark: true,
77680
- customShape: (_a = this._spec.progress) === null || _a === void 0 ? void 0 : _a.customShape,
77681
- stateSort: (_b = this._spec.progress) === null || _b === void 0 ? void 0 : _b.stateSort
77625
+ stateSort: (_a = this._spec.progress) === null || _a === void 0 ? void 0 : _a.stateSort
77626
+ }, {
77627
+ setCustomizedShape: (_b = this._spec.progress) === null || _b === void 0 ? void 0 : _b.customShape
77682
77628
  });
77683
77629
  return this._progressMark;
77684
77630
  }
@@ -77720,8 +77666,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
77720
77666
  var _a, _b;
77721
77667
  this._trackMark = this._createMark(CircularProgressSeries.mark.track, {
77722
77668
  parent: this._arcGroupMark,
77723
- customShape: (_a = this._spec.track) === null || _a === void 0 ? void 0 : _a.customShape,
77724
- stateSort: (_b = this._spec.track) === null || _b === void 0 ? void 0 : _b.stateSort
77669
+ stateSort: (_a = this._spec.track) === null || _a === void 0 ? void 0 : _a.stateSort
77670
+ }, {
77671
+ setCustomizedShape: (_b = this._spec.track) === null || _b === void 0 ? void 0 : _b.customShape
77725
77672
  });
77726
77673
  return this._trackMark;
77727
77674
  }
@@ -77914,8 +77861,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
77914
77861
  var _a, _b, _c;
77915
77862
  this._progressMark = this._createMark(LinearProgressSeries.mark.progress, {
77916
77863
  isSeriesMark: true,
77917
- customShape: (_b = (_a = this._spec.progress) === null || _a === void 0 ? void 0 : _a.customShape) !== null && _b !== void 0 ? _b : this._defaultProgressCustomShape,
77918
- stateSort: (_c = this._spec.progress) === null || _c === void 0 ? void 0 : _c.stateSort
77864
+ stateSort: (_a = this._spec.progress) === null || _a === void 0 ? void 0 : _a.stateSort
77865
+ }, {
77866
+ setCustomizedShape: (_c = (_b = this._spec.progress) === null || _b === void 0 ? void 0 : _b.customShape) !== null && _c !== void 0 ? _c : this._defaultProgressCustomShape
77919
77867
  });
77920
77868
  return this._progressMark;
77921
77869
  }
@@ -77964,8 +77912,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
77964
77912
  _initTrackMark() {
77965
77913
  var _a, _b;
77966
77914
  this._trackMark = this._createMark(LinearProgressSeries.mark.track, {
77967
- customShape: (_a = this._spec.track) === null || _a === void 0 ? void 0 : _a.customShape,
77968
- stateSort: (_b = this._spec.track) === null || _b === void 0 ? void 0 : _b.stateSort
77915
+ stateSort: (_a = this._spec.track) === null || _a === void 0 ? void 0 : _a.stateSort
77916
+ }, {
77917
+ setCustomizedShape: (_b = this._spec.track) === null || _b === void 0 ? void 0 : _b.customShape
77969
77918
  });
77970
77919
  return this._trackMark;
77971
77920
  }
@@ -78154,9 +78103,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
78154
78103
  }
78155
78104
  this._wordMark = this._createMark(BaseWordCloudSeries.mark.word, {
78156
78105
  key: DEFAULT_DATA_KEY,
78157
- defaultMorphElementKey: this._seriesField,
78158
78106
  groupKey: this._seriesField,
78159
78107
  isSeriesMark: true
78108
+ }, {
78109
+ morphElementKey: this._seriesField
78160
78110
  });
78161
78111
  }
78162
78112
  initMarkStyle() {
@@ -80350,8 +80300,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
80350
80300
  initMark() {
80351
80301
  this._wordMark = this._createMark(BaseWordCloudSeries.mark.word, {
80352
80302
  groupKey: this._seriesField,
80353
- support3d: true,
80354
80303
  isSeriesMark: true
80304
+ }, {
80305
+ support3d: true
80355
80306
  });
80356
80307
  }
80357
80308
  initMarkStyle() {
@@ -80624,13 +80575,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
80624
80575
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
80625
80576
  this._funnelMark = this._createMark(Object.assign(Object.assign({}, FunnelSeries.mark.funnel), { name: this._funnelMarkName, type: this._funnelMarkType }), {
80626
80577
  themeSpec: (_a = this._theme) === null || _a === void 0 ? void 0 : _a.funnel,
80627
- morph: shouldMarkDoMorph(this._spec, this._funnelMarkName),
80628
- defaultMorphElementKey: this._seriesField,
80629
80578
  groupKey: this._seriesField,
80630
80579
  isSeriesMark: true,
80631
- customShape: (_b = this._spec.funnel) === null || _b === void 0 ? void 0 : _b.customShape,
80632
- stateSort: (_c = this._spec.funnel) === null || _c === void 0 ? void 0 : _c.stateSort,
80580
+ stateSort: (_b = this._spec.funnel) === null || _b === void 0 ? void 0 : _b.stateSort,
80633
80581
  noSeparateStyle: true
80582
+ }, {
80583
+ setCustomizedShape: (_c = this._spec.funnel) === null || _c === void 0 ? void 0 : _c.customShape,
80584
+ morph: shouldMarkDoMorph(this._spec, this._funnelMarkName),
80585
+ morphElementKey: this._seriesField
80634
80586
  });
80635
80587
  if (this._spec.isTransform) {
80636
80588
  this._funnelTransformMark = this._createMark(Object.assign(Object.assign({}, FunnelSeries.mark.transform), { name: this._transformMarkName, type: this._transformMarkType }), {
@@ -80638,9 +80590,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
80638
80590
  skipBeforeLayouted: false,
80639
80591
  dataView: this._viewDataTransform.getDataView(),
80640
80592
  dataProductId: this._viewDataTransform.getProductId(),
80641
- customShape: (_e = this._spec.transform) === null || _e === void 0 ? void 0 : _e.customShape,
80642
- stateSort: (_f = this._spec.transform) === null || _f === void 0 ? void 0 : _f.stateSort,
80593
+ stateSort: (_e = this._spec.transform) === null || _e === void 0 ? void 0 : _e.stateSort,
80643
80594
  noSeparateStyle: true
80595
+ }, {
80596
+ setCustomizedShape: (_f = this._spec.transform) === null || _f === void 0 ? void 0 : _f.customShape
80644
80597
  });
80645
80598
  }
80646
80599
  if ((_h = (_g = this._spec) === null || _g === void 0 ? void 0 : _g.outerLabel) === null || _h === void 0 ? void 0 : _h.visible) {
@@ -81205,7 +81158,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
81205
81158
  this._funnelMark = this._createMark(Object.assign(Object.assign({}, Funnel3dSeries.mark.funnel3d), { name: this._funnelMarkName, type: this._funnelMarkType }), {
81206
81159
  themeSpec: (_a = this._theme) === null || _a === void 0 ? void 0 : _a.funnel3d,
81207
81160
  key: this._seriesField,
81208
- isSeriesMark: true,
81161
+ isSeriesMark: true
81162
+ }, {
81209
81163
  support3d: true
81210
81164
  });
81211
81165
  if (this._spec.isTransform) {
@@ -82425,8 +82379,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
82425
82379
  }
82426
82380
  const sunburstMark = this._createMark(SunburstSeries.mark.sunburst, {
82427
82381
  isSeriesMark: true,
82428
- customShape: (_a = this._spec.sunburst) === null || _a === void 0 ? void 0 : _a.customShape,
82429
- stateSort: (_b = this._spec.sunburst) === null || _b === void 0 ? void 0 : _b.stateSort
82382
+ stateSort: (_a = this._spec.sunburst) === null || _a === void 0 ? void 0 : _a.stateSort
82383
+ }, {
82384
+ setCustomizedShape: (_b = this._spec.sunburst) === null || _b === void 0 ? void 0 : _b.customShape
82430
82385
  });
82431
82386
  this._sunburstMark = sunburstMark;
82432
82387
  }
@@ -82713,8 +82668,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
82713
82668
  return;
82714
82669
  }
82715
82670
  const circlePacking = this._createMark(CirclePackingSeries.mark.circlePacking, {
82716
- isSeriesMark: true,
82717
- customShape: (_b = this._spec.circlePacking) === null || _b === void 0 ? void 0 : _b.customShape
82671
+ isSeriesMark: true
82672
+ }, {
82673
+ setCustomizedShape: (_b = this._spec.circlePacking) === null || _b === void 0 ? void 0 : _b.customShape
82718
82674
  });
82719
82675
  this._circlePackingMark = circlePacking;
82720
82676
  }
@@ -84211,18 +84167,20 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84211
84167
  isSeriesMark: true,
84212
84168
  dataView: this._nodesSeriesData.getDataView(),
84213
84169
  dataProductId: this._nodesSeriesData.getProductId(),
84214
- customShape: (_a = this._spec.node) === null || _a === void 0 ? void 0 : _a.customShape,
84215
- stateSort: (_b = this._spec.node) === null || _b === void 0 ? void 0 : _b.stateSort
84170
+ stateSort: (_a = this._spec.node) === null || _a === void 0 ? void 0 : _a.stateSort
84171
+ }, {
84172
+ setCustomizedShape: (_b = this._spec.node) === null || _b === void 0 ? void 0 : _b.customShape
84216
84173
  });
84217
84174
  if (nodeMark) {
84218
- nodeMark.setZIndex(this._nodeLayoutZIndex);
84175
+ nodeMark.setMarkConfig({ zIndex: this._nodeLayoutZIndex });
84219
84176
  this._nodeMark = nodeMark;
84220
84177
  }
84221
84178
  const linkMark = this._createMark(SankeySeries.mark.link, {
84222
84179
  dataView: this._linksSeriesData.getDataView(),
84223
84180
  dataProductId: this._linksSeriesData.getProductId(),
84224
- customShape: (_c = this._spec.link) === null || _c === void 0 ? void 0 : _c.customShape,
84225
- stateSort: (_d = this._spec.link) === null || _d === void 0 ? void 0 : _d.stateSort
84181
+ stateSort: (_c = this._spec.link) === null || _c === void 0 ? void 0 : _c.stateSort
84182
+ }, {
84183
+ setCustomizedShape: (_d = this._spec.link) === null || _d === void 0 ? void 0 : _d.customShape
84226
84184
  });
84227
84185
  if (linkMark) {
84228
84186
  this._linkMark = linkMark;
@@ -84311,7 +84269,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84311
84269
  maxLineWidth: labelSpec.limit
84312
84270
  });
84313
84271
  }
84314
- labelMark.setZIndex(this._labelLayoutZIndex);
84272
+ labelMark.setMarkConfig({ zIndex: this._labelLayoutZIndex });
84315
84273
  }
84316
84274
  _createText(datum, labelSpec) {
84317
84275
  if (isNil$1(datum) || isNil$1(datum.datum)) {
@@ -84805,8 +84763,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84805
84763
  var _a, _b, _c, _d;
84806
84764
  const nonLeafMark = this._createMark(TreemapSeries.mark.nonLeaf, {
84807
84765
  isSeriesMark: true,
84808
- customShape: (_a = this._spec.nonLeaf) === null || _a === void 0 ? void 0 : _a.customShape,
84809
- stateSort: (_b = this._spec.nonLeaf) === null || _b === void 0 ? void 0 : _b.stateSort
84766
+ stateSort: (_a = this._spec.nonLeaf) === null || _a === void 0 ? void 0 : _a.stateSort
84767
+ }, {
84768
+ setCustomizedShape: (_b = this._spec.nonLeaf) === null || _b === void 0 ? void 0 : _b.customShape
84810
84769
  });
84811
84770
  if (nonLeafMark) {
84812
84771
  nonLeafMark.setTransform([
@@ -84821,8 +84780,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84821
84780
  }
84822
84781
  const leafMark = this._createMark(TreemapSeries.mark.leaf, {
84823
84782
  isSeriesMark: true,
84824
- customShape: (_c = this._spec.leaf) === null || _c === void 0 ? void 0 : _c.customShape,
84825
- stateSort: (_d = this._spec.leaf) === null || _d === void 0 ? void 0 : _d.stateSort
84783
+ stateSort: (_c = this._spec.leaf) === null || _c === void 0 ? void 0 : _c.stateSort
84784
+ }, {
84785
+ setCustomizedShape: (_d = this._spec.leaf) === null || _d === void 0 ? void 0 : _d.customShape
84826
84786
  });
84827
84787
  if (leafMark) {
84828
84788
  leafMark.setTransform([
@@ -85486,18 +85446,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
85486
85446
  largeThreshold: this._spec.largeThreshold
85487
85447
  };
85488
85448
  this._cellMark = this._createMark(HeatmapSeries.mark.cell, {
85489
- morph: shouldMarkDoMorph(this._spec, HeatmapSeries.mark.cell.name),
85490
- defaultMorphElementKey: this.getDimensionField()[0],
85491
85449
  isSeriesMark: true,
85492
- progressive,
85493
- customShape: (_a = this._spec.cell) === null || _a === void 0 ? void 0 : _a.customShape,
85494
- stateSort: (_b = this._spec.cell) === null || _b === void 0 ? void 0 : _b.stateSort
85495
- });
85450
+ stateSort: (_a = this._spec.cell) === null || _a === void 0 ? void 0 : _a.stateSort
85451
+ }, Object.assign(Object.assign({}, progressive), { setCustomizedShape: (_b = this._spec.cell) === null || _b === void 0 ? void 0 : _b.customShape, morph: shouldMarkDoMorph(this._spec, HeatmapSeries.mark.cell.name), morphElementKey: this.getDimensionField()[0] }));
85496
85452
  this._backgroundMark = this._createMark(HeatmapSeries.mark.cellBackground, {
85497
- progressive,
85498
- customShape: (_c = this._spec.cellBackground) === null || _c === void 0 ? void 0 : _c.customShape,
85499
- stateSort: (_d = this._spec.cellBackground) === null || _d === void 0 ? void 0 : _d.stateSort
85500
- });
85453
+ stateSort: (_c = this._spec.cellBackground) === null || _c === void 0 ? void 0 : _c.stateSort
85454
+ }, Object.assign(Object.assign({}, progressive), { setCustomizedShape: (_d = this._spec.cellBackground) === null || _d === void 0 ? void 0 : _d.customShape }));
85501
85455
  }
85502
85456
  initMarkStyle() {
85503
85457
  this.initCellMarkStyle();
@@ -85912,11 +85866,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
85912
85866
  groupKey: this._seriesField,
85913
85867
  isSeriesMark: true,
85914
85868
  key: DEFAULT_DATA_INDEX,
85915
- customShape: (_a = this._spec.nodePoint) === null || _a === void 0 ? void 0 : _a.customShape,
85916
- stateSort: (_b = this._spec.nodePoint) === null || _b === void 0 ? void 0 : _b.stateSort
85869
+ stateSort: (_a = this._spec.nodePoint) === null || _a === void 0 ? void 0 : _a.stateSort
85870
+ }, {
85871
+ setCustomizedShape: (_b = this._spec.nodePoint) === null || _b === void 0 ? void 0 : _b.customShape
85917
85872
  });
85918
85873
  if (nodePointMark) {
85919
- nodePointMark.setZIndex(LayoutZIndex.Node);
85874
+ nodePointMark.setMarkConfig({ zIndex: LayoutZIndex.Node });
85920
85875
  this._nodePointMark = nodePointMark;
85921
85876
  }
85922
85877
  const ripplePointMark = this._createMark(CorrelationSeries.mark.ripplePoint, {
@@ -85931,11 +85886,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
85931
85886
  key: DEFAULT_DATA_INDEX,
85932
85887
  dataView: this._centerSeriesData.getDataView(),
85933
85888
  dataProductId: this._centerSeriesData.getProductId(),
85934
- customShape: (_c = this._spec.centerPoint) === null || _c === void 0 ? void 0 : _c.customShape,
85935
- stateSort: (_d = this._spec.centerPoint) === null || _d === void 0 ? void 0 : _d.stateSort
85889
+ stateSort: (_c = this._spec.centerPoint) === null || _c === void 0 ? void 0 : _c.stateSort
85890
+ }, {
85891
+ setCustomizedShape: (_d = this._spec.centerPoint) === null || _d === void 0 ? void 0 : _d.customShape
85936
85892
  });
85937
85893
  if (centerPointMark) {
85938
- centerPointMark.setZIndex(LayoutZIndex.Node);
85894
+ centerPointMark.setMarkConfig({ zIndex: LayoutZIndex.Node });
85939
85895
  this._centerPointMark = centerPointMark;
85940
85896
  }
85941
85897
  }
@@ -86363,7 +86319,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
86363
86319
  }
86364
86320
  _initLiquidOutlineMarkStyle() {
86365
86321
  const liquidOutlineMark = this._liquidOutlineMark;
86366
- liquidOutlineMark.setZIndex(this.layoutZIndex);
86367
86322
  liquidOutlineMark.created();
86368
86323
  this.setMarkStyle(liquidOutlineMark, {
86369
86324
  stroke: this.getColorAttribute(),
@@ -86371,19 +86326,17 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
86371
86326
  height: () => this._region.getLayoutRect().height,
86372
86327
  path: () => this._getLiquidBackPath(true)
86373
86328
  }, 'normal', AttributeLevel.Series);
86374
- this._liquidOutlineMark.setInteractive(false);
86329
+ this._liquidOutlineMark.setMarkConfig({ interactive: false, zIndex: this.layoutZIndex });
86375
86330
  }
86376
86331
  _initLiquidBackgroundMarkStyle() {
86377
86332
  const liquidBackgroundMark = this._liquidBackgroundMark;
86378
- liquidBackgroundMark.setZIndex(this.layoutZIndex);
86379
86333
  liquidBackgroundMark.created();
86380
86334
  this.setMarkStyle(liquidBackgroundMark, {
86381
- clip: true,
86382
86335
  width: () => this._region.getLayoutRect().width,
86383
86336
  height: () => this._region.getLayoutRect().height,
86384
86337
  path: () => this._getLiquidBackPath()
86385
86338
  }, 'normal', AttributeLevel.Series);
86386
- this._liquidBackgroundMark.setInteractive(false);
86339
+ this._liquidBackgroundMark.setMarkConfig({ interactive: false, zIndex: this.layoutZIndex, clip: true });
86387
86340
  }
86388
86341
  _initLiquidMarkStyle() {
86389
86342
  const liquidMark = this._liquidMark;
@@ -91017,21 +90970,33 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
91017
90970
  return;
91018
90971
  }
91019
90972
  const trigger = array((_a = this._spec.trigger) !== null && _a !== void 0 ? _a : 'hover');
90973
+ const triggerOff = array(this._spec.triggerOff);
91020
90974
  const mode = this._option.mode;
91021
- if (trigger.includes('hover')) {
91022
- this._handleMouseMove = this._throttle(this._getMouseMoveHandler(false));
91023
- this._mountEvent('pointermove', { source: 'chart' }, this._handleMouseMove);
91024
- if (isMobileLikeMode(mode) || isMiniAppLikeMode(mode)) {
91025
- this._mountEvent('pointerdown', { source: 'chart' }, this._getMouseMoveHandler(false));
90975
+ trigger.forEach(triggerType => {
90976
+ var _a;
90977
+ if (triggerType === 'hover') {
90978
+ this._handleMouseMove = this._throttle(this._getMouseMoveHandler(false));
90979
+ this._mountEvent('pointermove', { source: 'chart' }, this._handleMouseMove);
90980
+ if (isMobileLikeMode(mode) || isMiniAppLikeMode(mode)) {
90981
+ this._mountEvent('pointerdown', { source: 'chart' }, this._getMouseMoveHandler(false));
90982
+ this._mountEvent('pointerup', { source: 'window' }, this._getMouseOutHandler(true));
90983
+ }
90984
+ this._mountEvent('pointerleave', { source: 'chart' }, this._getMouseOutHandler(false));
90985
+ }
90986
+ else if (triggerType === 'click') {
90987
+ this._mountEvent('pointertap', { source: 'chart' }, this._getMouseMoveHandler(true));
91026
90988
  this._mountEvent('pointerup', { source: 'window' }, this._getMouseOutHandler(true));
91027
90989
  }
91028
- this._mountEvent('pointerleave', { source: 'chart' }, this._getMouseOutHandler(false));
91029
- }
91030
- if (trigger.includes('click')) {
91031
- this._mountEvent('pointertap', { source: 'chart' }, this._getMouseMoveHandler(true));
91032
- this._mountEvent('pointerup', { source: 'window' }, this._getMouseOutHandler(true));
91033
- }
91034
- else if (this._spec.lockAfterClick) {
90990
+ else if (isObject$2(triggerType)) {
90991
+ this._mountEvent(triggerType.eventType, { source: (_a = triggerType.source) !== null && _a !== void 0 ? _a : 'chart', consume: triggerType.consume }, this._getMouseMoveHandler(true));
90992
+ }
90993
+ });
90994
+ const offEvents = triggerOff.filter(entry => isObject$2(entry));
90995
+ offEvents.forEach(entry => {
90996
+ var _a, _b;
90997
+ this._mountEvent(entry.eventType, { source: (_a = entry.source) !== null && _a !== void 0 ? _a : 'chart', consume: entry.consume }, this._getMouseOutHandler((_b = entry.checkOutside) !== null && _b !== void 0 ? _b : false));
90998
+ });
90999
+ if (!trigger.includes('click') && this._spec.lockAfterClick) {
91035
91000
  this._mountEvent('pointertap', { source: 'chart' }, this._handleClickToLock);
91036
91001
  }
91037
91002
  }
@@ -92819,7 +92784,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
92819
92784
  if (this._auto) {
92820
92785
  (_b = (_a = this._component) === null || _a === void 0 ? void 0 : _a.setStartAndEnd) === null || _b === void 0 ? void 0 : _b.call(_a, this._start, this._end);
92821
92786
  }
92822
- axis.effect.scaleUpdate();
92787
+ axis.effect.scaleUpdate({
92788
+ value: 'force'
92789
+ });
92823
92790
  }
92824
92791
  else {
92825
92792
  eachSeries(this._regions, s => {
@@ -96488,13 +96455,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
96488
96455
  if (this._layoutRule === 'region') {
96489
96456
  const component = this._createMark({ type: "component", name: `${region.getGroupMark().name}-label-component` }, {
96490
96457
  componentType: 'label',
96491
- noSeparateStyle: true,
96458
+ noSeparateStyle: true
96459
+ }, {
96492
96460
  support3d: this._spec.support3d
96493
96461
  });
96494
96462
  if (component) {
96495
96463
  component.setSkipBeforeLayouted(true);
96496
96464
  if (regionLabelInfo[0] && isValid$1(regionLabelInfo[0].labelSpec.zIndex)) {
96497
- component.setZIndex(regionLabelInfo[0].labelSpec.zIndex);
96465
+ component.setMarkConfig({ zIndex: regionLabelInfo[0].labelSpec.zIndex });
96498
96466
  }
96499
96467
  this._marks.addMark(component);
96500
96468
  this._labelComponentMap.set(component, () => {
@@ -96506,12 +96474,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
96506
96474
  regionLabelInfo.forEach((labelInfo, i) => {
96507
96475
  const component = this._createMark({ type: "component", name: `${labelInfo.labelMark.name}-component` }, {
96508
96476
  componentType: 'label',
96509
- noSeparateStyle: true,
96510
- support3d: labelInfo.baseMark.getSupport3d()
96477
+ noSeparateStyle: true
96478
+ }, {
96479
+ support3d: labelInfo.baseMark.getMarkConfig().support3d
96511
96480
  });
96512
96481
  if (component) {
96513
96482
  if (isValid$1(labelInfo.labelSpec.zIndex)) {
96514
- component.setZIndex(labelInfo.labelSpec.zIndex);
96483
+ component.setMarkConfig({ zIndex: labelInfo.labelSpec.zIndex });
96515
96484
  }
96516
96485
  component.setSkipBeforeLayouted(true);
96517
96486
  this._marks.addMark(component);
@@ -96722,7 +96691,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
96722
96691
  const series = this._getSeries();
96723
96692
  const component = this._createMark({ type: "component", name: `${series.name}-total-label-component` }, {
96724
96693
  componentType: 'label',
96725
- noSeparateStyle: true,
96694
+ noSeparateStyle: true
96695
+ }, {
96726
96696
  support3d: this._spec.support3d
96727
96697
  });
96728
96698
  if (component) {