@visactor/vtable-plugins 1.19.10-alpha.0 → 1.19.10-alpha.2

package/dist/vtable-plugins.js

@@ -742,15 +742,7 @@
     const EnvContribution = Symbol.for("EnvContribution");
     const VGlobal = Symbol.for("VGlobal");
 
-    const container = new Container();
-
-    const RenderService = Symbol.for("RenderService");
-
-    class Application {
-      get renderService() {
-        return this._renderService || (this._renderService = container.get(RenderService)), this._renderService;
-      }
-    }
+    class Application {}
     const application = new Application();
 
     let idx = 0;
@@ -4092,8 +4084,7 @@
       y1: 0,
       strokeBoundsBuffer: 0,
       cornerRadius: 0,
-      cornerType: "round",
-      drawStrokeWhenZeroWH: !1
+      cornerType: "round"
     });
     Object.assign(Object.assign({}, DefaultAttribute), {
       width: 0,
@@ -4102,8 +4093,7 @@
       y1: 0,
       cornerRadius: 0,
       length: 0,
-      cornerType: "round",
-      drawStrokeWhenZeroWH: !1
+      cornerType: "round"
     });
     const DefaultSymbolAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
       symbolType: "circle",
@@ -4330,34 +4320,6 @@
         }
         return c;
       }
-      static processColorStops(colorStops) {
-        if (!colorStops || 0 === colorStops.length) return [];
-        if (colorStops.some(item => item.length)) {
-          const stops = colorStops.map(item => ({
-            color: item.value,
-            offset: item.length ? parseFloat(item.length.value) / 100 : -1
-          }));
-          stops[0].offset < 0 && (stops[0].offset = 0), stops[stops.length - 1].offset < 0 && (stops[stops.length - 1].offset = 1);
-          for (let i = 1; i < stops.length - 1; i++) if (stops[i].offset < 0) {
-            const prevWithOffsetIdx = i - 1;
-            let nextWithOffsetIdx = i + 1;
-            for (; nextWithOffsetIdx < stops.length && stops[nextWithOffsetIdx].offset < 0;) nextWithOffsetIdx++;
-            const startOffset = stops[prevWithOffsetIdx].offset,
-              endOffset = stops[nextWithOffsetIdx].offset,
-              unspecCount = nextWithOffsetIdx - prevWithOffsetIdx;
-            for (let j = 1; j < unspecCount; j++) stops[prevWithOffsetIdx + j].offset = startOffset + (endOffset - startOffset) * j / unspecCount;
-            i = nextWithOffsetIdx - 1;
-          }
-          return stops;
-        }
-        return colorStops.map((item, index) => {
-          const offset = colorStops.length > 1 ? index / (colorStops.length - 1) : 0;
-          return {
-            color: item.value,
-            offset: offset
-          };
-        });
-      }
       static ParseConic(datum) {
         const {
             orientation: orientation,
@@ -4371,7 +4333,10 @@
           y: .5,
           startAngle: sa,
           endAngle: sa + pi2,
-          stops: GradientParser.processColorStops(colorStops)
+          stops: colorStops.map(item => ({
+            color: item.value,
+            offset: parseFloat(item.length.value) / 100
+          }))
         };
       }
       static ParseRadial(datum) {
@@ -4386,7 +4351,10 @@
           y1: .5,
           r0: 0,
           r1: 1,
-          stops: GradientParser.processColorStops(colorStops)
+          stops: colorStops.map(item => ({
+            color: item.value,
+            offset: parseFloat(item.length.value) / 100
+          }))
         };
       }
       static ParseLinear(datum) {
@@ -4408,7 +4376,10 @@
           y0: y0,
           x1: x1,
           y1: y1,
-          stops: GradientParser.processColorStops(colorStops)
+          stops: colorStops.map(item => ({
+            color: item.value,
+            offset: parseFloat(item.length.value) / 100
+          }))
         };
       }
     }
@@ -4492,9 +4463,6 @@
       return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
     let ATextMeasure = class {
-      constructor() {
-        this.id = "ATextMeasure";
-      }
       configure(service, env) {
         this.canvas = service.canvas, this.context = service.context, service.bindTextMeasure(this);
       }
@@ -4887,13 +4855,11 @@
       return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
     const TextMeasureContribution = Symbol.for("TextMeasureContribution");
-    let DefaultTextMeasureContribution = class extends ATextMeasure {
-      constructor() {
-        super(...arguments), this.id = "DefaultTextMeasureContribution";
-      }
-    };
+    let DefaultTextMeasureContribution = class extends ATextMeasure {};
     DefaultTextMeasureContribution = __decorate$t([injectable()], DefaultTextMeasureContribution);
 
+    const container = new Container();
+
     const CanvasFactory = Symbol.for("CanvasFactory");
 
     function wrapCanvas(params) {
@@ -5472,17 +5438,13 @@
         return this.tryInitCanvas(), this._context;
       }
       constructor(contributions) {
-        this.contributions = contributions, this.configured = !1, this.global = application.global, this._textMeasureMap = new Map(), this.global.hooks.onSetEnv.tap("graphic-util", (lastEnv, env, global) => {
+        this.contributions = contributions, this.configured = !1, this.global = application.global, this.global.hooks.onSetEnv.tap("graphic-util", (lastEnv, env, global) => {
           this.configured = !1, this.configure(global, env);
         });
       }
       get textMeasure() {
         return this._textMeasure || this.configure(this.global, this.global.env), this._textMeasure;
       }
-      getTextMeasureInstance(textMeasureId) {
-        if (!textMeasureId) return this.textMeasure;
-        return this._textMeasureMap.get(textMeasureId) || this.textMeasure;
-      }
       configure(global, env) {
         this.configured || (this.contributions.getContributions().forEach(contribution => {
           contribution.configure(this, env);
@@ -5495,7 +5457,7 @@
         }
       }
       bindTextMeasure(tm) {
-        this._textMeasure && "DefaultTextMeasureContribution" !== tm.id || (this._textMeasure = tm), this._textMeasureMap.has(tm.id) || this._textMeasureMap.set(tm.id, tm);
+        this._textMeasure = tm;
       }
       measureText(text, tc, method = "native") {
         var _a;
@@ -8279,7 +8241,7 @@
         });
       }
       setAttributes(params, forceUpdateTag = !1, context) {
-        params && ((params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background ? this.loadImage(params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._setAttributes(params, forceUpdateTag, context));
+        (params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background ? this.loadImage(params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._setAttributes(params, forceUpdateTag, context);
       }
       _setAttributes(params, forceUpdateTag = !1, context) {
         const keys = Object.keys(params);
@@ -9104,8 +9066,8 @@
     function strokeVisible(opacity, strokeOpacity) {
       return opacity * strokeOpacity > 0;
     }
-    function rectStrokeVisible(opacity, strokeOpacity, width, height, drawStrokeWhenZeroWH) {
-      return drawStrokeWhenZeroWH ? opacity * strokeOpacity > 0 : opacity * strokeOpacity > 0 && 0 !== width && 0 !== height;
+    function rectStrokeVisible(opacity, strokeOpacity, width, height) {
+      return opacity * strokeOpacity > 0 && 0 !== width && 0 !== height;
     }
 
     const AreaRenderContribution = Symbol.for("AreaRenderContribution");
@@ -9526,7 +9488,7 @@
           this.cache.layoutData.lines.forEach(item => {
             mergedText += item.str;
           });
-          return (Array.isArray(text) ? text.join("") : text).toString() !== mergedText;
+          return (Array.isArray(text) ? text.join("") : text) !== mergedText;
         }
         return "vertical" === attribute.direction && this.cache.verticalList && this.cache.verticalList[0] ? this.cache.verticalList[0].map(item => item.text).join("") !== attribute.text.toString() : null != this.clipedText && this.clipedText !== attribute.text.toString();
       }
@@ -9625,7 +9587,7 @@
         return fontSize ? .1 * fontSize : 0;
       }
       updateHorizontalMultilineAABBBounds(text) {
-        var _a, _b;
+        var _a;
         const textTheme = this.getGraphicTheme(),
           attribute = this.attribute,
           {
@@ -9652,7 +9614,7 @@
           const bbox = this.cache.layoutData.bbox;
           return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
-        const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_b = this.stage) || void 0 === _b ? void 0 : _b.textMeasureId)),
+        const textMeasure = application.graphicUtil.textMeasure,
           layoutData = new CanvasTextLayout(fontFamily, {
             fontSize: fontSize,
             fontWeight: fontWeight,
@@ -9670,7 +9632,7 @@
         return this.cache.layoutData = layoutData, this.clearUpdateShapeTag(), this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
       }
       updateWrapAABBBounds(text) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const textTheme = this.getGraphicTheme(),
           {
             fontFamily = textTheme.fontFamily,
@@ -9696,7 +9658,7 @@
           const bbox = this.cache.layoutData.bbox;
           return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
-        const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_b = this.stage) || void 0 === _b ? void 0 : _b.textMeasureId)),
+        const textMeasure = application.graphicUtil.textMeasure,
           textOptions = {
             fontSize: fontSize,
             fontWeight: fontWeight,
@@ -9728,7 +9690,7 @@
             if ("" !== str && "" === clip.str || clip.wordBreaked) {
               if (ellipsis) {
                 const clipEllipsis = textMeasure.clipTextWithSuffix(str, textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
-                clip.str = null !== (_c = clipEllipsis.str) && void 0 !== _c ? _c : "", clip.width = null !== (_d = clipEllipsis.width) && void 0 !== _d ? _d : 0;
+                clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
               } else clip.str = "", clip.width = 0;
               needCut = !1;
             }
@@ -9791,9 +9753,9 @@
         return this.cache.layoutData = layoutData, this.clearUpdateShapeTag(), this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
       }
       updateVerticalMultilineAABBBounds(text) {
-        var _a, _b, _c;
+        var _a, _b;
         const textTheme = this.getGraphicTheme(),
-          textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_a = this.stage) || void 0 === _a ? void 0 : _a.textMeasureId));
+          textMeasure = application.graphicUtil.textMeasure;
         let width;
         const attribute = this.attribute,
           {
@@ -9814,7 +9776,7 @@
         } = attribute;
         if (!verticalMode) {
           const t = textAlign;
-          textAlign = null !== (_b = Text.baselineMapAlign[textBaseline]) && void 0 !== _b ? _b : "left", textBaseline = null !== (_c = Text.alignMapBaseline[t]) && void 0 !== _c ? _c : "top";
+          textAlign = null !== (_a = Text.baselineMapAlign[textBaseline]) && void 0 !== _a ? _a : "left", textBaseline = null !== (_b = Text.alignMapBaseline[t]) && void 0 !== _b ? _b : "top";
         }
         if (width = 0, !this.shouldUpdateShape() && this.cache) {
           this.cache.verticalList.forEach(item => {
@@ -11799,8 +11761,7 @@
           y1: y1,
           x: originX = rectAttribute.x,
           y: originY = rectAttribute.y,
-          fillStrokeOrder = rectAttribute.fillStrokeOrder,
-          drawStrokeWhenZeroWH = rectAttribute.drawStrokeWhenZeroWH
+          fillStrokeOrder = rectAttribute.fillStrokeOrder
         } = rect.attribute;
         let {
           width: width,
@@ -11808,7 +11769,7 @@
         } = rect.attribute;
         width = (null != width ? width : x1 - originX) || 0, height = (null != height ? height : y1 - originY) || 0;
         const fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
-          sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height, drawStrokeWhenZeroWH),
+          sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height),
           doFill = runFill(fill, background),
           doStroke = runStroke(stroke, lineWidth);
         if (!rect.valid || !visible) return;
@@ -12530,6 +12491,7 @@
           decorator(target, key, paramIndex);
         };
       };
+    const RenderService = Symbol.for("RenderService");
     let DefaultRenderService = class {
       constructor(drawContribution) {
         this.drawContribution = drawContribution;
@@ -13418,6 +13380,8 @@
     application.transformUtil = transformUtil;
     const graphicService = container.get(GraphicService);
     application.graphicService = graphicService;
+    const renderService = container.get(RenderService);
+    application.renderService = renderService;
     const layerService = container.get(LayerService);
     application.layerService = layerService;
 
@@ -13665,13 +13629,13 @@
             this._skipRender > 1 && this.renderNextFrame(), this._skipRender = 0;
           } else this._skipRender = 1;
         }, this.beforeRender = stage => {
-          this._beforeRenderList.forEach(cb => cb(stage));
+          this._beforeRender && this._beforeRender(stage);
         }, this.afterClearScreen = drawParams => {
           this._afterClearScreen && this._afterClearScreen(drawParams);
         }, this.afterClearRect = drawParams => {
           this._afterClearRect && this._afterClearRect(drawParams);
         }, this.afterRender = stage => {
-          this.renderCount++, this._afterRenderList.forEach(cb => cb(stage)), this._afterNextRenderCbs && this._afterNextRenderCbs.forEach(cb => cb(stage)), this._afterNextRenderCbs = null, this.tickedBeforeRender = !1;
+          this.renderCount++, this._afterRender && this._afterRender(stage), this._afterNextRenderCbs && this._afterNextRenderCbs.forEach(cb => cb(stage)), this._afterNextRenderCbs = null, this.tickedBeforeRender = !1;
         }, this.afterTickCb = () => {
           this.tickedBeforeRender = !0, "rendering" !== this.state && this.renderNextFrame();
         }, this.params = params, this.theme = new Theme(), this.hooks = {
@@ -13679,7 +13643,7 @@
           afterRender: new SyncHook(["stage"]),
           afterClearScreen: new SyncHook(["stage"]),
           afterClearRect: new SyncHook(["stage"])
-        }, this.global = application.global, !this.global.env && isBrowserEnv() && this.global.setEnv("browser"), this.window = container.get(VWindow), this.renderService = container.get(RenderService), this.pluginService = container.get(PluginService), this.layerService = container.get(LayerService), this.graphicService = container.get(GraphicService), this.pluginService.active(this, params), this._beforeRenderList = [], this._afterRenderList = [], this.window.create({
+        }, this.global = application.global, !this.global.env && isBrowserEnv() && this.global.setEnv("browser"), this.window = container.get(VWindow), this.renderService = container.get(RenderService), this.pluginService = container.get(PluginService), this.layerService = container.get(LayerService), this.graphicService = container.get(GraphicService), this.pluginService.active(this, params), this.window.create({
           width: params.width,
           height: params.height,
           viewBox: params.viewBox,
@@ -13690,7 +13654,7 @@
           canvas: params.canvas
         }), this.state = "normal", this.renderCount = 0, this.tryInitEventSystem(), this._background = null !== (_a = params.background) && void 0 !== _a ? _a : DefaultConfig.BACKGROUND, this.appendChild(this.layerService.createLayer(this, {
           main: !0
-        })), this.nextFrameRenderLayerSet = new Set(), this.willNextFrameRender = !1, this.stage = this, this.renderStyle = params.renderStyle, params.autoRender && this.enableAutoRender(), params.autoRefresh && this.enableAutoRefresh(), !1 === params.disableDirtyBounds && this.enableDirtyBounds(), params.enableHtmlAttribute && this.enableHtmlAttribute(params.enableHtmlAttribute), params.ReactDOM && this.enableReactAttribute(params.ReactDOM), params.enableLayout && this.enableLayout(), this.hooks.beforeRender.tap("constructor", this.beforeRender), this.hooks.afterRender.tap("constructor", this.afterRender), params.beforeRender && this._beforeRenderList.push(params.beforeRender), params.afterRender && this._afterRenderList.push(params.afterRender), this.hooks.afterClearScreen.tap("constructor", this.afterClearScreen), this.hooks.afterClearRect.tap("constructor", this.afterClearRect), this._afterClearScreen = params.afterClearScreen, this._afterClearRect = params.afterClearRect, this.supportInteractiveLayer = !1 !== params.interactiveLayer, params.optimize || (params.optimize = {
+        })), this.nextFrameRenderLayerSet = new Set(), this.willNextFrameRender = !1, this.stage = this, this.renderStyle = params.renderStyle, params.autoRender && this.enableAutoRender(), params.autoRefresh && this.enableAutoRefresh(), !1 === params.disableDirtyBounds && this.enableDirtyBounds(), params.enableHtmlAttribute && this.enableHtmlAttribute(params.enableHtmlAttribute), params.ReactDOM && this.enableReactAttribute(params.ReactDOM), params.enableLayout && this.enableLayout(), this.hooks.beforeRender.tap("constructor", this.beforeRender), this.hooks.afterRender.tap("constructor", this.afterRender), this.hooks.afterClearScreen.tap("constructor", this.afterClearScreen), this.hooks.afterClearRect.tap("constructor", this.afterClearRect), this._beforeRender = params.beforeRender, this._afterRender = params.afterRender, this._afterClearScreen = params.afterClearScreen, this._afterClearRect = params.afterClearRect, this.supportInteractiveLayer = !1 !== params.interactiveLayer, params.optimize || (params.optimize = {
           tickRenderMode: "effect"
         }), this.optmize(params.optimize), params.background && isString$3(this._background) && this._background.includes("/") && this.setAttributes({
           background: this._background
@@ -13805,16 +13769,10 @@
         options.enableView3dTransform && this.enableView3dTransform();
       }
       setBeforeRender(cb) {
-        this._beforeRenderList.push(cb);
-      }
-      removeBeforeRender(cb) {
-        this._beforeRenderList = this._beforeRenderList.filter(c => c !== cb);
+        this._beforeRender = cb;
       }
       setAfterRender(cb) {
-        this._afterRenderList.push(cb);
-      }
-      removeAfterRender(cb) {
-        this._afterRenderList = this._afterRenderList.filter(c => c !== cb);
+        this._afterRender = cb;
       }
       afterNextRender(cb) {
         this._afterNextRenderCbs || (this._afterNextRenderCbs = []), this._afterNextRenderCbs.push(cb);