@visactor/vrender 0.18.14-alpha.0 → 0.19.0-alpha.1

package/cjs/index.d.ts

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

package/cjs/index.js

@@ -21,7 +21,7 @@ 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.14-alpha.0", (0, vrender_core_1.preLoadAllModule)(), (0, 
+exports.version = "0.19.0-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)(), 

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,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.14-alpha.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();\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,gBAAgB,CAAC;AAExC,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.0-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

@@ -5679,14 +5679,13 @@
     }, {
       key: "clipTextWithSuffix",
       value: function clipTextWithSuffix(text, options, width, suffix, wordBreak, position) {
-        var forceSuffix = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : !1;
         if ("" === suffix) return this.clipText(text, options, width, wordBreak);
         if (0 === text.length) return {
           str: "",
           width: 0
         };
         var length = this.measureTextWidth(text, options);
-        if (!forceSuffix && length <= width) return {
+        if (length <= width) return {
           str: text,
           width: length
         };
@@ -5695,16 +5694,12 @@
           str: "",
           width: 0
         };
-        if (forceSuffix && length + suffixWidth <= width) return {
-          str: text + suffix,
-          width: length + suffixWidth
-        };
         width -= suffixWidth;
         var data = this._clipText(text, options, width, 0, text.length - 1, position, suffix);
         if (wordBreak && data.str !== text) {
           var index = testLetter(text, data.str.length);
-          index !== data.str.length && (data.result = text.substring(0, index), data.width = this.measureTextWidth(data.str, options));
-        } else forceSuffix && data.str === text && (data.result = text + suffix);
+          index !== data.str.length && (data.str = text.substring(0, index), data.width = this.measureTextWidth(data.str, options));
+        }
         return data.str = data.result, data.width += suffixWidth, data;
       }
     }]);
@@ -7537,12 +7532,7 @@
           for (; overTargetAncestor && overTargetAncestor !== _this.rootTarget.parent && overTargetAncestor !== e.target;) overTargetAncestor = overTargetAncestor.parent;
           if (!overTargetAncestor || overTargetAncestor === _this.rootTarget.parent) {
             var enterEvent = _this.clonePointerEvent(e, "pointerenter");
-            enterEvent.eventPhase = enterEvent.AT_TARGET;
-            var currentTarget = enterEvent.target;
-            var outTargetAncestors = new Set();
-            var ancestor = outTarget;
-            for (; ancestor && ancestor !== _this.rootTarget;) outTargetAncestors.add(ancestor), ancestor = ancestor.parent;
-            for (; currentTarget && currentTarget !== outTarget && currentTarget !== _this.rootTarget.parent;) outTargetAncestors.has(currentTarget) || (enterEvent.currentTarget = currentTarget, _this.notifyTarget(enterEvent), isMouse && _this.notifyTarget(enterEvent, "mouseenter")), currentTarget = currentTarget.parent;
+            for (enterEvent.eventPhase = enterEvent.AT_TARGET; enterEvent.target && enterEvent.target !== outTarget && enterEvent.target !== _this.rootTarget.parent;) enterEvent.currentTarget = enterEvent.target, _this.notifyTarget(enterEvent), isMouse && _this.notifyTarget(enterEvent, "mouseenter"), enterEvent.target = enterEvent.target.parent;
             _this.freeEvent(enterEvent);
           }
           _this.freeEvent(overEvent);
@@ -7786,6 +7776,8 @@
   }();
 
   var EventTarget = {
+    pickable: !0,
+    visible: !0,
     dispatchEvent: function dispatchEvent(e) {
       var _a;
       if (!(e instanceof FederatedEvent)) throw new Error("DisplayObject cannot propagate events outside of the Federated Events API");
@@ -11821,17 +11813,19 @@
         var _a, _b, _c, _d;
         if (hasAnimation) {
           var keys = Object.keys(attrs),
-            noWorkAttrs = this.getNoWorkAnimateAttr(),
+            noWorkAAttr = this.getNoWorkAnimateAttr(),
             animateAttrs = {};
           var noAnimateAttrs;
-          keys.forEach(function (key) {
-            noWorkAttrs[key] ? (noAnimateAttrs || (noAnimateAttrs = {}), noAnimateAttrs[key] = attrs[key]) : animateAttrs[key] = isClear && void 0 === attrs[key] ? _this3.getDefaultAttribute(key) : attrs[key];
+          isClear ? keys.forEach(function (key) {
+            noWorkAAttr[key] ? (noAnimateAttrs || (noAnimateAttrs = {}), noAnimateAttrs[key] = attrs[key]) : animateAttrs[key] = void 0 === attrs[key] ? _this3.getDefaultAttribute(key) : attrs[key];
+          }) : keys.forEach(function (key) {
+            noWorkAAttr[key] ? (noAnimateAttrs || (noAnimateAttrs = {}), noAnimateAttrs[key] = attrs[key]) : animateAttrs[key] = attrs[key];
           });
           var animate = this.animate();
           animate.stateNames = stateNames, animate.to(animateAttrs, null !== (_b = null === (_a = this.stateAnimateConfig) || void 0 === _a ? void 0 : _a.duration) && void 0 !== _b ? _b : DefaultStateAnimateConfig.duration, null !== (_d = null === (_c = this.stateAnimateConfig) || void 0 === _c ? void 0 : _c.easing) && void 0 !== _d ? _d : DefaultStateAnimateConfig.easing), noAnimateAttrs && this.setAttributes(noAnimateAttrs, !1, {
             type: exports.AttributeUpdateType.STATE
           });
-        } else this.stopStateAnimates(), this.setAttributes(attrs, !1, {
+        } else this.setAttributes(attrs, !1, {
           type: exports.AttributeUpdateType.STATE
         });
       }
@@ -11848,14 +11842,6 @@
           newNormalAttrs[key] = _this4.getNormalAttribute(key);
         }), this.normalAttrs = newNormalAttrs;
       }
-    }, {
-      key: "stopStateAnimates",
-      value: function stopStateAnimates() {
-        var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "end";
-        this.animates && this.animates.forEach(function (animate) {
-          animate.stateNames && animate.stop(type);
-        });
-      }
     }, {
       key: "getNormalAttribute",
       value: function getNormalAttribute(key) {
@@ -13903,7 +13889,7 @@
             var str = lines[i];
             var needCut = !0;
             if (i === lineCountLimit - 1) {
-              var _clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, !1, suffixPosition, i !== lines.length - 1);
+              var _clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
               linesLayout.push({
                 str: _clip.str,
                 width: _clip.width
@@ -17685,8 +17671,6 @@
     }, {
       key: "updateGroupAABBBounds",
       value: function updateGroupAABBBounds(attribute, groupTheme, aabbBounds, graphic) {
-        var originalAABBBounds = aabbBounds;
-        aabbBounds = aabbBounds.clone();
         var width = attribute.width,
           height = attribute.height,
           path = attribute.path,
@@ -17694,12 +17678,12 @@
           clip = _attribute$clip === void 0 ? groupTheme.clip : _attribute$clip;
         path && path.length ? path.forEach(function (g) {
           aabbBounds.union(g.AABBBounds);
-        }) : null != width && null != height && aabbBounds.set(0, 0, Math.max(0, width), Math.max(0, height)), clip || graphic.forEachChildren(function (node) {
+        }) : null != width && null != height && aabbBounds.set(0, 0, width, height), clip || graphic.forEachChildren(function (node) {
           aabbBounds.union(node.AABBBounds);
         });
         var tb1 = this.tempAABBBounds1,
           tb2 = this.tempAABBBounds2;
-        return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, groupTheme, !1, graphic), originalAABBBounds.copy(aabbBounds), originalAABBBounds;
+        return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, groupTheme, !1, graphic), aabbBounds;
       }
     }, {
       key: "updateGlyphAABBBounds",
@@ -20659,14 +20643,9 @@
           backgroundMode = _graphic$attribute$ba === void 0 ? graphicAttribute.backgroundMode : _graphic$attribute$ba,
           _graphic$attribute$ba2 = _graphic$attribute.backgroundFit,
           backgroundFit = _graphic$attribute$ba2 === void 0 ? graphicAttribute.backgroundFit : _graphic$attribute$ba2;
-        var matrix,
+        var b,
           background = graphic.attribute.background;
         if (!background) return;
-        var restore = function restore() {
-          "richtext" === graphic.type && (context.restore(), context.save(), matrix && context.setTransformFromMatrix(matrix, !0, 1));
-        };
-        var b;
-        "richtext" === graphic.type && (matrix = context.currentMatrix.clone(), context.restore(), context.save(), context.setTransformForCurrent());
         var shouldReCalBounds = isObject$1(background) && background.background,
           onlyTranslate = graphic.transMatrix.onlyTranslate();
         if (shouldReCalBounds) {
@@ -20691,13 +20670,13 @@
         })).clone());
         if (graphic.backgroundImg && graphic.resources) {
           var res = graphic.resources.get(background);
-          if ("success" !== res.state || !res.data) return void restore();
+          if ("success" !== res.state || !res.data) return;
           context.highPerformanceSave(), onlyTranslate && context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), this.doDrawImage(context, res.data, b, backgroundMode, backgroundFit), context.highPerformanceRestore(), context.setTransformForCurrent();
         } else {
           var backgroundCornerRadius = graphic.attribute.backgroundCornerRadius;
           context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = background, backgroundCornerRadius ? (createRectPath(context, b.x1, b.y1, b.width(), b.height(), backgroundCornerRadius), context.fill()) : context.fillRect(b.x1, b.y1, b.width(), b.height()), context.highPerformanceRestore();
         }
-        shouldReCalBounds && boundsAllocate.free(b), restore();
+        shouldReCalBounds && boundsAllocate.free(b);
       }
     }]);
   }(DefaultBaseBackgroundRenderContribution);
@@ -21455,7 +21434,7 @@
       value: function render(groups, params) {
         this.renderTreeRoots = groups, this.drawParams = params;
         var updateBounds = params.updateBounds;
-        this.prepare(updateBounds), this.prepareRenderList(), this.beforeDraw(params), this.draw(params), this.afterDraw(params), this.drawParams = null;
+        this.prepare(updateBounds), this.prepareRenderList(), this.beforeDraw(params), this.draw(params), this.afterDraw(params);
       }
     }]);
   }();
@@ -23262,7 +23241,7 @@
           }), !isFinite(boundsLegal)) return;
           width = childrenWidth, height = childrenHeight;
         }
-        null == p.attribute.width ? p.attribute.width = width : width = p.attribute.width, null == p.attribute.height ? p.attribute.height = height : height = p.attribute.height, this.tempBounds.copy(p._AABBBounds);
+        p.attribute.width = width, p.attribute.height = height, this.tempBounds.copy(p._AABBBounds);
         var result = {
             main: {
               len: width,
@@ -23303,7 +23282,7 @@
             }), tempMainL = 0, tempCrossL = 0) : (mainList.push({
               idx: i - 1,
               mainLen: tempMainL,
-              crossLen: tempCrossL
+              crossLen: crossLen
             }), tempMainL = mainLen, tempCrossL = crossLen) : (tempMainL += mainLen, tempCrossL = Math.max(tempCrossL, crossLen));
           }), mainList.push({
             idx: mianLenArray.length - 1,
@@ -24294,7 +24273,7 @@
       value: function release() {
         _get(_getPrototypeOf(Stage.prototype), "release", this).call(this), this.hooks.beforeRender.unTap("constructor", this.beforeRender), this.hooks.afterRender.unTap("constructor", this.afterRender), this.eventSystem && this.eventSystem.release(), this.layerService.releaseStage(this), this.pluginService.release(), this.forEach(function (layer) {
           layer.release();
-        }), this.interactiveLayer && this.interactiveLayer.release(), this.window.release(), this.ticker.remTimeline(this.timeline), this.renderService.renderTreeRoots = [];
+        }), this.interactiveLayer && this.interactiveLayer.release(), this.window.release();
       }
     }, {
       key: "setStage",
@@ -29111,9 +29090,9 @@
         if (target && !isRoot) {
           var handlePointerMove = function handlePointerMove(moveEvent) {
             if (dragstartTriggered || (moveEvent.type = "dragstart", null == target || target.dispatchEvent(moveEvent), dragstartTriggered = !0), moveEvent.type = "drag", null == target || target.dispatchEvent(moveEvent), !isRoot) {
-              target.attribute.pickable = !1;
+              target.pickable = !1;
               var elemBelow = (null == rootNode ? void 0 : rootNode.pick(moveEvent.global.x, moveEvent.global.y)).graphic;
-              target.attribute.pickable = !0, currentDroppable !== elemBelow && (currentDroppable && (moveEvent.type = "dragleave", moveEvent.target = currentDroppable, currentDroppable.dispatchEvent(moveEvent)), elemBelow && (moveEvent.type = "dragenter", moveEvent.target = elemBelow, elemBelow.dispatchEvent(moveEvent)), currentDroppable = elemBelow, currentDroppable && (moveEvent.type = "dragover", moveEvent.target = currentDroppable, currentDroppable.dispatchEvent(moveEvent)));
+              target.pickable = !0, currentDroppable !== elemBelow && (currentDroppable && (moveEvent.type = "dragleave", moveEvent.target = currentDroppable, currentDroppable.dispatchEvent(moveEvent)), elemBelow && (moveEvent.type = "dragenter", moveEvent.target = elemBelow, elemBelow.dispatchEvent(moveEvent)), currentDroppable = elemBelow, currentDroppable && (moveEvent.type = "dragover", moveEvent.target = currentDroppable, currentDroppable.dispatchEvent(moveEvent)));
             }
           };
           var currentDroppable,
@@ -34918,7 +34897,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.18.14-alpha.0";
+  const version = "0.19.0-alpha.1";
   preLoadAllModule();
   if (isBrowserEnv()) {
       loadBrowserEnv(container);