@visactor/vrender 0.21.2 → 0.21.3

package/dist/index.js

@@ -591,6 +591,31 @@
         return function (target, key) {
           decorator(target, key, paramIndex);
         };
+      },
+      __awaiter$8 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
+        return new (P || (P = Promise))(function (resolve, reject) {
+          function fulfilled(value) {
+            try {
+              step(generator.next(value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function rejected(value) {
+            try {
+              step(generator.throw(value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function step(result) {
+            var value;
+            result.done ? resolve(result.value) : (value = result.value, value instanceof P ? value : new P(function (resolve) {
+              resolve(value);
+            })).then(fulfilled, rejected);
+          }
+          step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
       };
     exports.DefaultGlobal = class DefaultGlobal {
       get env() {
@@ -716,6 +741,11 @@
       loadBlob(url) {
         return this._env || this.setEnv("browser"), this.envContribution.loadBlob(url);
       }
+      loadFont(name, source, descriptors) {
+        return __awaiter$8(this, void 0, void 0, function* () {
+          return this._env || this.setEnv("browser"), this.envContribution.loadFont(name, source, descriptors);
+        });
+      }
       isChrome() {
         return null != this._isChrome || (this._env || this.setEnv("browser"), this._isChrome = "browser" === this._env && navigator.userAgent.indexOf("Chrome") > -1), this._isChrome;
       }
@@ -5795,7 +5825,7 @@
       return null;
     }
 
-    var __awaiter$5 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
+    var __awaiter$7 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
       return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) {
           try {
@@ -5865,7 +5895,7 @@
       }
       forEachChildrenAsync(cb) {
         let reverse = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !1;
-        return __awaiter$5(this, void 0, void 0, function* () {
+        return __awaiter$7(this, void 0, void 0, function* () {
           if (reverse) {
             let child = this._lastChild,
               i = 0;
@@ -10473,7 +10503,7 @@
       return str.startsWith("<");
     }
 
-    var __awaiter$4 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
+    var __awaiter$6 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
       return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) {
           try {
@@ -10502,7 +10532,7 @@
       group.incrementalAppendChild(graphic);
     }
     function waitForAllSubLayers(stage) {
-      return __awaiter$4(this, void 0, void 0, function* () {
+      return __awaiter$6(this, void 0, void 0, function* () {
         const promiseList = [],
           layers = stage.getChildren();
         yield new Promise(resolve => {
@@ -12451,7 +12481,9 @@
         const {
           background: background,
           backgroundMode = graphicAttribute.backgroundMode,
-          backgroundFit = graphicAttribute.backgroundFit
+          backgroundFit = graphicAttribute.backgroundFit,
+          width: width,
+          height: height
         } = graphic.attribute;
         if (background) if (graphic.backgroundImg) {
           const res = graphic.resources.get(background);
@@ -12484,11 +12516,7 @@
             height: height
           } = getActualPosition(graphic);
           cornerRadius ? createRectPath(context, x - expandX, y - expandY, width + 2 * expandX, height + 2 * expandY, cornerRadius) : context.rect(x - expandX, y - expandY, width + 2 * expandX, height + 2 * expandY), context.globalAlpha = 1, fill && (context.fillStyle = fill, context.fill()), stroke && lineWidth > 0 && (context.lineWidth = lineWidth, context.strokeStyle = stroke, context.stroke());
-        } else {
-          context.beginPath();
-          const b = graphic.AABBBounds;
-          context.rect(x, y, b.width(), b.height()), context.fillStyle = background, context.globalAlpha = 1, context.fill();
-        }
+        } else context.beginPath(), context.rect(x, y, width || 0, height || 0), context.fillStyle = background, context.globalAlpha = 1, context.fill();
       }
     }
     function getActualPosition(graphic) {
@@ -14205,7 +14233,7 @@
           doFill: doFill,
           doStroke: doStroke
         } = data;
-        context.setShadowBlendStyle && context.setShadowBlendStyle(image, imageAttribute), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
+        context.setShadowBlendStyle && context.setShadowBlendStyle(image, image.attribute, imageAttribute), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
         const _runFill = () => {
             if (doFill) if (fillCb) fillCb(context, image.attribute, imageAttribute);else if (fVisible) {
               if (!url || !image.resources) return;
@@ -14222,7 +14250,7 @@
             }
           },
           _runStroke = () => {
-            doStroke && (strokeCb ? strokeCb(context, image.attribute, imageAttribute) : sVisible && (context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute), context.stroke()));
+            doStroke && (strokeCb ? strokeCb(context, image.attribute, imageAttribute) : sVisible && (context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute), context.strokeRect(x, y, width, height)));
           };
         fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
       }
@@ -17841,7 +17869,7 @@
       container.load(envModules), container.load(textMeasureModules), container.load(layerHandlerModules);
     }
 
-    var __awaiter$3 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
+    var __awaiter$5 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
       return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) {
           try {
@@ -17914,7 +17942,7 @@
     }
     function foreachAsync(graphic, defaultZIndex, cb) {
       let reverse = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : !1;
-      return __awaiter$3(this, void 0, void 0, function* () {
+      return __awaiter$5(this, void 0, void 0, function* () {
         yield graphic.forEachChildrenAsync(cb, reverse);
       });
     }
@@ -18275,7 +18303,7 @@
           decorator(target, key, paramIndex);
         };
       },
-      __awaiter$2 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
+      __awaiter$4 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
         return new (P || (P = Promise))(function (resolve, reject) {
           function fulfilled(value) {
             try {
@@ -18310,7 +18338,7 @@
         }, this.defaultRenderMap.set(this.lineRender.numberType, this.lineRender), this.defaultRenderMap.set(this.areaRender.numberType, this.areaRender);
       }
       draw(renderService, drawContext) {
-        return __awaiter$2(this, void 0, void 0, function* () {
+        return __awaiter$4(this, void 0, void 0, function* () {
           if (this.checkingForDrawPromise) return;
           this.lastRenderService = renderService, this.lastDrawContext = drawContext, this.checkingForDrawPromise = this.checkForDraw(drawContext);
           const skipDraw = yield this.checkingForDrawPromise;
@@ -18331,15 +18359,15 @@
         });
       }
       _increaseRender(group, drawContext) {
-        return __awaiter$2(this, void 0, void 0, function* () {
+        return __awaiter$4(this, void 0, void 0, function* () {
           this.rendering = !0, yield this._renderIncrementalGroup(group, drawContext);
         });
       }
       _renderIncrementalGroup(group, drawContext) {
-        return __awaiter$2(this, void 0, void 0, function* () {
+        return __awaiter$4(this, void 0, void 0, function* () {
           this.count = group.count, yield new Promise(resolve => {
             this.renderItem(group, drawContext, {
-              drawingCb: () => __awaiter$2(this, void 0, void 0, function* () {
+              drawingCb: () => __awaiter$4(this, void 0, void 0, function* () {
                 if (2 !== group.count) yield foreachAsync(group, DefaultAttribute.zIndex, (item, i) => {
                   if (this.status === STATUS.STOP) return !0;
                   if (item.isContainer) return !1;
@@ -18360,7 +18388,7 @@
         });
       }
       waitToNextFrame() {
-        return __awaiter$2(this, void 0, void 0, function* () {
+        return __awaiter$4(this, void 0, void 0, function* () {
           return new Promise(resolve => {
             this.global.getRequestAnimationFrame()(() => {
               resolve(!1);
@@ -18369,13 +18397,13 @@
         });
       }
       checkForDraw(drawContext) {
-        return __awaiter$2(this, void 0, void 0, function* () {
+        return __awaiter$4(this, void 0, void 0, function* () {
           let skip = this.rendering;
           return drawContext.restartIncremental && (skip = !1, yield this.forceStop(), this.resetToInit()), skip;
         });
       }
       forceStop() {
-        return __awaiter$2(this, void 0, void 0, function* () {
+        return __awaiter$4(this, void 0, void 0, function* () {
           this.rendering && (this.status = STATUS.STOP, yield new Promise(resolve => {
             this.hooks.completeDraw.tap("stopCb", () => {
               this.status = STATUS.NORMAL, this.hooks.completeDraw.taps = this.hooks.completeDraw.taps.filter(item => "stopCb" !== item.name), resolve(!1);
@@ -18387,11 +18415,11 @@
         this.currFrameStartAt = 0, this.currentIdx = 0;
       }
       renderGroup(group, drawContext) {
-        return __awaiter$2(this, void 0, void 0, function* () {
+        return __awaiter$4(this, void 0, void 0, function* () {
           if (!drawContext.break && !1 !== group.attribute.visibleAll) return group.incremental && drawContext.startAtId === group._uid ? (yield this._increaseRender(group, drawContext), void (drawContext.break = !0)) : void (yield new Promise(resolve => {
             this.renderItem(group, drawContext, {
-              drawingCb: () => __awaiter$2(this, void 0, void 0, function* () {
-                yield foreachAsync(group, DefaultAttribute.zIndex, item => __awaiter$2(this, void 0, void 0, function* () {
+              drawingCb: () => __awaiter$4(this, void 0, void 0, function* () {
+                yield foreachAsync(group, DefaultAttribute.zIndex, item => __awaiter$4(this, void 0, void 0, function* () {
                   drawContext.break || item.isContainer && (yield this.renderGroup(item, drawContext));
                 })), resolve(!1);
               })
@@ -19413,12 +19441,37 @@
     BaseCanvas.env = "browser";
 
     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;
-    };
+        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;
+      },
+      __awaiter$3 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
+        return new (P || (P = Promise))(function (resolve, reject) {
+          function fulfilled(value) {
+            try {
+              step(generator.next(value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function rejected(value) {
+            try {
+              step(generator.throw(value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function step(result) {
+            var value;
+            result.done ? resolve(result.value) : (value = result.value, value instanceof P ? value : new P(function (resolve) {
+              resolve(value);
+            })).then(fulfilled, rejected);
+          }
+          step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+      };
     exports.BaseEnvContribution = class BaseEnvContribution {
       configure(service) {
         service.env === this.type && service.setActiveEnvContribution(this);
@@ -19487,6 +19540,13 @@
           left: 0
         };
       }
+      loadFont(font, source, descriptors) {
+        return __awaiter$3(this, void 0, void 0, function* () {
+          return {
+            loadState: "fail"
+          };
+        });
+      }
     };
     exports.BaseEnvContribution = __decorate$1c([injectable()], exports.BaseEnvContribution);
 
@@ -20497,7 +20557,7 @@
         const fVisible = fillVisible(opacity, fillOpacity, !0),
           sVisible = fillVisible(opacity, strokeOpacity, !0);
         if (!fVisible) return;
-        context.translate(x, y), this.beforeRenderStep(richtext, context, x, y, fVisible, sVisible, fVisible, sVisible, richtextAttribute, drawContext);
+        context.setShadowBlendStyle && context.setShadowBlendStyle(richtext, richtext.attribute, richtextAttribute), context.translate(x, y), this.beforeRenderStep(richtext, context, x, y, fVisible, sVisible, fVisible, sVisible, richtextAttribute, drawContext);
         richtext.getFrameCache().draw(context, this.drawIcon), this.afterRenderStep(richtext, context, x, y, fVisible, sVisible, fVisible, sVisible, richtextAttribute, drawContext);
       }
       drawIcon(icon, context, x, y, baseline) {
@@ -20931,11 +20991,18 @@
 
     class HtmlAttributePlugin {
       constructor() {
-        this.name = "HtmlAttributePlugin", this.activeEvent = "onRegister", this._uid = Generator.GenAutoIncrementId(), this.key = this.name + this._uid, this.htmlMap = {}, this.renderId = 0;
+        this.name = "HtmlAttributePlugin", this.activeEvent = "onRegister", this._uid = Generator.GenAutoIncrementId(), this.key = this.name + this._uid, this.htmlMap = {}, this.renderId = 0, this.onWheel = ev => {
+          try {
+            const newEvent = new ev.constructor(ev.type, ev);
+            this.pluginService.stage.window.getContext().getCanvas().nativeCanvas.dispatchEvent(newEvent);
+          } catch (err) {
+            return;
+          }
+        };
       }
       activate(context) {
         this.pluginService = context, context.stage.hooks.afterRender.tap(this.key, stage => {
-          stage && stage === this.pluginService.stage && this.drawHTML(context.stage.renderService);
+          stage && stage === this.pluginService.stage && this.drawHTML([...context.stage.getChildren()]);
         });
       }
       deactivate(context) {
@@ -20997,10 +21064,13 @@
       }
       updateStyleOfWrapContainer(graphic, stage, wrapContainer, nativeContainer, options) {
         const {
-          pointerEvents: pointerEvents
+          pointerEvents: pointerEvents,
+          penetrateEventList = []
         } = options;
         let calculateStyle = this.parseDefaultStyleFromGraphic(graphic);
-        calculateStyle.display = !1 !== graphic.attribute.visible ? "block" : "none", calculateStyle.pointerEvents = !0 === pointerEvents ? "all" : pointerEvents || "none", wrapContainer.style.position || (wrapContainer.style.position = "absolute", nativeContainer.style.position = "relative");
+        calculateStyle.display = !1 !== graphic.attribute.visible ? "block" : "none", calculateStyle.pointerEvents = !0 === pointerEvents ? "all" : pointerEvents || "none", "none" !== calculateStyle.pointerEvents && (this.removeWrapContainerEventListener(wrapContainer), penetrateEventList.forEach(event => {
+          "wheel" === event && wrapContainer.addEventListener("wheel", this.onWheel);
+        })), wrapContainer.style.position || (wrapContainer.style.position = "absolute", nativeContainer.style.position = "relative");
         let left = 0,
           top = 0;
         const b = graphic.globalAABBBounds;
@@ -21037,8 +21107,8 @@
           this.htmlMap[key] && this.htmlMap[key].renderId !== this.renderId && this.removeElement(key);
         }), this.renderId += 1;
       }
-      drawHTML(renderService) {
-        "browser" === application.global.env && (renderService.renderTreeRoots.sort((a, b) => {
+      drawHTML(layers) {
+        "browser" === application.global.env && (layers.sort((a, b) => {
           var _a, _b;
           return (null !== (_a = a.attribute.zIndex) && void 0 !== _a ? _a : DefaultAttribute.zIndex) - (null !== (_b = b.attribute.zIndex) && void 0 !== _b ? _b : DefaultAttribute.zIndex);
         }).forEach(group => {
@@ -21057,6 +21127,9 @@
         } = this.htmlMap[id];
         wrapContainer && application.global.removeDom(wrapContainer), this.htmlMap[id] = null;
       }
+      removeWrapContainerEventListener(wrapContainer) {
+        wrapContainer.removeEventListener("wheel", this.onWheel);
+      }
       renderGraphicHTML(graphic) {
         var _a;
         const {
@@ -24927,6 +25000,31 @@
       },
       __metadata$J = 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) {
+        return new (P || (P = Promise))(function (resolve, reject) {
+          function fulfilled(value) {
+            try {
+              step(generator.next(value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function rejected(value) {
+            try {
+              step(generator.throw(value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function step(result) {
+            var value;
+            result.done ? resolve(result.value) : (value = result.value, value instanceof P ? value : new P(function (resolve) {
+              resolve(value);
+            })).then(fulfilled, rejected);
+          }
+          step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
       };
     class DynamicB {
       get x1() {
@@ -25122,6 +25220,19 @@
           left: actualLeft
         };
       }
+      loadFont(font, source, descriptors) {
+        return __awaiter$2(this, void 0, void 0, function* () {
+          return new FontFace(font, isString$1(source) ? `url(${source})` : source, descriptors).load().then(function (loadedFont) {
+            return document.fonts.add(loadedFont), {
+              loadState: "success"
+            };
+          }).catch(function (error) {
+            return console.error("Failed to load font:", error), {
+              loadState: "fail"
+            };
+          });
+        });
+      }
     };
     exports.BrowserEnvContribution = __decorate$T([injectable(), __metadata$J("design:paramtypes", [])], exports.BrowserEnvContribution);
 
@@ -28681,7 +28792,7 @@
 
     const roughModule = _roughModule;
 
-    const version = "0.21.2";
+    const version = "0.21.3";
     preLoadAllModule();
     if (isBrowserEnv()) {
         loadBrowserEnv(container);