@visactor/vrender 1.0.13-alpha.1 → 1.0.14-alpha.0

package/dist/index.js

@@ -4615,6 +4615,34 @@
         }
         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,
@@ -4628,10 +4656,7 @@
           y: .5,
           startAngle: sa,
           endAngle: sa + pi2,
-          stops: colorStops.map(item => ({
-            color: item.value,
-            offset: parseFloat(item.length.value) / 100
-          }))
+          stops: GradientParser.processColorStops(colorStops)
         };
       }
       static ParseRadial(datum) {
@@ -4646,10 +4671,7 @@
           y1: .5,
           r0: 0,
           r1: 1,
-          stops: colorStops.map(item => ({
-            color: item.value,
-            offset: parseFloat(item.length.value) / 100
-          }))
+          stops: GradientParser.processColorStops(colorStops)
         };
       }
       static ParseLinear(datum) {
@@ -4671,10 +4693,7 @@
           y0: y0,
           x1: x1,
           y1: y1,
-          stops: colorStops.map(item => ({
-            color: item.value,
-            offset: parseFloat(item.length.value) / 100
-          }))
+          stops: GradientParser.processColorStops(colorStops)
         };
       }
     }
@@ -4880,6 +4899,9 @@
       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);
       }
@@ -5272,7 +5294,11 @@
       return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
     const TextMeasureContribution = Symbol.for("TextMeasureContribution");
-    exports.DefaultTextMeasureContribution = class DefaultTextMeasureContribution extends ATextMeasure {};
+    exports.DefaultTextMeasureContribution = class DefaultTextMeasureContribution extends ATextMeasure {
+      constructor() {
+        super(...arguments), this.id = "DefaultTextMeasureContribution";
+      }
+    };
     exports.DefaultTextMeasureContribution = __decorate$1L([injectable()], exports.DefaultTextMeasureContribution);
 
     const container = new Container();
@@ -5859,13 +5885,17 @@
         return this.tryInitCanvas(), this._context;
       }
       constructor(contributions) {
-        this.contributions = contributions, this.configured = !1, this.global = application.global, this.global.hooks.onSetEnv.tap("graphic-util", (lastEnv, env, global) => {
+        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.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);
@@ -5878,7 +5908,7 @@
         }
       }
       bindTextMeasure(tm) {
-        this._textMeasure = tm;
+        this._textMeasure && "DefaultTextMeasureContribution" !== tm.id || (this._textMeasure = tm), this._textMeasureMap.has(tm.id) || this._textMeasureMap.set(tm.id, tm);
       }
       measureText(text, tc, method = "native") {
         var _a;
@@ -10770,7 +10800,7 @@
         return fontSize ? .1 * fontSize : 0;
       }
       updateHorizontalMultilineAABBBounds(text) {
-        var _a;
+        var _a, _b;
         const textTheme = this.getGraphicTheme(),
           attribute = this.attribute,
           {
@@ -10797,7 +10827,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.textMeasure,
+        const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_b = this.stage) || void 0 === _b ? void 0 : _b.textMeasureId)),
           layoutData = new CanvasTextLayout(fontFamily, {
             fontSize: fontSize,
             fontWeight: fontWeight,
@@ -10815,7 +10845,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;
+        var _a, _b, _c, _d;
         const textTheme = this.getGraphicTheme(),
           {
             fontFamily = textTheme.fontFamily,
@@ -10841,7 +10871,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.textMeasure,
+        const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_b = this.stage) || void 0 === _b ? void 0 : _b.textMeasureId)),
           textOptions = {
             fontSize: fontSize,
             fontWeight: fontWeight,
@@ -10873,7 +10903,7 @@
             if ("" !== str && "" === clip.str || clip.wordBreaked) {
               if (ellipsis) {
                 const clipEllipsis = textMeasure.clipTextWithSuffix(str, textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
-                clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
+                clip.str = null !== (_c = clipEllipsis.str) && void 0 !== _c ? _c : "", clip.width = null !== (_d = clipEllipsis.width) && void 0 !== _d ? _d : 0;
               } else clip.str = "", clip.width = 0;
               needCut = !1;
             }
@@ -10936,9 +10966,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;
+        var _a, _b, _c;
         const textTheme = this.getGraphicTheme(),
-          textMeasure = application.graphicUtil.textMeasure;
+          textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_a = this.stage) || void 0 === _a ? void 0 : _a.textMeasureId));
         let width;
         const attribute = this.attribute,
           {
@@ -10959,7 +10989,7 @@
         } = attribute;
         if (!verticalMode) {
           const t = textAlign;
-          textAlign = null !== (_a = Text.baselineMapAlign[textBaseline]) && void 0 !== _a ? _a : "left", textBaseline = null !== (_b = Text.alignMapBaseline[t]) && void 0 !== _b ? _b : "top";
+          textAlign = null !== (_b = Text.baselineMapAlign[textBaseline]) && void 0 !== _b ? _b : "left", textBaseline = null !== (_c = Text.alignMapBaseline[t]) && void 0 !== _c ? _c : "top";
         }
         if (width = 0, !this.shouldUpdateShape() && this.cache) {
           this.cache.verticalList.forEach(item => {
@@ -11073,7 +11103,7 @@
         return isArray$1(text) ? !text.every(t => null == t || "" === t) : null != text && "" !== text;
       }
       updateMultilineAABBBounds(text) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const textTheme = this.getGraphicTheme(),
           {
             fontFamily = textTheme.fontFamily,
@@ -11097,7 +11127,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.textMeasure,
+        const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_c = this.stage) || void 0 === _c ? void 0 : _c.textMeasureId)),
           layoutObj = new CanvasTextLayout(fontFamily, {
             fontSize: fontSize,
             fontWeight: fontWeight,
@@ -11126,7 +11156,7 @@
             if ("" !== str && "" === clip.str) {
               if (ellipsis) {
                 const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.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 !== (_d = clipEllipsis.str) && void 0 !== _d ? _d : "", clip.width = null !== (_e = clipEllipsis.width) && void 0 !== _e ? _e : 0;
               } else clip.str = "", clip.width = 0;
               needCut = !1;
             }
@@ -12403,7 +12433,7 @@
           case "right":
             deltaX = -aabbBounds.width();
         }
-        return aabbBounds.translate(deltaX, deltaY), application.graphicService.updateTempAABBBounds(aabbBounds), null == attribute.forceBoundsHeight && null == attribute.forceBoundsWidth || application.graphicService.updateHTMLTextAABBBounds(attribute, richtextTheme, aabbBounds), this.widthWithoutTransform = aabbBounds.x2 - aabbBounds.x1, this.heightWithoutTransform = aabbBounds.y2 - aabbBounds.y1, application.graphicService.transformAABBBounds(attribute, aabbBounds, richtextTheme, !1, this), 0 === aabbBounds.width() && 0 === aabbBounds.height() && aabbBounds.clear(), aabbBounds;
+        return height || ("middle" === this.verticalDirection ? deltaY -= aabbBounds.height() / 2 : "bottom" === this.verticalDirection && (deltaY -= aabbBounds.height())), aabbBounds.translate(deltaX, deltaY), application.graphicService.updateTempAABBBounds(aabbBounds), null == attribute.forceBoundsHeight && null == attribute.forceBoundsWidth || application.graphicService.updateHTMLTextAABBBounds(attribute, richtextTheme, aabbBounds), this.widthWithoutTransform = aabbBounds.x2 - aabbBounds.x1, this.heightWithoutTransform = aabbBounds.y2 - aabbBounds.y1, application.graphicService.transformAABBBounds(attribute, aabbBounds, richtextTheme, !1, this), 0 === aabbBounds.width() && 0 === aabbBounds.height() && aabbBounds.clear(), aabbBounds;
       }
       needUpdateTags(keys) {
         return super.needUpdateTags(keys, RICHTEXT_UPDATE_TAG_KEY);
@@ -19167,6 +19197,7 @@
         }));
       }
       tryShowInputBounds() {
+        var _a, _b;
         if (!this.currRt || !this.focusing) return;
         const {
             editOptions = {}
@@ -19182,6 +19213,8 @@
         this.shadowBounds = this.shadowBounds || createRect({}), this.shadowBounds.setAttributes({
           x: 0,
           y: 0,
+          scaleX: 1 / (null !== (_a = this.currRt.attribute.scaleX) && void 0 !== _a ? _a : 1),
+          scaleY: 1 / (null !== (_b = this.currRt.attribute.scaleY) && void 0 !== _b ? _b : 1),
           width: width,
           height: height,
           fill: !1,
@@ -19283,7 +19316,9 @@
             y2 = getRichTextBounds(Object.assign(Object.assign({}, target.attribute), {
               textConfig: [{
                 text: "a"
-              }]
+              }],
+              scaleX: 1,
+              scaleY: 1
             })).height();
           this.startCursorPos = {
             x: x,
@@ -19319,7 +19354,10 @@
           textConfig: [{
             text: "a"
           }]
-        })), b = getRichTextBounds(attr)), "middle" === textBaseline ? dy = -b.height() / 2 : "bottom" === textBaseline && (dy = -b.height()), this.editLine && this.editLine.setAttributes({
+        })), b = getRichTextBounds(Object.assign(Object.assign({}, attr), {
+          scaleX: 1,
+          scaleY: 1
+        }))), "middle" === textBaseline ? dy = -b.height() / 2 : "bottom" === textBaseline && (dy = -b.height()), this.editLine && this.editLine.setAttributes({
           dy: dy
         }), this.editBg && this.editBg.setAttributes({
           dy: dy
@@ -19516,9 +19554,15 @@
           } = rt.attribute;
         let dy = 0;
         if ("middle" === textBaseline) {
-          dy = getRichTextBounds(rt.attribute).height() / 2;
+          dy = getRichTextBounds(Object.assign(Object.assign({}, rt.attribute), {
+            scaleX: 1,
+            scaleY: 1
+          })).height() / 2;
         } else if ("bottom" === textBaseline) {
-          dy = getRichTextBounds(rt.attribute).height();
+          dy = getRichTextBounds(Object.assign(Object.assign({}, rt.attribute), {
+            scaleX: 1,
+            scaleY: 1
+          })).height();
         }
         return p1.y += dy, p1;
       }
@@ -30503,8 +30547,6 @@
       }
       onStart() {
         super.onStart();
-      }
-      onFirstRun() {
         const fromProps = this.getFromProps();
         this.target.setAttributes(fromProps);
       }
@@ -35293,7 +35335,7 @@
       afterStageRender(stage, canvas) {
         var _a, _b;
         let result = null;
-        if (null === (_b = null === (_a = this.params) || void 0 === _a ? void 0 : _a.options) || void 0 === _b ? void 0 : _b.useWebGL) {
+        if (!1 !== (null === (_b = null === (_a = this.params) || void 0 === _a ? void 0 : _a.options) || void 0 === _b ? void 0 : _b.useWebGL)) {
           if (this.supportsWebGL() && (this.gl || this.initWebGL(canvas) || console.warn("WebGL初始化失败，尝试Canvas 2D回退"), this.gl)) {
             if (result = this.applyWebGLEffect(canvas), result) return result;
             console.warn("WebGL特效执行失败，尝试Canvas 2D回退");
@@ -35941,12 +35983,13 @@
 
     class Particle extends HybridEffectBase {
       constructor(from, to, duration, easing, params) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         super(from, to, duration, easing, params), this.particles = [], this.positionBuffer = null, this.colorBuffer = null, this.particleConfig = {
           effectType: (null === (_a = null == params ? void 0 : params.options) || void 0 === _a ? void 0 : _a.effectType) || "gravity",
           count: (null === (_b = null == params ? void 0 : params.options) || void 0 === _b ? void 0 : _b.count) || 4e3,
           size: (null === (_c = null == params ? void 0 : params.options) || void 0 === _c ? void 0 : _c.size) || 20,
-          strength: (null === (_d = null == params ? void 0 : params.options) || void 0 === _d ? void 0 : _d.strength) || 1.5
+          strength: (null === (_d = null == params ? void 0 : params.options) || void 0 === _d ? void 0 : _d.strength) || 1.5,
+          useWebGL: void 0 === (null === (_e = null == params ? void 0 : params.options) || void 0 === _e ? void 0 : _e.useWebGL) || params.options.useWebGL
         };
       }
       getShaderSources() {
@@ -36421,7 +36464,7 @@
       AnimateExecutor.registerBuiltInAnimate("increaseCount", IncreaseCount), AnimateExecutor.registerBuiltInAnimate("fromTo", FromTo), AnimateExecutor.registerBuiltInAnimate("scaleIn", ScaleIn), AnimateExecutor.registerBuiltInAnimate("scaleOut", ScaleOut), AnimateExecutor.registerBuiltInAnimate("growHeightIn", GrowHeightIn), AnimateExecutor.registerBuiltInAnimate("growHeightOut", GrowHeightOut), AnimateExecutor.registerBuiltInAnimate("growWidthIn", GrowWidthIn), AnimateExecutor.registerBuiltInAnimate("growWidthOut", GrowWidthOut), AnimateExecutor.registerBuiltInAnimate("growCenterIn", GrowCenterIn), AnimateExecutor.registerBuiltInAnimate("growCenterOut", GrowCenterOut), AnimateExecutor.registerBuiltInAnimate("clipIn", ClipIn), AnimateExecutor.registerBuiltInAnimate("clipOut", ClipOut), AnimateExecutor.registerBuiltInAnimate("fadeIn", FadeIn), AnimateExecutor.registerBuiltInAnimate("fadeOut", FadeOut), AnimateExecutor.registerBuiltInAnimate("growPointsIn", GrowPointsIn), AnimateExecutor.registerBuiltInAnimate("growPointsOut", GrowPointsOut), AnimateExecutor.registerBuiltInAnimate("growPointsXIn", GrowPointsXIn), AnimateExecutor.registerBuiltInAnimate("growPointsXOut", GrowPointsXOut), AnimateExecutor.registerBuiltInAnimate("growPointsYIn", GrowPointsYIn), AnimateExecutor.registerBuiltInAnimate("growPointsYOut", GrowPointsYOut), AnimateExecutor.registerBuiltInAnimate("growAngleIn", GrowAngleIn), AnimateExecutor.registerBuiltInAnimate("growAngleOut", GrowAngleOut), AnimateExecutor.registerBuiltInAnimate("growRadiusIn", GrowRadiusIn), AnimateExecutor.registerBuiltInAnimate("growRadiusOut", GrowRadiusOut), AnimateExecutor.registerBuiltInAnimate("moveIn", MoveIn), AnimateExecutor.registerBuiltInAnimate("moveOut", MoveOut), AnimateExecutor.registerBuiltInAnimate("rotateIn", RotateIn), AnimateExecutor.registerBuiltInAnimate("rotateOut", RotateOut), AnimateExecutor.registerBuiltInAnimate("update", Update), AnimateExecutor.registerBuiltInAnimate("state", State), AnimateExecutor.registerBuiltInAnimate("labelItemAppear", LabelItemAppear), AnimateExecutor.registerBuiltInAnimate("labelItemDisappear", LabelItemDisappear), AnimateExecutor.registerBuiltInAnimate("poptipAppear", PoptipAppear), AnimateExecutor.registerBuiltInAnimate("poptipDisappear", PoptipDisappear), AnimateExecutor.registerBuiltInAnimate("inputText", InputText), AnimateExecutor.registerBuiltInAnimate("inputRichText", InputRichText), AnimateExecutor.registerBuiltInAnimate("outputRichText", OutputRichText), AnimateExecutor.registerBuiltInAnimate("slideRichText", SlideRichText), AnimateExecutor.registerBuiltInAnimate("slideOutRichText", SlideOutRichText), AnimateExecutor.registerBuiltInAnimate("slideIn", SlideIn), AnimateExecutor.registerBuiltInAnimate("growIn", GrowIn), AnimateExecutor.registerBuiltInAnimate("spinIn", SpinIn), AnimateExecutor.registerBuiltInAnimate("moveScaleIn", MoveScaleIn), AnimateExecutor.registerBuiltInAnimate("moveRotateIn", MoveRotateIn), AnimateExecutor.registerBuiltInAnimate("strokeIn", StrokeIn), AnimateExecutor.registerBuiltInAnimate("slideOut", SlideOut), AnimateExecutor.registerBuiltInAnimate("growOut", GrowOut), AnimateExecutor.registerBuiltInAnimate("spinOut", SpinOut), AnimateExecutor.registerBuiltInAnimate("moveScaleOut", MoveScaleOut), AnimateExecutor.registerBuiltInAnimate("moveRotateOut", MoveRotateOut), AnimateExecutor.registerBuiltInAnimate("strokeOut", StrokeOut), AnimateExecutor.registerBuiltInAnimate("pulse", PulseAnimate), AnimateExecutor.registerBuiltInAnimate("MotionPath", MotionPath), AnimateExecutor.registerBuiltInAnimate("streamLight", StreamLight), AnimateExecutor.registerBuiltInAnimate("dissolve", Dissolve), AnimateExecutor.registerBuiltInAnimate("grayscale", Grayscale), AnimateExecutor.registerBuiltInAnimate("distortion", Distortion), AnimateExecutor.registerBuiltInAnimate("particle", Particle), AnimateExecutor.registerBuiltInAnimate("glitch", Glitch), AnimateExecutor.registerBuiltInAnimate("gaussianBlur", GaussianBlur), AnimateExecutor.registerBuiltInAnimate("pixelation", Pixelation);
     };
 
-    const version = "1.0.13-alpha.1";
+    const version = "1.0.14-alpha.0";
     preLoadAllModule();
     if (isBrowserEnv()) {
         loadBrowserEnv(container);
@@ -36625,6 +36668,7 @@
     exports.GlobalPickerService = GlobalPickerService;
     exports.Glyph = Glyph;
     exports.GlyphRender = GlyphRender;
+    exports.GradientParser = GradientParser;
     exports.Graphic = Graphic;
     exports.GraphicCreator = GraphicCreator$1;
     exports.GraphicPicker = GraphicPicker;