@visactor/vrender 0.20.0-alpha.4 → 0.20.0

package/dist/index.js

@@ -35,40 +35,11 @@
     var Reflect$1 = (function (Reflect) {
       var target;
       return function (exporter) {
-        const hasOwn = Object.prototype.hasOwnProperty,
-          supportsSymbol = "function" == typeof Symbol,
+        const supportsSymbol = "function" == typeof Symbol,
           toPrimitiveSymbol = supportsSymbol && void 0 !== Symbol.toPrimitive ? Symbol.toPrimitive : "@@toPrimitive",
-          iteratorSymbol = supportsSymbol && void 0 !== Symbol.iterator ? Symbol.iterator : "@@iterator",
-          supportsCreate = "function" == typeof Object.create,
-          supportsProto = {
-            __proto__: []
-          } instanceof Array,
-          downLevel = !supportsCreate && !supportsProto,
-          HashMap = {
-            create: supportsCreate ? function () {
-              return MakeDictionary(Object.create(null));
-            } : supportsProto ? function () {
-              return MakeDictionary({
-                __proto__: null
-              });
-            } : function () {
-              return MakeDictionary({});
-            },
-            has: downLevel ? function (map, key) {
-              return hasOwn.call(map, key);
-            } : function (map, key) {
-              return key in map;
-            },
-            get: downLevel ? function (map, key) {
-              return hasOwn.call(map, key) ? map[key] : void 0;
-            } : function (map, key) {
-              return map[key];
-            }
-          },
-          functionPrototype = Object.getPrototypeOf(Function),
-          usePolyfill = "object" == typeof process && process.env && "true" === process.env.REFLECT_METADATA_USE_MAP_POLYFILL,
-          _Map = usePolyfill || "function" != typeof Map || "function" != typeof Map.prototype.entries ? CreateMapPolyfill() : Map,
-          Metadata = (usePolyfill || "function" != typeof Set || "function" != typeof Set.prototype.entries ? CreateSetPolyfill() : Set, new (usePolyfill || "function" != typeof WeakMap ? CreateWeakMapPolyfill() : WeakMap)());
+          functionPrototype = (Object.getPrototypeOf(Function)),
+          _Map = ("object" == typeof process && process.env && process.env.REFLECT_METADATA_USE_MAP_POLYFILL, Map),
+          Metadata = (new WeakMap());
         function defineMetadata(metadataKey, metadataValue, target, propertyKey) {
           if (!IsObject(target)) throw new TypeError();
           return OrdinaryDefineOwnMetadata(metadataKey, metadataValue, target, propertyKey);
@@ -225,183 +196,6 @@
           const constructor = prototypeProto.constructor;
           return "function" != typeof constructor || constructor === O ? proto : constructor;
         }
-        function CreateMapPolyfill() {
-          const cacheSentinel = {},
-            arraySentinel = [],
-            MapIterator = function () {
-              function MapIterator(keys, values, selector) {
-                this._index = 0, this._keys = keys, this._values = values, this._selector = selector;
-              }
-              return MapIterator.prototype["@@iterator"] = function () {
-                return this;
-              }, MapIterator.prototype[iteratorSymbol] = function () {
-                return this;
-              }, MapIterator.prototype.next = function () {
-                const index = this._index;
-                if (index >= 0 && index < this._keys.length) {
-                  const result = this._selector(this._keys[index], this._values[index]);
-                  return index + 1 >= this._keys.length ? (this._index = -1, this._keys = arraySentinel, this._values = arraySentinel) : this._index++, {
-                    value: result,
-                    done: !1
-                  };
-                }
-                return {
-                  value: void 0,
-                  done: !0
-                };
-              }, MapIterator.prototype.throw = function (error) {
-                throw this._index >= 0 && (this._index = -1, this._keys = arraySentinel, this._values = arraySentinel), error;
-              }, MapIterator.prototype.return = function (value) {
-                return this._index >= 0 && (this._index = -1, this._keys = arraySentinel, this._values = arraySentinel), {
-                  value: value,
-                  done: !0
-                };
-              }, MapIterator;
-            }();
-          return function () {
-            function Map() {
-              this._keys = [], this._values = [], this._cacheKey = cacheSentinel, this._cacheIndex = -2;
-            }
-            return Object.defineProperty(Map.prototype, "size", {
-              get: function () {
-                return this._keys.length;
-              },
-              enumerable: !0,
-              configurable: !0
-            }), Map.prototype.has = function (key) {
-              return this._find(key, !1) >= 0;
-            }, Map.prototype.get = function (key) {
-              const index = this._find(key, !1);
-              return index >= 0 ? this._values[index] : void 0;
-            }, Map.prototype.set = function (key, value) {
-              const index = this._find(key, !0);
-              return this._values[index] = value, this;
-            }, Map.prototype.delete = function (key) {
-              const index = this._find(key, !1);
-              if (index >= 0) {
-                const size = this._keys.length;
-                for (let i = index + 1; i < size; i++) this._keys[i - 1] = this._keys[i], this._values[i - 1] = this._values[i];
-                return this._keys.length--, this._values.length--, key === this._cacheKey && (this._cacheKey = cacheSentinel, this._cacheIndex = -2), !0;
-              }
-              return !1;
-            }, Map.prototype.clear = function () {
-              this._keys.length = 0, this._values.length = 0, this._cacheKey = cacheSentinel, this._cacheIndex = -2;
-            }, Map.prototype.keys = function () {
-              return new MapIterator(this._keys, this._values, getKey);
-            }, Map.prototype.values = function () {
-              return new MapIterator(this._keys, this._values, getValue);
-            }, Map.prototype.entries = function () {
-              return new MapIterator(this._keys, this._values, getEntry);
-            }, Map.prototype["@@iterator"] = function () {
-              return this.entries();
-            }, Map.prototype[iteratorSymbol] = function () {
-              return this.entries();
-            }, Map.prototype._find = function (key, insert) {
-              return this._cacheKey !== key && (this._cacheIndex = this._keys.indexOf(this._cacheKey = key)), this._cacheIndex < 0 && insert && (this._cacheIndex = this._keys.length, this._keys.push(key), this._values.push(void 0)), this._cacheIndex;
-            }, Map;
-          }();
-          function getKey(key, _) {
-            return key;
-          }
-          function getValue(_, value) {
-            return value;
-          }
-          function getEntry(key, value) {
-            return [key, value];
-          }
-        }
-        function CreateSetPolyfill() {
-          return function () {
-            function Set() {
-              this._map = new _Map();
-            }
-            return Object.defineProperty(Set.prototype, "size", {
-              get: function () {
-                return this._map.size;
-              },
-              enumerable: !0,
-              configurable: !0
-            }), Set.prototype.has = function (value) {
-              return this._map.has(value);
-            }, Set.prototype.add = function (value) {
-              return this._map.set(value, value), this;
-            }, Set.prototype.delete = function (value) {
-              return this._map.delete(value);
-            }, Set.prototype.clear = function () {
-              this._map.clear();
-            }, Set.prototype.keys = function () {
-              return this._map.keys();
-            }, Set.prototype.values = function () {
-              return this._map.values();
-            }, Set.prototype.entries = function () {
-              return this._map.entries();
-            }, Set.prototype["@@iterator"] = function () {
-              return this.keys();
-            }, Set.prototype[iteratorSymbol] = function () {
-              return this.keys();
-            }, Set;
-          }();
-        }
-        function CreateWeakMapPolyfill() {
-          const UUID_SIZE = 16,
-            keys = HashMap.create(),
-            rootKey = CreateUniqueKey();
-          return function () {
-            function WeakMap() {
-              this._key = CreateUniqueKey();
-            }
-            return WeakMap.prototype.has = function (target) {
-              const table = GetOrCreateWeakMapTable(target, !1);
-              return void 0 !== table && HashMap.has(table, this._key);
-            }, WeakMap.prototype.get = function (target) {
-              const table = GetOrCreateWeakMapTable(target, !1);
-              return void 0 !== table ? HashMap.get(table, this._key) : void 0;
-            }, WeakMap.prototype.set = function (target, value) {
-              return GetOrCreateWeakMapTable(target, !0)[this._key] = value, this;
-            }, WeakMap.prototype.delete = function (target) {
-              const table = GetOrCreateWeakMapTable(target, !1);
-              return void 0 !== table && delete table[this._key];
-            }, WeakMap.prototype.clear = function () {
-              this._key = CreateUniqueKey();
-            }, WeakMap;
-          }();
-          function CreateUniqueKey() {
-            let key;
-            do {
-              key = "@@WeakMap@@" + CreateUUID();
-            } while (HashMap.has(keys, key));
-            return keys[key] = !0, key;
-          }
-          function GetOrCreateWeakMapTable(target, create) {
-            if (!hasOwn.call(target, rootKey)) {
-              if (!create) return;
-              Object.defineProperty(target, rootKey, {
-                value: HashMap.create()
-              });
-            }
-            return target[rootKey];
-          }
-          function FillRandomBytes(buffer, size) {
-            for (let i = 0; i < size; ++i) buffer[i] = 255 * Math.random() | 0;
-            return buffer;
-          }
-          function GenRandomBytes(size) {
-            return "function" == typeof Uint8Array ? "undefined" != typeof crypto ? crypto.getRandomValues(new Uint8Array(size)) : FillRandomBytes(new Uint8Array(size), size) : FillRandomBytes(new Array(size), size);
-          }
-          function CreateUUID() {
-            const data = GenRandomBytes(UUID_SIZE);
-            data[6] = 79 & data[6] | 64, data[8] = 191 & data[8] | 128;
-            let result = "";
-            for (let offset = 0; offset < UUID_SIZE; ++offset) {
-              const byte = data[offset];
-              4 !== offset && 6 !== offset && 8 !== offset || (result += "-"), byte < 16 && (result += "0"), result += byte.toString(16).toLowerCase();
-            }
-            return result;
-          }
-        }
-        function MakeDictionary(obj) {
-          return obj.__ = void 0, delete obj.__, obj;
-        }
         exporter("defineMetadata", defineMetadata), exporter("hasMetadata", hasMetadata), exporter("hasOwnMetadata", hasOwnMetadata), exporter("getMetadata", getMetadata);
       }((target = Reflect, function (key, value) {
         "function" != typeof target[key] && Object.defineProperty(target, key, {
@@ -12189,7 +11983,7 @@
     const defaultGroupBackgroundRenderContribution = new DefaultGroupBackgroundRenderContribution();
 
     const halfPi = pi / 2;
-    function createRectPath(path, x, y, width, height, rectCornerRadius) {
+    function createRectPath(path, x, y, width, height, rectCornerRadius, edgeCb) {
       let cornerRadius;
       if (width < 0 && (x += width, width = -width), height < 0 && (y += height, height = -height), isNumber$1(rectCornerRadius, !0)) cornerRadius = [rectCornerRadius = abs(rectCornerRadius), rectCornerRadius, rectCornerRadius, rectCornerRadius];else if (Array.isArray(rectCornerRadius)) {
         const cornerRadiusArr = rectCornerRadius;
@@ -12221,27 +12015,28 @@
         rightBottomPoint2 = [rightBottom[0], rightBottom[1] - _cornerRadius[2]],
         leftBottomPoint1 = [leftBottom[0] + _cornerRadius[3], leftBottom[1]],
         leftBottomPoint2 = [leftBottom[0], leftBottom[1] - _cornerRadius[3]];
-      if (path.moveTo(leftTopPoint1[0], leftTopPoint1[1]), path.lineTo(rightTopPoint1[0], rightTopPoint1[1]), !arrayEqual(rightTopPoint1, rightTopPoint2)) {
+      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)) {
+        edgeCb && edgeCb[0] && path.moveTo(rightTopPoint1[0], rightTopPoint1[1]);
         const centerX = rightTopPoint1[0],
           centerY = rightTopPoint1[1] + _cornerRadius[1];
         path.arc(centerX, centerY, _cornerRadius[1], -halfPi, 0, !1);
       }
-      if (path.lineTo(rightBottomPoint2[0], rightBottomPoint2[1]), !arrayEqual(rightBottomPoint1, rightBottomPoint2)) {
+      if (edgeCb && edgeCb[1] ? edgeCb[1](rightTopPoint2[0], rightTopPoint2[1], rightBottomPoint2[0], rightBottomPoint2[1]) : path.lineTo(rightBottomPoint2[0], rightBottomPoint2[1]), !arrayEqual(rightBottomPoint1, rightBottomPoint2)) {
         const centerX = rightBottomPoint2[0] - _cornerRadius[2],
           centerY = rightBottomPoint2[1];
-        path.arc(centerX, centerY, _cornerRadius[2], 0, halfPi, !1);
+        edgeCb && edgeCb[1] && path.moveTo(rightBottomPoint2[0], rightBottomPoint2[1]), path.arc(centerX, centerY, _cornerRadius[2], 0, halfPi, !1);
       }
-      if (path.lineTo(leftBottomPoint1[0], leftBottomPoint1[1]), !arrayEqual(leftBottomPoint1, leftBottomPoint2)) {
+      if (edgeCb && edgeCb[2] ? edgeCb[2](rightBottomPoint1[0], rightBottomPoint1[1], leftBottomPoint1[0], leftBottomPoint1[1]) : path.lineTo(leftBottomPoint1[0], leftBottomPoint1[1]), !arrayEqual(leftBottomPoint1, leftBottomPoint2)) {
         const centerX = leftBottomPoint1[0],
           centerY = leftBottomPoint1[1] - _cornerRadius[3];
-        path.arc(centerX, centerY, _cornerRadius[3], halfPi, pi, !1);
+        edgeCb && edgeCb[2] && path.moveTo(leftBottomPoint1[0], leftBottomPoint1[1]), path.arc(centerX, centerY, _cornerRadius[3], halfPi, pi, !1);
       }
-      if (path.lineTo(leftTopPoint2[0], leftTopPoint2[1]), !arrayEqual(leftTopPoint1, leftTopPoint2)) {
+      if (edgeCb && edgeCb[3] ? edgeCb[3](leftBottomPoint2[0], leftBottomPoint2[1], leftTopPoint2[0], leftTopPoint2[1]) : path.lineTo(leftTopPoint2[0], leftTopPoint2[1]), !arrayEqual(leftTopPoint1, leftTopPoint2)) {
         const centerX = leftTopPoint1[0],
           centerY = leftTopPoint1[1] + _cornerRadius[0];
-        path.arc(centerX, centerY, _cornerRadius[0], pi, pi + halfPi, !1);
+        edgeCb && edgeCb[3] && path.moveTo(leftTopPoint2[0], leftTopPoint2[1]), path.arc(centerX, centerY, _cornerRadius[0], pi, pi + halfPi, !1);
       }
-      return path.closePath(), path;
+      return !edgeCb && path.closePath(), path;
     }
 
     var __decorate$1z = undefined && undefined.__decorate || function (decorators, target, key, desc) {
@@ -12318,14 +12113,24 @@
           y1: y1,
           x: originX = groupAttribute.x,
           y: originY = groupAttribute.y,
-          stroke = groupAttribute.stroke
+          stroke = groupAttribute.stroke,
+          cornerRadius = groupAttribute.cornerRadius
         } = rect.attribute;
         let {
           width: width,
           height: height
         } = rect.attribute;
         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), 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]) {
+          if (context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute), !(0 === cornerRadius || isArray$1(cornerRadius) && cornerRadius.every(num => 0 === num))) {
+            let lastStroke,
+              lastStrokeI = 0;
+            return createRectPath(context, x, y, width, height, cornerRadius, new Array(4).fill(0).map((_, i) => (x1, y1, x2, y2) => {
+              stroke[i] && (lastStrokeI === i - 1 && stroke[i] === lastStroke || (context.setStrokeStyle(rect, Object.assign(Object.assign({}, rect.attribute), {
+                stroke: stroke[i]
+              }), x, y, groupAttribute), context.beginPath(), context.moveTo(x1, y1), lastStroke = stroke[i]), lastStrokeI = i, context.lineTo(x2, y2), context.stroke(), 3 === i && context.beginPath());
+            })), void context.stroke();
+          }
+          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]) {
             const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;
             context.lineTo(x, adjustY);
           } else context.moveTo(x, y);
@@ -13169,9 +12974,9 @@
           data = this.valid(area, areaAttribute, fillCb, strokeCb);
         if (!data) return;
         const {
-            doFill: doFill,
-            doStroke: doStroke
+            doFill: doFill
           } = data,
+          doStroke = data.doStroke && data.sVisible,
           {
             clipRange = areaAttribute.clipRange,
             closePath: closePath,
@@ -13989,7 +13794,9 @@
           clip: clip,
           baseOpacity = 1
         } = group.attribute;
-        clip ? context.save() : context.highPerformanceSave(), context.baseGlobalAlpha *= baseOpacity;
+        clip ? context.save() : context.highPerformanceSave();
+        const baseGlobalAlpha = context.baseGlobalAlpha;
+        context.baseGlobalAlpha *= baseOpacity;
         const groupAttribute = getTheme(group, null == params ? void 0 : params.theme).group,
           lastModelMatrix = context.modelMatrix;
         if (context.camera) {
@@ -14003,7 +13810,7 @@
           scrollY = groupAttribute.scrollY
         } = group.attribute;
         let p;
-        (scrollX || scrollY) && context.translate(scrollX, scrollY), params && params.drawingCb && (p = params.drawingCb()), context.modelMatrix !== lastModelMatrix && mat4Allocate.free(context.modelMatrix), context.modelMatrix = lastModelMatrix, context.baseGlobalAlpha /= baseOpacity, p && p.then ? p.then(() => {
+        (scrollX || scrollY) && context.translate(scrollX, scrollY), params && params.drawingCb && (p = params.drawingCb()), context.modelMatrix !== lastModelMatrix && mat4Allocate.free(context.modelMatrix), context.modelMatrix = lastModelMatrix, context.baseGlobalAlpha = baseGlobalAlpha, p && p.then ? p.then(() => {
           clip ? context.restore() : context.highPerformanceRestore();
         }) : clip ? context.restore() : context.highPerformanceRestore();
       }
@@ -14182,7 +13989,7 @@
           const m = graphic.globalTransMatrix.getInverse();
           drawContribution.dirtyBounds.copy(drawContribution.backupDirtyBounds).transformWithMatrix(m), drawContribution.backupDirtyBounds.copy(drawContribution.dirtyBounds);
         }
-        return drawContribution.renderGroup(graphic.shadowRoot, drawContext, graphic.parent.globalTransMatrix), context.highPerformanceRestore(), drawContribution.dirtyBounds && drawContribution.backupDirtyBounds && (drawContribution.dirtyBounds.copy(tempDirtyBounds), drawContribution.backupDirtyBounds.copy(tempBackupDirtyBounds)), !0;
+        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;
       }
     }
     class DebugDrawItemInterceptorContribution {
@@ -16550,20 +16357,21 @@
         this.frame.lines.push(line), this.frame.actualHeight += line.height, this.y += line.height, this.lineBuffer.length = 0, this.lineWidth = this.maxAscent = this.maxDescent = this.maxAscentForBlank = this.maxDescentForBlank = 0;
       }
       deal(paragraph) {
-        paragraph instanceof RichTextIcon ? "horizontal" === this.direction && 0 === this.width || "vertical" === this.direction && 0 === this.height || this.lineWidth + paragraph[this.directionKey.width] <= this[this.directionKey.width] ? this.store(paragraph) : 0 === this.lineBuffer.length ? (this.store(paragraph), this.send()) : (this.send(), this.deal(paragraph)) : "number" != typeof this.width || this.width < 0 || (paragraph.newLine && this.send(), 0 !== paragraph.text.length && ("horizontal" === this.direction && 0 === this.width || "vertical" === this.direction && 0 === this.height || this.lineWidth + paragraph[this.directionKey.width] <= this[this.directionKey.width] ? this.store(paragraph) : this.lineWidth === this[this.directionKey.width] ? (this.send(), this.deal(paragraph)) : this.cut(paragraph)));
+        let singleLine = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !1;
+        paragraph instanceof RichTextIcon ? "horizontal" === this.direction && 0 === this.width || "vertical" === this.direction && 0 === this.height || this.lineWidth + paragraph[this.directionKey.width] <= this[this.directionKey.width] ? this.store(paragraph) : 0 === this.lineBuffer.length ? (this.store(paragraph), this.send()) : (this.send(), this.deal(paragraph)) : "number" != typeof this.width || this.width < 0 || (paragraph.newLine && this.send(), 0 !== paragraph.text.length && ("horizontal" === this.direction && 0 === this.width || "vertical" === this.direction && 0 === this.height || this.lineWidth + paragraph[this.directionKey.width] <= this[this.directionKey.width] ? this.store(paragraph) : this.lineWidth === this[this.directionKey.width] ? (this.send(), this.deal(paragraph)) : this.cut(paragraph, singleLine)));
       }
-      cut(paragraph) {
+      cut(paragraph, singleLine) {
         const availableWidth = this[this.directionKey.width] - this.lineWidth || 0,
           guessIndex = Math.ceil(availableWidth / paragraph[this.directionKey.width] * paragraph.length) || 0,
           index = getStrByWithCanvas(paragraph.text, availableWidth, paragraph.character, guessIndex, "break-word" === this.frame.wordBreak);
         if (0 !== index) {
           const [p1, p2] = seperateParagraph(paragraph, index);
-          this.store(p1), this.deal(p2);
+          this.store(p1), singleLine ? this.send() : this.deal(p2);
         } else 0 !== this.lineBuffer.length && (this.send(), this.deal(paragraph));
       }
     }
 
-    const RICHTEXT_UPDATE_TAG_KEY = ["width", "height", "ellipsis", "wordBreak", "verticalDirection", "maxHeight", "maxWidth", "textAlign", "textBaseline", "textConfig", "layoutDirection", ...GRAPHIC_UPDATE_TAG_KEY];
+    const RICHTEXT_UPDATE_TAG_KEY = ["width", "height", "ellipsis", "wordBreak", "verticalDirection", "maxHeight", "maxWidth", "textAlign", "textBaseline", "textConfig", "layoutDirection", "fill", "stroke", "fontSize", ...GRAPHIC_UPDATE_TAG_KEY];
     class RichText extends Graphic {
       constructor(params) {
         super(params), this.type = "richtext", this._currentHoverIcon = null, this.numberType = RICHTEXT_NUMBER_TYPE;
@@ -16765,7 +16573,7 @@
             skip = !1;
           for (let i = 0; i < paragraphs.length; i++) {
             const p = paragraphs[i];
-            skip ? (p.overflow = !0, p.left = 1 / 0, p.top = 1 / 0, !p.newLine && frame.lines[frame.lines.length - 1].paragraphs.push(p)) : wrapper.deal(p), frame.lines.length !== lineCount && (lineCount = frame.lines.length, wrapper.lineBuffer.length = 0, p.overflow = !0, p.left = 1e3, p.top = 1e3, frame.lines[frame.lines.length - 1].paragraphs.push(p), skip = !0), p.newLine && (skip = !1, wrapper.lineWidth = 0);
+            skip ? (p.overflow = !0, p.left = 1 / 0, p.top = 1 / 0, !p.newLine && frame.lines[frame.lines.length - 1].paragraphs.push(p)) : wrapper.deal(p, !0), frame.lines.length !== lineCount && (lineCount = frame.lines.length, wrapper.lineBuffer.length = 0, p.overflow = !0, p.left = 1e3, p.top = 1e3, frame.lines[frame.lines.length - 1].paragraphs.push(p), skip = !0), p.newLine && (skip = !1, wrapper.lineWidth = 0), wrapper.send();
           }
         } else for (let i = 0; i < paragraphs.length; i++) wrapper.deal(paragraphs[i]);
         wrapper.send();
@@ -16806,10 +16614,11 @@
         let pickIcon;
         return frameCache.icons.forEach(icon => {
           var _a, _b;
-          icon.AABBBounds.containsPoint({
+          const bounds = icon.AABBBounds.clone();
+          bounds.translate(icon._marginArray[3], icon._marginArray[0]), bounds.containsPoint({
             x: point.x - x,
             y: point.y - y
-          }) && (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);
+          }) && (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]);
         }), pickIcon;
       }
       getNoWorkAnimateAttr() {
@@ -24254,7 +24063,7 @@
           opacity = defaultParams.opacity,
           fill = defaultParams.fill
         } = attribute;
-        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;
+        _context.globalAlpha = fillOpacity * opacity * this.baseGlobalAlpha, fillOpacity > 1e-12 && opacity > 1e-12 && (_context.fillStyle = createColor(this, fill, params, offsetX, offsetY));
       }
       setShadowBlendStyle(params, attribute, defaultParams) {
         if (Array.isArray(defaultParams)) {
@@ -24297,7 +24106,7 @@
           strokeOpacity = defaultParams.strokeOpacity,
           opacity = defaultParams.opacity
         } = attribute;
-        if (strokeOpacity > 1e-12 && opacity > 1e-12) {
+        if (_context.globalAlpha = strokeOpacity * opacity * this.baseGlobalAlpha, strokeOpacity > 1e-12 && opacity > 1e-12) {
           const {
             lineWidth = defaultParams.lineWidth,
             stroke = defaultParams.stroke,
@@ -24306,7 +24115,7 @@
             lineCap = defaultParams.lineCap,
             miterLimit = defaultParams.miterLimit
           } = attribute;
-          _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;
+          _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;
         }
       }
       setTextStyleWithoutAlignBaseline(params, defaultParams, z) {
@@ -28450,7 +28259,7 @@
 
     const roughModule = _roughModule;
 
-    const version = "0.20.0-alpha.4";
+    const version = "0.20.0";
     preLoadAllModule();
     if (isBrowserEnv()) {
         loadBrowserEnv(container);