@visactor/vrender 0.18.9 → 0.18.10-alpha.1

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
 import '@visactor/vrender-core';
-export declare const version = "0.18.9";
+export declare const version = "0.18.10-alpha.1";
 export * from '@visactor/vrender-core';
 export * from '@visactor/vrender-kits';

package/cjs/index.js

@@ -21,13 +21,14 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_core_1 = require("@visactor/vrender-core"), vrender_kits_1 = require("@visactor/vrender-kits"), vrender_kits_2 = require("@visactor/vrender-kits");
 
-exports.version = "0.18.9", (0, vrender_core_1.preLoadAllModule)(), (0, vrender_core_1.isBrowserEnv)() ? (0, 
-vrender_kits_1.loadBrowserEnv)(vrender_core_1.container) : (0, vrender_core_1.isNodeEnv)() && (0, 
-vrender_kits_1.loadNodeEnv)(vrender_core_1.container), (0, vrender_kits_2.registerArc)(), 
-(0, vrender_kits_2.registerArc3d)(), (0, vrender_kits_2.registerArea)(), (0, vrender_kits_2.registerCircle)(), 
-(0, vrender_kits_2.registerGlyph)(), (0, vrender_kits_2.registerGroup)(), (0, vrender_kits_2.registerImage)(), 
-(0, vrender_kits_2.registerLine)(), (0, vrender_kits_2.registerPath)(), (0, vrender_kits_2.registerPolygon)(), 
-(0, vrender_kits_2.registerPyramid3d)(), (0, vrender_kits_2.registerRect)(), (0, 
-vrender_kits_2.registerRect3d)(), (0, vrender_kits_2.registerRichtext)(), (0, vrender_kits_2.registerShadowRoot)(), 
-(0, vrender_kits_2.registerSymbol)(), (0, vrender_kits_2.registerText)(), (0, vrender_kits_2.registerWrapText)(), 
-__exportStar(require("@visactor/vrender-core"), exports), __exportStar(require("@visactor/vrender-kits"), exports);
+exports.version = "0.18.10-alpha.1", (0, vrender_core_1.preLoadAllModule)(), (0, 
+vrender_core_1.isBrowserEnv)() ? (0, vrender_kits_1.loadBrowserEnv)(vrender_core_1.container) : (0, 
+vrender_core_1.isNodeEnv)() && (0, vrender_kits_1.loadNodeEnv)(vrender_core_1.container), 
+(0, vrender_kits_2.registerArc)(), (0, vrender_kits_2.registerArc3d)(), (0, vrender_kits_2.registerArea)(), 
+(0, vrender_kits_2.registerCircle)(), (0, vrender_kits_2.registerGlyph)(), (0, vrender_kits_2.registerGroup)(), 
+(0, vrender_kits_2.registerImage)(), (0, vrender_kits_2.registerLine)(), (0, vrender_kits_2.registerPath)(), 
+(0, vrender_kits_2.registerPolygon)(), (0, vrender_kits_2.registerPyramid3d)(), 
+(0, vrender_kits_2.registerRect)(), (0, vrender_kits_2.registerRect3d)(), (0, vrender_kits_2.registerRichtext)(), 
+(0, vrender_kits_2.registerShadowRoot)(), (0, vrender_kits_2.registerSymbol)(), 
+(0, vrender_kits_2.registerText)(), (0, vrender_kits_2.registerWrapText)(), __exportStar(require("@visactor/vrender-core"), exports), 
+__exportStar(require("@visactor/vrender-kits"), exports);

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA8F;AAC9F,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;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.18.9\";\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"]}
+{"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.18.10-alpha.1\";\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.js

@@ -7989,16 +7989,12 @@
     }, {
       key: "mapToCanvasPoint",
       value: function mapToCanvasPoint(nativeEvent) {
-        var _a, _b;
+        var _a;
         var point = null === (_a = this.globalObj) || void 0 === _a ? void 0 : _a.mapToCanvasPoint(nativeEvent, this.domElement);
         if (point) return point;
-        var x = 0,
-          y = 0;
-        if (nativeEvent.changedTouches) {
-          var data = null !== (_b = nativeEvent.changedTouches[0]) && void 0 !== _b ? _b : {};
-          x = data.clientX || 0, y = data.clientY || 0;
-        } else x = nativeEvent.clientX || 0, y = nativeEvent.clientY || 0;
-        var rect = this.domElement.getBoundingClientRect();
+        var x = nativeEvent.clientX,
+          y = nativeEvent.clientY,
+          rect = this.domElement.getBoundingClientRect();
         return {
           x: x - rect.left,
           y: y - rect.top
@@ -11476,7 +11472,6 @@
     }, {
       key: "loading",
       value: function loading() {
-        var _this = this;
         setTimeout(function () {
           if (!ResourceLoader.isLoading && ResourceLoader.toLoadAueue.length) {
             ResourceLoader.isLoading = !0;
@@ -11502,13 +11497,9 @@
                 return mark.imageLoadFail(url);
               });
             }), Promise.all(promises).then(function () {
-              ResourceLoader.isLoading = !1, _this.onLoadSuccessCb.forEach(function (cb) {
-                return cb();
-              }), ResourceLoader.loading();
+              ResourceLoader.isLoading = !1, ResourceLoader.loading();
             })["catch"](function (error) {
-              console.error(error), ResourceLoader.isLoading = !1, _this.onLoadSuccessCb.forEach(function (cb) {
-                return cb();
-              }), ResourceLoader.loading();
+              console.error(error), ResourceLoader.isLoading = !1, ResourceLoader.loading();
             });
           }
         }, 0);
@@ -11532,11 +11523,6 @@
           ResourceLoader.toLoadAueue.unshift(elememt[0]);
         }
       }
-    }, {
-      key: "onLoadSuccess",
-      value: function onLoadSuccess(cb) {
-        this.onLoadSuccessCb.push(cb);
-      }
     }]);
     return ResourceLoader;
   }();
@@ -11544,7 +11530,7 @@
     for (var i = 0; i < arr.length; i++) if (arr[i].url === url) return i;
     return -1;
   }
-  ResourceLoader.cache = new Map(), ResourceLoader.isLoading = !1, ResourceLoader.toLoadAueue = [], ResourceLoader.onLoadSuccessCb = [];
+  ResourceLoader.cache = new Map(), ResourceLoader.isLoading = !1, ResourceLoader.toLoadAueue = [];
 
   var tempMatrix = new Matrix(),
     tempBounds$1 = new AABBBounds();
@@ -11677,7 +11663,7 @@
       key: "tryUpdateGlobalAABBBounds",
       value: function tryUpdateGlobalAABBBounds() {
         var b = this.AABBBounds;
-        return this._globalAABBBounds ? this._globalAABBBounds.setValue(b.x1, b.y1, b.x2, b.y2) : this._globalAABBBounds = b.clone(), this._globalAABBBounds.empty() || this.parent && this._globalAABBBounds.transformWithMatrix(this.parent.globalTransMatrix), this._globalAABBBounds;
+        return this._globalAABBBounds ? this._globalAABBBounds.setValue(b.x1, b.y1, b.x2, b.y2) : this._globalAABBBounds = b.clone(), this.parent && this._globalAABBBounds.transformWithMatrix(this.parent.globalTransMatrix), this._globalAABBBounds;
       }
     }, {
       key: "tryUpdateGlobalTransMatrix",
@@ -13385,10 +13371,6 @@
       strokeOpacity = _graphic$attribute$st2 === void 0 ? themeAttributes.strokeOpacity : _graphic$attribute$st2,
       _graphic$attribute$vi = _graphic$attribute.visible,
       visible = _graphic$attribute$vi === void 0 ? themeAttributes.visible : _graphic$attribute$vi,
-      _graphic$attribute$x = _graphic$attribute.x,
-      originX = _graphic$attribute$x === void 0 ? themeAttributes.x : _graphic$attribute$x,
-      _graphic$attribute$y = _graphic$attribute.y,
-      originY = _graphic$attribute$y === void 0 ? themeAttributes.y : _graphic$attribute$y,
       fVisible = fillVisible(opacity, fillOpacity, fill),
       sVisible = strokeVisible(opacity, strokeOpacity),
       doFill = runFill(fill),
@@ -13398,7 +13380,7 @@
     if (!(fVisible || sVisible || fillCb || strokeCb)) return !0;
     context.beginPath();
     var path = "function" == typeof graphic.pathProxy ? graphic.pathProxy(graphic.attribute) : graphic.pathProxy;
-    return renderCommandList(path.commandList, context, x, y), context.setShadowBlendStyle && context.setShadowBlendStyle(graphic, graphic.attribute, themeAttributes), doStroke && (strokeCb ? strokeCb(context, graphic.attribute, themeAttributes) : sVisible && (context.setStrokeStyle(graphic, graphic.attribute, x - originX, y - originY, themeAttributes), context.stroke())), doFill && (fillCb ? fillCb(context, graphic.attribute, themeAttributes) : fVisible && (context.setCommonStyle(graphic, graphic.attribute, x - originX, y - originY, themeAttributes), context.fill())), !0;
+    return renderCommandList(path.commandList, context, x, y), context.setShadowBlendStyle && context.setShadowBlendStyle(graphic, graphic.attribute, themeAttributes), doStroke && (strokeCb ? strokeCb(context, graphic.attribute, themeAttributes) : sVisible && (context.setStrokeStyle(graphic, graphic.attribute, x, y, themeAttributes), context.stroke())), doFill && (fillCb ? fillCb(context, graphic.attribute, themeAttributes) : fVisible && (context.setCommonStyle(graphic, graphic.attribute, x, y, themeAttributes), context.fill())), !0;
   }
   function intersect(x0, y0, x1, y1, x2, y2, x3, y3) {
     var x10 = x1 - x0,
@@ -20591,9 +20573,7 @@
           var endSeg = segments[segments.length - 1];
           startP = segments[0].points[0], endP = endSeg.points[endSeg.points.length - 1];
         } else startP = points[0], endP = points[points.length - 1];
-        var xTotalLength = abs(endP.x - startP.x),
-          yTotalLength = abs(endP.y - startP.y);
-        direction = Number.isFinite(xTotalLength + yTotalLength) ? xTotalLength > yTotalLength ? exports.Direction.ROW : exports.Direction.COLUMN : exports.Direction.ROW, drawAreaSegments(context.camera ? context : context.nativeContext, cache, clipRange, {
+        direction = abs(endP.x - startP.x) > abs(endP.y - startP.y) ? exports.Direction.ROW : exports.Direction.COLUMN, drawAreaSegments(context.camera ? context : context.nativeContext, cache, clipRange, {
           offsetX: offsetX,
           offsetY: offsetY,
           offsetZ: offsetZ,
@@ -21046,7 +21026,7 @@
             doStroke && (strokeCb ? strokeCb(context, text.attribute, textAttribute) : sVisible && (context.setStrokeStyle(text, text.attribute, originX - x, originY - y, textAttribute), multilineLayout.lines.forEach(function (line) {
               context.strokeText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);
             }))), doFill && (fillCb ? fillCb(context, text.attribute, textAttribute) : fVisible && (context.setCommonStyle(text, text.attribute, originX - x, originY - y, textAttribute), multilineLayout.lines.forEach(function (line) {
-              context.fillText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z), _this2.drawMultiUnderLine(underline, lineThrough, text, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y - textDrawOffsetY("bottom", fontSize) - .05 * fontSize, z, line.width, textAttribute, context);
+              context.fillText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z), _this2.drawMultiUnderLine(underline, lineThrough, text, (line.leftOffset || 0) + x, (line.topOffset || 0) + yOffset + y - textDrawOffsetY("bottom", fontSize) - .05 * fontSize, z, line.width, textAttribute, context);
             })));
           } else {
             text.tryUpdateAABBBounds();
@@ -21158,6 +21138,8 @@
       value: function drawMultiUnderLine(underline, lineThrough, text, x, y, z, w, textAttribute, context) {
         if (lineThrough + underline <= 0) return;
         var _text$attribute4 = text.attribute,
+          _text$attribute4$text = _text$attribute4.textAlign,
+          textAlign = _text$attribute4$text === void 0 ? textAttribute.textAlign : _text$attribute4$text,
           _text$attribute4$font = _text$attribute4.fontSize,
           fontSize = _text$attribute4$font === void 0 ? textAttribute.fontSize : _text$attribute4$font,
           _text$attribute4$fill = _text$attribute4.fill,
@@ -21170,6 +21152,7 @@
           underlineDash = _text$attribute4$unde2 === void 0 ? textAttribute.underlineDash : _text$attribute4$unde2,
           _text$attribute4$fill2 = _text$attribute4.fillOpacity,
           fillOpacity = _text$attribute4$fill2 === void 0 ? textAttribute.fillOpacity : _text$attribute4$fill2,
+          offsetX = textDrawOffsetX(textAlign, w),
           offsetY = textLayoutOffsetY("alphabetic", fontSize, fontSize),
           attribute = {
             lineWidth: 0,
@@ -21181,12 +21164,12 @@
         if (underline) {
           attribute.lineWidth = underline, context.setStrokeStyle(text, attribute, x, y, textAttribute), context.setLineDash(underlineDash), context.beginPath();
           var dy = y + offsetY + fontSize + deltaY + underlineOffset;
-          context.moveTo(x + 0, dy, z), context.lineTo(x + 0 + w, dy, z), context.stroke();
+          context.moveTo(x + offsetX, dy, z), context.lineTo(x + offsetX + w, dy, z), context.stroke();
         }
         if (deltaY = -1, lineThrough) {
           attribute.lineWidth = lineThrough, context.setStrokeStyle(text, attribute, x, y, textAttribute), context.beginPath();
           var _dy2 = y + offsetY + fontSize / 2 + deltaY;
-          context.moveTo(x + 0, _dy2, z), context.lineTo(x + 0 + w, _dy2, z), context.stroke();
+          context.moveTo(x + offsetX, _dy2, z), context.lineTo(x + offsetX + w, _dy2, z), context.stroke();
         }
       }
     }]);
@@ -30865,8 +30848,7 @@
     }, {
       key: "getStyle",
       value: function getStyle() {
-        var _a;
-        return null !== (_a = this.canvas.nativeCanvas.style) && void 0 !== _a ? _a : {};
+        return this.canvas.nativeCanvas.style;
       }
     }, {
       key: "setStyle",
@@ -31011,20 +30993,12 @@
     _createClass(BrowserEnvContribution, [{
       key: "mapToCanvasPoint",
       value: function mapToCanvasPoint(nativeEvent, domElement) {
-        var _a, _b;
-        var clientX = 0,
-          clientY = 0,
-          offsetX = 0,
-          offsetY = 0;
-        if (nativeEvent.changedTouches) {
-          var data = null !== (_a = nativeEvent.changedTouches[0]) && void 0 !== _a ? _a : {};
-          clientX = data.clientX || 0, clientY = data.clientY || 0, offsetX = clientX, offsetY = clientY;
-        } else clientX = nativeEvent.clientX || 0, clientY = nativeEvent.clientY || 0, offsetX = nativeEvent.offsetX || 0, offsetY = nativeEvent.offsetY || 0;
+        var _a;
         if (domElement) {
-          var x = clientX,
-            y = clientY,
+          var x = nativeEvent.clientX,
+            y = nativeEvent.clientY,
             rect = domElement.getBoundingClientRect(),
-            nativeCanvas = null === (_b = domElement.getNativeHandler) || void 0 === _b ? void 0 : _b.call(domElement).nativeCanvas;
+            nativeCanvas = null === (_a = domElement.getNativeHandler) || void 0 === _a ? void 0 : _a.call(domElement).nativeCanvas;
           var scaleX, scaleY;
           return nativeCanvas && (scaleX = rect.width / nativeCanvas.offsetWidth, scaleY = rect.height / nativeCanvas.offsetHeight), {
             x: (x - rect.left) / (isValidNumber$1(scaleX) ? scaleX : 1),
@@ -31032,8 +31006,8 @@
           };
         }
         return {
-          x: offsetX,
-          y: offsetY
+          x: nativeEvent.offsetX,
+          y: nativeEvent.offsetY
         };
       }
     }, {
@@ -35362,7 +35336,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.18.9";
+  const version = "0.18.10-alpha.1";
   preLoadAllModule();
   if (isBrowserEnv()) {
       loadBrowserEnv(container);