@visactor/vrender-components 1.1.11-alpha.1 → 1.1.12

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.
package/cjs/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export declare const version = "1.1.11-alpha.1";
1
+ export declare const version = "1.1.12";
2
2
  export * from './core/base';
3
3
  export { AbstractComponent } from './core/base';
4
4
  export * from './core/type';
package/cjs/index.js CHANGED
@@ -18,7 +18,7 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
18
18
  Object.defineProperty(exports, "__esModule", {
19
19
  value: !0
20
20
  }), exports.labelSmartInvert = exports.IOperateType = exports.Brush = exports.PlayerEventEnum = exports.ContinuousPlayer = exports.DiscretePlayer = exports.Indicator = exports.Title = exports.SizeContinuousLegend = exports.ColorContinuousLegend = exports.registerMarkPointAnimate = exports.MarkPoint = exports.registerMarkArcAreaAnimate = exports.MarkArcArea = exports.registerMarkArcLineAnimate = exports.MarkArcLine = exports.registerMarkAreaAnimate = exports.MarkArea = exports.registerMarkLineAnimate = exports.MarkLine = exports.DataZoom = exports.Segment = exports.CircleAxisGrid = exports.LineAxisGrid = exports.polarAngleAxisDiscreteTicks = exports.continuousTicks = exports.CircleAxis = exports.LineAxis = exports.registerSymbolDataLabel = exports.DataLabel = exports.PolygonCrosshair = exports.SectorCrosshair = exports.CircleCrosshair = exports.LineCrosshair = exports.loadPoptip = exports.loadScrollbar = exports.ScrollBar = exports.AbstractComponent = exports.version = void 0,
21
- exports.version = "1.1.11-alpha.1", __exportStar(require("./core/base"), exports);
21
+ exports.version = "1.1.12", __exportStar(require("./core/base"), exports);
22
22
 
23
23
  var base_1 = require("./core/base");
24
24
 
package/cjs/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,8CAA4B;AAC5B,oCAAgD;AAAvC,yGAAA,iBAAiB,OAAA;AAC1B,8CAA4B;AAC5B,8CAA4B;AAC5B,mDAAkD;AAAzC,sGAAA,SAAS,OAAA;AAClB,6CAAmD;AAA1C,uGAAA,aAAa,OAAA;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,0CAA6C;AAApC,oGAAA,UAAU,OAAA;AACnB,8CAA4B;AAC5B,yCAAiD;AAAxC,qGAAA,aAAa,OAAA;AACtB,6CAAqD;AAA5C,yGAAA,eAAe,OAAA;AACxB,6CAAqD;AAA5C,yGAAA,eAAe,OAAA;AACxB,+CAAuD;AAA9C,2GAAA,gBAAgB,OAAA;AACzB,0CAAwB;AACxB,+CAA8C;AAArC,sGAAA,SAAS,OAAA;AAClB,yCAAyD;AAAhD,iHAAA,uBAAuB,OAAA;AAChC,yCAAuB;AACvB,oCAAuC;AAA9B,gGAAA,QAAQ,OAAA;AACjB,wCAA2C;AAAlC,oGAAA,UAAU,OAAA;AACnB,0DAA8D;AAArD,6GAAA,eAAe,OAAA;AACxB,qEAAoF;AAA3E,0HAAA,2BAA2B,OAAA;AACpC,8CAA4B;AAC5B,yCAAgD;AAAvC,oGAAA,YAAY,OAAA;AACrB,6CAAoD;AAA3C,wGAAA,cAAc,OAAA;AACvB,4CAA0B;AAC1B,6CAA4C;AAAnC,kGAAA,OAAO,OAAA;AAChB,8CAA4B;AAC5B,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,2CAAyB;AACzB,sCAAkE;AAAzD,gGAAA,QAAQ,OAAA;AAAE,+GAAA,uBAAuB,OAAA;AAC1C,sCAAkE;AAAzD,gGAAA,QAAQ,OAAA;AAAE,+GAAA,uBAAuB,OAAA;AAC1C,8CAA4E;AAAnE,uGAAA,WAAW,OAAA;AAAE,sHAAA,0BAA0B,OAAA;AAChD,8CAA4E;AAAnE,uGAAA,WAAW,OAAA;AAAE,sHAAA,0BAA0B,OAAA;AAChD,wCAAqE;AAA5D,kGAAA,SAAS,OAAA;AAAE,iHAAA,wBAAwB,OAAA;AAC5C,0CAAwB;AACxB,2CAAyB;AACzB,8CAA6D;AAApD,8GAAA,qBAAqB,OAAA;AAC9B,2CAA0D;AAAjD,4GAAA,oBAAoB,OAAA;AAC7B,0CAAwB;AACxB,uCAAsC;AAA7B,8FAAA,KAAK,OAAA;AACd,8CAA4B;AAC5B,mDAAkD;AAAzC,sGAAA,SAAS,OAAA;AAClB,2CAAyB;AACzB,8CAA4B;AAC5B,2CAAyB;AACzB,4DAA0D;AAAjD,iHAAA,cAAc,OAAA;AACvB,gEAA8D;AAArD,qHAAA,gBAAgB,OAAA;AACzB,6CAAsD;AAA7C,wGAAA,eAAe,OAAA;AACxB,0CAAwB;AACxB,uCAAsC;AAA7B,8FAAA,KAAK,OAAA;AACd,qCAA4C;AAAnC,oGAAA,YAAY,OAAA;AACrB,4CAA0B;AAC1B,6CAA2B;AAC3B,8CAA4B;AAC5B,wCAAsB;AACtB,6CAA2B;AAC3B,0CAAwB;AACxB,8CAA4B;AAC5B,4CAA0B;AAC1B,yCAAuB;AACvB,8DAA4D;AAAnD,qHAAA,gBAAgB,OAAA;AACzB,2CAAyB;AACzB,+CAA6B;AAC7B,wDAAsC","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"1.1.11-alpha.1\";\n\nexport * from './core/base';\nexport { AbstractComponent } from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport { ScrollBar } from './scrollbar/scrollbar';\nexport { loadScrollbar } from './scrollbar/module';\nexport * from './tag';\nexport * from './poptip';\nexport { loadPoptip } from './poptip/module';\nexport * from './crosshair';\nexport { LineCrosshair } from './crosshair/line';\nexport { CircleCrosshair } from './crosshair/circle';\nexport { SectorCrosshair } from './crosshair/sector';\nexport { PolygonCrosshair } from './crosshair/polygon';\nexport * from './label';\nexport { DataLabel } from './label/dataLabel';\nexport { registerSymbolDataLabel } from './label/symbol';\nexport * from './axis';\nexport { LineAxis } from './axis/line';\nexport { CircleAxis } from './axis/circle';\nexport { continuousTicks } from './axis/tick-data/continuous';\nexport { polarAngleAxisDiscreteTicks } from './axis/tick-data/discrete/polar-angle';\nexport * from './axis/grid';\nexport { LineAxisGrid } from './axis/grid/line';\nexport { CircleAxisGrid } from './axis/grid/circle';\nexport * from './segment';\nexport { Segment } from './segment/segment';\nexport * from './data-zoom';\nexport { DataZoom } from './data-zoom/data-zoom';\nexport * from './marker';\nexport { MarkLine, registerMarkLineAnimate } from './marker/line';\nexport { MarkArea, registerMarkAreaAnimate } from './marker/area';\nexport { MarkArcLine, registerMarkArcLineAnimate } from './marker/arc-line';\nexport { MarkArcArea, registerMarkArcAreaAnimate } from './marker/arc-area';\nexport { MarkPoint, registerMarkPointAnimate } from './marker/point';\nexport * from './pager';\nexport * from './legend';\nexport { ColorContinuousLegend } from './legend/color/color';\nexport { SizeContinuousLegend } from './legend/size/size';\nexport * from './title';\nexport { Title } from './title/title';\nexport * from './indicator';\nexport { Indicator } from './indicator/indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport { DiscretePlayer } from './player/discrete-player';\nexport { ContinuousPlayer } from './player/continuous-player';\nexport { PlayerEventEnum } from './player/type/event';\nexport * from './brush';\nexport { Brush } from './brush/brush';\nexport { IOperateType } from './brush/type';\nexport * from './tooltip';\nexport * from './timeline';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './radio';\nexport * from './empty-tip';\nexport * from './weather';\nexport * from './util';\nexport { labelSmartInvert } from './util/label-smartInvert';\nexport * from './switch';\nexport * from './label-item';\nexport * from './table-series-number';\n"]}
1
+ {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,8CAA4B;AAC5B,oCAAgD;AAAvC,yGAAA,iBAAiB,OAAA;AAC1B,8CAA4B;AAC5B,8CAA4B;AAC5B,mDAAkD;AAAzC,sGAAA,SAAS,OAAA;AAClB,6CAAmD;AAA1C,uGAAA,aAAa,OAAA;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,0CAA6C;AAApC,oGAAA,UAAU,OAAA;AACnB,8CAA4B;AAC5B,yCAAiD;AAAxC,qGAAA,aAAa,OAAA;AACtB,6CAAqD;AAA5C,yGAAA,eAAe,OAAA;AACxB,6CAAqD;AAA5C,yGAAA,eAAe,OAAA;AACxB,+CAAuD;AAA9C,2GAAA,gBAAgB,OAAA;AACzB,0CAAwB;AACxB,+CAA8C;AAArC,sGAAA,SAAS,OAAA;AAClB,yCAAyD;AAAhD,iHAAA,uBAAuB,OAAA;AAChC,yCAAuB;AACvB,oCAAuC;AAA9B,gGAAA,QAAQ,OAAA;AACjB,wCAA2C;AAAlC,oGAAA,UAAU,OAAA;AACnB,0DAA8D;AAArD,6GAAA,eAAe,OAAA;AACxB,qEAAoF;AAA3E,0HAAA,2BAA2B,OAAA;AACpC,8CAA4B;AAC5B,yCAAgD;AAAvC,oGAAA,YAAY,OAAA;AACrB,6CAAoD;AAA3C,wGAAA,cAAc,OAAA;AACvB,4CAA0B;AAC1B,6CAA4C;AAAnC,kGAAA,OAAO,OAAA;AAChB,8CAA4B;AAC5B,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,2CAAyB;AACzB,sCAAkE;AAAzD,gGAAA,QAAQ,OAAA;AAAE,+GAAA,uBAAuB,OAAA;AAC1C,sCAAkE;AAAzD,gGAAA,QAAQ,OAAA;AAAE,+GAAA,uBAAuB,OAAA;AAC1C,8CAA4E;AAAnE,uGAAA,WAAW,OAAA;AAAE,sHAAA,0BAA0B,OAAA;AAChD,8CAA4E;AAAnE,uGAAA,WAAW,OAAA;AAAE,sHAAA,0BAA0B,OAAA;AAChD,wCAAqE;AAA5D,kGAAA,SAAS,OAAA;AAAE,iHAAA,wBAAwB,OAAA;AAC5C,0CAAwB;AACxB,2CAAyB;AACzB,8CAA6D;AAApD,8GAAA,qBAAqB,OAAA;AAC9B,2CAA0D;AAAjD,4GAAA,oBAAoB,OAAA;AAC7B,0CAAwB;AACxB,uCAAsC;AAA7B,8FAAA,KAAK,OAAA;AACd,8CAA4B;AAC5B,mDAAkD;AAAzC,sGAAA,SAAS,OAAA;AAClB,2CAAyB;AACzB,8CAA4B;AAC5B,2CAAyB;AACzB,4DAA0D;AAAjD,iHAAA,cAAc,OAAA;AACvB,gEAA8D;AAArD,qHAAA,gBAAgB,OAAA;AACzB,6CAAsD;AAA7C,wGAAA,eAAe,OAAA;AACxB,0CAAwB;AACxB,uCAAsC;AAA7B,8FAAA,KAAK,OAAA;AACd,qCAA4C;AAAnC,oGAAA,YAAY,OAAA;AACrB,4CAA0B;AAC1B,6CAA2B;AAC3B,8CAA4B;AAC5B,wCAAsB;AACtB,6CAA2B;AAC3B,0CAAwB;AACxB,8CAA4B;AAC5B,4CAA0B;AAC1B,yCAAuB;AACvB,8DAA4D;AAAnD,qHAAA,gBAAgB,OAAA;AACzB,2CAAyB;AACzB,+CAA6B;AAC7B,wDAAsC","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"1.1.12\";\n\nexport * from './core/base';\nexport { AbstractComponent } from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport { ScrollBar } from './scrollbar/scrollbar';\nexport { loadScrollbar } from './scrollbar/module';\nexport * from './tag';\nexport * from './poptip';\nexport { loadPoptip } from './poptip/module';\nexport * from './crosshair';\nexport { LineCrosshair } from './crosshair/line';\nexport { CircleCrosshair } from './crosshair/circle';\nexport { SectorCrosshair } from './crosshair/sector';\nexport { PolygonCrosshair } from './crosshair/polygon';\nexport * from './label';\nexport { DataLabel } from './label/dataLabel';\nexport { registerSymbolDataLabel } from './label/symbol';\nexport * from './axis';\nexport { LineAxis } from './axis/line';\nexport { CircleAxis } from './axis/circle';\nexport { continuousTicks } from './axis/tick-data/continuous';\nexport { polarAngleAxisDiscreteTicks } from './axis/tick-data/discrete/polar-angle';\nexport * from './axis/grid';\nexport { LineAxisGrid } from './axis/grid/line';\nexport { CircleAxisGrid } from './axis/grid/circle';\nexport * from './segment';\nexport { Segment } from './segment/segment';\nexport * from './data-zoom';\nexport { DataZoom } from './data-zoom/data-zoom';\nexport * from './marker';\nexport { MarkLine, registerMarkLineAnimate } from './marker/line';\nexport { MarkArea, registerMarkAreaAnimate } from './marker/area';\nexport { MarkArcLine, registerMarkArcLineAnimate } from './marker/arc-line';\nexport { MarkArcArea, registerMarkArcAreaAnimate } from './marker/arc-area';\nexport { MarkPoint, registerMarkPointAnimate } from './marker/point';\nexport * from './pager';\nexport * from './legend';\nexport { ColorContinuousLegend } from './legend/color/color';\nexport { SizeContinuousLegend } from './legend/size/size';\nexport * from './title';\nexport { Title } from './title/title';\nexport * from './indicator';\nexport { Indicator } from './indicator/indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport { DiscretePlayer } from './player/discrete-player';\nexport { ContinuousPlayer } from './player/continuous-player';\nexport { PlayerEventEnum } from './player/type/event';\nexport * from './brush';\nexport { Brush } from './brush/brush';\nexport { IOperateType } from './brush/type';\nexport * from './tooltip';\nexport * from './timeline';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './radio';\nexport * from './empty-tip';\nexport * from './weather';\nexport * from './util';\nexport { labelSmartInvert } from './util/label-smartInvert';\nexport * from './switch';\nexport * from './label-item';\nexport * from './table-series-number';\n"]}
@@ -3,4 +3,4 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: !0
5
5
  });
6
- //# sourceMappingURL=type.js.map
6
+ //# sourceMappingURL=type.js.map
package/cjs/jsx/index.js CHANGED
@@ -18,4 +18,4 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
18
18
  Object.defineProperty(exports, "__esModule", {
19
19
  value: !0
20
20
  }), __exportStar(require("./component-type"), exports);
21
- //# sourceMappingURL=index.js.map
21
+ //# sourceMappingURL=index.js.map
package/dist/index.es.js CHANGED
@@ -151,12 +151,19 @@ function getApplicationState() {
151
151
  }
152
152
  const application = getApplicationState().application;
153
153
 
154
+ const GENERATOR_STATE_SYMBOL = Symbol.for("@visactor/vrender-core/generator-state");
155
+ function getGeneratorState() {
156
+ const scope = globalThis;
157
+ return scope[GENERATOR_STATE_SYMBOL] || (scope[GENERATOR_STATE_SYMBOL] = {
158
+ autoIncrementId: 0
159
+ });
160
+ }
161
+ const generatorState = getGeneratorState();
154
162
  class Generator {
155
163
  static GenAutoIncrementId() {
156
- return Generator.auto_increment_id++;
164
+ return generatorState.autoIncrementId++;
157
165
  }
158
166
  }
159
- Generator.auto_increment_id = 0;
160
167
 
161
168
  var __awaiter$4 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
162
169
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -5454,6 +5461,7 @@ class Graphic extends Node {
5454
5461
  [key]: value
5455
5462
  }, this.attribute, key, context);
5456
5463
  if (params) this._setAttributes(params, forceUpdateTag, context);else if (this.canCommitBaseAttributesByTouchedKeys()) this.commitBaseAttributeBySingleKey(key, value, !!forceUpdateTag, context);else {
5464
+ this.detachAttributeFromBaseAttributes();
5457
5465
  const nextAttrs = {
5458
5466
  [key]: value
5459
5467
  };
@@ -7196,7 +7204,7 @@ class CanvasTextLayout {
7196
7204
  }
7197
7205
  }
7198
7206
 
7199
- const TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "maxWidth", "textAlign", "textBaseline", "heightLimit", "lineClamp", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", "direction", "wordBreak", "heightLimit", "lineClamp", ...GRAPHIC_UPDATE_TAG_KEY];
7207
+ const TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "maxWidth", "textAlign", "textBaseline", "heightLimit", "lineClamp", "fontSize", "fontFamily", "fontWeight", "fontStyle", "fontVariant", "ellipsis", "lineHeight", "direction", "wordBreak", "heightLimit", "lineClamp", ...GRAPHIC_UPDATE_TAG_KEY];
7200
7208
  class Text extends Graphic {
7201
7209
  get font() {
7202
7210
  const textTheme = this.getGraphicTheme();
@@ -7347,6 +7355,8 @@ class Text extends Graphic {
7347
7355
  textBaseline = textTheme.textBaseline,
7348
7356
  fontSize = textTheme.fontSize,
7349
7357
  fontWeight = textTheme.fontWeight,
7358
+ fontStyle = textTheme.fontStyle,
7359
+ fontVariant = textTheme.fontVariant,
7350
7360
  ellipsis = textTheme.ellipsis,
7351
7361
  maxLineWidth: maxLineWidth,
7352
7362
  stroke = textTheme.stroke,
@@ -7370,6 +7380,8 @@ class Text extends Graphic {
7370
7380
  fontSize: fontSize,
7371
7381
  fontWeight: fontWeight,
7372
7382
  fontFamily: fontFamily,
7383
+ fontStyle: fontStyle,
7384
+ fontVariant: fontVariant,
7373
7385
  lineHeight: lineHeight
7374
7386
  }, textMeasure).GetLayoutByLines(text, textAlign, textBaseline, lineHeight, !0 === ellipsis ? textTheme.ellipsis : ellipsis || void 0, !1, {
7375
7387
  lineWidth: maxLineWidth,
@@ -7396,6 +7408,8 @@ class Text extends Graphic {
7396
7408
  lineWidth = textTheme.lineWidth,
7397
7409
  wordBreak = textTheme.wordBreak,
7398
7410
  fontWeight = textTheme.fontWeight,
7411
+ fontStyle = textTheme.fontStyle,
7412
+ fontVariant = textTheme.fontVariant,
7399
7413
  ignoreBuf = textTheme.ignoreBuf,
7400
7414
  measureMode = textTheme.measureMode,
7401
7415
  suffixPosition = textTheme.suffixPosition,
@@ -7414,6 +7428,8 @@ class Text extends Graphic {
7414
7428
  fontSize: fontSize,
7415
7429
  fontWeight: fontWeight,
7416
7430
  fontFamily: fontFamily,
7431
+ fontStyle: fontStyle,
7432
+ fontVariant: fontVariant,
7417
7433
  lineHeight: lineHeight
7418
7434
  },
7419
7435
  layoutObj = new CanvasTextLayout(fontFamily, textOptions, textMeasure),
@@ -7515,6 +7531,8 @@ class Text extends Graphic {
7515
7531
  fontFamily = textTheme.fontFamily,
7516
7532
  fontSize = textTheme.fontSize,
7517
7533
  fontWeight = textTheme.fontWeight,
7534
+ fontStyle = textTheme.fontStyle,
7535
+ fontVariant = textTheme.fontVariant,
7518
7536
  stroke = textTheme.stroke,
7519
7537
  lineWidth = textTheme.lineWidth,
7520
7538
  verticalMode = textTheme.verticalMode,
@@ -7547,14 +7565,18 @@ class Text extends Graphic {
7547
7565
  data = textMeasure.clipTextWithSuffixVertical(verticalData, {
7548
7566
  fontSize: fontSize,
7549
7567
  fontWeight: fontWeight,
7550
- fontFamily: fontFamily
7568
+ fontFamily: fontFamily,
7569
+ fontStyle: fontStyle,
7570
+ fontVariant: fontVariant
7551
7571
  }, maxLineWidth, strEllipsis, !1, suffixPosition);
7552
7572
  verticalLists[i] = data.verticalList, width = data.width;
7553
7573
  } else {
7554
7574
  const data = textMeasure.clipTextVertical(verticalData, {
7555
7575
  fontSize: fontSize,
7556
7576
  fontWeight: fontWeight,
7557
- fontFamily: fontFamily
7577
+ fontFamily: fontFamily,
7578
+ fontStyle: fontStyle,
7579
+ fontVariant: fontVariant
7558
7580
  }, maxLineWidth, !1);
7559
7581
  verticalLists[i] = data.verticalList, width = data.width;
7560
7582
  }
@@ -7562,7 +7584,9 @@ class Text extends Graphic {
7562
7584
  const w = t.direction === TextDirection.HORIZONTAL ? fontSize : textMeasure.measureTextWidth(t.text, {
7563
7585
  fontSize: fontSize,
7564
7586
  fontWeight: fontWeight,
7565
- fontFamily: fontFamily
7587
+ fontFamily: fontFamily,
7588
+ fontStyle: fontStyle,
7589
+ fontVariant: fontVariant
7566
7590
  });
7567
7591
  width += w, t.width = w;
7568
7592
  });
@@ -7656,6 +7680,8 @@ class WrapText extends Text {
7656
7680
  lineWidth = textTheme.lineWidth,
7657
7681
  wordBreak = textTheme.wordBreak,
7658
7682
  fontWeight = textTheme.fontWeight,
7683
+ fontStyle = textTheme.fontStyle,
7684
+ fontVariant = textTheme.fontVariant,
7659
7685
  ignoreBuf = textTheme.ignoreBuf,
7660
7686
  heightLimit = 0,
7661
7687
  suffixPosition = textTheme.suffixPosition,
@@ -7671,7 +7697,9 @@ class WrapText extends Text {
7671
7697
  layoutObj = new CanvasTextLayout(fontFamily, {
7672
7698
  fontSize: fontSize,
7673
7699
  fontWeight: fontWeight,
7674
- fontFamily: fontFamily
7700
+ fontFamily: fontFamily,
7701
+ fontStyle: fontStyle,
7702
+ fontVariant: fontVariant
7675
7703
  }, textMeasure),
7676
7704
  lines = text.map(l => l.toString()),
7677
7705
  linesLayout = [],
@@ -7921,23 +7949,21 @@ let Line$1 = class Line extends Graphic {
7921
7949
  }
7922
7950
  updateLineAABBBoundsByPoints(attribute, lineTheme, aabbBounds, graphic) {
7923
7951
  const {
7924
- points = lineTheme.points,
7925
- connectedType: connectedType
7952
+ points = lineTheme.points
7926
7953
  } = attribute,
7927
7954
  b = aabbBounds;
7928
7955
  return points.forEach(p => {
7929
- !1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
7956
+ !1 !== p.defined && b.add(p.x, p.y);
7930
7957
  }), b;
7931
7958
  }
7932
7959
  updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds, graphic) {
7933
7960
  const {
7934
- segments = lineTheme.segments,
7935
- connectedType: connectedType
7961
+ segments = lineTheme.segments
7936
7962
  } = attribute,
7937
7963
  b = aabbBounds;
7938
7964
  return segments.forEach(s => {
7939
7965
  s.points.forEach(p => {
7940
- !1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
7966
+ !1 !== p.defined && b.add(p.x, p.y);
7941
7967
  });
7942
7968
  }), b;
7943
7969
  }
@@ -9239,7 +9265,7 @@ function createPath(attributes) {
9239
9265
  return new Path(attributes);
9240
9266
  }
9241
9267
 
9242
- const AREA_UPDATE_TAG_KEY = ["segments", "points", "curveType", "curveTension", ...GRAPHIC_UPDATE_TAG_KEY];
9268
+ const AREA_UPDATE_TAG_KEY = ["segments", "points", "curveType", "curveTension", "connectedType", ...GRAPHIC_UPDATE_TAG_KEY];
9243
9269
  class Area extends Graphic {
9244
9270
  constructor(params) {
9245
9271
  super(params), this.type = "area", this.numberType = AREA_NUMBER_TYPE;
@@ -9272,7 +9298,7 @@ class Area extends Graphic {
9272
9298
  b = aabbBounds;
9273
9299
  return points.forEach(p => {
9274
9300
  var _a, _b;
9275
- b.add(p.x, p.y), b.add(null !== (_a = p.x1) && void 0 !== _a ? _a : p.x, null !== (_b = p.y1) && void 0 !== _b ? _b : p.y);
9301
+ !1 !== p.defined && (b.add(p.x, p.y), b.add(null !== (_a = p.x1) && void 0 !== _a ? _a : p.x, null !== (_b = p.y1) && void 0 !== _b ? _b : p.y));
9276
9302
  }), b;
9277
9303
  }
9278
9304
  updateAreaAABBBoundsBySegments(attribute, areaTheme, aabbBounds, graphic) {
@@ -9283,7 +9309,7 @@ class Area extends Graphic {
9283
9309
  return segments.forEach(s => {
9284
9310
  s.points.forEach(p => {
9285
9311
  var _a, _b;
9286
- b.add(p.x, p.y), b.add(null !== (_a = p.x1) && void 0 !== _a ? _a : p.x, null !== (_b = p.y1) && void 0 !== _b ? _b : p.y);
9312
+ !1 !== p.defined && (b.add(p.x, p.y), b.add(null !== (_a = p.x1) && void 0 !== _a ? _a : p.x, null !== (_b = p.y1) && void 0 !== _b ? _b : p.y));
9287
9313
  });
9288
9314
  }), b;
9289
9315
  }
@@ -13851,6 +13877,113 @@ function drawSegItem(ctx, curve, endPercent, params) {
13851
13877
  }
13852
13878
  }
13853
13879
 
13880
+ function getAreaPointRuns(points, connectedType, startPoint) {
13881
+ const runs = [];
13882
+ if (!points.some(p => !1 === p.defined)) {
13883
+ const run = startPoint ? [startPoint, ...points] : points;
13884
+ return run.length && runs.push(run), {
13885
+ runs: runs,
13886
+ tail: run[run.length - 1]
13887
+ };
13888
+ }
13889
+ let run = startPoint ? [startPoint] : [];
13890
+ for (let i = 0; i < points.length; i++) {
13891
+ const point = points[i];
13892
+ !1 !== point.defined ? run.push(point) : "connect" !== connectedType && (run.length && runs.push(run), run = []);
13893
+ }
13894
+ return run.length && runs.push(run), {
13895
+ runs: runs,
13896
+ tail: run[run.length - 1]
13897
+ };
13898
+ }
13899
+ function joinAreaPaths(paths) {
13900
+ var _a;
13901
+ if (1 === paths.length) return paths[0];
13902
+ const curves = [];
13903
+ for (let i = 0; i < paths.length; i++) {
13904
+ const next = paths[i].curves;
13905
+ if (curves.length) {
13906
+ const previous = curves[curves.length - 1],
13907
+ gap = new LineCurve(null !== (_a = previous.p3) && void 0 !== _a ? _a : previous.p1, next[0].p0);
13908
+ gap.defined = !1, gap.originP1 = previous.originP2, gap.originP2 = next[0].originP1, curves.push(gap);
13909
+ }
13910
+ for (let j = 0; j < next.length; j++) curves.push(next[j]);
13911
+ }
13912
+ const path = paths[paths.length - 1];
13913
+ return path.curves = curves, path.length = NaN, path;
13914
+ }
13915
+ function compileAreaRuns(runs, curveType, curveTension, sourceSegmentIndex, topStart, bottomStart) {
13916
+ var _a, _b, _c, _d;
13917
+ const tops = [],
13918
+ bottoms = [],
13919
+ bottomType = "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType;
13920
+ for (let i = 0; i < runs.length; i++) {
13921
+ const points = runs[i],
13922
+ startPoint = 0 === i ? topStart : void 0;
13923
+ if (points.length < 2 - Number(!!startPoint)) continue;
13924
+ const bottomPoints = [];
13925
+ for (let j = points.length - 1; j >= 0; j--) {
13926
+ const p = points[j];
13927
+ bottomPoints.push({
13928
+ x: null !== (_a = p.x1) && void 0 !== _a ? _a : p.x,
13929
+ y: null !== (_b = p.y1) && void 0 !== _b ? _b : p.y
13930
+ });
13931
+ }
13932
+ 0 === i && bottomStart && bottomPoints.push({
13933
+ x: null !== (_c = bottomStart.x1) && void 0 !== _c ? _c : bottomStart.x,
13934
+ y: null !== (_d = bottomStart.y1) && void 0 !== _d ? _d : bottomStart.y
13935
+ });
13936
+ const top = calcLineCache(points, curveType, {
13937
+ startPoint: startPoint,
13938
+ curveTension: curveTension
13939
+ }),
13940
+ bottom = calcLineCache(bottomPoints, bottomType, {
13941
+ curveTension: curveTension
13942
+ });
13943
+ (null == top ? void 0 : top.curves.length) && (null == bottom ? void 0 : bottom.curves.length) && (tops.push(top), bottoms.push(bottom));
13944
+ }
13945
+ return tops.length ? {
13946
+ top: joinAreaPaths(tops),
13947
+ bottom: joinAreaPaths(bottoms.reverse()),
13948
+ sourceSegmentIndex: sourceSegmentIndex,
13949
+ direction: Direction.ROW
13950
+ } : null;
13951
+ }
13952
+ function calcAreaCache(points, segments, curveType, connectedType, curveTension) {
13953
+ var _a;
13954
+ const caches = [];
13955
+ let tail, topTail, first, last;
13956
+ const count = segments ? segments.length : 1;
13957
+ for (let i = 0; i < count; i++) {
13958
+ const segmentPoints = segments ? segments[i].points : null != points ? points : [],
13959
+ result = getAreaPointRuns(segmentPoints, connectedType),
13960
+ canContinue = "connect" === connectedType || !1 !== (null === (_a = segmentPoints[0]) || void 0 === _a ? void 0 : _a.defined);
13961
+ if (result.runs.length) {
13962
+ first = null != first ? first : result.runs[0][0];
13963
+ const lastRun = result.runs[result.runs.length - 1];
13964
+ last = lastRun[lastRun.length - 1];
13965
+ }
13966
+ const cache = compileAreaRuns(result.runs, curveType, curveTension, i, canContinue ? topTail : void 0, canContinue ? tail : void 0);
13967
+ if (cache && caches.push(cache), result.tail) {
13968
+ tail = result.tail;
13969
+ const lastRun = result.runs[result.runs.length - 1];
13970
+ topTail = cache && (1 === result.runs.length || lastRun.length > 1) ? {
13971
+ x: cache.top.endX,
13972
+ y: cache.top.endY
13973
+ } : tail;
13974
+ } else "connect" !== connectedType && segmentPoints.length && (tail = topTail = void 0);
13975
+ }
13976
+ if (!caches.length) return null;
13977
+ let direction = Direction.ROW;
13978
+ if (null != last.x1) {
13979
+ const dx = abs(last.x - first.x),
13980
+ dy = abs(last.y - first.y);
13981
+ (null == last.y1 || Number.isFinite(dx + dy) && dy >= dx) && (direction = Direction.COLUMN);
13982
+ }
13983
+ for (let i = 0; i < caches.length; i++) caches[i].direction = direction;
13984
+ return segments ? caches : caches[0];
13985
+ }
13986
+
13854
13987
  function drawEachCurve(path, curve, lastCurve, defined0, offsetX, offsetY, offsetZ) {
13855
13988
  var _a;
13856
13989
  let p0 = curve.p0,
@@ -13934,27 +14067,28 @@ function drawIncrementalSegments(path, lastSeg, segments, params) {
13934
14067
  });
13935
14068
  }
13936
14069
  function drawIncrementalAreaSegments(path, lastSeg, segments, params) {
14070
+ var _a, _b;
13937
14071
  const {
13938
14072
  offsetX = 0,
13939
- offsetY = 0
14073
+ offsetY = 0,
14074
+ connectedType = "none"
13940
14075
  } = params || {},
14076
+ startPoint = params && "startPoint" in params ? params.startPoint : lastSeg && getAreaPointRuns(lastSeg.points, connectedType).tail,
13941
14077
  {
13942
- points: points
13943
- } = segments,
13944
- definedPointsList = [];
13945
- for (let i = 0; i < points.length; i++) !1 === points[i].defined && (i);
13946
- definedPointsList.push(points), definedPointsList.forEach((points, i) => {
13947
- var _a, _b, _c, _d;
13948
- const startP = lastSeg && 0 === i ? lastSeg.points[lastSeg.points.length - 1] : points[0];
13949
- path.moveTo(startP.x + offsetX, startP.y + offsetY), points.forEach(p => {
13950
- !1 !== p.defined ? path.lineTo(p.x + offsetX, p.y + offsetY) : path.moveTo(p.x + offsetX, p.y + offsetY);
13951
- });
13952
- for (let i = points.length - 1; i >= 0; i--) {
13953
- const p = points[i];
13954
- path.lineTo(null !== (_a = p.x1) && void 0 !== _a ? _a : p.x, null !== (_b = p.y1) && void 0 !== _b ? _b : p.y);
14078
+ runs: runs
14079
+ } = getAreaPointRuns(segments.points, connectedType, startPoint);
14080
+ for (let i = 0; i < runs.length; i++) {
14081
+ const points = runs[i];
14082
+ if (!(points.length < 2)) {
14083
+ path.moveTo(points[0].x + offsetX, points[0].y + offsetY);
14084
+ for (let j = 1; j < points.length; j++) path.lineTo(points[j].x + offsetX, points[j].y + offsetY);
14085
+ for (let j = points.length - 1; j >= 0; j--) {
14086
+ const p = points[j];
14087
+ path.lineTo(null !== (_a = p.x1) && void 0 !== _a ? _a : p.x, null !== (_b = p.y1) && void 0 !== _b ? _b : p.y);
14088
+ }
14089
+ path.closePath();
13955
14090
  }
13956
- path.lineTo(null !== (_c = startP.x1) && void 0 !== _c ? _c : startP.x, null !== (_d = startP.y1) && void 0 !== _d ? _d : startP.y), path.closePath();
13957
- });
14091
+ }
13958
14092
  }
13959
14093
 
13960
14094
  class DefaultCanvasLineRender extends BaseRender {
@@ -14217,7 +14351,6 @@ class DefaultCanvasAreaRender extends BaseRender {
14217
14351
  })();
14218
14352
  }
14219
14353
  drawShape(area, context, x, y, drawContext, params, fillCb, strokeCb) {
14220
- var _a, _b, _c, _d, _e, _f;
14221
14354
  const areaAttribute = getTheme(area, null == params ? void 0 : params.theme).area,
14222
14355
  {
14223
14356
  fill = areaAttribute.fill,
@@ -14243,93 +14376,23 @@ class DefaultCanvasAreaRender extends BaseRender {
14243
14376
  let {
14244
14377
  curveType = areaAttribute.curveType
14245
14378
  } = area.attribute;
14246
- function parsePoint(points, connectedType) {
14247
- return "connect" !== connectedType ? points : points.filter(p => !1 !== p.defined);
14248
- }
14249
14379
  if (closePath && "linear" === curveType && (curveType = "linearClosed"), 1 === clipRange && !segments && !points.some(p => !1 === p.defined) && "linear" === curveType) return this.drawLinearAreaHighPerformance(area, context, !!fill, doStroke, fillOpacity, strokeOpacity, x, y, areaAttribute, drawContext, params, fillCb, strokeCb);
14250
- if (area.shouldUpdateShape()) {
14251
- if (segments && segments.length) {
14252
- let startPoint, lastTopSeg;
14253
- const topCaches = segments.map((seg, index) => {
14254
- if (seg.points.length <= 1 && 0 === index) return seg.points[0] && (lastTopSeg = {
14255
- endX: seg.points[0].x,
14256
- endY: seg.points[0].y
14257
- }), null;
14258
- 1 === index ? startPoint = {
14259
- x: lastTopSeg.endX,
14260
- y: lastTopSeg.endY
14261
- } : index > 1 && (startPoint.x = lastTopSeg.endX, startPoint.y = lastTopSeg.endY);
14262
- const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
14263
- startPoint: startPoint,
14264
- curveTension: curveTension
14265
- });
14266
- return lastTopSeg = data, data;
14267
- }).filter(item => !!item);
14268
- let lastBottomSeg;
14269
- const bottomCaches = [];
14270
- for (let i = segments.length - 1; i >= 0; i--) {
14271
- const points = segments[i].points,
14272
- bottomPoints = [];
14273
- for (let i = points.length - 1; i >= 0; i--) bottomPoints.push({
14274
- x: null !== (_a = points[i].x1) && void 0 !== _a ? _a : points[i].x,
14275
- y: null !== (_b = points[i].y1) && void 0 !== _b ? _b : points[i].y
14276
- });
14277
- if (0 !== i) {
14278
- const lastSegmentPoints = segments[i - 1].points,
14279
- endPoint = lastSegmentPoints[lastSegmentPoints.length - 1];
14280
- endPoint && bottomPoints.push({
14281
- x: null !== (_c = endPoint.x1) && void 0 !== _c ? _c : endPoint.x,
14282
- y: null !== (_d = endPoint.y1) && void 0 !== _d ? _d : endPoint.y
14283
- });
14284
- }
14285
- bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(parsePoint(bottomPoints, connectedType), "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
14286
- curveTension: curveTension
14287
- }), bottomCaches.unshift(lastBottomSeg));
14288
- }
14289
- area.cacheArea = bottomCaches.map((item, index) => ({
14290
- top: topCaches[index],
14291
- bottom: item
14292
- }));
14293
- } else {
14294
- if (!points || !points.length) return area.cacheArea = null, void area.clearUpdateShapeTag();
14295
- {
14296
- const topPoints = parsePoint(points, connectedType),
14297
- bottomPoints = [];
14298
- for (let i = topPoints.length - 1; i >= 0; i--) bottomPoints.push({
14299
- x: null !== (_e = topPoints[i].x1) && void 0 !== _e ? _e : topPoints[i].x,
14300
- y: null !== (_f = topPoints[i].y1) && void 0 !== _f ? _f : topPoints[i].y
14301
- });
14302
- const topCache = calcLineCache(topPoints, curveType, {
14303
- curveTension: curveTension
14304
- }),
14305
- bottomCache = calcLineCache(bottomPoints, "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
14306
- curveTension: curveTension
14307
- });
14308
- area.cacheArea = {
14309
- top: topCache,
14310
- bottom: bottomCache
14311
- };
14312
- }
14313
- }
14314
- area.clearUpdateShapeTag();
14315
- }
14316
- if (Array.isArray(area.cacheArea)) {
14317
- const segments = area.attribute.segments.filter(item => item.points.length);
14318
- if (1 === segments[0].points.length && segments.shift(), 1 === clipRange) {
14380
+ if (area.shouldUpdateShape() && (area.cacheArea = calcAreaCache(points, segments, curveType, connectedType, curveTension), area.clearUpdateShapeTag()), area.cacheArea) if (Array.isArray(area.cacheArea)) {
14381
+ if (1 === clipRange) {
14319
14382
  let skip = !1;
14320
- area.cacheArea.forEach((cache, index) => {
14321
- skip || (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[index], [areaAttribute, area.attribute], clipRange, x, y, z, area, drawContext, fillCb, strokeCb));
14383
+ area.cacheArea.forEach(cache => {
14384
+ skip || (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[cache.sourceSegmentIndex], [areaAttribute, area.attribute], clipRange, x, y, z, area, drawContext, fillCb, strokeCb));
14322
14385
  });
14323
14386
  } else {
14324
14387
  const totalLength = area.cacheArea.reduce((l, c) => l + c.top.getLength(), 0),
14325
14388
  totalDrawLength = clipRange * totalLength;
14326
14389
  let drawedLengthUntilLast = 0,
14327
14390
  skip = !1;
14328
- area.cacheArea.forEach((cache, index) => {
14391
+ area.cacheArea.forEach(cache => {
14329
14392
  if (skip) return;
14330
14393
  const curSegLength = cache.top.getLength(),
14331
14394
  _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;
14332
- drawedLengthUntilLast += curSegLength, _cr > 0 && (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[index], [areaAttribute, area.attribute], min(_cr, 1), x, y, z, area, drawContext, fillCb, strokeCb));
14395
+ drawedLengthUntilLast += curSegLength, _cr > 0 && (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[cache.sourceSegmentIndex], [areaAttribute, area.attribute], min(_cr, 1), x, y, z, area, drawContext, fillCb, strokeCb));
14333
14396
  });
14334
14397
  }
14335
14398
  } else this.drawSegmentItem(context, area.cacheArea, doFill, fillOpacity, doStroke, strokeOpacity, area.attribute, areaAttribute, clipRange, x, y, z, area, drawContext, fillCb, strokeCb);
@@ -14342,22 +14405,11 @@ class DefaultCanvasAreaRender extends BaseRender {
14342
14405
  return this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb);
14343
14406
  }
14344
14407
  _drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
14408
+ var _a;
14345
14409
  if (!(cache && cache.top && cache.bottom && cache.top.curves && cache.top.curves.length && cache.bottom.curves && cache.bottom.curves.length)) return;
14346
14410
  context.beginPath();
14347
- const {
14348
- points: points,
14349
- segments: segments
14350
- } = area.attribute;
14351
- let endP,
14352
- startP,
14353
- direction = Direction.ROW;
14354
- if (segments) {
14355
- const endSeg = segments[segments.length - 1];
14356
- startP = segments[0].points[0], endP = endSeg.points[endSeg.points.length - 1];
14357
- } else startP = points[0], endP = points[points.length - 1];
14358
- const xTotalLength = abs(endP.x - startP.x),
14359
- yTotalLength = abs(endP.y - startP.y);
14360
- direction = null == endP.x1 ? Direction.ROW : null == endP.y1 ? Direction.COLUMN : Number.isFinite(xTotalLength + yTotalLength) ? xTotalLength > yTotalLength ? Direction.ROW : Direction.COLUMN : Direction.ROW, drawAreaSegments(context, cache, clipRange, {
14411
+ const direction = null !== (_a = cache.direction) && void 0 !== _a ? _a : cache.top.direction;
14412
+ drawAreaSegments(context, cache, clipRange, {
14361
14413
  offsetX: offsetX,
14362
14414
  offsetY: offsetY,
14363
14415
  offsetZ: offsetZ,
@@ -15017,6 +15069,16 @@ class DefaultCanvasImageRender extends BaseRender {
15017
15069
  }
15018
15070
  }
15019
15071
 
15072
+ function previousPoint(segments, index, connectedType) {
15073
+ for (let i = index - 1; i >= 0; i--) {
15074
+ const points = segments[i].points;
15075
+ for (let j = points.length - 1; j >= 0; j--) {
15076
+ const point = points[j];
15077
+ if (!1 !== point.defined) return point;
15078
+ if ("connect" !== connectedType) return;
15079
+ }
15080
+ }
15081
+ }
15020
15082
  class DefaultIncrementalCanvasAreaRender extends DefaultCanvasAreaRender {
15021
15083
  constructor() {
15022
15084
  super(...arguments), this.numberType = AREA_NUMBER_TYPE;
@@ -15036,21 +15098,32 @@ class DefaultIncrementalCanvasAreaRender extends DefaultCanvasAreaRender {
15036
15098
  fill = areaAttribute.fill,
15037
15099
  fillOpacity = areaAttribute.fillOpacity,
15038
15100
  opacity = areaAttribute.opacity,
15039
- visible = areaAttribute.visible
15101
+ visible = areaAttribute.visible,
15102
+ connectedType = areaAttribute.connectedType
15040
15103
  } = area.attribute,
15041
15104
  fVisible = fillVisible(opacity, fillOpacity, fill),
15042
15105
  doFill = runFill(fill);
15043
15106
  if (!area.valid || !visible) return;
15044
15107
  if (!doFill) return;
15045
15108
  if (!fVisible && !fillCb) return;
15046
- for (let i = startAtIdx; i < startAtIdx + length; i++) this.drawIncreaseSegment(area, context, segments[i - 1], segments[i], area.attribute.segments[i], [areaAttribute, area.attribute], x, y);
15109
+ const endIndex = Math.min(startAtIdx + length, segments.length);
15110
+ for (let i = startAtIdx; i < endIndex; i++) segments[i].points.some(p => !1 !== p.defined) && this.drawIncreaseSegment(area, context, segments[i - 1], segments[i], area.attribute.segments[i], [areaAttribute, area.attribute], x, y, {
15111
+ connectedType: connectedType,
15112
+ startPoint: previousPoint(segments, i, connectedType)
15113
+ });
15047
15114
  } else super.drawShape(area, context, x, y, drawContext, params, fillCb);
15048
15115
  }
15049
- drawIncreaseSegment(area, context, lastSeg, seg, attribute, defaultAttribute, offsetX, offsetY) {
15050
- seg && (context.beginPath(), drawIncrementalAreaSegments(context.camera ? context : context.nativeContext, lastSeg, seg, {
15116
+ drawIncreaseSegment(area, context, lastSeg, seg, attribute, defaultAttribute, offsetX, offsetY, continuity) {
15117
+ var _a, _b;
15118
+ if (!seg) return;
15119
+ const connectedType = null !== (_b = null !== (_a = null == continuity ? void 0 : continuity.connectedType) && void 0 !== _a ? _a : area.attribute.connectedType) && void 0 !== _b ? _b : getTheme(area).area.connectedType,
15120
+ startPoint = continuity ? continuity.startPoint : lastSeg && getAreaPointRuns(lastSeg.points, connectedType).tail;
15121
+ context.beginPath(), drawIncrementalAreaSegments(context.camera ? context : context.nativeContext, lastSeg, seg, {
15051
15122
  offsetX: offsetX,
15052
- offsetY: offsetY
15053
- }), context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute), context.setCommonStyle(area, attribute, offsetX, offsetY, defaultAttribute), context.fill());
15123
+ offsetY: offsetY,
15124
+ connectedType: connectedType,
15125
+ startPoint: startPoint
15126
+ }), context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute), context.setCommonStyle(area, attribute, offsetX, offsetY, defaultAttribute), context.fill();
15054
15127
  }
15055
15128
  }
15056
15129
 
@@ -36967,6 +37040,6 @@ TableSeriesNumber.defaultAttributes = {
36967
37040
  select: true
36968
37041
  };
36969
37042
 
36970
- const version = "1.1.11-alpha.1";
37043
+ const version = "1.1.12";
36971
37044
 
36972
37045
  export { AXIS_ELEMENT_NAME, AbstractComponent, ArcInfo, ArcLabel, ArcSegment, AxisStateValue, BasePlayer, Brush, CheckBox, CircleAxis, CircleAxisGrid, CircleCrosshair, ColorContinuousLegend, ContinuousPlayer, DEFAULT_ITEM_SPACE_COL, DEFAULT_ITEM_SPACE_ROW, DEFAULT_LABEL_SPACE, DEFAULT_PAGER_SPACE, DEFAULT_SHAPE_SIZE, DEFAULT_SHAPE_SPACE, DEFAULT_STATES$1 as DEFAULT_STATES, DEFAULT_TITLE_SPACE, DEFAULT_VALUE_SPACE, DataLabel, DataZoom, DataZoomActiveTag, DirectionEnum, DiscreteLegend, DiscretePlayer, EmptyTip, GroupTransition, IDataZoomEvent, IDataZoomInteractiveEvent, IMarkAreaLabelPosition, IMarkCommonArcLabelPosition, IMarkLineLabelPosition, IMarkPointItemPosition, IOperateType, Indicator, LEGEND_ELEMENT_NAME, LabelBase, LegendEvent, LegendStateValue, LineAxis, LineAxisGrid, LineCrosshair, LineLabel, LinkPath, MarkArcArea, MarkArcLine, MarkArea, MarkLine, MarkPoint, Pager, PlayerEventEnum, PolygonCrosshair, PolygonSectorCrosshair, PopTip, Radio, RectCrosshair, RectLabel, SLIDER_ELEMENT_NAME, ScrollBar, SectorCrosshair, Segment, SeriesNumberCellStateValue, SeriesNumberEvent, SizeContinuousLegend, Slider, StoryLabelItem, Switch, SymbolLabel, TableSeriesNumber, Tag, Timeline, Title, Tooltip, TopZIndex, VTag, WeatherBox, alignTextInLine, angle, angleLabelOrientAttribute, angleTo, cartesianTicks, clampRadian, computeOffsetForlimit, continuousTicks, contrastAccessibilityChecker, convertDomainToTickData, createTextGraphicByType, deltaXYToAngle, fuzzyEqualNumber, getAxisBreakSymbolAttrs, getCircleLabelPosition, getCirclePoints, getCircleVerticalVector, getElMap, getHorizontalPath, getMarksByName, getNoneGroupMarksByName, getPolarAngleLabelPosition, getPolygonPath, getSizeHandlerPath, getTextAlignAttrOfVerticalDir, getTextType, getVerticalCoord, getVerticalPath, hasOverlap, htmlAttributeTransform, initTextMeasure, installPoptipToApp, installScrollbarToApp, isInRange, isPostiveXAxis, isRichText, isVisible, labelSmartInvert, length, limitShapeInBounds, linearDiscreteTicks, loadPoptip, loadScrollbar, measureTextSize, normalize, polarAngleAxisDiscreteTicks, polarTicks, reactAttributeTransform, registerArcDataLabel, registerLineDataLabel, registerMarkArcAreaAnimate, registerMarkArcLineAnimate, registerMarkAreaAnimate, registerMarkLineAnimate, registerMarkPointAnimate, registerRectDataLabel, registerSymbolDataLabel, removeRepeatPoint, richTextAttributeTransform, scale, setPoptipTheme, smartInvertStrategy, tan2AngleToAngle, textIntersect, ticks, traverseGroup, version };
package/es/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export declare const version = "1.1.11-alpha.1";
1
+ export declare const version = "1.1.12";
2
2
  export * from './core/base';
3
3
  export { AbstractComponent } from './core/base';
4
4
  export * from './core/type';
package/es/index.js CHANGED
@@ -1,4 +1,4 @@
1
- export const version = "1.1.11-alpha.1";
1
+ export const version = "1.1.12";
2
2
 
3
3
  export * from "./core/base";
4
4
 
package/es/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAExC,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,cAAc,QAAQ,CAAC;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAC;AACpF,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AACrE,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"1.1.11-alpha.1\";\n\nexport * from './core/base';\nexport { AbstractComponent } from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport { ScrollBar } from './scrollbar/scrollbar';\nexport { loadScrollbar } from './scrollbar/module';\nexport * from './tag';\nexport * from './poptip';\nexport { loadPoptip } from './poptip/module';\nexport * from './crosshair';\nexport { LineCrosshair } from './crosshair/line';\nexport { CircleCrosshair } from './crosshair/circle';\nexport { SectorCrosshair } from './crosshair/sector';\nexport { PolygonCrosshair } from './crosshair/polygon';\nexport * from './label';\nexport { DataLabel } from './label/dataLabel';\nexport { registerSymbolDataLabel } from './label/symbol';\nexport * from './axis';\nexport { LineAxis } from './axis/line';\nexport { CircleAxis } from './axis/circle';\nexport { continuousTicks } from './axis/tick-data/continuous';\nexport { polarAngleAxisDiscreteTicks } from './axis/tick-data/discrete/polar-angle';\nexport * from './axis/grid';\nexport { LineAxisGrid } from './axis/grid/line';\nexport { CircleAxisGrid } from './axis/grid/circle';\nexport * from './segment';\nexport { Segment } from './segment/segment';\nexport * from './data-zoom';\nexport { DataZoom } from './data-zoom/data-zoom';\nexport * from './marker';\nexport { MarkLine, registerMarkLineAnimate } from './marker/line';\nexport { MarkArea, registerMarkAreaAnimate } from './marker/area';\nexport { MarkArcLine, registerMarkArcLineAnimate } from './marker/arc-line';\nexport { MarkArcArea, registerMarkArcAreaAnimate } from './marker/arc-area';\nexport { MarkPoint, registerMarkPointAnimate } from './marker/point';\nexport * from './pager';\nexport * from './legend';\nexport { ColorContinuousLegend } from './legend/color/color';\nexport { SizeContinuousLegend } from './legend/size/size';\nexport * from './title';\nexport { Title } from './title/title';\nexport * from './indicator';\nexport { Indicator } from './indicator/indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport { DiscretePlayer } from './player/discrete-player';\nexport { ContinuousPlayer } from './player/continuous-player';\nexport { PlayerEventEnum } from './player/type/event';\nexport * from './brush';\nexport { Brush } from './brush/brush';\nexport { IOperateType } from './brush/type';\nexport * from './tooltip';\nexport * from './timeline';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './radio';\nexport * from './empty-tip';\nexport * from './weather';\nexport * from './util';\nexport { labelSmartInvert } from './util/label-smartInvert';\nexport * from './switch';\nexport * from './label-item';\nexport * from './table-series-number';\n"]}
1
+ {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"1.1.12\";\n\nexport * from './core/base';\nexport { AbstractComponent } from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport { ScrollBar } from './scrollbar/scrollbar';\nexport { loadScrollbar } from './scrollbar/module';\nexport * from './tag';\nexport * from './poptip';\nexport { loadPoptip } from './poptip/module';\nexport * from './crosshair';\nexport { LineCrosshair } from './crosshair/line';\nexport { CircleCrosshair } from './crosshair/circle';\nexport { SectorCrosshair } from './crosshair/sector';\nexport { PolygonCrosshair } from './crosshair/polygon';\nexport * from './label';\nexport { DataLabel } from './label/dataLabel';\nexport { registerSymbolDataLabel } from './label/symbol';\nexport * from './axis';\nexport { LineAxis } from './axis/line';\nexport { CircleAxis } from './axis/circle';\nexport { continuousTicks } from './axis/tick-data/continuous';\nexport { polarAngleAxisDiscreteTicks } from './axis/tick-data/discrete/polar-angle';\nexport * from './axis/grid';\nexport { LineAxisGrid } from './axis/grid/line';\nexport { CircleAxisGrid } from './axis/grid/circle';\nexport * from './segment';\nexport { Segment } from './segment/segment';\nexport * from './data-zoom';\nexport { DataZoom } from './data-zoom/data-zoom';\nexport * from './marker';\nexport { MarkLine, registerMarkLineAnimate } from './marker/line';\nexport { MarkArea, registerMarkAreaAnimate } from './marker/area';\nexport { MarkArcLine, registerMarkArcLineAnimate } from './marker/arc-line';\nexport { MarkArcArea, registerMarkArcAreaAnimate } from './marker/arc-area';\nexport { MarkPoint, registerMarkPointAnimate } from './marker/point';\nexport * from './pager';\nexport * from './legend';\nexport { ColorContinuousLegend } from './legend/color/color';\nexport { SizeContinuousLegend } from './legend/size/size';\nexport * from './title';\nexport { Title } from './title/title';\nexport * from './indicator';\nexport { Indicator } from './indicator/indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport { DiscretePlayer } from './player/discrete-player';\nexport { ContinuousPlayer } from './player/continuous-player';\nexport { PlayerEventEnum } from './player/type/event';\nexport * from './brush';\nexport { Brush } from './brush/brush';\nexport { IOperateType } from './brush/type';\nexport * from './tooltip';\nexport * from './timeline';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './radio';\nexport * from './empty-tip';\nexport * from './weather';\nexport * from './util';\nexport { labelSmartInvert } from './util/label-smartInvert';\nexport * from './switch';\nexport * from './label-item';\nexport * from './table-series-number';\n"]}
@@ -1,2 +1,2 @@
1
1
  export { };
2
- //# sourceMappingURL=type.js.map
2
+ //# sourceMappingURL=type.js.map
package/es/jsx/index.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export * from "./component-type";
2
- //# sourceMappingURL=index.js.map
2
+ //# sourceMappingURL=index.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@visactor/vrender-components",
3
- "version": "1.1.11-alpha.1",
3
+ "version": "1.1.12",
4
4
  "description": "components library for dp visualization",
5
5
  "sideEffects": false,
6
6
  "main": "cjs/index.js",
@@ -129,9 +129,9 @@
129
129
  "dependencies": {
130
130
  "@visactor/vutils": "~1.0.12",
131
131
  "@visactor/vscale": "~1.0.12",
132
- "@visactor/vrender-core": "1.1.11-alpha.1",
133
- "@visactor/vrender-kits": "1.1.11-alpha.1",
134
- "@visactor/vrender-animate": "1.1.11-alpha.1"
132
+ "@visactor/vrender-core": "1.1.12",
133
+ "@visactor/vrender-kits": "1.1.12",
134
+ "@visactor/vrender-animate": "1.1.12"
135
135
  },
136
136
  "devDependencies": {
137
137
  "@rushstack/eslint-patch": "~1.1.4",
@@ -145,8 +145,8 @@
145
145
  "vite": "3.2.6",
146
146
  "typescript": "4.9.5",
147
147
  "cross-env": "^7.0.3",
148
- "@internal/bundler": "0.0.1",
149
148
  "@internal/eslint-config": "0.0.1",
149
+ "@internal/bundler": "0.0.1",
150
150
  "@internal/ts-config": "0.0.1"
151
151
  },
152
152
  "keywords": [