@visactor/vrender 0.20.3 → 0.20.5-beta.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.
package/cjs/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import '@visactor/vrender-core';
2
- export declare const version = "0.20.3";
2
+ export declare const version = "0.20.5-beta.0";
3
3
  export * from '@visactor/vrender-core';
4
4
  export * from '@visactor/vrender-kits';
package/cjs/index.js CHANGED
@@ -21,7 +21,7 @@ Object.defineProperty(exports, "__esModule", {
21
21
 
22
22
  const vrender_core_1 = require("@visactor/vrender-core"), vrender_kits_1 = require("@visactor/vrender-kits"), vrender_kits_2 = require("@visactor/vrender-kits");
23
23
 
24
- exports.version = "0.20.3", (0, vrender_core_1.preLoadAllModule)(), (0, vrender_core_1.isBrowserEnv)() ? (0,
24
+ exports.version = "0.20.5-beta.0", (0, vrender_core_1.preLoadAllModule)(), (0, vrender_core_1.isBrowserEnv)() ? (0,
25
25
  vrender_kits_1.loadBrowserEnv)(vrender_core_1.container) : (0, vrender_core_1.isNodeEnv)() && (0,
26
26
  vrender_kits_1.loadNodeEnv)(vrender_core_1.container), (0, vrender_kits_2.registerArc)(),
27
27
  (0, vrender_kits_2.registerArc3d)(), (0, vrender_kits_2.registerArea)(), (0, vrender_kits_2.registerCircle)(),
package/cjs/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAWgC;AAChC,yDAAqE;AACrE,yDAmBgC;AAEnB,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;IAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;CAC3B;KAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;IACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;CACxB;AACD,IAAA,0BAAW,GAAE,CAAC;AACd,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,8BAAe,GAAE,CAAC;AAClB,IAAA,gCAAiB,GAAE,CAAC;AACpB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,iCAAkB,GAAE,CAAC;AACrB,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,4CAA6B,GAAE,CAAC;AAChC,IAAA,0CAA2B,GAAE,CAAC;AAC9B,IAAA,2CAA4B,GAAE,CAAC;AAC/B,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,kCAAmB,GAAE,CAAC;AACtB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import '@visactor/vrender-core';\nimport {\n container,\n isBrowserEnv,\n isNodeEnv,\n preLoadAllModule,\n registerFlexLayoutPlugin,\n registerViewTransform3dPlugin,\n registerHtmlAttributePlugin,\n registerReactAttributePlugin,\n registerDirectionalLight,\n registerOrthoCamera\n} from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n registerArc,\n registerArc3d,\n registerArea,\n registerCircle,\n registerGlyph,\n registerGroup,\n registerImage,\n registerLine,\n registerPath,\n registerPolygon,\n registerPyramid3d,\n registerRect,\n registerRect3d,\n registerRichtext,\n registerShadowRoot,\n registerSymbol,\n registerText,\n registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\nexport const version = \"0.20.3\";\n\npreLoadAllModule();\n\nif (isBrowserEnv()) {\n loadBrowserEnv(container);\n} else if (isNodeEnv()) {\n loadNodeEnv(container);\n}\nregisterArc();\nregisterArc3d();\nregisterArea();\nregisterCircle();\nregisterGlyph();\nregisterGroup();\nregisterImage();\nregisterLine();\nregisterPath();\nregisterPolygon();\nregisterPyramid3d();\nregisterRect();\nregisterRect3d();\nregisterRichtext();\nregisterShadowRoot();\nregisterSymbol();\nregisterText();\nregisterWrapText();\n\nregisterFlexLayoutPlugin();\nregisterViewTransform3dPlugin();\nregisterHtmlAttributePlugin();\nregisterReactAttributePlugin();\nregisterDirectionalLight();\nregisterOrthoCamera();\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
1
+ {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAWgC;AAChC,yDAAqE;AACrE,yDAmBgC;AAEnB,QAAA,OAAO,GAAG,eAAe,CAAC;AAEvC,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;IAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;CAC3B;KAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;IACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;CACxB;AACD,IAAA,0BAAW,GAAE,CAAC;AACd,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,8BAAe,GAAE,CAAC;AAClB,IAAA,gCAAiB,GAAE,CAAC;AACpB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,iCAAkB,GAAE,CAAC;AACrB,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,4CAA6B,GAAE,CAAC;AAChC,IAAA,0CAA2B,GAAE,CAAC;AAC9B,IAAA,2CAA4B,GAAE,CAAC;AAC/B,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,kCAAmB,GAAE,CAAC;AACtB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import '@visactor/vrender-core';\nimport {\n container,\n isBrowserEnv,\n isNodeEnv,\n preLoadAllModule,\n registerFlexLayoutPlugin,\n registerViewTransform3dPlugin,\n registerHtmlAttributePlugin,\n registerReactAttributePlugin,\n registerDirectionalLight,\n registerOrthoCamera\n} from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n registerArc,\n registerArc3d,\n registerArea,\n registerCircle,\n registerGlyph,\n registerGroup,\n registerImage,\n registerLine,\n registerPath,\n registerPolygon,\n registerPyramid3d,\n registerRect,\n registerRect3d,\n registerRichtext,\n registerShadowRoot,\n registerSymbol,\n registerText,\n registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\nexport const version = \"0.20.5-beta.0\";\n\npreLoadAllModule();\n\nif (isBrowserEnv()) {\n loadBrowserEnv(container);\n} else if (isNodeEnv()) {\n loadNodeEnv(container);\n}\nregisterArc();\nregisterArc3d();\nregisterArea();\nregisterCircle();\nregisterGlyph();\nregisterGroup();\nregisterImage();\nregisterLine();\nregisterPath();\nregisterPolygon();\nregisterPyramid3d();\nregisterRect();\nregisterRect3d();\nregisterRichtext();\nregisterShadowRoot();\nregisterSymbol();\nregisterText();\nregisterWrapText();\n\nregisterFlexLayoutPlugin();\nregisterViewTransform3dPlugin();\nregisterHtmlAttributePlugin();\nregisterReactAttributePlugin();\nregisterDirectionalLight();\nregisterOrthoCamera();\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
package/dist/index.es.js CHANGED
@@ -16387,7 +16387,13 @@ class Wrapper {
16387
16387
  const RICHTEXT_UPDATE_TAG_KEY = ["width", "height", "ellipsis", "wordBreak", "verticalDirection", "maxHeight", "maxWidth", "textAlign", "textBaseline", "textConfig", "layoutDirection", "fill", "stroke", "fontSize", ...GRAPHIC_UPDATE_TAG_KEY];
16388
16388
  class RichText extends Graphic {
16389
16389
  constructor(params) {
16390
- super(params), this.type = "richtext", this._currentHoverIcon = null, this.numberType = RICHTEXT_NUMBER_TYPE;
16390
+ super(params), this.type = "richtext", this._currentHoverIcon = null, this.numberType = RICHTEXT_NUMBER_TYPE, this.onBeforeAttributeUpdate = (val, attributes, key) => {
16391
+ for (const key in val) if ("hoverIconId" === key) {
16392
+ if (val[key] === attributes[key]) continue;
16393
+ const icon = this._frameCache.icons.get(val[key]);
16394
+ this.updateHoverIconState(icon);
16395
+ }
16396
+ };
16391
16397
  }
16392
16398
  get width() {
16393
16399
  var _a;
@@ -16558,8 +16564,9 @@ class RichText extends Graphic {
16558
16564
  paragraphs = [],
16559
16565
  textConfig = null != tc ? tc : _tc;
16560
16566
  for (let i = 0; i < textConfig.length; i++) if ("image" in textConfig[i]) {
16561
- const config = this.combinedStyleToCharacter(textConfig[i]),
16562
- iconCache = config.id && this._frameCache && this._frameCache.icons && this._frameCache.icons.get(config.id);
16567
+ const config = this.combinedStyleToCharacter(textConfig[i]);
16568
+ config.lineWidth = void 0;
16569
+ const iconCache = config.id && this._frameCache && this._frameCache.icons && this._frameCache.icons.get(config.id);
16563
16570
  if (iconCache) paragraphs.push(iconCache);else {
16564
16571
  const icon = new RichTextIcon(config);
16565
16572
  icon.successCallback = () => {
@@ -16609,14 +16616,16 @@ class RichText extends Graphic {
16609
16616
  }
16610
16617
  bindIconEvent() {
16611
16618
  this.addEventListener("pointermove", e => {
16612
- var _a, _b, _c, _d, _e;
16613
16619
  const pickedIcon = this.pickIcon(e.global);
16614
- pickedIcon && pickedIcon === this._currentHoverIcon || (pickedIcon ? (null === (_a = this._currentHoverIcon) || void 0 === _a || _a.setHoverState(!1), this._currentHoverIcon = pickedIcon, this._currentHoverIcon.setHoverState(!0), null === (_b = this.stage) || void 0 === _b || _b.setCursor(pickedIcon.attribute.cursor), null === (_c = this.stage) || void 0 === _c || _c.renderNextFrame()) : !pickedIcon && this._currentHoverIcon && (this._currentHoverIcon.setHoverState(!1), this._currentHoverIcon = null, null === (_d = this.stage) || void 0 === _d || _d.setCursor(), null === (_e = this.stage) || void 0 === _e || _e.renderNextFrame()));
16620
+ pickedIcon && pickedIcon === this._currentHoverIcon || (pickedIcon ? this.setAttribute("hoverIconId", pickedIcon.richtextId) : !pickedIcon && this._currentHoverIcon && this.setAttribute("hoverIconId", void 0));
16615
16621
  }), this.addEventListener("pointerleave", e => {
16616
- var _a, _b;
16617
- this._currentHoverIcon && (this._currentHoverIcon.setHoverState(!1), this._currentHoverIcon = null, null === (_a = this.stage) || void 0 === _a || _a.setCursor(), null === (_b = this.stage) || void 0 === _b || _b.renderNextFrame());
16622
+ this._currentHoverIcon && this.setAttribute("hoverIconId", void 0);
16618
16623
  });
16619
16624
  }
16625
+ updateHoverIconState(pickedIcon) {
16626
+ var _a, _b, _c, _d, _e;
16627
+ pickedIcon ? (null === (_a = this._currentHoverIcon) || void 0 === _a || _a.setHoverState(!1), this._currentHoverIcon = pickedIcon, this._currentHoverIcon.setHoverState(!0), null === (_b = this.stage) || void 0 === _b || _b.setCursor(pickedIcon.attribute.cursor), null === (_c = this.stage) || void 0 === _c || _c.renderNextFrame()) : (this._currentHoverIcon.setHoverState(!1), this._currentHoverIcon = null, null === (_d = this.stage) || void 0 === _d || _d.setCursor(), null === (_e = this.stage) || void 0 === _e || _e.renderNextFrame());
16628
+ }
16620
16629
  pickIcon(point) {
16621
16630
  const frameCache = this.getFrameCache(),
16622
16631
  {
@@ -16624,7 +16633,7 @@ class RichText extends Graphic {
16624
16633
  f: y
16625
16634
  } = this.globalTransMatrix;
16626
16635
  let pickIcon;
16627
- return frameCache.icons.forEach(icon => {
16636
+ return frameCache.icons.forEach((icon, key) => {
16628
16637
  var _a, _b;
16629
16638
  const bounds = icon.AABBBounds.clone();
16630
16639
  bounds.translate(icon._marginArray[3], icon._marginArray[0]), bounds.containsPoint({
@@ -18278,7 +18287,8 @@ class Stage extends Group {
18278
18287
  });
18279
18288
  }
18280
18289
  pauseRender() {
18281
- this._skipRender = -1;
18290
+ let sr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
18291
+ this._skipRender = sr;
18282
18292
  }
18283
18293
  resumeRender() {
18284
18294
  this._skipRender = 0;
@@ -18585,8 +18595,7 @@ class Stage extends Group {
18585
18595
  }
18586
18596
  pick(x, y) {
18587
18597
  if ("released" === this.releaseStatus) return;
18588
- this.pickerService || (this.pickerService = container.get(PickerService));
18589
- const result = this.pickerService.pick(this.children, new Point(x, y), {
18598
+ const result = this.getPickerService().pick(this.children, new Point(x, y), {
18590
18599
  bounds: this.AABBBounds
18591
18600
  });
18592
18601
  return !(!(null == result ? void 0 : result.graphic) && !(null == result ? void 0 : result.group)) && result;
@@ -18671,6 +18680,9 @@ class Stage extends Group {
18671
18680
  resumeTriggerEvent() {
18672
18681
  this._eventSystem && this._eventSystem.resumeTriggerEvent();
18673
18682
  }
18683
+ getPickerService() {
18684
+ return this.pickerService || (this.pickerService = container.get(PickerService)), this.pickerService;
18685
+ }
18674
18686
  }
18675
18687
 
18676
18688
  function createStage(params) {
@@ -28273,7 +28285,7 @@ const registerWrapText = _registerWrapText;
28273
28285
 
28274
28286
  const roughModule = _roughModule;
28275
28287
 
28276
- const version = "0.20.3";
28288
+ const version = "0.20.5-beta.0";
28277
28289
  preLoadAllModule();
28278
28290
  if (isBrowserEnv()) {
28279
28291
  loadBrowserEnv(container);
package/dist/index.js CHANGED
@@ -16393,7 +16393,13 @@
16393
16393
  const RICHTEXT_UPDATE_TAG_KEY = ["width", "height", "ellipsis", "wordBreak", "verticalDirection", "maxHeight", "maxWidth", "textAlign", "textBaseline", "textConfig", "layoutDirection", "fill", "stroke", "fontSize", ...GRAPHIC_UPDATE_TAG_KEY];
16394
16394
  class RichText extends Graphic {
16395
16395
  constructor(params) {
16396
- super(params), this.type = "richtext", this._currentHoverIcon = null, this.numberType = RICHTEXT_NUMBER_TYPE;
16396
+ super(params), this.type = "richtext", this._currentHoverIcon = null, this.numberType = RICHTEXT_NUMBER_TYPE, this.onBeforeAttributeUpdate = (val, attributes, key) => {
16397
+ for (const key in val) if ("hoverIconId" === key) {
16398
+ if (val[key] === attributes[key]) continue;
16399
+ const icon = this._frameCache.icons.get(val[key]);
16400
+ this.updateHoverIconState(icon);
16401
+ }
16402
+ };
16397
16403
  }
16398
16404
  get width() {
16399
16405
  var _a;
@@ -16564,8 +16570,9 @@
16564
16570
  paragraphs = [],
16565
16571
  textConfig = null != tc ? tc : _tc;
16566
16572
  for (let i = 0; i < textConfig.length; i++) if ("image" in textConfig[i]) {
16567
- const config = this.combinedStyleToCharacter(textConfig[i]),
16568
- iconCache = config.id && this._frameCache && this._frameCache.icons && this._frameCache.icons.get(config.id);
16573
+ const config = this.combinedStyleToCharacter(textConfig[i]);
16574
+ config.lineWidth = void 0;
16575
+ const iconCache = config.id && this._frameCache && this._frameCache.icons && this._frameCache.icons.get(config.id);
16569
16576
  if (iconCache) paragraphs.push(iconCache);else {
16570
16577
  const icon = new RichTextIcon(config);
16571
16578
  icon.successCallback = () => {
@@ -16615,14 +16622,16 @@
16615
16622
  }
16616
16623
  bindIconEvent() {
16617
16624
  this.addEventListener("pointermove", e => {
16618
- var _a, _b, _c, _d, _e;
16619
16625
  const pickedIcon = this.pickIcon(e.global);
16620
- pickedIcon && pickedIcon === this._currentHoverIcon || (pickedIcon ? (null === (_a = this._currentHoverIcon) || void 0 === _a || _a.setHoverState(!1), this._currentHoverIcon = pickedIcon, this._currentHoverIcon.setHoverState(!0), null === (_b = this.stage) || void 0 === _b || _b.setCursor(pickedIcon.attribute.cursor), null === (_c = this.stage) || void 0 === _c || _c.renderNextFrame()) : !pickedIcon && this._currentHoverIcon && (this._currentHoverIcon.setHoverState(!1), this._currentHoverIcon = null, null === (_d = this.stage) || void 0 === _d || _d.setCursor(), null === (_e = this.stage) || void 0 === _e || _e.renderNextFrame()));
16626
+ pickedIcon && pickedIcon === this._currentHoverIcon || (pickedIcon ? this.setAttribute("hoverIconId", pickedIcon.richtextId) : !pickedIcon && this._currentHoverIcon && this.setAttribute("hoverIconId", void 0));
16621
16627
  }), this.addEventListener("pointerleave", e => {
16622
- var _a, _b;
16623
- this._currentHoverIcon && (this._currentHoverIcon.setHoverState(!1), this._currentHoverIcon = null, null === (_a = this.stage) || void 0 === _a || _a.setCursor(), null === (_b = this.stage) || void 0 === _b || _b.renderNextFrame());
16628
+ this._currentHoverIcon && this.setAttribute("hoverIconId", void 0);
16624
16629
  });
16625
16630
  }
16631
+ updateHoverIconState(pickedIcon) {
16632
+ var _a, _b, _c, _d, _e;
16633
+ pickedIcon ? (null === (_a = this._currentHoverIcon) || void 0 === _a || _a.setHoverState(!1), this._currentHoverIcon = pickedIcon, this._currentHoverIcon.setHoverState(!0), null === (_b = this.stage) || void 0 === _b || _b.setCursor(pickedIcon.attribute.cursor), null === (_c = this.stage) || void 0 === _c || _c.renderNextFrame()) : (this._currentHoverIcon.setHoverState(!1), this._currentHoverIcon = null, null === (_d = this.stage) || void 0 === _d || _d.setCursor(), null === (_e = this.stage) || void 0 === _e || _e.renderNextFrame());
16634
+ }
16626
16635
  pickIcon(point) {
16627
16636
  const frameCache = this.getFrameCache(),
16628
16637
  {
@@ -16630,7 +16639,7 @@
16630
16639
  f: y
16631
16640
  } = this.globalTransMatrix;
16632
16641
  let pickIcon;
16633
- return frameCache.icons.forEach(icon => {
16642
+ return frameCache.icons.forEach((icon, key) => {
16634
16643
  var _a, _b;
16635
16644
  const bounds = icon.AABBBounds.clone();
16636
16645
  bounds.translate(icon._marginArray[3], icon._marginArray[0]), bounds.containsPoint({
@@ -18284,7 +18293,8 @@
18284
18293
  });
18285
18294
  }
18286
18295
  pauseRender() {
18287
- this._skipRender = -1;
18296
+ let sr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
18297
+ this._skipRender = sr;
18288
18298
  }
18289
18299
  resumeRender() {
18290
18300
  this._skipRender = 0;
@@ -18591,8 +18601,7 @@
18591
18601
  }
18592
18602
  pick(x, y) {
18593
18603
  if ("released" === this.releaseStatus) return;
18594
- this.pickerService || (this.pickerService = container.get(PickerService));
18595
- const result = this.pickerService.pick(this.children, new Point(x, y), {
18604
+ const result = this.getPickerService().pick(this.children, new Point(x, y), {
18596
18605
  bounds: this.AABBBounds
18597
18606
  });
18598
18607
  return !(!(null == result ? void 0 : result.graphic) && !(null == result ? void 0 : result.group)) && result;
@@ -18677,6 +18686,9 @@
18677
18686
  resumeTriggerEvent() {
18678
18687
  this._eventSystem && this._eventSystem.resumeTriggerEvent();
18679
18688
  }
18689
+ getPickerService() {
18690
+ return this.pickerService || (this.pickerService = container.get(PickerService)), this.pickerService;
18691
+ }
18680
18692
  }
18681
18693
 
18682
18694
  function createStage(params) {
@@ -28279,7 +28291,7 @@
28279
28291
 
28280
28292
  const roughModule = _roughModule;
28281
28293
 
28282
- const version = "0.20.3";
28294
+ const version = "0.20.5-beta.0";
28283
28295
  preLoadAllModule();
28284
28296
  if (isBrowserEnv()) {
28285
28297
  loadBrowserEnv(container);