@visactor/vrender 0.22.0-vstory.10 → 0.22.0-vstory.12

package/dist/index.js

@@ -577,17 +577,17 @@
     const VGlobal = Symbol.for("VGlobal");
     const DEFAULT_TEXT_FONT_FAMILY = "PingFang SC,Helvetica Neue,Microsoft Yahei,system-ui,-apple-system,segoe ui,Roboto,Helvetica,Arial,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol";
 
-    var __decorate$1J = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1L = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$1i = undefined && undefined.__metadata || function (k, v) {
+      __metadata$1j = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$U = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$V = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -621,6 +621,12 @@
       get env() {
         return this._env;
       }
+      get isImageAnonymous() {
+        return this._isImageAnonymous;
+      }
+      set isImageAnonymous(isImageAnonymous) {
+        this._isImageAnonymous = isImageAnonymous;
+      }
       get devicePixelRatio() {
         return this._env || this.setEnv("browser"), this.envContribution.getDevicePixelRatio();
       }
@@ -655,7 +661,7 @@
         this._env || this.setEnv("browser"), this.envContribution.applyStyles = support;
       }
       constructor(contributions) {
-        this.contributions = contributions, this.id = Generator.GenAutoIncrementId(), this.hooks = {
+        this.contributions = contributions, this._isImageAnonymous = !0, this.id = Generator.GenAutoIncrementId(), this.hooks = {
           onSetEnv: new SyncHook(["lastEnv", "env", "global"])
         }, this.measureTextMethod = "native", this.optimizeVisible = !1;
       }
@@ -783,7 +789,7 @@
         return this._env || this.setEnv("browser"), this.envContribution.copyToClipBoard(text);
       }
     };
-    exports.DefaultGlobal = __decorate$1J([injectable(), __param$U(0, inject(ContributionProvider)), __param$U(0, named(EnvContribution)), __metadata$1i("design:paramtypes", [Object])], exports.DefaultGlobal);
+    exports.DefaultGlobal = __decorate$1L([injectable(), __param$V(0, inject(ContributionProvider)), __param$V(0, named(EnvContribution)), __metadata$1j("design:paramtypes", [Object])], exports.DefaultGlobal);
 
     exports.MeasureModeEnum = void 0;
     !function (MeasureModeEnum) {
@@ -3470,7 +3476,7 @@
           default:
             if (this._t <= 0) this.context.lineTo(this._x, y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x, y, !1 !== this._lastDefined && !1 !== p.defined, p);else {
               const x1 = this._x * (1 - this._t) + x * this._t;
-              this.context.lineTo(x1, this._y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x1, y, !1 !== this._lastDefined && !1 !== p.defined, p);
+              .5 === this._t ? this.context.lineTo(x1, this._y, !1 !== this._lastDefined, this.lastPoint) : this.context.lineTo(x1, this._y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x1, y, !1 !== this._lastDefined && !1 !== p.defined, p);
             }
         }
         this._lastDefined = p.defined, this._x = x, this._y = y, this.lastPoint = p;
@@ -4300,6 +4306,7 @@
     const DefaultRichTextAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultTextStyle), {
       editable: !1,
       editOptions: null,
+      ascentDescentMode: "actual",
       width: 300,
       height: 300,
       ellipsis: !0,
@@ -4347,7 +4354,7 @@
     class Application {}
     const application = new Application();
 
-    const parse = function () {
+    const parse$1 = function () {
       const tokens = {
         linearGradient: /^(linear\-gradient)/i,
         radialGradient: /^(radial\-gradient)/i,
@@ -4500,7 +4507,7 @@
       }
       static Parse(c) {
         if (GradientParser.IsGradientStr(c)) try {
-          const datum = parse(c)[0];
+          const datum = parse$1(c)[0];
           if (datum) {
             if ("linear" === datum.type) return GradientParser.ParseLinear(datum);
             if ("radial" === datum.type) return GradientParser.ParseRadial(datum);
@@ -4747,17 +4754,20 @@
       return i + 1;
     }
     function measureTextCanvas(text, character) {
+      let mode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "actual";
       const measurement = application.graphicUtil.textMeasure.measureText(text, character),
         result = {
           ascent: 0,
           height: 0,
           descent: 0,
           width: 0
-        };
-      return "number" != typeof measurement.fontBoundingBoxAscent || "number" != typeof measurement.fontBoundingBoxDescent ? (result.width = measurement.width, result.height = character.fontSize || 0, result.ascent = result.height, result.descent = 0) : (result.width = measurement.width, result.height = Math.floor(measurement.fontBoundingBoxAscent + measurement.fontBoundingBoxDescent), result.ascent = Math.floor(measurement.fontBoundingBoxAscent), result.descent = result.height - result.ascent), result;
+        },
+        ascent = "actual" === mode ? measurement.actualBoundingBoxAscent : measurement.fontBoundingBoxAscent,
+        descent = "actual" === mode ? measurement.actualBoundingBoxDescent : measurement.fontBoundingBoxDescent;
+      return "number" != typeof ascent || "number" != typeof descent ? (result.width = Math.floor(measurement.width), result.height = character.fontSize || 0, result.ascent = result.height, result.descent = 0) : (result.width = Math.floor(measurement.width), result.height = Math.floor(ascent + descent), result.ascent = Math.floor(ascent), result.descent = result.height - result.ascent), result;
     }
 
-    var __decorate$1I = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1K = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -5139,9 +5149,9 @@
         return data.str = data.result, data.width += suffixWidth, data;
       }
     };
-    ATextMeasure = __decorate$1I([injectable()], ATextMeasure);
+    ATextMeasure = __decorate$1K([injectable()], ATextMeasure);
 
-    var __decorate$1H = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1J = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -5150,7 +5160,7 @@
     };
     const TextMeasureContribution = Symbol.for("TextMeasureContribution");
     exports.DefaultTextMeasureContribution = class DefaultTextMeasureContribution extends ATextMeasure {};
-    exports.DefaultTextMeasureContribution = __decorate$1H([injectable()], exports.DefaultTextMeasureContribution);
+    exports.DefaultTextMeasureContribution = __decorate$1J([injectable()], exports.DefaultTextMeasureContribution);
 
     const container = new Container();
 
@@ -5564,14 +5574,14 @@
     }
     const canvasAllocate = new DefaultCanvasAllocate();
 
-    var __decorate$1G = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1I = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$1h = undefined && undefined.__metadata || function (k, v) {
+      __metadata$1i = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     const VWindow = Symbol.for("VWindow");
@@ -5708,19 +5718,19 @@
         return this._handler.getTopLeft(baseWindow);
       }
     };
-    exports.DefaultWindow = __decorate$1G([injectable(), __metadata$1h("design:paramtypes", [])], exports.DefaultWindow);
+    exports.DefaultWindow = __decorate$1I([injectable(), __metadata$1i("design:paramtypes", [])], exports.DefaultWindow);
 
-    var __decorate$1F = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1H = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$1g = undefined && undefined.__metadata || function (k, v) {
+      __metadata$1h = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$T = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$U = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -5815,7 +5825,7 @@
         return c.nativeCanvas ? c.nativeCanvas : null;
       }
     };
-    exports.DefaultGraphicUtil = __decorate$1F([injectable(), __param$T(0, inject(ContributionProvider)), __param$T(0, named(TextMeasureContribution)), __metadata$1g("design:paramtypes", [Object])], exports.DefaultGraphicUtil);
+    exports.DefaultGraphicUtil = __decorate$1H([injectable(), __param$U(0, inject(ContributionProvider)), __param$U(0, named(TextMeasureContribution)), __metadata$1h("design:paramtypes", [Object])], exports.DefaultGraphicUtil);
     var TransformMode;
     !function (TransformMode) {
       TransformMode[TransformMode.transform = 0] = "transform", TransformMode[TransformMode.matrix = 1] = "matrix";
@@ -5873,7 +5883,7 @@
         return this;
       }
     };
-    exports.DefaultTransformUtil = __decorate$1F([injectable(), __metadata$1g("design:paramtypes", [])], exports.DefaultTransformUtil);
+    exports.DefaultTransformUtil = __decorate$1H([injectable(), __metadata$1h("design:paramtypes", [])], exports.DefaultTransformUtil);
 
     const defaultThemeObj = {
         arc: DefaultArcAttribute,
@@ -7386,7 +7396,7 @@
         let id = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : Generator.GenAutoIncrementId();
         let timeline = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultTimeline;
         let slience = arguments.length > 2 ? arguments[2] : undefined;
-        this.id = id, this.timeline = timeline, this.status = exports.AnimateStatus.INITIAL, this.tailAnimate = new SubAnimate(this), this.subAnimates = [this.tailAnimate], this.timeScale = 1, this.rawPosition = -1, this._startTime = 0, this._duringTime = 0, this.timeline.addAnimate(this), this.slience = slience;
+        this.id = id, this.timeline = timeline || defaultTimeline, this.status = exports.AnimateStatus.INITIAL, this.tailAnimate = new SubAnimate(this), this.subAnimates = [this.tailAnimate], this.timeScale = 1, this.rawPosition = -1, this._startTime = 0, this._duringTime = 0, this.timeline.addAnimate(this), this.slience = slience;
       }
       setTimeline(timeline) {
         timeline !== this.timeline && (this.timeline.removeAnimate(this, !1), timeline.addAnimate(this));
@@ -7876,7 +7886,8 @@
       }
       onEnd() {}
       onUpdate(end, ratio, out) {
-        !1 !== this.valid && (out.text = end ? this.toNumber : (this.fromNumber + (this.toNumber - this.fromNumber) * ratio).toFixed(this.decimalLength));
+        var _a;
+        !1 !== this.valid && (out.text = end ? null === (_a = this.to) || void 0 === _a ? void 0 : _a.text : (this.fromNumber + (this.toNumber - this.fromNumber) * ratio).toFixed(this.decimalLength));
       }
     }
     var Direction;
@@ -9722,7 +9733,7 @@
       }
       static GetFile(url, type) {
         let data = ResourceLoader.cache.get(url);
-        return data ? "init" === data.loadState || "fail" === data.loadState ? Promise.reject() : "loading" === data.loadState ? data.dataPromise.then(data => data.data) : Promise.resolve(data.data) : (data = {
+        return data ? "fail" === data.loadState ? Promise.reject() : "init" === data.loadState || "loading" === data.loadState ? data.dataPromise.then(data => data.data) : Promise.resolve(data.data) : (data = {
           type: type,
           loadState: "init"
         }, ResourceLoader.cache.set(url, data), "arrayBuffer" === type ? data.dataPromise = application.global.loadArrayBuffer(url) : "blob" === type ? data.dataPromise = application.global.loadBlob(url) : "json" === type && (data.dataPromise = application.global.loadJson(url)), data.dataPromise.then(data => data.data));
@@ -11176,14 +11187,14 @@
     const VirtualLayerHandlerContribution = Symbol.for("VirtualLayerHandlerContribution");
 
     var DefaultLayerService_1,
-      __decorate$1E = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+      __decorate$1G = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$1f = undefined && undefined.__metadata || function (k, v) {
+      __metadata$1g = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     exports.DefaultLayerService = DefaultLayerService_1 = class {
@@ -11247,7 +11258,7 @@
         this.layerMap.delete(stage);
       }
     };
-    exports.DefaultLayerService.idprefix = "visactor_layer", exports.DefaultLayerService.prefix_count = 0, exports.DefaultLayerService = DefaultLayerService_1 = __decorate$1E([injectable(), __metadata$1f("design:paramtypes", [])], exports.DefaultLayerService);
+    exports.DefaultLayerService.idprefix = "visactor_layer", exports.DefaultLayerService.prefix_count = 0, exports.DefaultLayerService = DefaultLayerService_1 = __decorate$1G([injectable(), __metadata$1g("design:paramtypes", [])], exports.DefaultLayerService);
 
     var coreModule = new ContainerModule(bind => {
       bind(VGlobal).to(exports.DefaultGlobal).inSingletonScope(), bind(VWindow).to(exports.DefaultWindow), bind(GraphicUtil).to(exports.DefaultGraphicUtil).inSingletonScope(), bind(TransformUtil).to(exports.DefaultTransformUtil).inSingletonScope(), bind(LayerService).to(exports.DefaultLayerService).inSingletonScope();
@@ -11786,17 +11797,17 @@
     const matrixAllocate = new DefaultMatrixAllocate();
     const mat4Allocate = new DefaultMat4Allocate();
 
-    var __decorate$1D = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1F = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$1e = undefined && undefined.__metadata || function (k, v) {
+      __metadata$1f = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$S = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$T = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -12008,7 +12019,7 @@
         };
       }
     };
-    exports.DefaultGraphicService = __decorate$1D([injectable(), __param$S(0, inject(GraphicCreator$1)), __metadata$1e("design:paramtypes", [Object])], exports.DefaultGraphicService);
+    exports.DefaultGraphicService = __decorate$1F([injectable(), __param$T(0, inject(GraphicCreator$1)), __metadata$1f("design:paramtypes", [Object])], exports.DefaultGraphicService);
 
     const updateBoundsOfCommonOuterBorder = (attribute, theme, aabbBounds) => {
       const {
@@ -13446,7 +13457,7 @@
           } = attribute,
           b = aabbBounds;
         return points.forEach(p => {
-          !1 === p.defined && "zero" !== connectedType && "connect" !== connectedType || b.add(p.x, p.y);
+          !1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
         }), b;
       }
       updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds, graphic) {
@@ -13457,7 +13468,7 @@
           b = aabbBounds;
         return segments.forEach(s => {
           s.points.forEach(p => {
-            !1 === p.defined && "zero" !== connectedType && "connect" !== connectedType || b.add(p.x, p.y);
+            !1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
           });
         }), b;
       }
@@ -13888,16 +13899,20 @@
     }
 
     function getFixedLRTB(left, right, top, bottom) {
+      const leftInt = Math.round(left),
+        topInt = Math.round(top),
+        rightInt = Math.round(right),
+        bottomInt = Math.round(bottom);
       return {
-        left: Math.round(left),
-        top: Math.round(top),
-        right: Math.round(right),
-        bottom: Math.round(bottom)
+        left: left > leftInt ? leftInt : leftInt - .5,
+        top: top > topInt ? topInt : topInt - .5,
+        right: rightInt > right ? rightInt : rightInt + .5,
+        bottom: bottomInt > bottom ? bottomInt : bottomInt + .5
       };
     }
     class Paragraph {
-      constructor(text, newLine, character) {
-        this.fontSize = character.fontSize || 16, this.textBaseline = character.textBaseline || "alphabetic";
+      constructor(text, newLine, character, ascentDescentMode) {
+        this.fontSize = character.fontSize || 16, this.textBaseline = character.textBaseline || "alphabetic", this.ascentDescentMode = ascentDescentMode;
         const lineHeight = calculateLineHeight(character.lineHeight, this.fontSize);
         this.lineHeight = "number" == typeof lineHeight ? lineHeight > this.fontSize ? lineHeight : this.fontSize : Math.floor(1.2 * this.fontSize), this.height = this.lineHeight;
         const {
@@ -13905,7 +13920,7 @@
           height: height,
           descent: descent,
           width: width
-        } = measureTextCanvas(text, character);
+        } = measureTextCanvas(text, character, this.ascentDescentMode);
         let halfDetaHeight = 0,
           deltaAscent = 0,
           deltaDescent = 0;
@@ -13914,7 +13929,7 @@
       updateWidth() {
         const {
           width: width
-        } = measureTextCanvas(this.text, this.character);
+        } = measureTextCanvas(this.text, this.character, this.ascentDescentMode);
         this.width = width, "vertical" === this.direction && (this.widthOrigin = this.width, this.width = this.heightOrigin, this.height = this.widthOrigin);
       }
       drawBackground(ctx, top, ascent, deltaLeft, isLineFirst, textAlign, lineHeight) {
@@ -13931,16 +13946,24 @@
             if (text = text.slice(0, index), text += this.ellipsisStr, "right" === textAlign || "end" === textAlign) {
               const {
                 width: width
-              } = measureTextCanvas(this.text.slice(index), this.character);
+              } = measureTextCanvas(this.text.slice(index), this.character, this.ascentDescentMode);
               "vertical" === direction || (left -= this.ellipsisWidth - width);
             }
           }
         }
+        switch (this.character.script) {
+          case "super":
+            baseline -= this.ascent * (1 / 3);
+            break;
+          case "sub":
+            baseline += this.descent / 2;
+        }
+        "vertical" === direction && (ctx.save(), ctx.rotateAbout(Math.PI / 2, left, baseline), ctx.translate(-this.heightOrigin || -this.lineHeight / 2, -this.descent / 2), ctx.translate(left, baseline), left = 0, baseline = 0);
+        const fillStyle = ctx.fillStyle,
+          globalAlpha = ctx.globalAlpha;
+        ctx.fillStyle = this.character.background, void 0 !== this.character.backgroundOpacity && (ctx.globalAlpha = this.character.backgroundOpacity);
         const lrtb = getFixedLRTB(left, left + (this.widthOrigin || this.width), top, top + lineHeight);
-        return Object.assign(Object.assign({}, lrtb), {
-          fillStyle: this.character.background,
-          globalAlpha: this.character.backgroundOpacity
-        });
+        ctx.fillRect(lrtb.left, lrtb.top, lrtb.right - lrtb.left, lrtb.bottom - lrtb.top), ctx.fillStyle = fillStyle, ctx.globalAlpha = globalAlpha;
       }
       draw(ctx, top, ascent, deltaLeft, isLineFirst, textAlign, lineHeight) {
         let baseline = top + ascent,
@@ -13955,7 +13978,7 @@
             if (text = text.slice(0, index), text += this.ellipsisStr, "right" === textAlign || "end" === textAlign) {
               const {
                 width: width
-              } = measureTextCanvas(this.text.slice(index), this.character);
+              } = measureTextCanvas(this.text.slice(index), this.character, this.ascentDescentMode);
               "vertical" === direction || (left -= this.ellipsisWidth - width);
             }
           }
@@ -13975,21 +13998,21 @@
           if (this.character.underline) {
             const top = 1 + baseline,
               lrtb = getFixedLRTB(left, left + (this.widthOrigin || this.width), top, top + (this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1));
-            ctx.fillRect(lrtb.left, lrtb.top, lrtb.right - lrtb.left, lrtb.bottom - lrtb.top);
+            ctx.fillRect(lrtb.left, 1 + baseline, lrtb.right - lrtb.left, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
           }
           if (this.character.lineThrough) {
             const top = 1 + baseline - this.ascent / 2,
               lrtb = getFixedLRTB(left, left + (this.widthOrigin || this.width), top, top + (this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1));
-            ctx.fillRect(lrtb.left, lrtb.top, lrtb.right - lrtb.left, lrtb.bottom - lrtb.top);
+            ctx.fillRect(lrtb.left, 1 + baseline - this.ascent / 2, lrtb.right - lrtb.left, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
           }
         } else if ("underline" === this.character.textDecoration) {
           const top = 1 + baseline,
             lrtb = getFixedLRTB(left, left + (this.widthOrigin || this.width), top, top + (this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1));
-          ctx.fillRect(lrtb.left, lrtb.top, lrtb.right - lrtb.left, lrtb.bottom - lrtb.top);
+          ctx.fillRect(lrtb.left, 1 + baseline, lrtb.right - lrtb.left, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
         } else if ("line-through" === this.character.textDecoration) {
           const top = 1 + baseline - this.ascent / 2,
             lrtb = getFixedLRTB(left, left + (this.widthOrigin || this.width), top, top + (this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1));
-          ctx.fillRect(lrtb.left, lrtb.top, lrtb.right - lrtb.left, lrtb.bottom - lrtb.top);
+          ctx.fillRect(lrtb.left, 1 + baseline - this.ascent / 2, lrtb.right - lrtb.left, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
         }
         "vertical" === direction && ctx.restore();
       }
@@ -14003,7 +14026,7 @@
           text = text.slice(0, index), text += this.ellipsisStr;
           const {
             width: measureWidth
-          } = measureTextCanvas(this.text.slice(index), this.character);
+          } = measureTextCanvas(this.text.slice(index), this.character, this.ascentDescentMode);
           return width + this.ellipsisWidth - measureWidth;
         }
         return width;
@@ -14012,7 +14035,7 @@
     function seperateParagraph(paragraph, index) {
       const text1 = paragraph.text.slice(0, index),
         text2 = paragraph.text.slice(index);
-      return [new Paragraph(text1, paragraph.newLine, paragraph.character), new Paragraph(text2, !0, paragraph.character)];
+      return [new Paragraph(text1, paragraph.newLine, paragraph.character, paragraph.ascentDescentMode), new Paragraph(text2, !0, paragraph.character, paragraph.ascentDescentMode)];
     }
 
     const IMAGE_UPDATE_TAG_KEY = ["width", "height", "image", ...GRAPHIC_UPDATE_TAG_KEY];
@@ -14201,7 +14224,7 @@
             paragraph.ellipsisStr = ellipsis;
             const {
                 width: width
-              } = measureTextCanvas(ellipsis, paragraph.character),
+              } = measureTextCanvas(ellipsis, paragraph.character, paragraph.ascentDescentMode),
               ellipsisWidth = width || 0;
             if (ellipsisWidth <= this.blankWidth + otherParagraphWidth) {
               lastLine && (paragraph.ellipsis = "add");
@@ -14214,19 +14237,8 @@
             paragraph.ellipsis = "hide", otherParagraphWidth += paragraph.width;
           }
         }
-        let fillStyle = "",
-          globalAlpha = -1,
-          currBgList = [];
-        const bgList = [currBgList];
         this.paragraphs.forEach((paragraph, index) => {
-          if (paragraph instanceof RichTextIcon) return;
-          const data = paragraph.drawBackground(ctx, y, this.ascent, x, 0 === index, this.textAlign, this.height);
-          data && (fillStyle === data.fillStyle && globalAlpha === data.globalAlpha || (currBgList = [], bgList.push(currBgList), fillStyle = data.fillStyle, globalAlpha = data.globalAlpha), currBgList.push(data));
-        }), bgList.forEach(bg => {
-          if (0 === bg.length) return;
-          const data = bg[0],
-            end = bg[bg.length - 1];
-          ctx.fillStyle = data.fillStyle, ctx.globalAlpha = data.globalAlpha, ctx.fillRect(data.left, data.top, end.right - data.left, end.bottom - data.top);
+          paragraph instanceof RichTextIcon || paragraph.drawBackground(ctx, y, this.ascent, x, 0 === index, this.textAlign, this.height);
         }), this.paragraphs.forEach((paragraph, index) => {
           if (paragraph instanceof RichTextIcon) return paragraph.setAttributes({
             x: x + paragraph._x,
@@ -14248,7 +14260,7 @@
           if (paragraph instanceof RichTextIcon) break;
           const {
               width: width
-            } = measureTextCanvas(ellipsis, paragraph.character),
+            } = measureTextCanvas(ellipsis, paragraph.character, paragraph.ascentDescentMode),
             ellipsisWidth = width || 0;
           if (ellipsisWidth <= this.blankWidth + otherParagraphWidth) {
             paragraph.ellipsis = "add", paragraph.ellipsisWidth = ellipsisWidth;
@@ -14389,13 +14401,7 @@
         }
         return cache.every(item => item.isComposing || !(item.text && isString$1(item.text) && RichText.splitText(item.text).length > 1));
       }
-      static splitEmoji(text) {
-        return [...new Intl.Segmenter().segment(text)].map(x => x.segment);
-      }
       static splitText(text) {
-        try {
-          return this.splitEmoji(text);
-        } catch (e) {}
         return Array.from(text);
       }
       static TransformTextConfig2SingleCharacter(textConfig) {
@@ -14521,7 +14527,8 @@
           layoutDirection: layoutDirection,
           singleLine: singleLine,
           disableAutoWrapLine: disableAutoWrapLine,
-          editable: editable
+          editable: editable,
+          ascentDescentMode: ascentDescentMode
         } = this.attribute;
         let {
           textConfig: _tc = []
@@ -14544,8 +14551,8 @@
           const richTextConfig = this.combinedStyleToCharacter(textConfig[i]);
           if (isNumber$1(richTextConfig.text) && (richTextConfig.text = `${richTextConfig.text}`), richTextConfig.text && richTextConfig.text.includes("\n")) {
             const textParts = richTextConfig.text.split("\n");
-            for (let j = 0; j < textParts.length; j++) paragraphs.push(new Paragraph(textParts[j], 0 !== j, richTextConfig));
-          } else richTextConfig.text && paragraphs.push(new Paragraph(richTextConfig.text, !1, richTextConfig));
+            for (let j = 0; j < textParts.length; j++) paragraphs.push(new Paragraph(textParts[j], 0 !== j, richTextConfig, ascentDescentMode));
+          } else richTextConfig.text && paragraphs.push(new Paragraph(richTextConfig.text, !1, richTextConfig, ascentDescentMode));
         }
         const maxWidthFinite = "number" == typeof maxWidth && Number.isFinite(maxWidth) && maxWidth > 0,
           maxHeightFinite = "number" == typeof maxHeight && Number.isFinite(maxHeight) && maxHeight > 0,
@@ -15409,17 +15416,17 @@
       }
     }
 
-    var __decorate$1C = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1E = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$1d = undefined && undefined.__metadata || function (k, v) {
+      __metadata$1e = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$R = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$S = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -15516,7 +15523,7 @@
         });
       }
     };
-    exports.DefaultBaseInteractiveRenderContribution = __decorate$1C([injectable(), __param$R(0, inject(ContributionProvider)), __param$R(0, named(InteractiveSubRenderContribution)), __metadata$1d("design:paramtypes", [Object])], exports.DefaultBaseInteractiveRenderContribution);
+    exports.DefaultBaseInteractiveRenderContribution = __decorate$1E([injectable(), __param$S(0, inject(ContributionProvider)), __param$S(0, named(InteractiveSubRenderContribution)), __metadata$1e("design:paramtypes", [Object])], exports.DefaultBaseInteractiveRenderContribution);
 
     function formatRatio(ratio) {
       return ratio <= .5 ? 4 * ratio - 1 : -4 * ratio + 3;
@@ -15864,7 +15871,7 @@
       return !edgeCb && path.closePath(), path;
     }
 
-    var __decorate$1B = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1D = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -15929,7 +15936,7 @@
         Array.isArray(stroke) && stroke.some(s => !1 === s) && (doFillOrStroke.doStroke = !1);
       }
     };
-    exports.SplitRectBeforeRenderContribution = __decorate$1B([injectable()], exports.SplitRectBeforeRenderContribution);
+    exports.SplitRectBeforeRenderContribution = __decorate$1D([injectable()], exports.SplitRectBeforeRenderContribution);
     exports.SplitRectAfterRenderContribution = class SplitRectAfterRenderContribution {
       constructor() {
         this.time = exports.BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, this.order = 0;
@@ -15966,7 +15973,7 @@
         }
       }
     };
-    exports.SplitRectAfterRenderContribution = __decorate$1B([injectable()], exports.SplitRectAfterRenderContribution);
+    exports.SplitRectAfterRenderContribution = __decorate$1D([injectable()], exports.SplitRectAfterRenderContribution);
     const defaultRectRenderContribution = new DefaultRectRenderContribution();
     const defaultRectTextureRenderContribution = defaultBaseTextureRenderContribution;
     const defaultRectBackgroundRenderContribution = defaultBaseBackgroundRenderContribution;
@@ -15975,8 +15982,8 @@
       constructor() {
         super(...arguments), this.time = exports.BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, this.order = 0;
       }
-      drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
-        return super.drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
+      drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
+        return super.drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
       }
     }
     const defaultImageRenderContribution = new DefaultImageRenderContribution();
@@ -16071,17 +16078,17 @@
       }
     }
 
-    var __decorate$1A = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1C = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$1c = undefined && undefined.__metadata || function (k, v) {
+      __metadata$1d = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$Q = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$R = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -16245,19 +16252,19 @@
         this._draw(arc, arcAttribute, !1, drawContext, params);
       }
     };
-    exports.DefaultCanvasArcRender = __decorate$1A([injectable(), __param$Q(0, inject(ContributionProvider)), __param$Q(0, named(ArcRenderContribution)), __metadata$1c("design:paramtypes", [Object])], exports.DefaultCanvasArcRender);
+    exports.DefaultCanvasArcRender = __decorate$1C([injectable(), __param$R(0, inject(ContributionProvider)), __param$R(0, named(ArcRenderContribution)), __metadata$1d("design:paramtypes", [Object])], exports.DefaultCanvasArcRender);
 
-    var __decorate$1z = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1B = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$1b = undefined && undefined.__metadata || function (k, v) {
+      __metadata$1c = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$P = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$Q = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -16298,7 +16305,7 @@
         this._draw(circle, circleAttribute, !1, drawContext, params);
       }
     };
-    exports.DefaultCanvasCircleRender = __decorate$1z([injectable(), __param$P(0, inject(ContributionProvider)), __param$P(0, named(CircleRenderContribution)), __metadata$1b("design:paramtypes", [Object])], exports.DefaultCanvasCircleRender);
+    exports.DefaultCanvasCircleRender = __decorate$1B([injectable(), __param$Q(0, inject(ContributionProvider)), __param$Q(0, named(CircleRenderContribution)), __metadata$1c("design:paramtypes", [Object])], exports.DefaultCanvasCircleRender);
 
     function drawSegItem(ctx, curve, endPercent, params) {
       if (!curve.p1) return;
@@ -16422,7 +16429,7 @@
       });
     }
 
-    var __decorate$1y = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1A = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -16438,7 +16445,7 @@
         this._draw(line, lineAttribute, !1, drawContext, params);
       }
       drawSegmentItem(context, cache, fill, stroke, fillOpacity, strokeOpacity, attribute, defaultAttribute, clipRange, clipRangeByDimension, offsetX, offsetY, line, fillCb, strokeCb) {
-        var _a, _b, _c, _d, _e;
+        var _a;
         if (!cache) return;
         context.beginPath();
         const z = null !== (_a = this.z) && void 0 !== _a ? _a : 0;
@@ -16451,27 +16458,7 @@
           x: originX = 0,
           x: originY = 0
         } = attribute;
-        !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke()));
-        let {
-          connectedType: connectedType,
-          connectedX: connectedX,
-          connectedY: connectedY,
-          connectedStyle: connectedStyle
-        } = attribute;
-        if (isArray$1(defaultAttribute) ? (connectedType = null !== (_b = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _b ? _b : defaultAttribute[1].connectedType, connectedX = null !== (_c = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _c ? _c : defaultAttribute[1].connectedX, connectedY = null !== (_d = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _d ? _d : defaultAttribute[1].connectedY, connectedStyle = null !== (_e = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _e ? _e : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), "none" !== connectedType) {
-          context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {
-            offsetX: offsetX,
-            offsetY: offsetY,
-            offsetZ: z,
-            drawConnect: !0,
-            mode: connectedType,
-            zeroX: connectedX,
-            zeroY: connectedY
-          });
-          const da = [];
-          isArray$1(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute), !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.stroke()));
-        }
-        return !1;
+        return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke())), !1;
       }
       drawLinearLineHighPerformance(line, context, fill, stroke, fillOpacity, strokeOpacity, offsetX, offsetY, lineAttribute, drawContext, params, fillCb, strokeCb) {
         var _a;
@@ -16503,7 +16490,8 @@
             segments: segments,
             points: points,
             closePath: closePath,
-            curveTension = lineAttribute.curveTension
+            curveTension = lineAttribute.curveTension,
+            connectedType = lineAttribute.connectedType
           } = line.attribute;
         if (!this.valid(line, lineAttribute, fillCb, strokeCb)) return;
         let {
@@ -16515,6 +16503,9 @@
           clipRangeByDimension = lineAttribute.clipRangeByDimension
         } = line.attribute;
         if (1 === clipRange && !segments && !points.some(p => !1 === p.defined) && "linear" === curveType) return this.drawLinearLineHighPerformance(line, context, !!fill, !!stroke, fillOpacity, strokeOpacity, x, y, lineAttribute, drawContext, params, fillCb, strokeCb);
+        function parsePoint(points, connectedType) {
+          return "none" === connectedType ? points : points.filter(p => !1 !== p.defined);
+        }
         if (line.shouldUpdateShape()) {
           const {
               points: points,
@@ -16536,7 +16527,7 @@
                 y: lastSeg.endY,
                 defined: lastSeg.curves[lastSeg.curves.length - 1].defined
               } : index > 1 && (startPoint.x = lastSeg.endX, startPoint.y = lastSeg.endY, startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined);
-              const data = calcLineCache(seg.points, curveType, {
+              const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
                 startPoint: startPoint,
                 curveTension: curveTension
               });
@@ -16555,7 +16546,7 @@
             }
           } else {
             if (!points || !points.length) return line.cache = null, void line.clearUpdateShapeTag();
-            line.cache = calcLineCache(_points, curveType, {
+            line.cache = calcLineCache(parsePoint(_points, connectedType), curveType, {
               curveTension: curveTension
             });
           }
@@ -16583,15 +16574,10 @@
         } else this.drawSegmentItem(context, line.cache, !!fill, !!stroke, fillOpacity, strokeOpacity, line.attribute, lineAttribute, clipRange, clipRangeByDimension, x, y, line, fillCb, strokeCb);
       }
     };
-    exports.DefaultCanvasLineRender = __decorate$1y([injectable()], exports.DefaultCanvasLineRender);
+    exports.DefaultCanvasLineRender = __decorate$1A([injectable()], exports.DefaultCanvasLineRender);
 
     function drawAreaSegments(path, segPath, percent, params) {
       var _a;
-      const {
-        drawConnect = !1,
-        mode = "none"
-      } = params || {};
-      if (drawConnect && "none" === mode) return;
       const {
         top: top,
         bottom: bottom
@@ -16601,34 +16587,11 @@
         const topList = [],
           bottomList = [];
         let lastDefined = !0;
-        if (drawConnect) {
-          let lastCurve,
-            lastBottomCurve,
-            defined0 = !0;
-          const n = top.curves.length;
-          top.curves.forEach((curve, i) => {
-            const bototmCurve = bottom.curves[n - i - 1];
-            let currentTopCurve = curve,
-              currentBottomCurve = bototmCurve;
-            if (curve.originP1 === curve.originP2) return lastCurve = curve, void (lastBottomCurve = bototmCurve);
-            if (lastCurve && lastCurve.originP1 === lastCurve.originP2 && (currentTopCurve = lastCurve, currentBottomCurve = lastBottomCurve), curve.defined) defined0 || (topList.push(currentTopCurve), bottomList.push(currentBottomCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0, defined0 = !defined0);else {
-              const {
-                originP1: originP1,
-                originP2: originP2
-              } = curve;
-              let validTopCurve, validBottomCurve;
-              originP1 && !1 !== originP1.defined ? (validTopCurve = currentTopCurve, validBottomCurve = currentBottomCurve) : originP1 && !1 !== originP2.defined && (validTopCurve = curve, validBottomCurve = bototmCurve), defined0 ? (defined0 = !defined0, topList.push(validTopCurve || curve), bottomList.push(validBottomCurve || bototmCurve)) : validTopCurve && (defined0 = !defined0, topList.push(validTopCurve || curve), bottomList.push(validBottomCurve || bototmCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0);
-            }
-            lastCurve = curve;
-          }), drawAreaConnectBlock(path, topList, bottomList, params);
-        } else {
-          for (let i = 0, n = top.curves.length; i < n; i++) {
-            const topCurve = top.curves[i];
-            lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1])), lastDefined = !lastDefined) : lastDefined && (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1]));
-          }
-          drawAreaBlock(path, topList, bottomList, params);
+        for (let i = 0, n = top.curves.length; i < n; i++) {
+          const topCurve = top.curves[i];
+          lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1])), lastDefined = !lastDefined) : lastDefined && (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1]));
         }
-        return;
+        return void drawAreaBlock(path, topList, bottomList, params);
       }
       if (percent <= 0) return;
       let {
@@ -16646,51 +16609,17 @@
         lastDefined = !0;
       const topList = [],
         bottomList = [];
-      let lastTopCurve,
-        lastBottomCurve,
-        defined0 = !0;
       for (let i = 0, n = top.curves.length; i < n; i++) {
         const topCurve = top.curves[i],
           curCurveLength = topCurve.getLength(direction),
           percent = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;
         if (percent < 0) break;
-        if (drawedLengthUntilLast += curCurveLength, drawConnect) {
-          const bototmCurve = bottom.curves[n - i - 1];
-          let currentTopCurve = topCurve,
-            currentBottomCurve = bototmCurve;
-          if (topCurve.originP1 === topCurve.originP2) {
-            lastTopCurve = topCurve, lastBottomCurve = bototmCurve;
-            continue;
-          }
-          if (lastTopCurve && lastTopCurve.originP1 === lastTopCurve.originP2 && (currentTopCurve = lastTopCurve, currentBottomCurve = lastBottomCurve), topCurve.defined) defined0 || (topList.push(currentTopCurve), bottomList.push(currentBottomCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0, defined0 = !defined0);else {
-            const {
-              originP1: originP1,
-              originP2: originP2
-            } = topCurve;
-            let validTopCurve, validBottomCurve;
-            originP1 && !1 !== originP1.defined ? (validTopCurve = currentTopCurve, validBottomCurve = currentBottomCurve) : originP1 && !1 !== originP2.defined && (validTopCurve = topCurve, validBottomCurve = bototmCurve), defined0 ? (defined0 = !defined0, topList.push(validTopCurve || topCurve), bottomList.push(validBottomCurve || bototmCurve)) : validTopCurve && (defined0 = !defined0, topList.push(validTopCurve || topCurve), bottomList.push(validBottomCurve || bototmCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0);
-          }
-          lastTopCurve = topCurve;
-        } else {
-          let tc = null,
-            bc = null;
-          lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (tc = topCurve, bc = bottom.curves[n - i - 1]), lastDefined = !lastDefined) : lastDefined && (tc = topCurve, bc = bottom.curves[n - i - 1]), tc && bc && (percent < 1 && (tc = tc.p2 && tc.p3 ? divideCubic(tc, percent)[0] : divideLinear(tc, percent)[0], bc = bc.p2 && bc.p3 ? divideCubic(bc, 1 - percent)[1] : divideLinear(bc, 1 - percent)[1]), tc.defined = lastDefined, bc.defined = lastDefined, topList.push(tc), bottomList.push(bc)), tc = null, bc = null;
-        }
+        drawedLengthUntilLast += curCurveLength;
+        let tc = null,
+          bc = null;
+        lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (tc = topCurve, bc = bottom.curves[n - i - 1]), lastDefined = !lastDefined) : lastDefined && (tc = topCurve, bc = bottom.curves[n - i - 1]), tc && bc && (percent < 1 && (tc = tc.p2 && tc.p3 ? divideCubic(tc, percent)[0] : divideLinear(tc, percent)[0], bc = bc.p2 && bc.p3 ? divideCubic(bc, 1 - percent)[1] : divideLinear(bc, 1 - percent)[1]), tc.defined = lastDefined, bc.defined = lastDefined, topList.push(tc), bottomList.push(bc)), tc = null, bc = null;
       }
-      drawConnect ? drawAreaConnectBlock(path, topList, bottomList, params) : drawAreaBlock(path, topList, bottomList, params);
-    }
-    function drawAreaConnectBlock(path, topList, bottomList, params) {
-      if (topList.length < 2) return;
-      const {
-        offsetX = 0,
-        offsetY = 0,
-        offsetZ = 0,
-        mode: mode
-      } = params || {};
-      let curve = topList[0];
-      path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), curve = topList[topList.length - 1];
-      let end = curve.p3 || curve.p1;
-      path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ), curve = bottomList[bottomList.length - 1], path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), curve = bottomList[0], end = curve.p3 || curve.p1, path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ), path.closePath();
+      drawAreaBlock(path, topList, bottomList, params);
     }
     function drawAreaBlock(path, topList, bottomList, params) {
       const {
@@ -16712,17 +16641,17 @@
     const defaultAreaTextureRenderContribution = new DefaultAreaTextureRenderContribution();
     const defaultAreaBackgroundRenderContribution = defaultBaseBackgroundRenderContribution;
 
-    var __decorate$1x = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1z = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$1a = undefined && undefined.__metadata || function (k, v) {
+      __metadata$1b = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$O = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$P = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -16791,7 +16720,8 @@
             fillOpacity = areaAttribute.fillOpacity,
             z = areaAttribute.z,
             strokeOpacity = areaAttribute.strokeOpacity,
-            curveTension = areaAttribute.curveTension
+            curveTension = areaAttribute.curveTension,
+            connectedType = areaAttribute.connectedType
           } = area.attribute,
           data = this.valid(area, areaAttribute, fillCb, strokeCb);
         if (!data) return;
@@ -16808,6 +16738,9 @@
         let {
           curveType = areaAttribute.curveType
         } = area.attribute;
+        function parsePoint(points, connectedType) {
+          return "connect" !== connectedType ? points : points.filter(p => !1 !== p.defined);
+        }
         if (closePath && "linear" === curveType && (curveType = "linearClosed"), 1 === clipRange && !segments && !points.some(p => !1 === p.defined) && "linear" === curveType) return this.drawLinearAreaHighPerformance(area, context, !!fill, doStroke, fillOpacity, strokeOpacity, x, y, areaAttribute, drawContext, params, fillCb, strokeCb);
         if (area.shouldUpdateShape()) {
           if (segments && segments.length) {
@@ -16821,7 +16754,7 @@
                 x: lastTopSeg.endX,
                 y: lastTopSeg.endY
               } : index > 1 && (startPoint.x = lastTopSeg.endX, startPoint.y = lastTopSeg.endY);
-              const data = calcLineCache(seg.points, curveType, {
+              const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
                 startPoint: startPoint,
                 curveTension: curveTension
               });
@@ -16844,7 +16777,7 @@
                   y: null !== (_d = endPoint.y1) && void 0 !== _d ? _d : endPoint.y
                 });
               }
-              bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(bottomPoints, "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
+              bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(parsePoint(bottomPoints, connectedType), "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
                 curveTension: curveTension
               }), bottomCaches.unshift(lastBottomSeg));
             }
@@ -16855,11 +16788,11 @@
           } else {
             if (!points || !points.length) return area.cacheArea = null, void area.clearUpdateShapeTag();
             {
-              const topPoints = points,
+              const topPoints = parsePoint(points, connectedType),
                 bottomPoints = [];
-              for (let i = points.length - 1; i >= 0; i--) bottomPoints.push({
-                x: null !== (_e = points[i].x1) && void 0 !== _e ? _e : points[i].x,
-                y: null !== (_f = points[i].y1) && void 0 !== _f ? _f : points[i].y
+              for (let i = topPoints.length - 1; i >= 0; i--) bottomPoints.push({
+                x: null !== (_e = topPoints[i].x1) && void 0 !== _e ? _e : topPoints[i].x,
+                y: null !== (_f = topPoints[i].y1) && void 0 !== _f ? _f : topPoints[i].y
               });
               const topCache = calcLineCache(topPoints, curveType, {
                   curveTension: curveTension
@@ -16901,20 +16834,10 @@
         this._draw(area, areaAttribute, !1, drawContext, params);
       }
       drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
-        let ret = !1;
-        return ret = ret || this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, !1, fillCb, strokeCb), ret = ret || this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, !0, fillCb, strokeCb), ret;
+        return this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb);
       }
-      _drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, connect, fillCb, strokeCb) {
-        var _a, _b, _c, _d;
+      _drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
         if (!(cache && cache.top && cache.bottom && cache.top.curves && cache.top.curves.length && cache.bottom.curves && cache.bottom.curves.length)) return;
-        let {
-          connectedType: connectedType,
-          connectedX: connectedX,
-          connectedY: connectedY,
-          connectedStyle: connectedStyle
-        } = attribute;
-        const da = [];
-        if (connect && (isArray$1(defaultAttribute) ? (connectedType = null !== (_a = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _a ? _a : defaultAttribute[1].connectedType, connectedX = null !== (_b = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _b ? _b : defaultAttribute[1].connectedX, connectedY = null !== (_c = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _c ? _c : defaultAttribute[1].connectedY, connectedStyle = null !== (_d = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _d ? _d : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), isArray$1(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute)), connect && "none" === connectedType) return !1;
         context.beginPath();
         const {
           points: points,
@@ -16933,11 +16856,7 @@
           offsetX: offsetX,
           offsetY: offsetY,
           offsetZ: offsetZ,
-          direction: direction,
-          drawConnect: connect,
-          mode: connectedType,
-          zeroX: connectedX,
-          zeroY: connectedY
+          direction: direction
         }), this.beforeRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
           attribute: attribute
         }), context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute);
@@ -16945,7 +16864,7 @@
           x: originX = 0,
           x: originY = 0
         } = attribute;
-        return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, connect ? connectedStyle : attribute, originX - offsetX, originY - offsetY, connect ? da : defaultAttribute), context.fill())), this.afterRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
+        return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), this.afterRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
           attribute: attribute
         }), (() => {
           if (!1 !== stroke) if (strokeCb) strokeCb(context, attribute, defaultAttribute);else {
@@ -16955,32 +16874,28 @@
             isArray$1(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1] && (context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, stroke[0] ? cache.top : cache.bottom, clipRange, direction === exports.Direction.ROW ? "x" : "y", {
               offsetX: offsetX,
               offsetY: offsetY,
-              offsetZ: offsetZ,
-              drawConnect: connect,
-              mode: connectedType,
-              zeroX: connectedX,
-              zeroY: connectedY
-            })), context.setStrokeStyle(area, connect ? connectedStyle : attribute, originX - offsetX, originY - offsetY, connect ? da : defaultAttribute), context.stroke();
+              offsetZ: offsetZ
+            })), context.setStrokeStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke();
           }
         })(), !1;
       }
     };
-    exports.DefaultCanvasAreaRender = __decorate$1x([injectable(), __param$O(0, inject(ContributionProvider)), __param$O(0, named(AreaRenderContribution)), __metadata$1a("design:paramtypes", [Object])], exports.DefaultCanvasAreaRender);
+    exports.DefaultCanvasAreaRender = __decorate$1z([injectable(), __param$P(0, inject(ContributionProvider)), __param$P(0, named(AreaRenderContribution)), __metadata$1b("design:paramtypes", [Object])], exports.DefaultCanvasAreaRender);
 
     const defaultPathTextureRenderContribution = defaultBaseTextureRenderContribution;
     const defaultPathBackgroundRenderContribution = defaultBaseBackgroundRenderContribution;
 
-    var __decorate$1w = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1y = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$19 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$1a = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$N = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$O = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -17024,19 +16939,19 @@
         this.tempTheme = pathAttribute, this._draw(path, pathAttribute, !1, drawContext, params), this.tempTheme = null;
       }
     };
-    exports.DefaultCanvasPathRender = __decorate$1w([injectable(), __param$N(0, inject(ContributionProvider)), __param$N(0, named(PathRenderContribution)), __metadata$19("design:paramtypes", [Object])], exports.DefaultCanvasPathRender);
+    exports.DefaultCanvasPathRender = __decorate$1y([injectable(), __param$O(0, inject(ContributionProvider)), __param$O(0, named(PathRenderContribution)), __metadata$1a("design:paramtypes", [Object])], exports.DefaultCanvasPathRender);
 
-    var __decorate$1v = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1x = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$18 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$19 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$M = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$N = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -17096,19 +17011,19 @@
         this.tempTheme = rectAttribute, this._draw(rect, rectAttribute, !1, drawContext, params), this.tempTheme = null;
       }
     };
-    exports.DefaultCanvasRectRender = __decorate$1v([injectable(), __param$M(0, inject(ContributionProvider)), __param$M(0, named(RectRenderContribution)), __metadata$18("design:paramtypes", [Object])], exports.DefaultCanvasRectRender);
+    exports.DefaultCanvasRectRender = __decorate$1x([injectable(), __param$N(0, inject(ContributionProvider)), __param$N(0, named(RectRenderContribution)), __metadata$19("design:paramtypes", [Object])], exports.DefaultCanvasRectRender);
 
-    var __decorate$1u = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1w = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$17 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$18 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$L = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$M = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -17179,7 +17094,7 @@
         this._draw(symbol, symbolAttribute, !1, drawContext, params);
       }
     };
-    exports.DefaultCanvasSymbolRender = __decorate$1u([injectable(), __param$L(0, inject(ContributionProvider)), __param$L(0, named(SymbolRenderContribution)), __metadata$17("design:paramtypes", [Object])], exports.DefaultCanvasSymbolRender);
+    exports.DefaultCanvasSymbolRender = __decorate$1w([injectable(), __param$M(0, inject(ContributionProvider)), __param$M(0, named(SymbolRenderContribution)), __metadata$18("design:paramtypes", [Object])], exports.DefaultCanvasSymbolRender);
 
     class DefaultBoundsAllocate {
       constructor() {
@@ -17268,17 +17183,17 @@
     }
     const defaultTextBackgroundRenderContribution = new DefaultTextBackgroundRenderContribution();
 
-    var __decorate$1t = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1v = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$16 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$17 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$K = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$L = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -17417,9 +17332,9 @@
         }
       }
     };
-    exports.DefaultCanvasTextRender = __decorate$1t([injectable(), __param$K(0, inject(ContributionProvider)), __param$K(0, named(TextRenderContribution)), __metadata$16("design:paramtypes", [Object])], exports.DefaultCanvasTextRender);
+    exports.DefaultCanvasTextRender = __decorate$1v([injectable(), __param$L(0, inject(ContributionProvider)), __param$L(0, named(TextRenderContribution)), __metadata$17("design:paramtypes", [Object])], exports.DefaultCanvasTextRender);
 
-    var __decorate$1s = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1u = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -17427,7 +17342,7 @@
       return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
     exports.AbstractGraphicRender = class AbstractGraphicRender {};
-    exports.AbstractGraphicRender = __decorate$1s([injectable()], exports.AbstractGraphicRender);
+    exports.AbstractGraphicRender = __decorate$1u([injectable()], exports.AbstractGraphicRender);
 
     function drawPolygon(path, points, x, y) {
       path.moveTo(points[0].x + x, points[0].y + y);
@@ -17483,17 +17398,17 @@
     const defaultPolygonTextureRenderContribution = defaultBaseTextureRenderContribution;
     const defaultPolygonBackgroundRenderContribution = defaultBaseBackgroundRenderContribution;
 
-    var __decorate$1r = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1t = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$15 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$16 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$J = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$K = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -17534,19 +17449,19 @@
         this._draw(polygon, polygonAttribute, !1, drawContext, params);
       }
     };
-    exports.DefaultCanvasPolygonRender = __decorate$1r([injectable(), __param$J(0, inject(ContributionProvider)), __param$J(0, named(PolygonRenderContribution)), __metadata$15("design:paramtypes", [Object])], exports.DefaultCanvasPolygonRender);
+    exports.DefaultCanvasPolygonRender = __decorate$1t([injectable(), __param$K(0, inject(ContributionProvider)), __param$K(0, named(PolygonRenderContribution)), __metadata$16("design:paramtypes", [Object])], exports.DefaultCanvasPolygonRender);
 
-    var __decorate$1q = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1s = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$14 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$15 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$I = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$J = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -17641,19 +17556,19 @@
         }) : clip ? context.restore() : context.highPerformanceRestore();
       }
     };
-    exports.DefaultCanvasGroupRender = __decorate$1q([injectable(), __param$I(0, inject(ContributionProvider)), __param$I(0, named(GroupRenderContribution)), __metadata$14("design:paramtypes", [Object])], exports.DefaultCanvasGroupRender);
+    exports.DefaultCanvasGroupRender = __decorate$1s([injectable(), __param$J(0, inject(ContributionProvider)), __param$J(0, named(GroupRenderContribution)), __metadata$15("design:paramtypes", [Object])], exports.DefaultCanvasGroupRender);
 
-    var __decorate$1p = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1r = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$13 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$14 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$H = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$I = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -17721,7 +17636,7 @@
         this._draw(image, imageAttribute, !1, drawContext);
       }
     };
-    exports.DefaultCanvasImageRender = __decorate$1p([injectable(), __param$H(0, inject(ContributionProvider)), __param$H(0, named(ImageRenderContribution)), __metadata$13("design:paramtypes", [Object])], exports.DefaultCanvasImageRender);
+    exports.DefaultCanvasImageRender = __decorate$1r([injectable(), __param$I(0, inject(ContributionProvider)), __param$I(0, named(ImageRenderContribution)), __metadata$14("design:paramtypes", [Object])], exports.DefaultCanvasImageRender);
 
     const IncrementalDrawContribution = Symbol.for("IncrementalDrawContribution");
     const ArcRender = Symbol.for("ArcRender");
@@ -17789,14 +17704,14 @@
       return result;
     };
 
-    var __decorate$1o = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1q = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$12 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$13 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     const DrawItemInterceptor = Symbol.for("DrawItemInterceptor");
@@ -17856,7 +17771,7 @@
         return !1;
       }
     };
-    exports.CommonDrawItemInterceptorContribution = __decorate$1o([injectable(), __metadata$12("design:paramtypes", [])], exports.CommonDrawItemInterceptorContribution);
+    exports.CommonDrawItemInterceptorContribution = __decorate$1q([injectable(), __metadata$13("design:paramtypes", [])], exports.CommonDrawItemInterceptorContribution);
     class InteractiveDrawItemInterceptorContribution {
       constructor() {
         this.order = 1;
@@ -17947,17 +17862,17 @@
       }
     }
 
-    var __decorate$1n = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1p = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$11 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$12 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$G = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$H = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -17995,7 +17910,7 @@
         this.prepare(updateBounds), this.prepareRenderList(), this.beforeDraw(params), this.draw(params), this.afterDraw(params), this.drawParams = null;
       }
     };
-    exports.DefaultRenderService = __decorate$1n([injectable(), __param$G(0, inject(DrawContribution)), __metadata$11("design:paramtypes", [Object])], exports.DefaultRenderService);
+    exports.DefaultRenderService = __decorate$1p([injectable(), __param$H(0, inject(DrawContribution)), __metadata$12("design:paramtypes", [Object])], exports.DefaultRenderService);
 
     var renderModule$1 = new ContainerModule(bind => {
       bind(RenderService).to(exports.DefaultRenderService);
@@ -18008,7 +17923,7 @@
     const PickItemInterceptor = Symbol.for("PickItemInterceptor");
     const PickServiceInterceptor = Symbol.for("PickServiceInterceptor");
 
-    var __decorate$1m = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1o = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -18030,7 +17945,7 @@
         return result;
       }
     };
-    exports.ShadowPickServiceInterceptorContribution = __decorate$1m([injectable()], exports.ShadowPickServiceInterceptorContribution);
+    exports.ShadowPickServiceInterceptorContribution = __decorate$1o([injectable()], exports.ShadowPickServiceInterceptorContribution);
     exports.ShadowRootPickItemInterceptorContribution = class ShadowRootPickItemInterceptorContribution {
       constructor() {
         this.order = 1;
@@ -18061,7 +17976,7 @@
         return context.highPerformanceRestore(), !result.graphic && result.group && "full" === shadowPickMode && (result.graphic = result.group), result;
       }
     };
-    exports.ShadowRootPickItemInterceptorContribution = __decorate$1m([injectable()], exports.ShadowRootPickItemInterceptorContribution);
+    exports.ShadowRootPickItemInterceptorContribution = __decorate$1o([injectable()], exports.ShadowRootPickItemInterceptorContribution);
     exports.InteractivePickItemInterceptorContribution = class InteractivePickItemInterceptorContribution {
       constructor() {
         this.order = 1;
@@ -18080,7 +17995,7 @@
         return null;
       }
     };
-    exports.InteractivePickItemInterceptorContribution = __decorate$1m([injectable()], exports.InteractivePickItemInterceptorContribution);
+    exports.InteractivePickItemInterceptorContribution = __decorate$1o([injectable()], exports.InteractivePickItemInterceptorContribution);
     exports.Canvas3DPickItemInterceptor = class Canvas3DPickItemInterceptor {
       constructor() {
         this.order = 1;
@@ -18100,7 +18015,7 @@
         context.setTransformForCurrent();
       }
     };
-    exports.Canvas3DPickItemInterceptor = __decorate$1m([injectable()], exports.Canvas3DPickItemInterceptor);
+    exports.Canvas3DPickItemInterceptor = __decorate$1o([injectable()], exports.Canvas3DPickItemInterceptor);
 
     var pickModule = new ContainerModule((bind, unbind, isBound) => {
       isBound(PickerService) || (bind(GlobalPickerService).toSelf(), bind(PickerService).toService(GlobalPickerService)), bind(exports.Canvas3DPickItemInterceptor).toSelf().inSingletonScope(), bind(PickItemInterceptor).toService(exports.Canvas3DPickItemInterceptor), bind(exports.ShadowRootPickItemInterceptorContribution).toSelf().inSingletonScope(), bind(PickItemInterceptor).toService(exports.ShadowRootPickItemInterceptorContribution), bind(exports.InteractivePickItemInterceptorContribution).toSelf().inSingletonScope(), bind(PickItemInterceptor).toService(exports.InteractivePickItemInterceptorContribution), bindContributionProvider(bind, PickItemInterceptor), bind(exports.ShadowPickServiceInterceptorContribution).toSelf().inSingletonScope(), bind(PickServiceInterceptor).toService(exports.ShadowPickServiceInterceptorContribution), bindContributionProvider(bind, PickServiceInterceptor);
@@ -18113,17 +18028,17 @@
     const AutoEnablePlugins = Symbol.for("AutoEnablePlugins");
     const PluginService = Symbol.for("PluginService");
 
-    var __decorate$1l = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1n = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$10 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$11 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$F = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$G = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -18163,7 +18078,7 @@
         }), this.onRegisterPlugin = [];
       }
     };
-    DefaultPluginService = __decorate$1l([injectable(), __param$F(0, inject(ContributionProvider)), __param$F(0, named(AutoEnablePlugins)), __metadata$10("design:paramtypes", [Object])], DefaultPluginService);
+    DefaultPluginService = __decorate$1n([injectable(), __param$G(0, inject(ContributionProvider)), __param$G(0, named(AutoEnablePlugins)), __metadata$11("design:paramtypes", [Object])], DefaultPluginService);
 
     var pluginModule = new ContainerModule(bind => {
       bind(PluginService).to(DefaultPluginService), bindContributionProviderNoSingletonScope(bind, AutoEnablePlugins);
@@ -18177,14 +18092,14 @@
       bind(TextMeasureContribution).to(exports.DefaultTextMeasureContribution).inSingletonScope(), bindContributionProvider(bind, TextMeasureContribution);
     });
 
-    var __decorate$1k = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1m = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$$ = undefined && undefined.__metadata || function (k, v) {
+      __metadata$10 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let CanvasLayerHandlerContribution = class {
@@ -18254,7 +18169,7 @@
         this.canvas.release();
       }
     };
-    CanvasLayerHandlerContribution = __decorate$1k([injectable(), __metadata$$("design:paramtypes", [])], CanvasLayerHandlerContribution);
+    CanvasLayerHandlerContribution = __decorate$1m([injectable(), __metadata$10("design:paramtypes", [])], CanvasLayerHandlerContribution);
 
     var layerHandlerModules = new ContainerModule(bind => {
       bind(CanvasLayerHandlerContribution).toSelf(), bind(StaticLayerHandlerContribution).toService(CanvasLayerHandlerContribution);
@@ -18373,17 +18288,17 @@
       return result;
     }
 
-    var __decorate$1j = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1l = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$_ = undefined && undefined.__metadata || function (k, v) {
+      __metadata$$ = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$E = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$F = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -18582,9 +18497,9 @@
       }
       afterDraw(renderService, drawParams) {}
     };
-    DefaultDrawContribution = __decorate$1j([injectable(), __param$E(0, multiInject(GraphicRender)), __param$E(1, inject(ContributionProvider)), __param$E(1, named(DrawItemInterceptor)), __metadata$_("design:paramtypes", [Array, Object])], DefaultDrawContribution);
+    DefaultDrawContribution = __decorate$1l([injectable(), __param$F(0, multiInject(GraphicRender)), __param$F(1, inject(ContributionProvider)), __param$F(1, named(DrawItemInterceptor)), __metadata$$("design:paramtypes", [Array, Object])], DefaultDrawContribution);
 
-    var __decorate$1i = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1k = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -18635,9 +18550,9 @@
         }), context.setShadowBlendStyle && context.setShadowBlendStyle(line, attribute, defaultAttribute), context.setStrokeStyle(line, attribute, offsetX, offsetY, defaultAttribute), context.stroke());
       }
     };
-    DefaultIncrementalCanvasLineRender = __decorate$1i([injectable()], DefaultIncrementalCanvasLineRender);
+    DefaultIncrementalCanvasLineRender = __decorate$1k([injectable()], DefaultIncrementalCanvasLineRender);
 
-    var __decorate$1h = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1j = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -18680,20 +18595,20 @@
         }), context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute), context.setCommonStyle(area, attribute, offsetX, offsetY, defaultAttribute), context.fill());
       }
     };
-    DefaultIncrementalCanvasAreaRender = __decorate$1h([injectable()], DefaultIncrementalCanvasAreaRender);
+    DefaultIncrementalCanvasAreaRender = __decorate$1j([injectable()], DefaultIncrementalCanvasAreaRender);
 
     var STATUS,
-      __decorate$1g = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+      __decorate$1i = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$Z = undefined && undefined.__metadata || function (k, v) {
+      __metadata$_ = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$D = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$E = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -18823,7 +18738,7 @@
         });
       }
     };
-    DefaultIncrementalDrawContribution = __decorate$1g([injectable(), __param$D(0, multiInject(GraphicRender)), __param$D(1, inject(DefaultIncrementalCanvasLineRender)), __param$D(2, inject(DefaultIncrementalCanvasAreaRender)), __param$D(3, inject(ContributionProvider)), __param$D(3, named(DrawItemInterceptor)), __metadata$Z("design:paramtypes", [Array, Object, Object, Object])], DefaultIncrementalDrawContribution);
+    DefaultIncrementalDrawContribution = __decorate$1i([injectable(), __param$E(0, multiInject(GraphicRender)), __param$E(1, inject(DefaultIncrementalCanvasLineRender)), __param$E(2, inject(DefaultIncrementalCanvasAreaRender)), __param$E(3, inject(ContributionProvider)), __param$E(3, named(DrawItemInterceptor)), __metadata$_("design:paramtypes", [Array, Object, Object, Object])], DefaultIncrementalDrawContribution);
 
     var renderModule = new ContainerModule(bind => {
       bind(DefaultBaseBackgroundRenderContribution).toSelf().inSingletonScope(), bind(DefaultBaseTextureRenderContribution).toSelf().inSingletonScope(), bind(DrawContribution).to(DefaultDrawContribution), bind(IncrementalDrawContribution).to(DefaultIncrementalDrawContribution), bind(GroupRender).to(exports.DefaultCanvasGroupRender).inSingletonScope(), bind(GraphicRender).toService(GroupRender), bindContributionProvider(bind, GroupRenderContribution), bind(exports.DefaultBaseInteractiveRenderContribution).toSelf().inSingletonScope(), bindContributionProvider(bind, InteractiveSubRenderContribution), bindContributionProvider(bind, GraphicRender), bind(exports.CommonDrawItemInterceptorContribution).toSelf().inSingletonScope(), bind(DrawItemInterceptor).toService(exports.CommonDrawItemInterceptorContribution), bindContributionProvider(bind, DrawItemInterceptor);
@@ -19519,14 +19434,14 @@
       return new Stage(params);
     }
 
-    var __decorate$1f = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1h = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$Y = undefined && undefined.__metadata || function (k, v) {
+      __metadata$Z = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     const initMatrix = new Matrix(1, 0, 0, 1, 0, 0),
@@ -19736,7 +19651,7 @@
         this.stack.forEach(m => matrixAllocate.free(m)), this.stack.length = 0;
       }
     };
-    exports.EmptyContext2d = __decorate$1f([injectable(), __metadata$Y("design:paramtypes", [Object, Number])], exports.EmptyContext2d);
+    exports.EmptyContext2d = __decorate$1h([injectable(), __metadata$Z("design:paramtypes", [Object, Number])], exports.EmptyContext2d);
 
     const DefaultConfig = {
       WIDTH: 500,
@@ -19835,7 +19750,7 @@
     }
     BaseCanvas.env = "browser";
 
-    var __decorate$1e = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1g = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -19949,16 +19864,16 @@
         return Promise.resolve(null);
       }
     };
-    exports.BaseEnvContribution = __decorate$1e([injectable()], exports.BaseEnvContribution);
+    exports.BaseEnvContribution = __decorate$1g([injectable()], exports.BaseEnvContribution);
 
-    var __decorate$1d = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1f = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$X = undefined && undefined.__metadata || function (k, v) {
+      __metadata$Y = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     exports.BaseWindowHandlerContribution = class BaseWindowHandlerContribution {
@@ -19997,7 +19912,7 @@
         return this.modelMatrix;
       }
     };
-    exports.BaseWindowHandlerContribution = __decorate$1d([injectable(), __metadata$X("design:paramtypes", [])], exports.BaseWindowHandlerContribution);
+    exports.BaseWindowHandlerContribution = __decorate$1f([injectable(), __metadata$Y("design:paramtypes", [])], exports.BaseWindowHandlerContribution);
 
     class DirectionalLight {
       constructor(dir, color) {
@@ -20088,17 +20003,17 @@
       Factory.registerPlugin("OrthoCamera", OrthoCamera);
     };
 
-    var __decorate$1c = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1e = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$W = undefined && undefined.__metadata || function (k, v) {
+      __metadata$X = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$C = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$D = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -20203,16 +20118,16 @@
         return picker || null;
       }
     };
-    exports.DefaultPickService = __decorate$1c([injectable(), __param$C(0, inject(ContributionProvider)), __param$C(0, named(PickItemInterceptor)), __param$C(1, inject(ContributionProvider)), __param$C(1, named(PickServiceInterceptor)), __metadata$W("design:paramtypes", [Object, Object])], exports.DefaultPickService);
+    exports.DefaultPickService = __decorate$1e([injectable(), __param$D(0, inject(ContributionProvider)), __param$D(0, named(PickItemInterceptor)), __param$D(1, inject(ContributionProvider)), __param$D(1, named(PickServiceInterceptor)), __metadata$X("design:paramtypes", [Object, Object])], exports.DefaultPickService);
 
-    var __decorate$1b = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1d = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$V = undefined && undefined.__metadata || function (k, v) {
+      __metadata$W = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     exports.DefaultGlobalPickerService = class DefaultGlobalPickerService {
@@ -20277,7 +20192,7 @@
         } : null;
       }
     };
-    exports.DefaultGlobalPickerService = __decorate$1b([injectable(), __metadata$V("design:paramtypes", [])], exports.DefaultGlobalPickerService);
+    exports.DefaultGlobalPickerService = __decorate$1d([injectable(), __metadata$W("design:paramtypes", [])], exports.DefaultGlobalPickerService);
 
     function simplifyRadialDist(points, sqTolerance) {
       let deltaX,
@@ -20358,13 +20273,17 @@
           } = this.currRt.attribute;
           if (this.composingConfigIdx = this.cursorIndex < 0 ? 0 : findConfigIndexByCursorIdx(textConfig, this.cursorIndex), this.cursorIndex < 0) {
             const config = textConfig[0];
-            textConfig.unshift(Object.assign(Object.assign(Object.assign({}, getDefaultCharacterConfig(this.currRt.attribute)), config), {
+            textConfig.unshift(Object.assign(Object.assign(Object.assign({
+              fill: "black"
+            }, getDefaultCharacterConfig(this.currRt.attribute)), config), {
               text: ""
             }));
           } else {
             const configIdx = this.composingConfigIdx,
               lastConfig = textConfig[configIdx] || textConfig[configIdx - 1];
-            textConfig.splice(configIdx, 0, Object.assign(Object.assign({}, lastConfig), {
+            textConfig.splice(configIdx, 0, Object.assign(Object.assign({
+              fill: "black"
+            }, lastConfig), {
               text: ""
             }));
           }
@@ -20436,9 +20355,9 @@
         textConfig.splice(configIdx, 1);
         const text = lastConfig.text,
           textList = text ? Array.from(text.toString()) : [];
-        for (let i = 0; i < textList.length; i++) textConfig.splice(i + configIdx, 0, Object.assign(Object.assign(Object.assign(Object.assign({}, getDefaultCharacterConfig(this.currRt.attribute)), {
+        for (let i = 0; i < textList.length; i++) textConfig.splice(i + configIdx, 0, Object.assign(Object.assign({
           fill: "black"
-        }), lastConfig), {
+        }, lastConfig), {
           isComposing: !1,
           text: textList[i]
         }));
@@ -20558,13 +20477,13 @@
         }, this.handleFocusOut = () => {
           throw new Error("不会走到这里 handleFocusOut");
         }, this.handleMove = e => {
-          this.currRt && !this.currRt.attribute.editable && this.deFocus(!0), this.isEditableRichtext(e) ? (this.handleEnter(), e.target.once("pointerleave", this.handleLeave), this.tryShowSelection(e, !1)) : this.handleLeave();
-        }, this.handleEnter = () => {
+          this.isRichtext(e) && (this.currRt = e.target, this.handleEnter(e), e.target.once("pointerleave", this.handleLeave), this.tryShowSelection(e, !1));
+        }, this.handleEnter = e => {
           this.editing = !0, this.pluginService.stage.setCursor("text");
-        }, this.handleLeave = () => {
+        }, this.handleLeave = e => {
           this.editing = !1, this.pluginService.stage.setCursor("default");
         }, this.handlePointerDown = e => {
-          this.editing && this.isEditableRichtext(e) ? this.onFocus(e) : this.deFocus(!0), this.triggerRender(), this.pointerDown = !0, this.updateCbs.forEach(cb => cb(this.editing ? "onfocus" : "defocus", this));
+          this.editing ? this.onFocus(e) : this.deFocus(!0), this.triggerRender(), this.pointerDown = !0, this.updateCbs.forEach(cb => cb(this.editing ? "onfocus" : "defocus", this));
         }, this.handlePointerUp = e => {
           this.pointerDown = !1;
         }, this.handleDBLClick = e => {
@@ -20638,11 +20557,9 @@
           const cache = currRt.getFrameCache();
           if (!cache) return;
           const {
-            lines: lines
-          } = cache;
-          if (0 === lines.length) return;
-          if (!lines[0].paragraphs || 0 === lines[0].paragraphs.length) return;
-          const totalCursorCount = lines.reduce((total, line) => total + line.paragraphs.length, 0) - 1;
+              lines: lines
+            } = cache,
+            totalCursorCount = lines.reduce((total, line) => total + line.paragraphs.length, 0) - 1;
           return this.selectionRange(-.1, totalCursorCount + .1), e.preventDefault(), !0;
         }
         return !1;
@@ -20717,9 +20634,6 @@
         placeholderColor && (textConfigItem.fill = placeholderColor), placeholderFontFamily && (textConfigItem.fontFamily = placeholderFontFamily), placeholderFontSize && (textConfigItem.fontSize = placeholderFontSize), this.shadowPlaceHolder = createRichText(Object.assign(Object.assign({}, this.currRt.attribute), {
           x: 0,
           y: 0,
-          pickable: !1,
-          editable: !1,
-          editOptions: null,
           angle: 0,
           _debug_bounds: !1,
           textConfig: [textConfigItem]
@@ -20735,15 +20649,15 @@
           } = editOptions;
         if (!editOptions || !boundsStrokeWhenInput) return;
         const {
-          attribute: attribute
-        } = this.currRt;
-        let b = this.currRt.AABBBounds,
-          h = b.height();
+            attribute: attribute
+          } = this.currRt,
+          b = this.currRt.AABBBounds;
+        let h = b.height();
         if (!attribute.textConfig.length && this.editLine) {
           const {
             points: points
           } = this.editLine.attribute;
-          h = points[1].y - points[0].y, b = getRichTextBounds(Object.assign({}, this.shadowPlaceHolder.attribute));
+          h = points[1].y - points[0].y;
         }
         this.shadowBounds = this.shadowBounds || createRect({}), this.shadowBounds.setAttributes({
           x: 0,
@@ -20764,7 +20678,7 @@
           editOptions: editOptions
         } = this.currRt.attribute;
         if (textConfig && textConfig.length) return;
-        if (!(editOptions && editOptions.placeholder && editOptions.syncPlaceHolderToTextConfig)) return;
+        if (!editOptions || !editOptions.placeholder) return;
         const {
           placeholder: placeholder
         } = editOptions;
@@ -20855,18 +20769,21 @@
       }
       deFocus() {
         let trulyDeFocus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : !1;
-        const currRt = this.currRt;
-        if (!currRt) return;
         this.updateCbs && this.updateCbs.forEach(cb => cb("beforeDefocus", this, {
           trulyDeFocus: trulyDeFocus
-        })), trulyDeFocus && (this.trySyncPlaceholderToTextConfig(), currRt.detachShadow()), this.currRt = null, this.editLine && (this.editLine.parent && this.editLine.parent.removeChild(this.editLine), this.editLine.release(), this.editLine = null, this.editBg.parent && this.editBg.parent.removeChild(this.editBg), this.editBg.release(), this.editBg = null), trulyDeFocus && (this.shadowBounds && (this.shadowBounds.parent && this.shadowBounds.parent.removeChild(this.shadowBounds), this.shadowBounds.release(), this.shadowBounds = null), this.shadowPlaceHolder && (this.shadowPlaceHolder.parent && this.shadowPlaceHolder.parent.removeChild(this.shadowPlaceHolder), this.shadowPlaceHolder.release(), this.shadowPlaceHolder = null)), this.focusing = !1;
+        }));
+        const target = this.currRt;
+        if (!target) return;
+        trulyDeFocus && (this.trySyncPlaceholderToTextConfig(), target.detachShadow());
+        const currRt = this.currRt;
+        this.currRt = null, this.editLine && (this.editLine.parent && this.editLine.parent.removeChild(this.editLine), this.editLine.release(), this.editLine = null, this.editBg.parent && this.editBg.parent.removeChild(this.editBg), this.editBg.release(), this.editBg = null), trulyDeFocus && (this.shadowBounds && (this.shadowBounds.parent && this.shadowBounds.parent.removeChild(this.shadowBounds), this.shadowBounds.release(), this.shadowBounds = null), this.shadowPlaceHolder && (this.shadowPlaceHolder.parent && this.shadowPlaceHolder.parent.removeChild(this.shadowPlaceHolder), this.shadowPlaceHolder.release(), this.shadowPlaceHolder = null)), this.focusing = !1;
         const textConfig = currRt.attribute.textConfig;
         let lastConfig = textConfig[textConfig.length - 1],
           cleared = !1;
         for (; lastConfig && "\n" === lastConfig.text;) textConfig.pop(), lastConfig = textConfig[textConfig.length - 1], cleared = !0;
         cleared && currRt.setAttributes({
           textConfig: textConfig
-        }), currRt.removeEventListener("pointerleave", this.handleLeave);
+        });
       }
       addAnimateToLine(line) {
         line.animates && line.animates.forEach(animate => {
@@ -20914,63 +20831,61 @@
           },
           line0Info = this.getLineByPoint(cache, startCursorPos),
           line1Info = this.getLineByPoint(cache, endCursorPos);
-        if (line0Info && line1Info) {
-          if ((startCursorPos.y > endCursorPos.y || startCursorPos.y === endCursorPos.y && startCursorPos.x > endCursorPos.x) && ([startCursorPos, endCursorPos] = [endCursorPos, startCursorPos], [line1Info, line0Info] = [line0Info, line1Info]), this.hideSelection(), line0Info === line1Info) this.editBg.setAttributes({
-            x: startCursorPos.x,
+        if ((startCursorPos.y > endCursorPos.y || startCursorPos.y === endCursorPos.y && startCursorPos.x > endCursorPos.x) && ([startCursorPos, endCursorPos] = [endCursorPos, startCursorPos], [line1Info, line0Info] = [line0Info, line1Info]), this.hideSelection(), line0Info === line1Info) this.editBg.setAttributes({
+          x: startCursorPos.x,
+          y: line0Info.top,
+          width: endCursorPos.x - startCursorPos.x,
+          height: line0Info.height,
+          fill: "#336df4",
+          fillOpacity: .2
+        });else {
+          this.editBg.setAttributes({
+            x: 0,
             y: line0Info.top,
-            width: endCursorPos.x - startCursorPos.x,
-            height: line0Info.height,
-            fill: "#336df4",
-            fillOpacity: .2
-          });else {
-            this.editBg.setAttributes({
-              x: 0,
-              y: line0Info.top,
-              width: 0,
-              height: 0
-            });
-            const startIdx = cache.lines.findIndex(item => item === line0Info),
-              endIdx = cache.lines.findIndex(item => item === line1Info);
-            let y = 0;
-            for (let i = startIdx; i <= endIdx; i++) {
-              const line = cache.lines[i];
-              if (i === startIdx) {
-                const p = line.paragraphs[line.paragraphs.length - 1];
-                this.editBg.add(createRect({
-                  x: startCursorPos.x,
-                  y: y,
-                  width: p.left + p.width - startCursorPos.x,
-                  height: line.height,
-                  fill: "#336df4",
-                  fillOpacity: .2
-                }));
-              } else if (i === endIdx) {
-                const p = line.paragraphs[0];
-                this.editBg.add(createRect({
-                  x: p.left,
-                  y: y,
-                  width: endCursorPos.x - p.left,
-                  height: line.height,
-                  fill: "#336df4",
-                  fillOpacity: .2
-                }));
-              } else {
-                const p0 = line.paragraphs[0],
-                  p1 = line.paragraphs[line.paragraphs.length - 1];
-                this.editBg.add(createRect({
-                  x: p0.left,
-                  y: y,
-                  width: p1.left + p1.width - p0.left,
-                  height: line.height,
-                  fill: "#336df4",
-                  fillOpacity: .2
-                }));
-              }
-              y += line.height;
+            width: 0,
+            height: 0
+          });
+          const startIdx = cache.lines.findIndex(item => item === line0Info),
+            endIdx = cache.lines.findIndex(item => item === line1Info);
+          let y = 0;
+          for (let i = startIdx; i <= endIdx; i++) {
+            const line = cache.lines[i];
+            if (i === startIdx) {
+              const p = line.paragraphs[line.paragraphs.length - 1];
+              this.editBg.add(createRect({
+                x: startCursorPos.x,
+                y: y,
+                width: p.left + p.width - startCursorPos.x,
+                height: line.height,
+                fill: "#336df4",
+                fillOpacity: .2
+              }));
+            } else if (i === endIdx) {
+              const p = line.paragraphs[0];
+              this.editBg.add(createRect({
+                x: p.left,
+                y: y,
+                width: endCursorPos.x - p.left,
+                height: line.height,
+                fill: "#336df4",
+                fillOpacity: .2
+              }));
+            } else {
+              const p0 = line.paragraphs[0],
+                p1 = line.paragraphs[line.paragraphs.length - 1];
+              this.editBg.add(createRect({
+                x: p0.left,
+                y: y,
+                width: p1.left + p1.width - p0.left,
+                height: line.height,
+                fill: "#336df4",
+                fillOpacity: .2
+              }));
             }
+            y += line.height;
           }
-          this.setCursorAndTextArea(currCursorData.x, currCursorData.y1, currCursorData.y2, this.currRt), this.triggerRender(), this.updateCbs.forEach(cb => cb("selection", this));
         }
+        this.setCursorAndTextArea(currCursorData.x, currCursorData.y1, currCursorData.y2, this.currRt), this.triggerRender(), this.updateCbs.forEach(cb => cb("selection", this));
       }
       hideSelection() {
         this.editBg && (this.editBg.removeAllChild(), this.editBg.setAttributes({
@@ -21014,10 +20929,7 @@
         return -1;
       }
       isRichtext(e) {
-        return !(!e.target || "richtext" !== e.target.type);
-      }
-      isEditableRichtext(e) {
-        return this.isRichtext(e) && !!e.target.attribute.editable;
+        return !(!e.target || "richtext" !== e.target.type || !e.target.attribute.editable);
       }
       triggerRender() {
         this.pluginService.stage.renderNextFrame();
@@ -21163,7 +21075,7 @@
         target && (this.currRt = target, e ? this._forceFocusByEvent(e) : this._forceFocusByCursorIndex(null != cursorIndex ? cursorIndex : -.1));
       }
       _forceFocusByEvent(e) {
-        this.handleEnter(), this.handlePointerDown(e), this.handlePointerUp(e);
+        this.handleEnter(e), this.handlePointerDown(e), this.handlePointerUp(e);
       }
       _forceFocusByCursorIndex(cursorIndex) {
         const richtext = this.currRt;
@@ -21367,7 +21279,7 @@
       loadPolygonModule || (loadPolygonModule = !0, bind(PolygonRender).to(exports.DefaultCanvasPolygonRender).inSingletonScope(), bind(GraphicRender).toService(PolygonRender), bind(PolygonRenderContribution).toService(exports.DefaultBaseInteractiveRenderContribution), bindContributionProvider(bind, PolygonRenderContribution));
     });
 
-    var __decorate$1a = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1c = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -21399,21 +21311,21 @@
         }), context.highPerformanceRestore();
       }
     };
-    DefaultCanvasGlyphRender = __decorate$1a([injectable()], DefaultCanvasGlyphRender);
+    DefaultCanvasGlyphRender = __decorate$1c([injectable()], DefaultCanvasGlyphRender);
 
     let loadGlyphModule = !1;
     const glyphModule = new ContainerModule(bind => {
       loadGlyphModule || (loadGlyphModule = !0, bind(GlyphRender).to(DefaultCanvasGlyphRender).inSingletonScope(), bind(GraphicRender).toService(GlyphRender));
     });
 
-    var __decorate$19 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1b = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$U = undefined && undefined.__metadata || function (k, v) {
+      __metadata$V = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let DefaultCanvasRichTextRender = class extends BaseRender {
@@ -21467,7 +21379,7 @@
         this._draw(richtext, richtextAttribute, !1, drawContext);
       }
     };
-    DefaultCanvasRichTextRender = __decorate$19([injectable(), __metadata$U("design:paramtypes", [])], DefaultCanvasRichTextRender);
+    DefaultCanvasRichTextRender = __decorate$1b([injectable(), __metadata$V("design:paramtypes", [])], DefaultCanvasRichTextRender);
 
     let loadRichtextModule = !1;
     const richtextModule = new ContainerModule(bind => {
@@ -21551,7 +21463,7 @@
       }
     }
 
-    var __decorate$18 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$1a = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -21607,14 +21519,14 @@
         this._draw(rect, rectAttribute, !1, drawContext);
       }
     };
-    DefaultCanvasRect3dRender = __decorate$18([injectable()], DefaultCanvasRect3dRender);
+    DefaultCanvasRect3dRender = __decorate$1a([injectable()], DefaultCanvasRect3dRender);
 
     let loadRect3dModule = !1;
     const rect3dModule = new ContainerModule(bind => {
       loadRect3dModule || (loadRect3dModule = !0, bind(Rect3DRender).to(DefaultCanvasRect3dRender).inSingletonScope(), bind(GraphicRender).toService(Rect3DRender));
     });
 
-    var __decorate$17 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$19 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -21741,14 +21653,14 @@
         this._draw(arc, arcAttribute, !1, drawContext, params);
       }
     };
-    DefaultCanvasArc3DRender = __decorate$17([injectable()], DefaultCanvasArc3DRender);
+    DefaultCanvasArc3DRender = __decorate$19([injectable()], DefaultCanvasArc3DRender);
 
     let loadArc3dModule = !1;
     const arc3dModule = new ContainerModule(bind => {
       loadArc3dModule || (loadArc3dModule = !0, bind(Arc3dRender).to(DefaultCanvasArc3DRender).inSingletonScope(), bind(GraphicRender).toService(Arc3dRender));
     });
 
-    var __decorate$16 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$18 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -21785,7 +21697,7 @@
         this._draw(pyramid3d, pyramid3dAttribute, !1, drawContext);
       }
     };
-    DefaultCanvasPyramid3dRender = __decorate$16([injectable()], DefaultCanvasPyramid3dRender);
+    DefaultCanvasPyramid3dRender = __decorate$18([injectable()], DefaultCanvasPyramid3dRender);
 
     let loadPyramid3dModule = !1;
     const pyramid3dModule = new ContainerModule(bind => {
@@ -23908,17 +23820,17 @@
       }
     }
 
-    var __decorate$15 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$17 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$T = undefined && undefined.__metadata || function (k, v) {
+      __metadata$U = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$B = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$C = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -24004,9 +23916,9 @@
         }), context.highPerformanceRestore();
       }
     };
-    RoughCanvasArcRender = __decorate$15([injectable(), __param$B(0, inject(exports.DefaultCanvasArcRender)), __metadata$T("design:paramtypes", [Object])], RoughCanvasArcRender);
+    RoughCanvasArcRender = __decorate$17([injectable(), __param$C(0, inject(exports.DefaultCanvasArcRender)), __metadata$U("design:paramtypes", [Object])], RoughCanvasArcRender);
 
-    var __decorate$14 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$16 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -24084,19 +23996,19 @@
         }), context.highPerformanceRestore(), !1;
       }
     };
-    RoughCanvasAreaRender = __decorate$14([injectable()], RoughCanvasAreaRender);
+    RoughCanvasAreaRender = __decorate$16([injectable()], RoughCanvasAreaRender);
 
-    var __decorate$13 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$15 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$S = undefined && undefined.__metadata || function (k, v) {
+      __metadata$T = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$A = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$B = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -24133,9 +24045,9 @@
         });
       }
     };
-    RoughCanvasCircleRender = __decorate$13([injectable(), __param$A(0, inject(exports.DefaultCanvasCircleRender)), __metadata$S("design:paramtypes", [Object])], RoughCanvasCircleRender);
+    RoughCanvasCircleRender = __decorate$15([injectable(), __param$B(0, inject(exports.DefaultCanvasCircleRender)), __metadata$T("design:paramtypes", [Object])], RoughCanvasCircleRender);
 
-    var __decorate$12 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$14 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -24214,19 +24126,19 @@
         }), context.highPerformanceRestore(), !1;
       }
     };
-    RoughCanvasLineRender = __decorate$12([injectable()], RoughCanvasLineRender);
+    RoughCanvasLineRender = __decorate$14([injectable()], RoughCanvasLineRender);
 
-    var __decorate$11 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$13 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$R = undefined && undefined.__metadata || function (k, v) {
+      __metadata$S = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$z = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$A = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -24300,19 +24212,19 @@
         }), context.highPerformanceRestore();
       }
     };
-    RoughCanvasPathRender = __decorate$11([injectable(), __param$z(0, inject(exports.DefaultCanvasPathRender)), __metadata$R("design:paramtypes", [Object])], RoughCanvasPathRender);
+    RoughCanvasPathRender = __decorate$13([injectable(), __param$A(0, inject(exports.DefaultCanvasPathRender)), __metadata$S("design:paramtypes", [Object])], RoughCanvasPathRender);
 
-    var __decorate$10 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$12 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$Q = undefined && undefined.__metadata || function (k, v) {
+      __metadata$R = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$y = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$z = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -24403,19 +24315,19 @@
         }), context.highPerformanceRestore();
       }
     };
-    RoughCanvasRectRender = __decorate$10([injectable(), __param$y(0, inject(exports.DefaultCanvasRectRender)), __metadata$Q("design:paramtypes", [Object])], RoughCanvasRectRender);
+    RoughCanvasRectRender = __decorate$12([injectable(), __param$z(0, inject(exports.DefaultCanvasRectRender)), __metadata$R("design:paramtypes", [Object])], RoughCanvasRectRender);
 
-    var __decorate$$ = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$11 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$P = undefined && undefined.__metadata || function (k, v) {
+      __metadata$Q = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$x = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$y = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -24507,7 +24419,7 @@
         if (this.canvasRenderer.drawShape) return this.canvasRenderer.drawShape(graphic, ctx, x, y, drawContext, params, fillCb, strokeCb);
       }
     };
-    RoughCanvasSymbolRender = __decorate$$([injectable(), __param$x(0, inject(exports.DefaultCanvasSymbolRender)), __metadata$P("design:paramtypes", [Object])], RoughCanvasSymbolRender);
+    RoughCanvasSymbolRender = __decorate$11([injectable(), __param$y(0, inject(exports.DefaultCanvasSymbolRender)), __metadata$Q("design:paramtypes", [Object])], RoughCanvasSymbolRender);
 
     var _roughModule = new ContainerModule(bind => {
       bind(RoughCanvasCircleRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasCircleRender), bind(RoughCanvasRectRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasRectRender), bind(RoughCanvasPathRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasPathRender), bind(RoughCanvasSymbolRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasSymbolRender), bind(RoughCanvasLineRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasLineRender), bind(RoughCanvasAreaRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasAreaRender), bind(RoughCanvasArcRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasArcRender);
@@ -24530,6 +24442,7 @@
     const CanvasAreaPicker = Symbol.for("CanvasAreaPicker");
     const CanvasCirclePicker = Symbol.for("CanvasCirclePicker");
     const CanvasImagePicker = Symbol.for("CanvasImagePicker");
+    const CanvasGifImagePicker = Symbol.for("CanvasGifImagePicker");
     const CanvasLinePicker = Symbol.for("CanvasLinePicker");
     const CanvasLottiePicker = Symbol.for("CanvasLottiePicker");
     const CanvasPathPicker = Symbol.for("CanvasPathPicker");
@@ -24670,9 +24583,11 @@
           name: name,
           id: id,
           attribute: attribute,
-          stateProxy: stateProxy
+          stateProxy: stateProxy,
+          animation: animation,
+          timeline: timeline
         } = _a,
-        props = __rest(_a, ["key", "name", "id", "attribute", "stateProxy"]);
+        props = __rest(_a, ["key", "name", "id", "attribute", "stateProxy", "animation", "timeline"]);
       let c = type;
       isString$1(type) && (c = graphicCreator[type]);
       const childrenList = [];
@@ -24681,7 +24596,13 @@
       }
       children.length && flatten(1 === children.length ? children[0] : children, childrenList);
       const g = "Group" === c.name ? new c(attribute) : c(config);
-      return parseToGraphic$1(g, childrenList, props), stateProxy && (g.stateProxy = stateProxy), g;
+      if (parseToGraphic$1(g, childrenList, props), stateProxy && (g.stateProxy = stateProxy), name && (g.name = name), isArray$1(animation)) {
+        const animate = g.animate();
+        timeline && animate.setTimeline(timeline), animation.forEach(item => {
+          animate[item[0]](...item.slice(1));
+        });
+      }
+      return g;
     }
     function parseToGraphic$1(g, childrenList, props) {
       let out,
@@ -25011,14 +24932,14 @@
       }
     }
 
-    var __decorate$_ = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$10 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$O = undefined && undefined.__metadata || function (k, v) {
+      __metadata$P = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     const outP = [0, 0, 0],
@@ -25530,16 +25451,16 @@
         this.stack.forEach(m => matrixAllocate.free(m)), this.stack.length = 0;
       }
     };
-    BrowserContext2d.env = "browser", BrowserContext2d = __decorate$_([injectable(), __metadata$O("design:paramtypes", [Object, Number])], BrowserContext2d);
+    BrowserContext2d.env = "browser", BrowserContext2d = __decorate$10([injectable(), __metadata$P("design:paramtypes", [Object, Number])], BrowserContext2d);
 
-    var __decorate$Z = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$$ = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$N = undefined && undefined.__metadata || function (k, v) {
+      __metadata$O = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let BrowserCanvas = class extends BaseCanvas {
@@ -25601,7 +25522,7 @@
         this._context.dpr = this._dpr;
       }
     };
-    BrowserCanvas.env = "browser", BrowserCanvas = __decorate$Z([injectable(), __metadata$N("design:paramtypes", [Object])], BrowserCanvas);
+    BrowserCanvas.env = "browser", BrowserCanvas = __decorate$$([injectable(), __metadata$O("design:paramtypes", [Object])], BrowserCanvas);
 
     function createModule(CanvasConstructor, ContextConstructor) {
       return new ContainerModule(bind => {
@@ -25611,17 +25532,17 @@
 
     const browserCanvasModule = createModule(BrowserCanvas, BrowserContext2d);
 
-    var __decorate$Y = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$_ = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$M = undefined && undefined.__metadata || function (k, v) {
+      __metadata$N = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$w = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$x = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -25672,9 +25593,9 @@
         return data;
       }
     };
-    DefaultCanvasPickerService = __decorate$Y([injectable(), __param$w(0, inject(ContributionProvider)), __param$w(0, named(CanvasPickerContribution)), __param$w(1, inject(DrawContribution)), __param$w(2, inject(ContributionProvider)), __param$w(2, named(PickItemInterceptor)), __param$w(3, inject(ContributionProvider)), __param$w(3, named(PickServiceInterceptor)), __metadata$M("design:paramtypes", [Object, Object, Object, Object])], DefaultCanvasPickerService);
+    DefaultCanvasPickerService = __decorate$_([injectable(), __param$x(0, inject(ContributionProvider)), __param$x(0, named(CanvasPickerContribution)), __param$x(1, inject(DrawContribution)), __param$x(2, inject(ContributionProvider)), __param$x(2, named(PickItemInterceptor)), __param$x(3, inject(ContributionProvider)), __param$x(3, named(PickServiceInterceptor)), __metadata$N("design:paramtypes", [Object, Object, Object, Object])], DefaultCanvasPickerService);
 
-    var __decorate$X = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$Z = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -25689,7 +25610,7 @@
         return !1;
       }
     };
-    DefaultCanvasGroupPicker = __decorate$X([injectable()], DefaultCanvasGroupPicker);
+    DefaultCanvasGroupPicker = __decorate$Z([injectable()], DefaultCanvasGroupPicker);
 
     const m$1 = new ContainerModule((bind, unbind, isBound, rebind) => {
       m$1.__vloaded || (m$1.__vloaded = !0, bind(CanvasGroupPicker).to(DefaultCanvasGroupPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasGroupPicker), bindContributionProvider(bind, CanvasPickerContribution));
@@ -25705,14 +25626,14 @@
     }
 
     var BrowserWindowHandlerContribution_1,
-      __decorate$W = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+      __decorate$Y = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$L = undefined && undefined.__metadata || function (k, v) {
+      __metadata$M = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let BrowserWindowHandlerContribution = BrowserWindowHandlerContribution_1 = class extends exports.BaseWindowHandlerContribution {
@@ -25870,19 +25791,19 @@
         return this.global.getElementTopLeft(this.canvas.nativeCanvas, baseWindow);
       }
     };
-    BrowserWindowHandlerContribution.env = "browser", BrowserWindowHandlerContribution.idprefix = "visactor_window", BrowserWindowHandlerContribution.prefix_count = 0, BrowserWindowHandlerContribution = BrowserWindowHandlerContribution_1 = __decorate$W([injectable(), __metadata$L("design:paramtypes", [])], BrowserWindowHandlerContribution);
+    BrowserWindowHandlerContribution.env = "browser", BrowserWindowHandlerContribution.idprefix = "visactor_window", BrowserWindowHandlerContribution.prefix_count = 0, BrowserWindowHandlerContribution = BrowserWindowHandlerContribution_1 = __decorate$Y([injectable(), __metadata$M("design:paramtypes", [])], BrowserWindowHandlerContribution);
     const browserWindowModule = new ContainerModule(bind => {
       bind(BrowserWindowHandlerContribution).toSelf(), bind(WindowHandlerContribution).toDynamicValue(ctx => ctx.container.get(BrowserWindowHandlerContribution)).whenTargetNamed(BrowserWindowHandlerContribution.env);
     });
 
-    var __decorate$V = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$X = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$K = undefined && undefined.__metadata || function (k, v) {
+      __metadata$L = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
       __awaiter$2 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
@@ -25936,7 +25857,7 @@
     function createImageElement$1(src) {
       let isSvg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !1;
       const img = document.createElement("img");
-      if (img.crossOrigin = "anonymous", isSvg) {
+      if (application.global.isImageAnonymous && (img.crossOrigin = "anonymous"), isSvg) {
         const data = new Blob([src], {
           type: "image/svg+xml"
         });
@@ -26129,7 +26050,7 @@
         return navigator.clipboard.writeText(text).then(() => {}).catch(err => {});
       }
     };
-    exports.BrowserEnvContribution = __decorate$V([injectable(), __metadata$K("design:paramtypes", [])], exports.BrowserEnvContribution);
+    exports.BrowserEnvContribution = __decorate$X([injectable(), __metadata$L("design:paramtypes", [])], exports.BrowserEnvContribution);
 
     const browserEnvModule = new ContainerModule(bind => {
       browserEnvModule.isBrowserBound || (browserEnvModule.isBrowserBound = !0, bind(exports.BrowserEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(exports.BrowserEnvContribution));
@@ -26144,7 +26065,7 @@
       loadBrowserEnv(container);
     }
 
-    var __decorate$U = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$W = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -26189,16 +26110,16 @@
         return null;
       }
     };
-    FeishuContext2d.env = "feishu", FeishuContext2d = __decorate$U([injectable()], FeishuContext2d);
+    FeishuContext2d.env = "feishu", FeishuContext2d = __decorate$W([injectable()], FeishuContext2d);
 
-    var __decorate$T = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$V = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$J = undefined && undefined.__metadata || function (k, v) {
+      __metadata$K = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let FeishuCanvas = class extends BaseCanvas {
@@ -26210,21 +26131,21 @@
       }
       release() {}
     };
-    FeishuCanvas.env = "feishu", FeishuCanvas = __decorate$T([injectable(), __metadata$J("design:paramtypes", [Object])], FeishuCanvas);
+    FeishuCanvas.env = "feishu", FeishuCanvas = __decorate$V([injectable(), __metadata$K("design:paramtypes", [Object])], FeishuCanvas);
 
     const feishuCanvasModule = createModule(FeishuCanvas, FeishuContext2d);
 
-    var __decorate$S = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$U = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$I = undefined && undefined.__metadata || function (k, v) {
+      __metadata$J = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$v = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$w = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -26360,22 +26281,22 @@
         context.nativeContext.save(), context.nativeContext.setTransform(dpr, 0, 0, dpr, 0, 0), context.clearRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1), color && (context.fillStyle = color, context.fillRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1)), context.nativeContext.restore();
       }
     };
-    FeishuWindowHandlerContribution.env = "feishu", FeishuWindowHandlerContribution = __decorate$S([injectable(), __param$v(0, inject(VGlobal)), __metadata$I("design:paramtypes", [Object])], FeishuWindowHandlerContribution);
+    FeishuWindowHandlerContribution.env = "feishu", FeishuWindowHandlerContribution = __decorate$U([injectable(), __param$w(0, inject(VGlobal)), __metadata$J("design:paramtypes", [Object])], FeishuWindowHandlerContribution);
     const feishuWindowModule = new ContainerModule(bind => {
       bind(FeishuWindowHandlerContribution).toSelf(), bind(WindowHandlerContribution).toDynamicValue(ctx => ctx.container.get(FeishuWindowHandlerContribution)).whenTargetNamed(FeishuWindowHandlerContribution.env);
     });
 
-    var __decorate$R = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$T = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$H = undefined && undefined.__metadata || function (k, v) {
+      __metadata$I = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$u = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$v = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -26406,7 +26327,7 @@
         } : null;
       }
     };
-    DefaultMathPickerService = __decorate$R([injectable(), __param$u(0, inject(ContributionProvider)), __param$u(0, named(MathPickerContribution)), __param$u(1, inject(ContributionProvider)), __param$u(1, named(PickItemInterceptor)), __param$u(2, inject(ContributionProvider)), __param$u(2, named(PickServiceInterceptor)), __metadata$H("design:paramtypes", [Object, Object, Object])], DefaultMathPickerService);
+    DefaultMathPickerService = __decorate$T([injectable(), __param$v(0, inject(ContributionProvider)), __param$v(0, named(MathPickerContribution)), __param$v(1, inject(ContributionProvider)), __param$v(1, named(PickItemInterceptor)), __param$v(2, inject(ContributionProvider)), __param$v(2, named(PickServiceInterceptor)), __metadata$I("design:paramtypes", [Object, Object, Object])], DefaultMathPickerService);
 
     const m = new ContainerModule(bind => {
       m.__vloaded || (m.__vloaded = !0, bindContributionProvider(bind, MathPickerContribution));
@@ -26443,17 +26364,17 @@
       }
     }
 
-    var __decorate$Q = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$S = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$G = undefined && undefined.__metadata || function (k, v) {
+      __metadata$H = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$t = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$u = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -26463,24 +26384,24 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "arc", this.numberType = ARC_NUMBER_TYPE;
       }
     };
-    DefaultMathArcPicker = __decorate$Q([injectable(), __param$t(0, inject(ArcRender)), __metadata$G("design:paramtypes", [Object])], DefaultMathArcPicker);
+    DefaultMathArcPicker = __decorate$S([injectable(), __param$u(0, inject(ArcRender)), __metadata$H("design:paramtypes", [Object])], DefaultMathArcPicker);
 
     let loadArcPick$1 = !1;
     const arcMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadArcPick$1 || (loadArcPick$1 = !0, bind(MathArcPicker).to(DefaultMathArcPicker).inSingletonScope(), bind(MathPickerContribution).toService(MathArcPicker));
     });
 
-    var __decorate$P = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$R = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$F = undefined && undefined.__metadata || function (k, v) {
+      __metadata$G = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$s = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$t = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -26490,24 +26411,24 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "area", this.numberType = AREA_NUMBER_TYPE;
       }
     };
-    DefaultMathAreaPicker = __decorate$P([injectable(), __param$s(0, inject(AreaRender)), __metadata$F("design:paramtypes", [Object])], DefaultMathAreaPicker);
+    DefaultMathAreaPicker = __decorate$R([injectable(), __param$t(0, inject(AreaRender)), __metadata$G("design:paramtypes", [Object])], DefaultMathAreaPicker);
 
     let loadAreaPick$1 = !1;
     const areaMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadAreaPick$1 || (loadAreaPick$1 = !0, bind(MathAreaPicker).to(DefaultMathAreaPicker).inSingletonScope(), bind(MathPickerContribution).toService(MathAreaPicker));
     });
 
-    var __decorate$O = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$Q = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$E = undefined && undefined.__metadata || function (k, v) {
+      __metadata$F = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$r = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$s = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -26517,7 +26438,7 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "circle", this.numberType = CIRCLE_NUMBER_TYPE;
       }
     };
-    DefaultMathCirclePicker = __decorate$O([injectable(), __param$r(0, inject(CircleRender)), __metadata$E("design:paramtypes", [Object])], DefaultMathCirclePicker);
+    DefaultMathCirclePicker = __decorate$Q([injectable(), __param$s(0, inject(CircleRender)), __metadata$F("design:paramtypes", [Object])], DefaultMathCirclePicker);
 
     let loadCirclePick$1 = !1;
     const circleMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
@@ -26548,17 +26469,17 @@
       }
     }
 
-    var __decorate$N = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$P = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$D = undefined && undefined.__metadata || function (k, v) {
+      __metadata$E = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$q = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$r = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -26568,14 +26489,14 @@
         super(), this.canvasRenderer = canvasRenderer;
       }
     };
-    DefaultMathGlyphPicker = __decorate$N([injectable(), __param$q(0, inject(GlyphRender)), __metadata$D("design:paramtypes", [Object])], DefaultMathGlyphPicker);
+    DefaultMathGlyphPicker = __decorate$P([injectable(), __param$r(0, inject(GlyphRender)), __metadata$E("design:paramtypes", [Object])], DefaultMathGlyphPicker);
 
     let loadGlyphPick$1 = !1;
     const glyphMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadGlyphPick$1 || (loadGlyphPick$1 = !0, bind(MathGlyphPicker).to(DefaultMathGlyphPicker).inSingletonScope(), bind(DefaultMathGlyphPicker).toService(MathGlyphPicker));
     });
 
-    var __decorate$M = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$O = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -26593,24 +26514,24 @@
         return !!pickContext && !!image.AABBBounds.containsPoint(point);
       }
     };
-    DefaultMathImagePicker = __decorate$M([injectable()], DefaultMathImagePicker);
+    DefaultMathImagePicker = __decorate$O([injectable()], DefaultMathImagePicker);
 
     let loadImagePick$1 = !1;
     const imageMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadImagePick$1 || (loadImagePick$1 = !0, bind(MathImagePicker).to(DefaultMathImagePicker).inSingletonScope(), bind(DefaultMathImagePicker).toService(MathImagePicker));
     });
 
-    var __decorate$L = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$N = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$C = undefined && undefined.__metadata || function (k, v) {
+      __metadata$D = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$p = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$q = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -26620,24 +26541,24 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "line", this.numberType = LINE_NUMBER_TYPE;
       }
     };
-    DefaultMathLinePicker = __decorate$L([injectable(), __param$p(0, inject(LineRender)), __metadata$C("design:paramtypes", [Object])], DefaultMathLinePicker);
+    DefaultMathLinePicker = __decorate$N([injectable(), __param$q(0, inject(LineRender)), __metadata$D("design:paramtypes", [Object])], DefaultMathLinePicker);
 
     let loadLinePick$1 = !1;
     const lineMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadLinePick$1 || (loadLinePick$1 = !0, bind(MathLinePicker).to(DefaultMathLinePicker).inSingletonScope(), bind(MathPickerContribution).toService(MathLinePicker));
     });
 
-    var __decorate$K = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$M = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$B = undefined && undefined.__metadata || function (k, v) {
+      __metadata$C = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$o = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$p = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -26647,24 +26568,24 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "polygon", this.numberType = POLYGON_NUMBER_TYPE;
       }
     };
-    DefaultMathPolygonPicker = __decorate$K([injectable(), __param$o(0, inject(PolygonRender)), __metadata$B("design:paramtypes", [Object])], DefaultMathPolygonPicker);
+    DefaultMathPolygonPicker = __decorate$M([injectable(), __param$p(0, inject(PolygonRender)), __metadata$C("design:paramtypes", [Object])], DefaultMathPolygonPicker);
 
     let loadPolygonPick$1 = !1;
     const polygonMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadPolygonPick$1 || (loadPolygonPick$1 = !0, bind(MathPolygonPicker).to(DefaultMathPolygonPicker).inSingletonScope(), bind(MathPickerContribution).toService(MathPolygonPicker));
     });
 
-    var __decorate$J = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$L = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$A = undefined && undefined.__metadata || function (k, v) {
+      __metadata$B = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$n = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$o = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -26674,7 +26595,7 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "path", this.numberType = PATH_NUMBER_TYPE;
       }
     };
-    DefaultMathPathPicker = __decorate$J([injectable(), __param$n(0, inject(PathRender)), __metadata$A("design:paramtypes", [Object])], DefaultMathPathPicker);
+    DefaultMathPathPicker = __decorate$L([injectable(), __param$o(0, inject(PathRender)), __metadata$B("design:paramtypes", [Object])], DefaultMathPathPicker);
 
     let loadPathPick$1 = !1;
     const pathMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
@@ -26729,17 +26650,17 @@
       }
     }
 
-    var __decorate$I = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$K = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$z = undefined && undefined.__metadata || function (k, v) {
+      __metadata$A = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$m = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$n = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -26749,7 +26670,7 @@
         super(), this.canvasRenderer = canvasRenderer;
       }
     };
-    DefaultMathRectPicker = __decorate$I([injectable(), __param$m(0, inject(RectRender)), __metadata$z("design:paramtypes", [Object])], DefaultMathRectPicker);
+    DefaultMathRectPicker = __decorate$K([injectable(), __param$n(0, inject(RectRender)), __metadata$A("design:paramtypes", [Object])], DefaultMathRectPicker);
 
     let loadRectPick$1 = !1;
     const rectMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
@@ -26761,17 +26682,17 @@
       loadRichTextPick || (loadRichTextPick = !0, bind(MathImagePicker).to(DefaultMathImagePicker).inSingletonScope(), bind(DefaultMathImagePicker).toService(MathImagePicker));
     });
 
-    var __decorate$H = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$J = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$y = undefined && undefined.__metadata || function (k, v) {
+      __metadata$z = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$l = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$m = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -26781,14 +26702,14 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "symbol", this.numberType = SYMBOL_NUMBER_TYPE;
       }
     };
-    DefaultMathSymbolPicker = __decorate$H([injectable(), __param$l(0, inject(SymbolRender)), __metadata$y("design:paramtypes", [Object])], DefaultMathSymbolPicker);
+    DefaultMathSymbolPicker = __decorate$J([injectable(), __param$m(0, inject(SymbolRender)), __metadata$z("design:paramtypes", [Object])], DefaultMathSymbolPicker);
 
     let loadSymbolPick$1 = !1;
     const symbolMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadSymbolPick$1 || (loadSymbolPick$1 = !0, bind(MathSymbolPicker).to(DefaultMathSymbolPicker).inSingletonScope(), bind(MathPickerContribution).toService(MathSymbolPicker));
     });
 
-    var __decorate$G = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$I = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -26803,7 +26724,7 @@
         return !!text.AABBBounds.containsPoint(point);
       }
     };
-    DefaultMathTextPicker = __decorate$G([injectable()], DefaultMathTextPicker);
+    DefaultMathTextPicker = __decorate$I([injectable()], DefaultMathTextPicker);
 
     let loadTextPick$1 = !1;
     const textMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
@@ -26886,19 +26807,20 @@
       }
     }
 
-    var __decorate$F = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$H = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$x = undefined && undefined.__metadata || function (k, v) {
+      __metadata$y = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     function makeUpCanvas$4(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCanvasList, pixelRatio) {
       const dpr = null != pixelRatio ? pixelRatio : tt.getSystemInfoSync().pixelRatio;
       canvasIdLists.forEach((id, i) => {
+        if (canvasMap.has(id)) return;
         const ctx = tt.createCanvasContext(id),
           canvas = new CanvasWrapDisableWH(ctx.canvas || {}, ctx, dpr, domref.width, domref.height, id);
         ctx.canvas = canvas, canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas);
@@ -26975,7 +26897,7 @@
         return null === (_a = null == event ? void 0 : event.type) || void 0 === _a || _a.startsWith("mouse"), event;
       }
     };
-    FeishuEnvContribution = __decorate$F([injectable(), __metadata$x("design:paramtypes", [])], FeishuEnvContribution);
+    FeishuEnvContribution = __decorate$H([injectable(), __metadata$y("design:paramtypes", [])], FeishuEnvContribution);
 
     const feishuEnvModule = new ContainerModule(bind => {
       feishuEnvModule.isFeishuBound || (feishuEnvModule.isFeishuBound = !0, bind(FeishuEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(FeishuEnvContribution));
@@ -26990,7 +26912,7 @@
       loadFeishuEnv(container);
     }
 
-    var __decorate$E = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$G = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -27037,7 +26959,13 @@
       measureText(text) {
         let method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : application.global.measureTextMethod;
         this.setTransform(1, 0, 0, 1, 0, 0, !0, application.global.devicePixelRatio);
-        return super.measureText(text, method);
+        return {
+          width: super.measureText(text, method).width,
+          fontBoundingBoxDescent: void 0,
+          fontBoundingBoxAscent: void 0,
+          actualBoundingBoxAscent: void 0,
+          actualBoundingBoxDescent: void 0
+        };
       }
       createPattern(image, repetition) {
         return null;
@@ -27051,16 +26979,16 @@
         }));
       }
     };
-    LynxContext2d.env = "lynx", LynxContext2d = __decorate$E([injectable()], LynxContext2d);
+    LynxContext2d.env = "lynx", LynxContext2d = __decorate$G([injectable()], LynxContext2d);
 
-    var __decorate$D = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$F = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$w = undefined && undefined.__metadata || function (k, v) {
+      __metadata$x = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let LynxCanvas = class extends BaseCanvas {
@@ -27076,19 +27004,19 @@
       }
       release() {}
     };
-    LynxCanvas.env = "lynx", LynxCanvas = __decorate$D([injectable(), __metadata$w("design:paramtypes", [Object])], LynxCanvas);
+    LynxCanvas.env = "lynx", LynxCanvas = __decorate$F([injectable(), __metadata$x("design:paramtypes", [Object])], LynxCanvas);
 
-    var __decorate$C = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$E = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$v = undefined && undefined.__metadata || function (k, v) {
+      __metadata$w = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$k = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$l = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -27226,21 +27154,21 @@
         context.nativeContext.save(), context.nativeContext.setTransform(dpr, 0, 0, dpr, 0, 0), context.clearRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1), color && (context.fillStyle = color, context.fillRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1)), context.nativeContext.restore();
       }
     };
-    LynxWindowHandlerContribution.env = "lynx", LynxWindowHandlerContribution = __decorate$C([injectable(), __param$k(0, inject(VGlobal)), __metadata$v("design:paramtypes", [Object])], LynxWindowHandlerContribution);
+    LynxWindowHandlerContribution.env = "lynx", LynxWindowHandlerContribution = __decorate$E([injectable(), __param$l(0, inject(VGlobal)), __metadata$w("design:paramtypes", [Object])], LynxWindowHandlerContribution);
     const lynxWindowModule = new ContainerModule(bind => {
       bind(LynxWindowHandlerContribution).toSelf(), bind(WindowHandlerContribution).toDynamicValue(ctx => ctx.container.get(LynxWindowHandlerContribution)).whenTargetNamed(LynxWindowHandlerContribution.env);
     });
 
     const lynxCanvasModule = createModule(LynxCanvas, LynxContext2d);
 
-    var __decorate$B = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$D = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$u = undefined && undefined.__metadata || function (k, v) {
+      __metadata$v = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let ng = !1;
@@ -27350,7 +27278,7 @@
       }
       release() {}
     };
-    LynxEnvContribution = __decorate$B([injectable(), __metadata$u("design:paramtypes", [])], LynxEnvContribution);
+    LynxEnvContribution = __decorate$D([injectable(), __metadata$v("design:paramtypes", [])], LynxEnvContribution);
 
     const lynxEnvModule = new ContainerModule(bind => {
       lynxEnvModule.isLynxBound || (lynxEnvModule.isLynxBound = !0, bind(LynxEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(LynxEnvContribution));
@@ -27365,14 +27293,14 @@
       loadLynxEnv(container);
     }
 
-    var __decorate$A = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$C = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$t = undefined && undefined.__metadata || function (k, v) {
+      __metadata$u = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let NodeContext2d = class extends BrowserContext2d {
@@ -27384,16 +27312,16 @@
       }
       release() {}
     };
-    NodeContext2d.env = "node", NodeContext2d = __decorate$A([injectable(), __metadata$t("design:paramtypes", [Object, Number])], NodeContext2d);
+    NodeContext2d.env = "node", NodeContext2d = __decorate$C([injectable(), __metadata$u("design:paramtypes", [Object, Number])], NodeContext2d);
 
-    var __decorate$z = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$B = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$s = undefined && undefined.__metadata || function (k, v) {
+      __metadata$t = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let NodeCanvas = class extends BaseCanvas {
@@ -27407,21 +27335,21 @@
         this._nativeCanvas.release && isFunction$1(this._nativeCanvas.release) && this._nativeCanvas.release();
       }
     };
-    NodeCanvas.env = "node", NodeCanvas = __decorate$z([injectable(), __metadata$s("design:paramtypes", [Object])], NodeCanvas);
+    NodeCanvas.env = "node", NodeCanvas = __decorate$B([injectable(), __metadata$t("design:paramtypes", [Object])], NodeCanvas);
 
     const nodeCanvasModule = createModule(NodeCanvas, NodeContext2d);
 
-    var __decorate$y = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$A = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$r = undefined && undefined.__metadata || function (k, v) {
+      __metadata$s = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$j = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$k = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -27512,12 +27440,12 @@
       }
       clearViewBox(color) {}
     };
-    NodeWindowHandlerContribution.env = "node", NodeWindowHandlerContribution = __decorate$y([injectable(), __param$j(0, inject(VGlobal)), __metadata$r("design:paramtypes", [Object])], NodeWindowHandlerContribution);
+    NodeWindowHandlerContribution.env = "node", NodeWindowHandlerContribution = __decorate$A([injectable(), __param$k(0, inject(VGlobal)), __metadata$s("design:paramtypes", [Object])], NodeWindowHandlerContribution);
     const nodeWindowModule = new ContainerModule(bind => {
       bind(NodeWindowHandlerContribution).toSelf(), bind(WindowHandlerContribution).toDynamicValue(ctx => ctx.container.get(NodeWindowHandlerContribution)).whenTargetNamed(NodeWindowHandlerContribution.env);
     });
 
-    var __decorate$x = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$z = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -27603,7 +27531,7 @@
       release() {}
       createOffscreenCanvas(params) {}
     };
-    NodeEnvContribution = __decorate$x([injectable()], NodeEnvContribution);
+    NodeEnvContribution = __decorate$z([injectable()], NodeEnvContribution);
 
     const nodeEnvModule = new ContainerModule(bind => {
       nodeEnvModule.isNodeBound || (nodeEnvModule.isNodeBound = !0, bind(NodeEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(NodeEnvContribution));
@@ -27617,7 +27545,7 @@
       loadNodeEnv(container);
     }
 
-    var __decorate$w = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$y = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -27706,16 +27634,16 @@
         return this.nativeContext.createCircularGradient && this.nativeContext.createCircularGradient(x0, y0, r0, x1, y1, r1);
       }
     };
-    TaroContext2d.env = "taro", TaroContext2d = __decorate$w([injectable()], TaroContext2d);
+    TaroContext2d.env = "taro", TaroContext2d = __decorate$y([injectable()], TaroContext2d);
 
-    var __decorate$v = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$x = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$q = undefined && undefined.__metadata || function (k, v) {
+      __metadata$r = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let TaroCanvas = class extends BaseCanvas {
@@ -27727,21 +27655,21 @@
       }
       release() {}
     };
-    TaroCanvas.env = "taro", TaroCanvas = __decorate$v([injectable(), __metadata$q("design:paramtypes", [Object])], TaroCanvas);
+    TaroCanvas.env = "taro", TaroCanvas = __decorate$x([injectable(), __metadata$r("design:paramtypes", [Object])], TaroCanvas);
 
     const taroCanvasModule = createModule(TaroCanvas, TaroContext2d);
 
-    var __decorate$u = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$w = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$p = undefined && undefined.__metadata || function (k, v) {
+      __metadata$q = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$i = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$j = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -27887,19 +27815,19 @@
         context.nativeContext.save(), context.nativeContext.setTransform(dpr, 0, 0, dpr, 0, 0), context.clearRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1), color && (context.fillStyle = color, context.fillRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1)), context.nativeContext.restore();
       }
     };
-    TaroWindowHandlerContribution.env = "taro", TaroWindowHandlerContribution = __decorate$u([injectable(), __param$i(0, inject(VGlobal)), __metadata$p("design:paramtypes", [Object])], TaroWindowHandlerContribution);
+    TaroWindowHandlerContribution.env = "taro", TaroWindowHandlerContribution = __decorate$w([injectable(), __param$j(0, inject(VGlobal)), __metadata$q("design:paramtypes", [Object])], TaroWindowHandlerContribution);
     const taroWindowModule = new ContainerModule(bind => {
       bind(TaroWindowHandlerContribution).toSelf(), bind(WindowHandlerContribution).toDynamicValue(ctx => ctx.container.get(TaroWindowHandlerContribution)).whenTargetNamed(TaroWindowHandlerContribution.env);
     });
 
-    var __decorate$t = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$v = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$o = undefined && undefined.__metadata || function (k, v) {
+      __metadata$p = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     function makeUpCanvas$2(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCanvasList, taro, dpr) {
@@ -27996,7 +27924,7 @@
       }
       release() {}
     };
-    TaroEnvContribution = __decorate$t([injectable(), __metadata$o("design:paramtypes", [])], TaroEnvContribution);
+    TaroEnvContribution = __decorate$v([injectable(), __metadata$p("design:paramtypes", [])], TaroEnvContribution);
 
     const taroEnvModule = new ContainerModule(bind => {
       taroEnvModule.isTaroBound || (taroEnvModule.isTaroBound = !0, bind(TaroEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(TaroEnvContribution));
@@ -28011,7 +27939,7 @@
       loadTaroEnv(container);
     }
 
-    var __decorate$s = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$u = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -28024,16 +27952,16 @@
         return null;
       }
     };
-    WxContext2d.env = "wx", WxContext2d = __decorate$s([injectable()], WxContext2d);
+    WxContext2d.env = "wx", WxContext2d = __decorate$u([injectable()], WxContext2d);
 
-    var __decorate$r = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$t = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$n = undefined && undefined.__metadata || function (k, v) {
+      __metadata$o = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let WxCanvas = class extends BaseCanvas {
@@ -28045,21 +27973,21 @@
       }
       release() {}
     };
-    WxCanvas.env = "wx", WxCanvas = __decorate$r([injectable(), __metadata$n("design:paramtypes", [Object])], WxCanvas);
+    WxCanvas.env = "wx", WxCanvas = __decorate$t([injectable(), __metadata$o("design:paramtypes", [Object])], WxCanvas);
 
     const wxCanvasModule = createModule(WxCanvas, WxContext2d);
 
-    var __decorate$q = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$s = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$m = undefined && undefined.__metadata || function (k, v) {
+      __metadata$n = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$h = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$i = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -28196,19 +28124,19 @@
         context.nativeContext.save(), context.nativeContext.setTransform(dpr, 0, 0, dpr, 0, 0), context.clearRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1), color && (context.fillStyle = color, context.fillRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1)), context.nativeContext.restore();
       }
     };
-    WxWindowHandlerContribution.env = "wx", WxWindowHandlerContribution = __decorate$q([injectable(), __param$h(0, inject(VGlobal)), __metadata$m("design:paramtypes", [Object])], WxWindowHandlerContribution);
+    WxWindowHandlerContribution.env = "wx", WxWindowHandlerContribution = __decorate$s([injectable(), __param$i(0, inject(VGlobal)), __metadata$n("design:paramtypes", [Object])], WxWindowHandlerContribution);
     const wxWindowModule = new ContainerModule(bind => {
       bind(WxWindowHandlerContribution).toSelf(), bind(WindowHandlerContribution).toDynamicValue(ctx => ctx.container.get(WxWindowHandlerContribution)).whenTargetNamed(WxWindowHandlerContribution.env);
     });
 
-    var __decorate$p = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$r = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$l = undefined && undefined.__metadata || function (k, v) {
+      __metadata$m = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
       __awaiter$1 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
@@ -28241,7 +28169,7 @@
         const dpr = wx.getSystemInfoSync().pixelRatio;
         for (let i = 0; i < canvasIdLists.length; i++) {
           const id = canvasIdLists[i];
-          yield new Promise(resolve => {
+          canvasMap.has(id) || (yield new Promise(resolve => {
             let data = wx.createSelectorQuery();
             component && (data = data.in(component)), data.select(`#${id}`).fields({
               node: !0,
@@ -28253,7 +28181,7 @@
                 height = res[0].height;
               canvas.width = width * dpr, canvas.height = height * dpr, canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas), resolve(null);
             });
-          });
+          }));
         }
       });
     }
@@ -28322,7 +28250,7 @@
         return null === (_a = null == event ? void 0 : event.type) || void 0 === _a || _a.startsWith("mouse"), event;
       }
     };
-    WxEnvContribution = __decorate$p([injectable(), __metadata$l("design:paramtypes", [])], WxEnvContribution);
+    WxEnvContribution = __decorate$r([injectable(), __metadata$m("design:paramtypes", [])], WxEnvContribution);
 
     const wxEnvModule = new ContainerModule(bind => {
       wxEnvModule._isWxBound || (wxEnvModule._isWxBound = !0, bind(WxEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(WxEnvContribution));
@@ -28350,7 +28278,7 @@
       loadAllEnv(container);
     }
 
-    var __decorate$o = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$q = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -28358,16 +28286,16 @@
       return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
     let TTContext2d = class extends FeishuContext2d {};
-    TTContext2d.env = "tt", TTContext2d = __decorate$o([injectable()], TTContext2d);
+    TTContext2d.env = "tt", TTContext2d = __decorate$q([injectable()], TTContext2d);
 
-    var __decorate$n = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$p = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$k = undefined && undefined.__metadata || function (k, v) {
+      __metadata$l = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let TTCanvas = class extends BaseCanvas {
@@ -28379,21 +28307,21 @@
       }
       release() {}
     };
-    TTCanvas.env = "tt", TTCanvas = __decorate$n([injectable(), __metadata$k("design:paramtypes", [Object])], TTCanvas);
+    TTCanvas.env = "tt", TTCanvas = __decorate$p([injectable(), __metadata$l("design:paramtypes", [Object])], TTCanvas);
 
     const ttCanvasModule = createModule(TTCanvas, TTContext2d);
 
-    var __decorate$m = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$o = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$j = undefined && undefined.__metadata || function (k, v) {
+      __metadata$k = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$g = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$h = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -28529,19 +28457,19 @@
         context.nativeContext.save(), context.nativeContext.setTransform(dpr, 0, 0, dpr, 0, 0), context.clearRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1), color && (context.fillStyle = color, context.fillRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1)), context.nativeContext.restore();
       }
     };
-    TTWindowHandlerContribution.env = "tt", TTWindowHandlerContribution = __decorate$m([injectable(), __param$g(0, inject(VGlobal)), __metadata$j("design:paramtypes", [Object])], TTWindowHandlerContribution);
+    TTWindowHandlerContribution.env = "tt", TTWindowHandlerContribution = __decorate$o([injectable(), __param$h(0, inject(VGlobal)), __metadata$k("design:paramtypes", [Object])], TTWindowHandlerContribution);
     const ttWindowModule = new ContainerModule(bind => {
       bind(TTWindowHandlerContribution).toSelf(), bind(WindowHandlerContribution).toDynamicValue(ctx => ctx.container.get(TTWindowHandlerContribution)).whenTargetNamed(TTWindowHandlerContribution.env);
     });
 
-    var __decorate$l = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$n = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$i = undefined && undefined.__metadata || function (k, v) {
+      __metadata$j = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
       __awaiter = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
@@ -28574,7 +28502,7 @@
         const dpr = tt.getSystemInfoSync().pixelRatio;
         for (let i = 0; i < canvasIdLists.length; i++) {
           const id = canvasIdLists[i];
-          yield new Promise(resolve => {
+          canvasMap.has(id) || (yield new Promise(resolve => {
             let data = tt.createSelectorQuery();
             component && (data = data.in(component)), data.select(`#${id}`).node().exec(res => {
               const canvas = res[0].node,
@@ -28582,7 +28510,7 @@
                 height = canvas.height;
               canvas.width = width * dpr, canvas.height = height * dpr, canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas), resolve(null);
             });
-          });
+          }));
         }
       });
     }
@@ -28651,7 +28579,7 @@
         return null === (_a = null == event ? void 0 : event.type) || void 0 === _a || _a.startsWith("mouse"), event;
       }
     };
-    TTEnvContribution = __decorate$l([injectable(), __metadata$i("design:paramtypes", [])], TTEnvContribution);
+    TTEnvContribution = __decorate$n([injectable(), __metadata$j("design:paramtypes", [])], TTEnvContribution);
 
     const ttEnvModule = new ContainerModule(bind => {
       ttEnvModule.isTTBound || (ttEnvModule.isTTBound = !0, bind(TTEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(TTEnvContribution));
@@ -28666,7 +28594,7 @@
       loadTTEnv(container);
     }
 
-    var __decorate$k = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$m = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -28751,16 +28679,16 @@
       }
       draw() {}
     };
-    HarmonyContext2d.env = "harmony", HarmonyContext2d = __decorate$k([injectable()], HarmonyContext2d);
+    HarmonyContext2d.env = "harmony", HarmonyContext2d = __decorate$m([injectable()], HarmonyContext2d);
 
-    var __decorate$j = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$l = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$h = undefined && undefined.__metadata || function (k, v) {
+      __metadata$i = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     let HarmonyCanvas = class extends BaseCanvas {
@@ -28773,19 +28701,19 @@
       resize(width, height) {}
       release() {}
     };
-    HarmonyCanvas.env = "harmony", HarmonyCanvas = __decorate$j([injectable(), __metadata$h("design:paramtypes", [Object])], HarmonyCanvas);
+    HarmonyCanvas.env = "harmony", HarmonyCanvas = __decorate$l([injectable(), __metadata$i("design:paramtypes", [Object])], HarmonyCanvas);
 
-    var __decorate$i = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$k = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$g = undefined && undefined.__metadata || function (k, v) {
+      __metadata$h = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$f = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$g = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -28922,21 +28850,21 @@
         context.nativeContext.save(), context.nativeContext.setTransform(dpr, 0, 0, dpr, 0, 0), context.clearRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1), color && (context.fillStyle = color, context.fillRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1)), context.nativeContext.restore();
       }
     };
-    HarmonyWindowHandlerContribution.env = "harmony", HarmonyWindowHandlerContribution = __decorate$i([injectable(), __param$f(0, inject(VGlobal)), __metadata$g("design:paramtypes", [Object])], HarmonyWindowHandlerContribution);
+    HarmonyWindowHandlerContribution.env = "harmony", HarmonyWindowHandlerContribution = __decorate$k([injectable(), __param$g(0, inject(VGlobal)), __metadata$h("design:paramtypes", [Object])], HarmonyWindowHandlerContribution);
     const harmonyWindowModule = new ContainerModule(bind => {
       bind(HarmonyWindowHandlerContribution).toSelf(), bind(WindowHandlerContribution).toDynamicValue(ctx => ctx.container.get(HarmonyWindowHandlerContribution)).whenTargetNamed(HarmonyWindowHandlerContribution.env);
     });
 
     const harmonyCanvasModule = createModule(HarmonyCanvas, HarmonyContext2d);
 
-    var __decorate$h = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$j = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$f = undefined && undefined.__metadata || function (k, v) {
+      __metadata$g = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       };
     function createCanvas(width, height, id) {
@@ -29017,7 +28945,7 @@
       }
       release() {}
     };
-    HarmonyEnvContribution = __decorate$h([injectable(), __metadata$f("design:paramtypes", [])], HarmonyEnvContribution);
+    HarmonyEnvContribution = __decorate$j([injectable(), __metadata$g("design:paramtypes", [])], HarmonyEnvContribution);
 
     const harmonyEnvModule = new ContainerModule(bind => {
       harmonyEnvModule.isHarmonyBound || (harmonyEnvModule.isHarmonyBound = !0, bind(HarmonyEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(HarmonyEnvContribution));
@@ -29032,17 +28960,17 @@
       loadHarmonyEnv(container);
     }
 
-    var __decorate$g = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$i = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$e = undefined && undefined.__metadata || function (k, v) {
+      __metadata$f = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$e = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$f = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29052,24 +28980,24 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "arc", this.numberType = ARC_NUMBER_TYPE;
       }
     };
-    DefaultCanvasArcPicker = __decorate$g([injectable(), __param$e(0, inject(ArcRender)), __metadata$e("design:paramtypes", [Object])], DefaultCanvasArcPicker);
+    DefaultCanvasArcPicker = __decorate$i([injectable(), __param$f(0, inject(ArcRender)), __metadata$f("design:paramtypes", [Object])], DefaultCanvasArcPicker);
 
     let loadArcPick = !1;
     const arcCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadArcPick || (loadArcPick = !0, bind(CanvasArcPicker).to(DefaultCanvasArcPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasArcPicker));
     });
 
-    var __decorate$f = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$h = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$d = undefined && undefined.__metadata || function (k, v) {
+      __metadata$e = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$d = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$e = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29079,7 +29007,7 @@
         super(), this.canvasRenderer = canvasRenderer;
       }
     };
-    DefaultCanvasRectPicker = __decorate$f([injectable(), __param$d(0, inject(RectRender)), __metadata$d("design:paramtypes", [Object])], DefaultCanvasRectPicker);
+    DefaultCanvasRectPicker = __decorate$h([injectable(), __param$e(0, inject(RectRender)), __metadata$e("design:paramtypes", [Object])], DefaultCanvasRectPicker);
 
     let loadRectPick = !1;
     const rectCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
@@ -29121,17 +29049,17 @@
       }
     }
 
-    var __decorate$e = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$g = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$c = undefined && undefined.__metadata || function (k, v) {
+      __metadata$d = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$c = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$d = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29141,24 +29069,24 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "line", this.numberType = LINE_NUMBER_TYPE;
       }
     };
-    DefaultCanvasLinePicker = __decorate$e([injectable(), __param$c(0, inject(LineRender)), __metadata$c("design:paramtypes", [Object])], DefaultCanvasLinePicker);
+    DefaultCanvasLinePicker = __decorate$g([injectable(), __param$d(0, inject(LineRender)), __metadata$d("design:paramtypes", [Object])], DefaultCanvasLinePicker);
 
     let loadLinePick = !1;
     const lineCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadLinePick || (loadLinePick = !0, bind(CanvasLinePicker).to(DefaultCanvasLinePicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasLinePicker));
     });
 
-    var __decorate$d = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$f = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$b = undefined && undefined.__metadata || function (k, v) {
+      __metadata$c = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$b = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$c = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29168,7 +29096,7 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "area", this.numberType = AREA_NUMBER_TYPE;
       }
     };
-    DefaultCanvasAreaPicker = __decorate$d([injectable(), __param$b(0, inject(AreaRender)), __metadata$b("design:paramtypes", [Object])], DefaultCanvasAreaPicker);
+    DefaultCanvasAreaPicker = __decorate$f([injectable(), __param$c(0, inject(AreaRender)), __metadata$c("design:paramtypes", [Object])], DefaultCanvasAreaPicker);
 
     let loadAreaPick = !1;
     const areaCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
@@ -29202,17 +29130,17 @@
       }
     }
 
-    var __decorate$c = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$e = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$a = undefined && undefined.__metadata || function (k, v) {
+      __metadata$b = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$a = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$b = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29257,24 +29185,24 @@
         }), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && mat4Allocate.free(pickContext.modelMatrix), pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), picked;
       }
     };
-    DefaultCanvasSymbolPicker = __decorate$c([injectable(), __param$a(0, inject(SymbolRender)), __metadata$a("design:paramtypes", [Object])], DefaultCanvasSymbolPicker);
+    DefaultCanvasSymbolPicker = __decorate$e([injectable(), __param$b(0, inject(SymbolRender)), __metadata$b("design:paramtypes", [Object])], DefaultCanvasSymbolPicker);
 
     let loadSymbolPick = !1;
     const symbolCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadSymbolPick || (loadSymbolPick = !0, bind(CanvasSymbolPicker).to(DefaultCanvasSymbolPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasSymbolPicker));
     });
 
-    var __decorate$b = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$d = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$9 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$a = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$9 = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$a = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29284,24 +29212,24 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "circle", this.numberType = CIRCLE_NUMBER_TYPE;
       }
     };
-    DefaultCanvasCirclePicker = __decorate$b([injectable(), __param$9(0, inject(CircleRender)), __metadata$9("design:paramtypes", [Object])], DefaultCanvasCirclePicker);
+    DefaultCanvasCirclePicker = __decorate$d([injectable(), __param$a(0, inject(CircleRender)), __metadata$a("design:paramtypes", [Object])], DefaultCanvasCirclePicker);
 
     let loadCirclePick = !1;
     const circleCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadCirclePick || (loadCirclePick = !0, bind(CanvasCirclePicker).to(DefaultCanvasCirclePicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasCirclePicker));
     });
 
-    var __decorate$a = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$c = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$8 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$9 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$8 = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$9 = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29354,24 +29282,24 @@
         }, (context, symbolAttribute, themeAttribute) => picked), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && mat4Allocate.free(pickContext.modelMatrix), pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), picked;
       }
     };
-    DefaultCanvasTextPicker = __decorate$a([injectable(), __param$8(0, inject(TextRender)), __metadata$8("design:paramtypes", [Object])], DefaultCanvasTextPicker);
+    DefaultCanvasTextPicker = __decorate$c([injectable(), __param$9(0, inject(TextRender)), __metadata$9("design:paramtypes", [Object])], DefaultCanvasTextPicker);
 
     let loadTextPick = !1;
     const textCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadTextPick || (loadTextPick = !0, bind(CanvasTextPicker).to(DefaultCanvasTextPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasTextPicker));
     });
 
-    var __decorate$9 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$b = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$7 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$8 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$7 = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$8 = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29381,24 +29309,24 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "path", this.numberType = PATH_NUMBER_TYPE;
       }
     };
-    DefaultCanvasPathPicker = __decorate$9([injectable(), __param$7(0, inject(PathRender)), __metadata$7("design:paramtypes", [Object])], DefaultCanvasPathPicker);
+    DefaultCanvasPathPicker = __decorate$b([injectable(), __param$8(0, inject(PathRender)), __metadata$8("design:paramtypes", [Object])], DefaultCanvasPathPicker);
 
     let loadPathPick = !1;
     const pathCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadPathPick || (loadPathPick = !0, bind(CanvasPathPicker).to(DefaultCanvasPathPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasPathPicker));
     });
 
-    var __decorate$8 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$a = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$6 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$7 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$6 = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$7 = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29408,24 +29336,24 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "polygon", this.numberType = POLYGON_NUMBER_TYPE;
       }
     };
-    DefaultCanvasPolygonPicker = __decorate$8([injectable(), __param$6(0, inject(PolygonRender)), __metadata$6("design:paramtypes", [Object])], DefaultCanvasPolygonPicker);
+    DefaultCanvasPolygonPicker = __decorate$a([injectable(), __param$7(0, inject(PolygonRender)), __metadata$7("design:paramtypes", [Object])], DefaultCanvasPolygonPicker);
 
     let loadPolygonPick = !1;
     const polygonCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadPolygonPick || (loadPolygonPick = !0, bind(CanvasPolygonPicker).to(DefaultCanvasPolygonPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasPolygonPicker));
     });
 
-    var __decorate$7 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$9 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$5 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$6 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$5 = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$6 = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29435,24 +29363,24 @@
         super(), this.canvasRenderer = canvasRenderer;
       }
     };
-    DefaultCanvasGlyphPicker = __decorate$7([injectable(), __param$5(0, inject(GlyphRender)), __metadata$5("design:paramtypes", [Object])], DefaultCanvasGlyphPicker);
+    DefaultCanvasGlyphPicker = __decorate$9([injectable(), __param$6(0, inject(GlyphRender)), __metadata$6("design:paramtypes", [Object])], DefaultCanvasGlyphPicker);
 
     let loadGlyphPick = !1;
     const glyphCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadGlyphPick || (loadGlyphPick = !0, bind(CanvasGlyphPicker).to(DefaultCanvasGlyphPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasGlyphPicker));
     });
 
-    var __decorate$6 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$8 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$4 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$5 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$4 = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$5 = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29465,14 +29393,14 @@
         return !!richtext.AABBBounds.containsPoint(point);
       }
     };
-    DefaultCanvasRichTextPicker = __decorate$6([injectable(), __param$4(0, inject(RichTextRender)), __metadata$4("design:paramtypes", [Object])], DefaultCanvasRichTextPicker);
+    DefaultCanvasRichTextPicker = __decorate$8([injectable(), __param$5(0, inject(RichTextRender)), __metadata$5("design:paramtypes", [Object])], DefaultCanvasRichTextPicker);
 
     let loadRichtextPick = !1;
     const richtextCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadRichtextPick || (loadRichtextPick = !0, bind(CanvasRichTextPicker).to(DefaultCanvasRichTextPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasRichTextPicker));
     });
 
-    var __decorate$5 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$7 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
         r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
@@ -29490,24 +29418,24 @@
         return !!pickContext && !!image.AABBBounds.containsPoint(point);
       }
     };
-    DefaultCanvasImagePicker = __decorate$5([injectable()], DefaultCanvasImagePicker);
+    DefaultCanvasImagePicker = __decorate$7([injectable()], DefaultCanvasImagePicker);
 
     let loadImagePick = !1;
     const imageCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadImagePick || (loadImagePick = !0, bind(CanvasImagePicker).to(DefaultCanvasImagePicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasImagePicker));
     });
 
-    var __decorate$4 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$6 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$3 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$4 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$3 = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$4 = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29517,24 +29445,24 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "rect3d", this.numberType = RECT3D_NUMBER_TYPE, this.themeType = "rect";
       }
     };
-    DefaultCanvasRect3dPicker = __decorate$4([injectable(), __param$3(0, inject(Rect3DRender)), __metadata$3("design:paramtypes", [Object])], DefaultCanvasRect3dPicker);
+    DefaultCanvasRect3dPicker = __decorate$6([injectable(), __param$4(0, inject(Rect3DRender)), __metadata$4("design:paramtypes", [Object])], DefaultCanvasRect3dPicker);
 
     let loadRect3dPick = !1;
     const rect3dCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadRect3dPick || (loadRect3dPick = !0, bind(CanvasRect3dPicker).to(DefaultCanvasRect3dPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasRect3dPicker));
     });
 
-    var __decorate$3 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$5 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$2 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$3 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$2 = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$3 = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29544,24 +29472,24 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "arc3d", this.numberType = ARC3D_NUMBER_TYPE, this.themeType = "arc";
       }
     };
-    DefaultCanvasArc3dPicker = __decorate$3([injectable(), __param$2(0, inject(Arc3dRender)), __metadata$2("design:paramtypes", [Object])], DefaultCanvasArc3dPicker);
+    DefaultCanvasArc3dPicker = __decorate$5([injectable(), __param$3(0, inject(Arc3dRender)), __metadata$3("design:paramtypes", [Object])], DefaultCanvasArc3dPicker);
 
     let loadArc3dPick = !1;
     const arc3dCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadArc3dPick || (loadArc3dPick = !0, bind(CanvasArc3dPicker).to(DefaultCanvasArc3dPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasArc3dPicker));
     });
 
-    var __decorate$2 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+    var __decorate$4 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
           r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
         if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
         return c > 3 && r && Object.defineProperty(target, key, r), r;
       },
-      __metadata$1 = undefined && undefined.__metadata || function (k, v) {
+      __metadata$2 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
       },
-      __param$1 = undefined && undefined.__param || function (paramIndex, decorator) {
+      __param$2 = undefined && undefined.__param || function (paramIndex, decorator) {
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
@@ -29571,15 +29499,747 @@
         super(), this.canvasRenderer = canvasRenderer, this.type = "pyramid3d", this.numberType = PYRAMID3D_NUMBER_TYPE, this.themeType = "polygon";
       }
     };
-    DefaultCanvasPyramid3dPicker = __decorate$2([injectable(), __param$1(0, inject(Pyramid3dRender)), __metadata$1("design:paramtypes", [Object])], DefaultCanvasPyramid3dPicker);
+    DefaultCanvasPyramid3dPicker = __decorate$4([injectable(), __param$2(0, inject(Pyramid3dRender)), __metadata$2("design:paramtypes", [Object])], DefaultCanvasPyramid3dPicker);
 
     let loadPyramid3dPick = !1;
     const pyramid3dCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
       loadPyramid3dPick || (loadPyramid3dPick = !0, bind(CanvasPyramid3dPicker).to(DefaultCanvasPyramid3dPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasPyramid3dPicker));
     });
 
+    var lib$1 = {};
+
+    var gif = {};
+
+    var lib = {};
+
+    Object.defineProperty(lib, "__esModule", {
+      value: true
+    });
+    lib.loop = lib.conditional = lib.parse = void 0;
+    var parse = function parse(stream, schema) {
+      var result = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var parent = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : result;
+      if (Array.isArray(schema)) {
+        schema.forEach(function (partSchema) {
+          return parse(stream, partSchema, result, parent);
+        });
+      } else if (typeof schema === 'function') {
+        schema(stream, result, parent, parse);
+      } else {
+        var key = Object.keys(schema)[0];
+        if (Array.isArray(schema[key])) {
+          parent[key] = {};
+          parse(stream, schema[key], result, parent[key]);
+        } else {
+          parent[key] = schema[key](stream, result, parent, parse);
+        }
+      }
+      return result;
+    };
+    lib.parse = parse;
+    var conditional = function conditional(schema, conditionFunc) {
+      return function (stream, result, parent, parse) {
+        if (conditionFunc(stream, result, parent)) {
+          parse(stream, schema, result, parent);
+        }
+      };
+    };
+    lib.conditional = conditional;
+    var loop = function loop(schema, continueFunc) {
+      return function (stream, result, parent, parse) {
+        var arr = [];
+        var lastStreamPos = stream.pos;
+        while (continueFunc(stream, result, parent)) {
+          var newParent = {};
+          parse(stream, schema, result, newParent); // cases when whole file is parsed but no termination is there and stream position is not getting updated as well
+          // it falls into infinite recursion, null check to avoid the same
+
+          if (stream.pos === lastStreamPos) {
+            break;
+          }
+          lastStreamPos = stream.pos;
+          arr.push(newParent);
+        }
+        return arr;
+      };
+    };
+    lib.loop = loop;
+
+    var uint8 = {};
+
+    Object.defineProperty(uint8, "__esModule", {
+      value: true
+    });
+    uint8.readBits = uint8.readArray = uint8.readUnsigned = uint8.readString = uint8.peekBytes = uint8.readBytes = uint8.peekByte = uint8.readByte = uint8.buildStream = void 0;
+
+    // Default stream and parsers for Uint8TypedArray data type
+    var buildStream = function buildStream(uint8Data) {
+      return {
+        data: uint8Data,
+        pos: 0
+      };
+    };
+    uint8.buildStream = buildStream;
+    var readByte = function readByte() {
+      return function (stream) {
+        return stream.data[stream.pos++];
+      };
+    };
+    uint8.readByte = readByte;
+    var peekByte = function peekByte() {
+      var offset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+      return function (stream) {
+        return stream.data[stream.pos + offset];
+      };
+    };
+    uint8.peekByte = peekByte;
+    var readBytes = function readBytes(length) {
+      return function (stream) {
+        return stream.data.subarray(stream.pos, stream.pos += length);
+      };
+    };
+    uint8.readBytes = readBytes;
+    var peekBytes = function peekBytes(length) {
+      return function (stream) {
+        return stream.data.subarray(stream.pos, stream.pos + length);
+      };
+    };
+    uint8.peekBytes = peekBytes;
+    var readString = function readString(length) {
+      return function (stream) {
+        return Array.from(readBytes(length)(stream)).map(function (value) {
+          return String.fromCharCode(value);
+        }).join('');
+      };
+    };
+    uint8.readString = readString;
+    var readUnsigned = function readUnsigned(littleEndian) {
+      return function (stream) {
+        var bytes = readBytes(2)(stream);
+        return littleEndian ? (bytes[1] << 8) + bytes[0] : (bytes[0] << 8) + bytes[1];
+      };
+    };
+    uint8.readUnsigned = readUnsigned;
+    var readArray = function readArray(byteSize, totalOrFunc) {
+      return function (stream, result, parent) {
+        var total = typeof totalOrFunc === 'function' ? totalOrFunc(stream, result, parent) : totalOrFunc;
+        var parser = readBytes(byteSize);
+        var arr = new Array(total);
+        for (var i = 0; i < total; i++) {
+          arr[i] = parser(stream);
+        }
+        return arr;
+      };
+    };
+    uint8.readArray = readArray;
+    var subBitsTotal = function subBitsTotal(bits, startIndex, length) {
+      var result = 0;
+      for (var i = 0; i < length; i++) {
+        result += bits[startIndex + i] && Math.pow(2, length - i - 1);
+      }
+      return result;
+    };
+    var readBits = function readBits(schema) {
+      return function (stream) {
+        var _byte = readByte()(stream); // convert the byte to bit array
+
+        var bits = new Array(8);
+        for (var i = 0; i < 8; i++) {
+          bits[7 - i] = !!(_byte & 1 << i);
+        } // convert the bit array to values based on the schema
+
+        return Object.keys(schema).reduce(function (res, key) {
+          var def = schema[key];
+          if (def.length) {
+            res[key] = subBitsTotal(bits, def.index, def.length);
+          } else {
+            res[key] = bits[def.index];
+          }
+          return res;
+        }, {});
+      };
+    };
+    uint8.readBits = readBits;
+
+    (function (exports) {
+
+      Object.defineProperty(exports, "__esModule", {
+        value: true
+      });
+      exports["default"] = void 0;
+      var _ = lib;
+      var _uint = uint8;
+
+      // a set of 0x00 terminated subblocks
+      var subBlocksSchema = {
+        blocks: function blocks(stream) {
+          var terminator = 0x00;
+          var chunks = [];
+          var streamSize = stream.data.length;
+          var total = 0;
+          for (var size = (0, _uint.readByte)()(stream); size !== terminator; size = (0, _uint.readByte)()(stream)) {
+            // size becomes undefined for some case when file is corrupted and  terminator is not proper 
+            // null check to avoid recursion
+            if (!size) break; // catch corrupted files with no terminator
+
+            if (stream.pos + size >= streamSize) {
+              var availableSize = streamSize - stream.pos;
+              chunks.push((0, _uint.readBytes)(availableSize)(stream));
+              total += availableSize;
+              break;
+            }
+            chunks.push((0, _uint.readBytes)(size)(stream));
+            total += size;
+          }
+          var result = new Uint8Array(total);
+          var offset = 0;
+          for (var i = 0; i < chunks.length; i++) {
+            result.set(chunks[i], offset);
+            offset += chunks[i].length;
+          }
+          return result;
+        }
+      }; // global control extension
+
+      var gceSchema = (0, _.conditional)({
+        gce: [{
+          codes: (0, _uint.readBytes)(2)
+        }, {
+          byteSize: (0, _uint.readByte)()
+        }, {
+          extras: (0, _uint.readBits)({
+            future: {
+              index: 0,
+              length: 3
+            },
+            disposal: {
+              index: 3,
+              length: 3
+            },
+            userInput: {
+              index: 6
+            },
+            transparentColorGiven: {
+              index: 7
+            }
+          })
+        }, {
+          delay: (0, _uint.readUnsigned)(true)
+        }, {
+          transparentColorIndex: (0, _uint.readByte)()
+        }, {
+          terminator: (0, _uint.readByte)()
+        }]
+      }, function (stream) {
+        var codes = (0, _uint.peekBytes)(2)(stream);
+        return codes[0] === 0x21 && codes[1] === 0xf9;
+      }); // image pipeline block
+
+      var imageSchema = (0, _.conditional)({
+        image: [{
+          code: (0, _uint.readByte)()
+        }, {
+          descriptor: [{
+            left: (0, _uint.readUnsigned)(true)
+          }, {
+            top: (0, _uint.readUnsigned)(true)
+          }, {
+            width: (0, _uint.readUnsigned)(true)
+          }, {
+            height: (0, _uint.readUnsigned)(true)
+          }, {
+            lct: (0, _uint.readBits)({
+              exists: {
+                index: 0
+              },
+              interlaced: {
+                index: 1
+              },
+              sort: {
+                index: 2
+              },
+              future: {
+                index: 3,
+                length: 2
+              },
+              size: {
+                index: 5,
+                length: 3
+              }
+            })
+          }]
+        }, (0, _.conditional)({
+          lct: (0, _uint.readArray)(3, function (stream, result, parent) {
+            return Math.pow(2, parent.descriptor.lct.size + 1);
+          })
+        }, function (stream, result, parent) {
+          return parent.descriptor.lct.exists;
+        }), {
+          data: [{
+            minCodeSize: (0, _uint.readByte)()
+          }, subBlocksSchema]
+        }]
+      }, function (stream) {
+        return (0, _uint.peekByte)()(stream) === 0x2c;
+      }); // plain text block
+
+      var textSchema = (0, _.conditional)({
+        text: [{
+          codes: (0, _uint.readBytes)(2)
+        }, {
+          blockSize: (0, _uint.readByte)()
+        }, {
+          preData: function preData(stream, result, parent) {
+            return (0, _uint.readBytes)(parent.text.blockSize)(stream);
+          }
+        }, subBlocksSchema]
+      }, function (stream) {
+        var codes = (0, _uint.peekBytes)(2)(stream);
+        return codes[0] === 0x21 && codes[1] === 0x01;
+      }); // application block
+
+      var applicationSchema = (0, _.conditional)({
+        application: [{
+          codes: (0, _uint.readBytes)(2)
+        }, {
+          blockSize: (0, _uint.readByte)()
+        }, {
+          id: function id(stream, result, parent) {
+            return (0, _uint.readString)(parent.blockSize)(stream);
+          }
+        }, subBlocksSchema]
+      }, function (stream) {
+        var codes = (0, _uint.peekBytes)(2)(stream);
+        return codes[0] === 0x21 && codes[1] === 0xff;
+      }); // comment block
+
+      var commentSchema = (0, _.conditional)({
+        comment: [{
+          codes: (0, _uint.readBytes)(2)
+        }, subBlocksSchema]
+      }, function (stream) {
+        var codes = (0, _uint.peekBytes)(2)(stream);
+        return codes[0] === 0x21 && codes[1] === 0xfe;
+      });
+      var schema = [{
+        header: [{
+          signature: (0, _uint.readString)(3)
+        }, {
+          version: (0, _uint.readString)(3)
+        }]
+      }, {
+        lsd: [{
+          width: (0, _uint.readUnsigned)(true)
+        }, {
+          height: (0, _uint.readUnsigned)(true)
+        }, {
+          gct: (0, _uint.readBits)({
+            exists: {
+              index: 0
+            },
+            resolution: {
+              index: 1,
+              length: 3
+            },
+            sort: {
+              index: 4
+            },
+            size: {
+              index: 5,
+              length: 3
+            }
+          })
+        }, {
+          backgroundColorIndex: (0, _uint.readByte)()
+        }, {
+          pixelAspectRatio: (0, _uint.readByte)()
+        }]
+      }, (0, _.conditional)({
+        gct: (0, _uint.readArray)(3, function (stream, result) {
+          return Math.pow(2, result.lsd.gct.size + 1);
+        })
+      }, function (stream, result) {
+        return result.lsd.gct.exists;
+      }),
+      // content frames
+      {
+        frames: (0, _.loop)([gceSchema, applicationSchema, commentSchema, imageSchema, textSchema], function (stream) {
+          var nextCode = (0, _uint.peekByte)()(stream); // rather than check for a terminator, we should check for the existence
+          // of an ext or image block to avoid infinite loops
+          //var terminator = 0x3B;
+          //return nextCode !== terminator;
+
+          return nextCode === 0x21 || nextCode === 0x2c;
+        })
+      }];
+      var _default = schema;
+      exports["default"] = _default;
+    })(gif);
+
+    var deinterlace$1 = {};
+
+    Object.defineProperty(deinterlace$1, "__esModule", {
+      value: true
+    });
+    deinterlace$1.deinterlace = void 0;
+
+    /**
+     * Deinterlace function from https://github.com/shachaf/jsgif
+     */
+    var deinterlace = function deinterlace(pixels, width) {
+      var newPixels = new Array(pixels.length);
+      var rows = pixels.length / width;
+      var cpRow = function cpRow(toRow, fromRow) {
+        var fromPixels = pixels.slice(fromRow * width, (fromRow + 1) * width);
+        newPixels.splice.apply(newPixels, [toRow * width, width].concat(fromPixels));
+      }; // See appendix E.
+
+      var offsets = [0, 4, 2, 1];
+      var steps = [8, 8, 4, 2];
+      var fromRow = 0;
+      for (var pass = 0; pass < 4; pass++) {
+        for (var toRow = offsets[pass]; toRow < rows; toRow += steps[pass]) {
+          cpRow(toRow, fromRow);
+          fromRow++;
+        }
+      }
+      return newPixels;
+    };
+    deinterlace$1.deinterlace = deinterlace;
+
+    var lzw$1 = {};
+
+    Object.defineProperty(lzw$1, "__esModule", {
+      value: true
+    });
+    lzw$1.lzw = void 0;
+
+    /**
+     * javascript port of java LZW decompression
+     * Original java author url: https://gist.github.com/devunwired/4479231
+     */
+    var lzw = function lzw(minCodeSize, data, pixelCount) {
+      var MAX_STACK_SIZE = 4096;
+      var nullCode = -1;
+      var npix = pixelCount;
+      var available, clear, code_mask, code_size, end_of_information, in_code, old_code, bits, code, i, datum, data_size, first, top, bi, pi;
+      var dstPixels = new Array(pixelCount);
+      var prefix = new Array(MAX_STACK_SIZE);
+      var suffix = new Array(MAX_STACK_SIZE);
+      var pixelStack = new Array(MAX_STACK_SIZE + 1); // Initialize GIF data stream decoder.
+
+      data_size = minCodeSize;
+      clear = 1 << data_size;
+      end_of_information = clear + 1;
+      available = clear + 2;
+      old_code = nullCode;
+      code_size = data_size + 1;
+      code_mask = (1 << code_size) - 1;
+      for (code = 0; code < clear; code++) {
+        prefix[code] = 0;
+        suffix[code] = code;
+      } // Decode GIF pixel stream.
+
+      var datum, bits, first, top, pi, bi;
+      datum = bits = first = top = pi = bi = 0;
+      for (i = 0; i < npix;) {
+        if (top === 0) {
+          if (bits < code_size) {
+            // get the next byte
+            datum += data[bi] << bits;
+            bits += 8;
+            bi++;
+            continue;
+          } // Get the next code.
+
+          code = datum & code_mask;
+          datum >>= code_size;
+          bits -= code_size; // Interpret the code
+
+          if (code > available || code == end_of_information) {
+            break;
+          }
+          if (code == clear) {
+            // Reset decoder.
+            code_size = data_size + 1;
+            code_mask = (1 << code_size) - 1;
+            available = clear + 2;
+            old_code = nullCode;
+            continue;
+          }
+          if (old_code == nullCode) {
+            pixelStack[top++] = suffix[code];
+            old_code = code;
+            first = code;
+            continue;
+          }
+          in_code = code;
+          if (code == available) {
+            pixelStack[top++] = first;
+            code = old_code;
+          }
+          while (code > clear) {
+            pixelStack[top++] = suffix[code];
+            code = prefix[code];
+          }
+          first = suffix[code] & 0xff;
+          pixelStack[top++] = first; // add a new string to the table, but only if space is available
+          // if not, just continue with current table until a clear code is found
+          // (deferred clear code implementation as per GIF spec)
+
+          if (available < MAX_STACK_SIZE) {
+            prefix[available] = old_code;
+            suffix[available] = first;
+            available++;
+            if ((available & code_mask) === 0 && available < MAX_STACK_SIZE) {
+              code_size++;
+              code_mask += available;
+            }
+          }
+          old_code = in_code;
+        } // Pop a pixel off the pixel stack.
+
+        top--;
+        dstPixels[pi++] = pixelStack[top];
+        i++;
+      }
+      for (i = pi; i < npix; i++) {
+        dstPixels[i] = 0; // clear missing pixels
+      }
+
+      return dstPixels;
+    };
+    lzw$1.lzw = lzw;
+
+    Object.defineProperty(lib$1, "__esModule", {
+      value: true
+    });
+    var decompressFrames_1 = lib$1.decompressFrames = lib$1.decompressFrame = parseGIF_1 = lib$1.parseGIF = void 0;
+    var _gif = _interopRequireDefault(gif);
+    var _jsBinarySchemaParser = lib;
+    var _uint = uint8;
+    var _deinterlace = deinterlace$1;
+    var _lzw = lzw$1;
+    function _interopRequireDefault(obj) {
+      return obj && obj.__esModule ? obj : {
+        "default": obj
+      };
+    }
+    var parseGIF = function parseGIF(arrayBuffer) {
+      var byteData = new Uint8Array(arrayBuffer);
+      return (0, _jsBinarySchemaParser.parse)((0, _uint.buildStream)(byteData), _gif["default"]);
+    };
+    var parseGIF_1 = lib$1.parseGIF = parseGIF;
+    var generatePatch = function generatePatch(image) {
+      var totalPixels = image.pixels.length;
+      var patchData = new Uint8ClampedArray(totalPixels * 4);
+      for (var i = 0; i < totalPixels; i++) {
+        var pos = i * 4;
+        var colorIndex = image.pixels[i];
+        var color = image.colorTable[colorIndex] || [0, 0, 0];
+        patchData[pos] = color[0];
+        patchData[pos + 1] = color[1];
+        patchData[pos + 2] = color[2];
+        patchData[pos + 3] = colorIndex !== image.transparentIndex ? 255 : 0;
+      }
+      return patchData;
+    };
+    var decompressFrame = function decompressFrame(frame, gct, buildImagePatch) {
+      if (!frame.image) {
+        console.warn('gif frame does not have associated image.');
+        return;
+      }
+      var image = frame.image; // get the number of pixels
+
+      var totalPixels = image.descriptor.width * image.descriptor.height; // do lzw decompression
+
+      var pixels = (0, _lzw.lzw)(image.data.minCodeSize, image.data.blocks, totalPixels); // deal with interlacing if necessary
+
+      if (image.descriptor.lct.interlaced) {
+        pixels = (0, _deinterlace.deinterlace)(pixels, image.descriptor.width);
+      }
+      var resultImage = {
+        pixels: pixels,
+        dims: {
+          top: frame.image.descriptor.top,
+          left: frame.image.descriptor.left,
+          width: frame.image.descriptor.width,
+          height: frame.image.descriptor.height
+        }
+      }; // color table
+
+      if (image.descriptor.lct && image.descriptor.lct.exists) {
+        resultImage.colorTable = image.lct;
+      } else {
+        resultImage.colorTable = gct;
+      } // add per frame relevant gce information
+
+      if (frame.gce) {
+        resultImage.delay = (frame.gce.delay || 10) * 10; // convert to ms
+
+        resultImage.disposalType = frame.gce.extras.disposal; // transparency
+
+        if (frame.gce.extras.transparentColorGiven) {
+          resultImage.transparentIndex = frame.gce.transparentColorIndex;
+        }
+      } // create canvas usable imagedata if desired
+
+      if (buildImagePatch) {
+        resultImage.patch = generatePatch(resultImage);
+      }
+      return resultImage;
+    };
+    lib$1.decompressFrame = decompressFrame;
+    var decompressFrames = function decompressFrames(parsedGif, buildImagePatches) {
+      return parsedGif.frames.filter(function (f) {
+        return f.image;
+      }).map(function (f) {
+        return decompressFrame(f, parsedGif.gct, buildImagePatches);
+      });
+    };
+    decompressFrames_1 = lib$1.decompressFrames = decompressFrames;
+
+    const GIFIMAGE_NUMBER_TYPE = Generator.GenAutoIncrementId();
     const LOTTIE_NUMBER_TYPE = Generator.GenAutoIncrementId();
 
+    class GifImage extends Image$1 {
+      constructor(params) {
+        super(params), this.type = "gif-image", this.numberType = GIFIMAGE_NUMBER_TYPE, this.loadGif();
+      }
+      loadGif() {
+        if (isString$1(this.attribute.gifImage)) ResourceLoader.GetFile(this.attribute.gifImage, "arrayBuffer").then(res => {
+          const gif = parseGIF_1(res),
+            frames = decompressFrames_1(gif, !0);
+          this.renderGIF(frames);
+        }).catch(e => {
+          console.error("Gif load error: ", e);
+        });else if (this.attribute.gifImage instanceof ArrayBuffer) {
+          const gif = parseGIF_1(this.attribute.gifImage),
+            frames = decompressFrames_1(gif, !0);
+          this.renderGIF(frames);
+        }
+      }
+      renderGIF(frames) {
+        this.loadedFrames = frames, this.frameIndex = 0, this.tempCanvas || (this.tempCanvas = application.global.createCanvas({}), this.tempCtx = this.tempCanvas.getContext("2d")), this.gifCanvas || (this.gifCanvas = application.global.createCanvas({}), this.gifCtx = this.gifCanvas.getContext("2d")), this.gifCanvas.width = frames[0].dims.width, this.gifCanvas.height = frames[0].dims.height, this.playing = !0, this.lastTime = new Date().getTime();
+        const animation = this.animate();
+        this.attribute.timeline && animation.setTimeline(this.attribute.timeline), animation.to({}, 1e3, "linear").loop(1 / 0);
+      }
+      renderFrame(context, x, y) {
+        const frame = this.loadedFrames[this.frameIndex || 0];
+        2 === frame.disposalType && this.gifCtx.clearRect(0, 0, this.gifCanvas.width, this.gifCanvas.height), this.drawPatch(frame), this.manipulate(context, x, y);
+        const diff = new Date().getTime() - this.lastTime;
+        frame.delay < diff && (this.frameIndex++, this.lastTime = new Date().getTime()), this.frameIndex >= this.loadedFrames.length && (this.frameIndex = 0);
+      }
+      drawPatch(frame) {
+        const dims = frame.dims;
+        this.frameImageData && dims.width === this.frameImageData.width && dims.height === this.frameImageData.height || (this.tempCanvas.width = dims.width, this.tempCanvas.height = dims.height, this.frameImageData = this.tempCtx.createImageData(dims.width, dims.height)), this.frameImageData.data.set(frame.patch), this.tempCtx.putImageData(this.frameImageData, 0, 0), this.gifCtx.drawImage(this.tempCanvas, dims.left, dims.top);
+      }
+      manipulate(context, x, y) {
+        context.drawImage(this.gifCanvas, 0, 0, this.gifCanvas.width, this.gifCanvas.height, x, y, this.attribute.width, this.attribute.height);
+      }
+      setAttribute(key, value, forceUpdateTag, context) {
+        super.setAttribute(key, value, forceUpdateTag, context), "gifImage" === key && this.loadGif();
+      }
+      setAttributes(params, forceUpdateTag, context) {
+        super.setAttributes(params, forceUpdateTag, context), params.gifImage && this.loadGif();
+      }
+    }
+    function createGifImage(attributes) {
+      return new GifImage(attributes);
+    }
+
+    var __decorate$3 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+      var d,
+        c = arguments.length,
+        r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
+      if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
+      return c > 3 && r && Object.defineProperty(target, key, r), r;
+    };
+    let DefaultCanvasGifImagePicker = class {
+      constructor() {
+        this.type = "gif-image", this.numberType = GIFIMAGE_NUMBER_TYPE;
+      }
+      contains(gifImage, point, params) {
+        const {
+          pickContext: pickContext
+        } = null != params ? params : {};
+        return !!pickContext && !!gifImage.AABBBounds.containsPoint(point);
+      }
+    };
+    DefaultCanvasGifImagePicker = __decorate$3([injectable()], DefaultCanvasGifImagePicker);
+
+    let loadGifImagePick = !1;
+    const gifImageCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
+      loadGifImagePick || (loadGifImagePick = !0, bind(CanvasGifImagePicker).to(DefaultCanvasGifImagePicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasGifImagePicker));
+    });
+
+    var __decorate$2 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+        var d,
+          c = arguments.length,
+          r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
+        if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
+        return c > 3 && r && Object.defineProperty(target, key, r), r;
+      },
+      __metadata$1 = undefined && undefined.__metadata || function (k, v) {
+        if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
+      },
+      __param$1 = undefined && undefined.__param || function (paramIndex, decorator) {
+        return function (target, key) {
+          decorator(target, key, paramIndex);
+        };
+      };
+    let DefaultCanvasGifImageRender = class extends exports.DefaultCanvasImageRender {
+      constructor(imageRenderContribitions) {
+        super(imageRenderContribitions), this.imageRenderContribitions = imageRenderContribitions, this.numberType = GIFIMAGE_NUMBER_TYPE, this._renderContribitions = void 0, this.builtinContributions = [defaultGifImageRenderContribution], this.init(imageRenderContribitions);
+      }
+      drawShape(image, context, x, y, drawContext, params, fillCb, strokeCb) {
+        const imageAttribute = getTheme(image).image,
+          {
+            x: originX = imageAttribute.x,
+            y: originY = imageAttribute.y,
+            fillStrokeOrder = imageAttribute.fillStrokeOrder
+          } = image.attribute,
+          data = this.valid(image, imageAttribute, fillCb);
+        if (!data) return;
+        const {
+            fVisible: fVisible,
+            sVisible: sVisible,
+            doFill: doFill,
+            doStroke: doStroke
+          } = data,
+          _runFill = () => {
+            doFill && fillCb && fillCb(context, image.attribute, imageAttribute);
+          },
+          _runStroke = () => {
+            doStroke && (strokeCb ? strokeCb(context, image.attribute, imageAttribute) : sVisible && (context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute), context.stroke()));
+          };
+        fillStrokeOrder ? (_runStroke(), context.save(), context.clip(), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb), _runFill(), context.restore()) : (context.save(), context.clip(), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb), _runFill(), context.restore(), _runStroke()), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
+      }
+      draw(image, renderService, drawContext) {
+        const {
+          context: context
+        } = renderService.drawParams;
+        if (!context) return;
+        const imageAttribute = getTheme(image).image;
+        this._draw(image, imageAttribute, !1, drawContext);
+      }
+    };
+    DefaultCanvasGifImageRender = __decorate$2([injectable(), __param$1(0, inject(ContributionProvider)), __param$1(0, named(ImageRenderContribution)), __metadata$1("design:paramtypes", [Object])], DefaultCanvasGifImageRender);
+    class DefaultGifImageRenderContribution extends DefaultRectRenderContribution {
+      constructor() {
+        super(...arguments), this.time = exports.BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, this.order = 0;
+      }
+      drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
+        image.renderFrame && image.playing && image.renderFrame(context, x, y);
+      }
+    }
+    const defaultGifImageRenderContribution = new DefaultGifImageRenderContribution();
+
+    let loadGifImageModule = !1;
+    const gifImageModule = new ContainerModule(bind => {
+      loadGifImageModule || (loadGifImageModule = !0, bind(DefaultCanvasGifImageRender).toSelf().inSingletonScope(), bind(GraphicRender).toService(DefaultCanvasGifImageRender));
+    });
+
     var lottie = {exports: {}};
 
     (function(module,exports){typeof navigator!=="undefined"&&function(global,factory){module.exports=factory();}(commonjsGlobal,function(){var svgNS='http://www.w3.org/2000/svg';var locationHref='';var _useWebWorker=false;var initialDefaultFrame=-999999;var setWebWorker=function setWebWorker(flag){_useWebWorker=!!flag;};var getWebWorker=function getWebWorker(){return _useWebWorker;};var setLocationHref=function setLocationHref(value){locationHref=value;};var getLocationHref=function getLocationHref(){return locationHref;};function createTag(type){// return {appendChild:function(){},setAttribute:function(){},style:{}}
@@ -30481,7 +31141,7 @@
 
     const roughModule = _roughModule;
 
-    const version = "0.22.0-vstory.10";
+    const version = "0.22.0-vstory.12";
     preLoadAllModule();
     if (isBrowserEnv()) {
         loadBrowserEnv(container);
@@ -30545,6 +31205,7 @@
     exports.CanvasAreaPicker = CanvasAreaPicker;
     exports.CanvasCirclePicker = CanvasCirclePicker;
     exports.CanvasFactory = CanvasFactory;
+    exports.CanvasGifImagePicker = CanvasGifImagePicker;
     exports.CanvasGlyphPicker = CanvasGlyphPicker;
     exports.CanvasGroupPicker = CanvasGroupPicker;
     exports.CanvasImagePicker = CanvasImagePicker;
@@ -30660,6 +31321,7 @@
     exports.GROUP_NUMBER_TYPE = GROUP_NUMBER_TYPE;
     exports.Generator = Generator;
     exports.Gesture = Gesture;
+    exports.GifImage = GifImage;
     exports.GlobalPickerService = GlobalPickerService;
     exports.Glyph = Glyph;
     exports.GlyphRender = GlyphRender;
@@ -30852,6 +31514,7 @@
     exports.createCircle = createCircle;
     exports.createColor = createColor;
     exports.createConicalGradient = createConicalGradient;
+    exports.createGifImage = createGifImage;
     exports.createGlyph = createGlyph;
     exports.createGroup = createGroup;
     exports.createImage = createImage;
@@ -30946,6 +31609,8 @@
     exports.getTextBounds = getTextBounds;
     exports.getTheme = getTheme;
     exports.getThemeFromGroup = getThemeFromGroup;
+    exports.gifImageCanvasPickModule = gifImageCanvasPickModule;
+    exports.gifImageModule = gifImageModule;
     exports.globalTheme = globalTheme;
     exports.glyphCanvasPickModule = glyphCanvasPickModule;
     exports.glyphMathPickModule = glyphMathPickModule;