@visactor/vrender 0.19.24-alpha.5 → 0.19.24-alpha.7

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 (10) hide show
  1. package/cjs/index.d.ts +1 -1
  2. package/cjs/index.js +1 -1
  3. package/cjs/index.js.map +1 -1
  4. package/dist/index.es.js +28 -25
  5. package/dist/index.js +28 -25
  6. package/dist/index.min.js +1 -1
  7. package/es/index.d.ts +1 -1
  8. package/es/index.js +1 -1
  9. package/es/index.js.map +1 -1
  10. package/package.json +5 -5
package/cjs/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import '@visactor/vrender-core';
2
- export declare const version = "0.19.24-alpha.5";
2
+ export declare const version = "0.19.24-alpha.7";
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.19.24-alpha.5", (0, vrender_core_1.preLoadAllModule)(), (0,
24
+ exports.version = "0.19.24-alpha.7", (0, vrender_core_1.preLoadAllModule)(), (0,
25
25
  vrender_core_1.isBrowserEnv)() ? (0, vrender_kits_1.loadBrowserEnv)(vrender_core_1.container) : (0,
26
26
  vrender_core_1.isNodeEnv)() && (0, vrender_kits_1.loadNodeEnv)(vrender_core_1.container),
27
27
  (0, vrender_kits_2.registerArc)(), (0, vrender_kits_2.registerArc3d)(), (0, vrender_kits_2.registerArea)(),
package/cjs/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA8F;AAC9F,yDAAqE;AACrE,yDAmBgC;AAEnB,QAAA,OAAO,GAAG,iBAAiB,CAAC;AAEzC,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;AACnB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule } 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.19.24-alpha.5\";\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();\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
1
+ {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA8F;AAC9F,yDAAqE;AACrE,yDAmBgC;AAEnB,QAAA,OAAO,GAAG,iBAAiB,CAAC;AAEzC,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;AACnB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule } 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.19.24-alpha.7\";\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();\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
package/dist/index.es.js CHANGED
@@ -13251,10 +13251,11 @@ class RichText extends Graphic {
13251
13251
  let pickIcon;
13252
13252
  return frameCache.icons.forEach(icon => {
13253
13253
  var _a, _b;
13254
- icon.AABBBounds.containsPoint({
13254
+ const bounds = icon.AABBBounds.clone();
13255
+ bounds.translate(icon._marginArray[3], icon._marginArray[0]), bounds.containsPoint({
13255
13256
  x: point.x - x,
13256
13257
  y: point.y - y
13257
- }) && (pickIcon = icon, pickIcon.globalX = (null !== (_a = pickIcon.attribute.x) && void 0 !== _a ? _a : 0) + x, pickIcon.globalY = (null !== (_b = pickIcon.attribute.y) && void 0 !== _b ? _b : 0) + y);
13258
+ }) && (pickIcon = icon, pickIcon.globalX = (null !== (_a = pickIcon.attribute.x) && void 0 !== _a ? _a : 0) + x + icon._marginArray[3], pickIcon.globalY = (null !== (_b = pickIcon.attribute.y) && void 0 !== _b ? _b : 0) + y + icon._marginArray[0]);
13258
13259
  }), pickIcon;
13259
13260
  }
13260
13261
  getNoWorkAnimateAttr() {
@@ -15448,26 +15449,27 @@ function createRectPath(path, x, y, width, height, rectCornerRadius, edgeCb) {
15448
15449
  leftBottomPoint1 = [leftBottom[0] + _cornerRadius[3], leftBottom[1]],
15449
15450
  leftBottomPoint2 = [leftBottom[0], leftBottom[1] - _cornerRadius[3]];
15450
15451
  if (path.moveTo(leftTopPoint1[0], leftTopPoint1[1]), edgeCb && edgeCb[0] ? edgeCb[0](leftTopPoint1[0], leftTopPoint1[1], rightTopPoint1[0], rightTopPoint1[1]) : path.lineTo(rightTopPoint1[0], rightTopPoint1[1]), !arrayEqual(rightTopPoint1, rightTopPoint2)) {
15452
+ edgeCb && edgeCb[0] && path.moveTo(rightTopPoint1[0], rightTopPoint1[1]);
15451
15453
  const centerX = rightTopPoint1[0],
15452
15454
  centerY = rightTopPoint1[1] + _cornerRadius[1];
15453
15455
  path.arc(centerX, centerY, _cornerRadius[1], -halfPi, 0, !1);
15454
15456
  }
15455
- if (edgeCb && edgeCb[1] ? edgeCb[1](rightTopPoint1[0], rightTopPoint1[1], rightBottomPoint2[0], rightBottomPoint2[1]) : path.lineTo(rightBottomPoint2[0], rightBottomPoint2[1]), !arrayEqual(rightBottomPoint1, rightBottomPoint2)) {
15457
+ if (edgeCb && edgeCb[1] ? edgeCb[1](rightTopPoint2[0], rightTopPoint2[1], rightBottomPoint2[0], rightBottomPoint2[1]) : path.lineTo(rightBottomPoint2[0], rightBottomPoint2[1]), !arrayEqual(rightBottomPoint1, rightBottomPoint2)) {
15456
15458
  const centerX = rightBottomPoint2[0] - _cornerRadius[2],
15457
15459
  centerY = rightBottomPoint2[1];
15458
- path.arc(centerX, centerY, _cornerRadius[2], 0, halfPi, !1);
15460
+ edgeCb && edgeCb[1] && path.moveTo(rightBottomPoint2[0], rightBottomPoint2[1]), path.arc(centerX, centerY, _cornerRadius[2], 0, halfPi, !1);
15459
15461
  }
15460
- if (edgeCb && edgeCb[2] ? edgeCb[2](rightBottomPoint2[0], rightBottomPoint2[1], leftBottomPoint1[0], leftBottomPoint1[1]) : path.lineTo(leftBottomPoint1[0], leftBottomPoint1[1]), !arrayEqual(leftBottomPoint1, leftBottomPoint2)) {
15462
+ if (edgeCb && edgeCb[2] ? edgeCb[2](rightBottomPoint1[0], rightBottomPoint1[1], leftBottomPoint1[0], leftBottomPoint1[1]) : path.lineTo(leftBottomPoint1[0], leftBottomPoint1[1]), !arrayEqual(leftBottomPoint1, leftBottomPoint2)) {
15461
15463
  const centerX = leftBottomPoint1[0],
15462
15464
  centerY = leftBottomPoint1[1] - _cornerRadius[3];
15463
- path.arc(centerX, centerY, _cornerRadius[3], halfPi, pi, !1);
15465
+ edgeCb && edgeCb[2] && path.moveTo(leftBottomPoint1[0], leftBottomPoint1[1]), path.arc(centerX, centerY, _cornerRadius[3], halfPi, pi, !1);
15464
15466
  }
15465
- if (edgeCb && edgeCb[3] ? edgeCb[3](leftBottomPoint1[0], leftBottomPoint1[1], leftTopPoint2[0], leftTopPoint2[1]) : path.lineTo(leftTopPoint2[0], leftTopPoint2[1]), !arrayEqual(leftTopPoint1, leftTopPoint2)) {
15467
+ if (edgeCb && edgeCb[3] ? edgeCb[3](leftBottomPoint2[0], leftBottomPoint2[1], leftTopPoint2[0], leftTopPoint2[1]) : path.lineTo(leftTopPoint2[0], leftTopPoint2[1]), !arrayEqual(leftTopPoint1, leftTopPoint2)) {
15466
15468
  const centerX = leftTopPoint1[0],
15467
15469
  centerY = leftTopPoint1[1] + _cornerRadius[0];
15468
- path.arc(centerX, centerY, _cornerRadius[0], pi, pi + halfPi, !1);
15470
+ edgeCb && edgeCb[3] && path.moveTo(leftTopPoint2[0], leftTopPoint2[1]), path.arc(centerX, centerY, _cornerRadius[0], pi, pi + halfPi, !1);
15469
15471
  }
15470
- return path.closePath(), path;
15472
+ return !edgeCb && path.closePath(), path;
15471
15473
  }
15472
15474
 
15473
15475
  var __decorate$1D = undefined && undefined.__decorate || function (decorators, target, key, desc) {
@@ -15563,20 +15565,21 @@ let SplitRectAfterRenderContribution = class {
15563
15565
  width: width,
15564
15566
  height: height
15565
15567
  } = rect.attribute;
15566
- if (width = (null != width ? width : x1 - originX) || 0, height = (null != height ? height : y1 - originY) || 0, Array.isArray(stroke) && stroke.some(s => !1 === s)) if (context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute), 0 === cornerRadius || isArray$1(cornerRadius) && cornerRadius.every(num => 0 === num)) {
15568
+ if (width = (null != width ? width : x1 - originX) || 0, height = (null != height ? height : y1 - originY) || 0, Array.isArray(stroke) && stroke.some(s => !1 === s)) {
15569
+ if (context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute), !(0 === cornerRadius || isArray$1(cornerRadius) && cornerRadius.every(num => 0 === num))) {
15570
+ let lastStroke,
15571
+ lastStrokeI = 0;
15572
+ return createRectPath(context, x, y, width, height, cornerRadius, new Array(4).fill(0).map((_, i) => (x1, y1, x2, y2) => {
15573
+ stroke[i] && (lastStrokeI === i - 1 && stroke[i] === lastStroke || (context.setStrokeStyle(rect, Object.assign(Object.assign({}, rect.attribute), {
15574
+ stroke: stroke[i]
15575
+ }), x, y, groupAttribute), context.beginPath(), context.moveTo(x1, y1), lastStroke = stroke[i]), lastStrokeI = i, context.lineTo(x2, y2), context.stroke(), 3 === i && context.beginPath());
15576
+ })), void context.stroke();
15577
+ }
15567
15578
  if (context.beginPath(), context.moveTo(x, y), stroke[0] ? context.lineTo(x + width, y) : context.moveTo(x + width, y), stroke[1] ? context.lineTo(x + width, y + height) : context.moveTo(x + width, y + height), stroke[2] ? context.lineTo(x, y + height) : context.moveTo(x, y + height), stroke[3]) {
15568
15579
  const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;
15569
15580
  context.lineTo(x, adjustY);
15570
15581
  } else context.moveTo(x, y);
15571
15582
  context.stroke();
15572
- } else {
15573
- let lastStroke,
15574
- lastStrokeI = 0;
15575
- createRectPath(context, x, y, width, height, cornerRadius, new Array(4).fill(0).map((_, i) => (x1, y1, x2, y2) => {
15576
- stroke[i] && (lastStrokeI === i - 1 && stroke[i] === lastStroke || (context.setStrokeStyle(rect, Object.assign(Object.assign({}, rect.attribute), {
15577
- stroke: stroke[i]
15578
- }), x, y, groupAttribute), context.beginPath(), context.moveTo(x1, y1), lastStroke = stroke[i]), lastStrokeI = i, context.lineTo(x2, y2), context.stroke());
15579
- }));
15580
15583
  }
15581
15584
  }
15582
15585
  };
@@ -16481,9 +16484,9 @@ let DefaultCanvasAreaRender = class extends BaseRender {
16481
16484
  data = this.valid(area, areaAttribute, fillCb, strokeCb);
16482
16485
  if (!data) return;
16483
16486
  const {
16484
- doFill: doFill,
16485
- doStroke: doStroke
16487
+ doFill: doFill
16486
16488
  } = data,
16489
+ doStroke = data.doStroke && data.sVisible,
16487
16490
  {
16488
16491
  clipRange = areaAttribute.clipRange,
16489
16492
  closePath: closePath,
@@ -17460,7 +17463,7 @@ class ShadowRootDrawItemInterceptorContribution {
17460
17463
  const m = graphic.globalTransMatrix.getInverse();
17461
17464
  drawContribution.dirtyBounds.copy(drawContribution.backupDirtyBounds).transformWithMatrix(m), drawContribution.backupDirtyBounds.copy(drawContribution.dirtyBounds);
17462
17465
  }
17463
- return drawContribution.renderGroup(graphic.shadowRoot, drawContext, graphic.parent.globalTransMatrix), context.highPerformanceRestore(), drawContribution.dirtyBounds && drawContribution.backupDirtyBounds && (drawContribution.dirtyBounds.copy(tempDirtyBounds), drawContribution.backupDirtyBounds.copy(tempBackupDirtyBounds)), !0;
17466
+ return drawContribution.renderGroup(graphic.shadowRoot, drawContext, matrixAllocate.allocate(1, 0, 0, 1, 0, 0)), context.highPerformanceRestore(), drawContribution.dirtyBounds && drawContribution.backupDirtyBounds && (drawContribution.dirtyBounds.copy(tempDirtyBounds), drawContribution.backupDirtyBounds.copy(tempBackupDirtyBounds)), !0;
17464
17467
  }
17465
17468
  }
17466
17469
  class DebugDrawItemInterceptorContribution {
@@ -24759,7 +24762,7 @@ let BrowserContext2d = class {
24759
24762
  opacity = defaultParams.opacity,
24760
24763
  fill = defaultParams.fill
24761
24764
  } = attribute;
24762
- fillOpacity > 1e-12 && opacity > 1e-12 ? (_context.globalAlpha = fillOpacity * opacity * this.baseGlobalAlpha, _context.fillStyle = createColor(this, fill, params, offsetX, offsetY)) : _context.globalAlpha = fillOpacity * opacity * this.baseGlobalAlpha;
24765
+ _context.globalAlpha = fillOpacity * opacity * this.baseGlobalAlpha, fillOpacity > 1e-12 && opacity > 1e-12 && (_context.fillStyle = createColor(this, fill, params, offsetX, offsetY));
24763
24766
  }
24764
24767
  setShadowBlendStyle(params, attribute, defaultParams) {
24765
24768
  if (Array.isArray(defaultParams)) {
@@ -24802,7 +24805,7 @@ let BrowserContext2d = class {
24802
24805
  strokeOpacity = defaultParams.strokeOpacity,
24803
24806
  opacity = defaultParams.opacity
24804
24807
  } = attribute;
24805
- if (strokeOpacity > 1e-12 && opacity > 1e-12) {
24808
+ if (_context.globalAlpha = strokeOpacity * opacity * this.baseGlobalAlpha, strokeOpacity > 1e-12 && opacity > 1e-12) {
24806
24809
  const {
24807
24810
  lineWidth = defaultParams.lineWidth,
24808
24811
  stroke = defaultParams.stroke,
@@ -24811,7 +24814,7 @@ let BrowserContext2d = class {
24811
24814
  lineCap = defaultParams.lineCap,
24812
24815
  miterLimit = defaultParams.miterLimit
24813
24816
  } = attribute;
24814
- _context.globalAlpha = strokeOpacity * opacity * this.baseGlobalAlpha, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
24817
+ _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
24815
24818
  }
24816
24819
  }
24817
24820
  setTextStyleWithoutAlignBaseline(params, defaultParams, z) {
@@ -29321,7 +29324,7 @@ const registerWrapText = _registerWrapText;
29321
29324
 
29322
29325
  const roughModule = _roughModule;
29323
29326
 
29324
- const version = "0.19.24-alpha.5";
29327
+ const version = "0.19.24-alpha.7";
29325
29328
  preLoadAllModule();
29326
29329
  if (isBrowserEnv()) {
29327
29330
  loadBrowserEnv(container);
package/dist/index.js CHANGED
@@ -13257,10 +13257,11 @@
13257
13257
  let pickIcon;
13258
13258
  return frameCache.icons.forEach(icon => {
13259
13259
  var _a, _b;
13260
- icon.AABBBounds.containsPoint({
13260
+ const bounds = icon.AABBBounds.clone();
13261
+ bounds.translate(icon._marginArray[3], icon._marginArray[0]), bounds.containsPoint({
13261
13262
  x: point.x - x,
13262
13263
  y: point.y - y
13263
- }) && (pickIcon = icon, pickIcon.globalX = (null !== (_a = pickIcon.attribute.x) && void 0 !== _a ? _a : 0) + x, pickIcon.globalY = (null !== (_b = pickIcon.attribute.y) && void 0 !== _b ? _b : 0) + y);
13264
+ }) && (pickIcon = icon, pickIcon.globalX = (null !== (_a = pickIcon.attribute.x) && void 0 !== _a ? _a : 0) + x + icon._marginArray[3], pickIcon.globalY = (null !== (_b = pickIcon.attribute.y) && void 0 !== _b ? _b : 0) + y + icon._marginArray[0]);
13264
13265
  }), pickIcon;
13265
13266
  }
13266
13267
  getNoWorkAnimateAttr() {
@@ -15454,26 +15455,27 @@
15454
15455
  leftBottomPoint1 = [leftBottom[0] + _cornerRadius[3], leftBottom[1]],
15455
15456
  leftBottomPoint2 = [leftBottom[0], leftBottom[1] - _cornerRadius[3]];
15456
15457
  if (path.moveTo(leftTopPoint1[0], leftTopPoint1[1]), edgeCb && edgeCb[0] ? edgeCb[0](leftTopPoint1[0], leftTopPoint1[1], rightTopPoint1[0], rightTopPoint1[1]) : path.lineTo(rightTopPoint1[0], rightTopPoint1[1]), !arrayEqual(rightTopPoint1, rightTopPoint2)) {
15458
+ edgeCb && edgeCb[0] && path.moveTo(rightTopPoint1[0], rightTopPoint1[1]);
15457
15459
  const centerX = rightTopPoint1[0],
15458
15460
  centerY = rightTopPoint1[1] + _cornerRadius[1];
15459
15461
  path.arc(centerX, centerY, _cornerRadius[1], -halfPi, 0, !1);
15460
15462
  }
15461
- if (edgeCb && edgeCb[1] ? edgeCb[1](rightTopPoint1[0], rightTopPoint1[1], rightBottomPoint2[0], rightBottomPoint2[1]) : path.lineTo(rightBottomPoint2[0], rightBottomPoint2[1]), !arrayEqual(rightBottomPoint1, rightBottomPoint2)) {
15463
+ if (edgeCb && edgeCb[1] ? edgeCb[1](rightTopPoint2[0], rightTopPoint2[1], rightBottomPoint2[0], rightBottomPoint2[1]) : path.lineTo(rightBottomPoint2[0], rightBottomPoint2[1]), !arrayEqual(rightBottomPoint1, rightBottomPoint2)) {
15462
15464
  const centerX = rightBottomPoint2[0] - _cornerRadius[2],
15463
15465
  centerY = rightBottomPoint2[1];
15464
- path.arc(centerX, centerY, _cornerRadius[2], 0, halfPi, !1);
15466
+ edgeCb && edgeCb[1] && path.moveTo(rightBottomPoint2[0], rightBottomPoint2[1]), path.arc(centerX, centerY, _cornerRadius[2], 0, halfPi, !1);
15465
15467
  }
15466
- if (edgeCb && edgeCb[2] ? edgeCb[2](rightBottomPoint2[0], rightBottomPoint2[1], leftBottomPoint1[0], leftBottomPoint1[1]) : path.lineTo(leftBottomPoint1[0], leftBottomPoint1[1]), !arrayEqual(leftBottomPoint1, leftBottomPoint2)) {
15468
+ if (edgeCb && edgeCb[2] ? edgeCb[2](rightBottomPoint1[0], rightBottomPoint1[1], leftBottomPoint1[0], leftBottomPoint1[1]) : path.lineTo(leftBottomPoint1[0], leftBottomPoint1[1]), !arrayEqual(leftBottomPoint1, leftBottomPoint2)) {
15467
15469
  const centerX = leftBottomPoint1[0],
15468
15470
  centerY = leftBottomPoint1[1] - _cornerRadius[3];
15469
- path.arc(centerX, centerY, _cornerRadius[3], halfPi, pi, !1);
15471
+ edgeCb && edgeCb[2] && path.moveTo(leftBottomPoint1[0], leftBottomPoint1[1]), path.arc(centerX, centerY, _cornerRadius[3], halfPi, pi, !1);
15470
15472
  }
15471
- if (edgeCb && edgeCb[3] ? edgeCb[3](leftBottomPoint1[0], leftBottomPoint1[1], leftTopPoint2[0], leftTopPoint2[1]) : path.lineTo(leftTopPoint2[0], leftTopPoint2[1]), !arrayEqual(leftTopPoint1, leftTopPoint2)) {
15473
+ if (edgeCb && edgeCb[3] ? edgeCb[3](leftBottomPoint2[0], leftBottomPoint2[1], leftTopPoint2[0], leftTopPoint2[1]) : path.lineTo(leftTopPoint2[0], leftTopPoint2[1]), !arrayEqual(leftTopPoint1, leftTopPoint2)) {
15472
15474
  const centerX = leftTopPoint1[0],
15473
15475
  centerY = leftTopPoint1[1] + _cornerRadius[0];
15474
- path.arc(centerX, centerY, _cornerRadius[0], pi, pi + halfPi, !1);
15476
+ edgeCb && edgeCb[3] && path.moveTo(leftTopPoint2[0], leftTopPoint2[1]), path.arc(centerX, centerY, _cornerRadius[0], pi, pi + halfPi, !1);
15475
15477
  }
15476
- return path.closePath(), path;
15478
+ return !edgeCb && path.closePath(), path;
15477
15479
  }
15478
15480
 
15479
15481
  var __decorate$1D = undefined && undefined.__decorate || function (decorators, target, key, desc) {
@@ -15569,20 +15571,21 @@
15569
15571
  width: width,
15570
15572
  height: height
15571
15573
  } = rect.attribute;
15572
- if (width = (null != width ? width : x1 - originX) || 0, height = (null != height ? height : y1 - originY) || 0, Array.isArray(stroke) && stroke.some(s => !1 === s)) if (context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute), 0 === cornerRadius || isArray$1(cornerRadius) && cornerRadius.every(num => 0 === num)) {
15574
+ if (width = (null != width ? width : x1 - originX) || 0, height = (null != height ? height : y1 - originY) || 0, Array.isArray(stroke) && stroke.some(s => !1 === s)) {
15575
+ if (context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute), !(0 === cornerRadius || isArray$1(cornerRadius) && cornerRadius.every(num => 0 === num))) {
15576
+ let lastStroke,
15577
+ lastStrokeI = 0;
15578
+ return createRectPath(context, x, y, width, height, cornerRadius, new Array(4).fill(0).map((_, i) => (x1, y1, x2, y2) => {
15579
+ stroke[i] && (lastStrokeI === i - 1 && stroke[i] === lastStroke || (context.setStrokeStyle(rect, Object.assign(Object.assign({}, rect.attribute), {
15580
+ stroke: stroke[i]
15581
+ }), x, y, groupAttribute), context.beginPath(), context.moveTo(x1, y1), lastStroke = stroke[i]), lastStrokeI = i, context.lineTo(x2, y2), context.stroke(), 3 === i && context.beginPath());
15582
+ })), void context.stroke();
15583
+ }
15573
15584
  if (context.beginPath(), context.moveTo(x, y), stroke[0] ? context.lineTo(x + width, y) : context.moveTo(x + width, y), stroke[1] ? context.lineTo(x + width, y + height) : context.moveTo(x + width, y + height), stroke[2] ? context.lineTo(x, y + height) : context.moveTo(x, y + height), stroke[3]) {
15574
15585
  const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;
15575
15586
  context.lineTo(x, adjustY);
15576
15587
  } else context.moveTo(x, y);
15577
15588
  context.stroke();
15578
- } else {
15579
- let lastStroke,
15580
- lastStrokeI = 0;
15581
- createRectPath(context, x, y, width, height, cornerRadius, new Array(4).fill(0).map((_, i) => (x1, y1, x2, y2) => {
15582
- stroke[i] && (lastStrokeI === i - 1 && stroke[i] === lastStroke || (context.setStrokeStyle(rect, Object.assign(Object.assign({}, rect.attribute), {
15583
- stroke: stroke[i]
15584
- }), x, y, groupAttribute), context.beginPath(), context.moveTo(x1, y1), lastStroke = stroke[i]), lastStrokeI = i, context.lineTo(x2, y2), context.stroke());
15585
- }));
15586
15589
  }
15587
15590
  }
15588
15591
  };
@@ -16487,9 +16490,9 @@
16487
16490
  data = this.valid(area, areaAttribute, fillCb, strokeCb);
16488
16491
  if (!data) return;
16489
16492
  const {
16490
- doFill: doFill,
16491
- doStroke: doStroke
16493
+ doFill: doFill
16492
16494
  } = data,
16495
+ doStroke = data.doStroke && data.sVisible,
16493
16496
  {
16494
16497
  clipRange = areaAttribute.clipRange,
16495
16498
  closePath: closePath,
@@ -17466,7 +17469,7 @@
17466
17469
  const m = graphic.globalTransMatrix.getInverse();
17467
17470
  drawContribution.dirtyBounds.copy(drawContribution.backupDirtyBounds).transformWithMatrix(m), drawContribution.backupDirtyBounds.copy(drawContribution.dirtyBounds);
17468
17471
  }
17469
- return drawContribution.renderGroup(graphic.shadowRoot, drawContext, graphic.parent.globalTransMatrix), context.highPerformanceRestore(), drawContribution.dirtyBounds && drawContribution.backupDirtyBounds && (drawContribution.dirtyBounds.copy(tempDirtyBounds), drawContribution.backupDirtyBounds.copy(tempBackupDirtyBounds)), !0;
17472
+ return drawContribution.renderGroup(graphic.shadowRoot, drawContext, matrixAllocate.allocate(1, 0, 0, 1, 0, 0)), context.highPerformanceRestore(), drawContribution.dirtyBounds && drawContribution.backupDirtyBounds && (drawContribution.dirtyBounds.copy(tempDirtyBounds), drawContribution.backupDirtyBounds.copy(tempBackupDirtyBounds)), !0;
17470
17473
  }
17471
17474
  }
17472
17475
  class DebugDrawItemInterceptorContribution {
@@ -24765,7 +24768,7 @@
24765
24768
  opacity = defaultParams.opacity,
24766
24769
  fill = defaultParams.fill
24767
24770
  } = attribute;
24768
- fillOpacity > 1e-12 && opacity > 1e-12 ? (_context.globalAlpha = fillOpacity * opacity * this.baseGlobalAlpha, _context.fillStyle = createColor(this, fill, params, offsetX, offsetY)) : _context.globalAlpha = fillOpacity * opacity * this.baseGlobalAlpha;
24771
+ _context.globalAlpha = fillOpacity * opacity * this.baseGlobalAlpha, fillOpacity > 1e-12 && opacity > 1e-12 && (_context.fillStyle = createColor(this, fill, params, offsetX, offsetY));
24769
24772
  }
24770
24773
  setShadowBlendStyle(params, attribute, defaultParams) {
24771
24774
  if (Array.isArray(defaultParams)) {
@@ -24808,7 +24811,7 @@
24808
24811
  strokeOpacity = defaultParams.strokeOpacity,
24809
24812
  opacity = defaultParams.opacity
24810
24813
  } = attribute;
24811
- if (strokeOpacity > 1e-12 && opacity > 1e-12) {
24814
+ if (_context.globalAlpha = strokeOpacity * opacity * this.baseGlobalAlpha, strokeOpacity > 1e-12 && opacity > 1e-12) {
24812
24815
  const {
24813
24816
  lineWidth = defaultParams.lineWidth,
24814
24817
  stroke = defaultParams.stroke,
@@ -24817,7 +24820,7 @@
24817
24820
  lineCap = defaultParams.lineCap,
24818
24821
  miterLimit = defaultParams.miterLimit
24819
24822
  } = attribute;
24820
- _context.globalAlpha = strokeOpacity * opacity * this.baseGlobalAlpha, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
24823
+ _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
24821
24824
  }
24822
24825
  }
24823
24826
  setTextStyleWithoutAlignBaseline(params, defaultParams, z) {
@@ -29327,7 +29330,7 @@
29327
29330
 
29328
29331
  const roughModule = _roughModule;
29329
29332
 
29330
- const version = "0.19.24-alpha.5";
29333
+ const version = "0.19.24-alpha.7";
29331
29334
  preLoadAllModule();
29332
29335
  if (isBrowserEnv()) {
29333
29336
  loadBrowserEnv(container);