@visactor/vchart 1.12.0-alpha.6 → 1.12.0-alpha.7

package/build/index.js

@@ -25532,219 +25532,6 @@
       return "vertical" === direction;
     }
 
-    const shapes = {
-      triangleForward: triangleForward,
-      triangleUpright: triangle,
-      triangle: triangle,
-      diamond: diamond,
-      square: square$1,
-      star: star,
-      cardioid: cardioid,
-      circle: circle,
-      pentagon: pentagon
-    };
-    function diamond() {
-      return function (theta) {
-        const thetaPrime = theta % (2 * Math.PI / 4);
-        return 1 / (Math.cos(thetaPrime) + Math.sin(thetaPrime));
-      };
-    }
-    function star() {
-      return function (theta) {
-        const thetaPrime = (theta + .955) % (2 * Math.PI / 10);
-        return (theta + .955) % (2 * Math.PI / 5) - 2 * Math.PI / 10 >= 0 ? 1 / (Math.cos(2 * Math.PI / 10 - thetaPrime) + 3.07768 * Math.sin(2 * Math.PI / 10 - thetaPrime)) : 1 / (Math.cos(thetaPrime) + 3.07768 * Math.sin(thetaPrime));
-      };
-    }
-    function square$1() {
-      return function (theta) {
-        return Math.min(1 / Math.abs(Math.cos(theta)), 1 / Math.abs(Math.sin(theta)));
-      };
-    }
-    function triangle() {
-      return function (theta) {
-        const thetaPrime = (theta + 3 * Math.PI / 2) % (2 * Math.PI / 3);
-        return 1 / (Math.cos(thetaPrime) + Math.sqrt(3) * Math.sin(thetaPrime));
-      };
-    }
-    function triangleForward() {
-      return function (theta) {
-        const thetaPrime = theta % (2 * Math.PI / 3);
-        return 1 / (Math.cos(thetaPrime) + Math.sqrt(3) * Math.sin(thetaPrime));
-      };
-    }
-    function cardioid() {
-      return function (theta) {
-        return 1 + Math.sin(theta);
-      };
-    }
-    function circle() {
-      return function () {
-        return 1;
-      };
-    }
-    function pentagon() {
-      return function (theta) {
-        const thetaPrime = (theta + .955) % (2 * Math.PI / 5);
-        return 1 / (Math.cos(thetaPrime) + .726543 * Math.sin(thetaPrime));
-      };
-    }
-    function getMaxRadiusAndCenter(shape, size) {
-      const w = size[0],
-        h = size[1];
-      let maxRadius = 1;
-      const center = [size[0] >> 1, size[1] >> 1];
-      switch (shape) {
-        case "cardioid":
-          center[1] = ~~(h / 2.7 * .4), maxRadius = Math.floor(Math.min(w / 2.3, h / 2.6));
-          break;
-        case "triangleForward":
-          maxRadius = h / Math.sqrt(.75) > w ? Math.floor(w / 2) : Math.floor(h / (2 * Math.sqrt(.75)));
-          break;
-        case "triangle":
-        case "triangleUpright":
-          center[1] = ~~(h / 1.5), maxRadius = Math.floor(Math.min(h / 1.5, w / 2));
-          break;
-        case "circle":
-        case "diamond":
-        case "square":
-        case "star":
-        case "pentagon":
-          maxRadius = Math.floor(Math.min(w / 2, h / 2));
-          break;
-        default:
-          maxRadius = Math.floor(Math.max(w / 2, h / 2));
-      }
-      return {
-        maxRadius: maxRadius,
-        center: center
-      };
-    }
-    const getShapeFunction = type => shapes[type] ? shapes[type]() : shapes.circle();
-
-    const generateIsEmptyPixel = backgroundColor => {
-      if (!backgroundColor || "#fff" === backgroundColor) return (imageData, y, x) => {
-        const width = imageData.width;
-        return 0 === imageData.data[y * width * 4 + 4 * x + 3] || 255 === imageData.data[y * width * 4 + 4 * x + 0] && 255 === imageData.data[y * width * 4 + 4 * x + 1] && 255 === imageData.data[y * width * 4 + 4 * x + 2];
-      };
-      const bctx = vglobal.createCanvas({
-        width: 1,
-        height: 1
-      }).getContext("2d");
-      bctx.fillStyle = backgroundColor, bctx.fillRect(0, 0, 1, 1);
-      const bgPixel = bctx.getImageData(0, 0, 1, 1).data;
-      return (imageData, y, x) => {
-        const width = imageData.width;
-        return [0, 1, 2, 3].every(i => imageData.data[4 * (y * width + x) + i] === bgPixel[i]);
-      };
-    };
-    const generateMaskCanvas = (shape, width, height, cacheCanvas) => {
-      const {
-          backgroundColor = "#fff"
-        } = shape,
-        maskCanvas = cacheCanvas || vglobal.createCanvas({
-          width: width,
-          height: height,
-          dpr: 1
-        }),
-        tempContext = maskCanvas.getContext("2d");
-      if (cacheCanvas) {
-        const prevWidth = cacheCanvas.width,
-          prevHeight = cacheCanvas.height;
-        tempContext.clearRect(0, 0, prevWidth, prevHeight), cacheCanvas.style.width = `${width}px`, cacheCanvas.style.height = `${height}px`, cacheCanvas.width = width, cacheCanvas.height = height;
-      }
-      return tempContext.fillStyle = backgroundColor, tempContext.fillRect(0, 0, maskCanvas.width, maskCanvas.height), "text" === shape.type ? drawTextMask(shape, maskCanvas.width, maskCanvas.height, tempContext) : "geometric" === shape.type && drawGeometricMask(shape, maskCanvas.width, maskCanvas.height, tempContext), maskCanvas;
-    };
-    const drawTextMask = (shape, width, height, ctx) => {
-      const {
-        fontFamily = "sans-serif",
-        fontWeight = "normal",
-        fontStyle = "normal",
-        fontVariant = "normal",
-        fill: fill,
-        text: text,
-        hollow: hollow
-      } = shape;
-      let baseFontSize = 12;
-      ctx.font = `${fontStyle} ${fontVariant} ${fontWeight} ${baseFontSize}px ${fontFamily}`, ctx.textAlign = "center", ctx.textBaseline = "middle", ctx.fillStyle = null != fill ? fill : "black";
-      const textWidth = ctx.measureText(text).width;
-      if (hollow && (ctx.globalCompositeOperation = "xor"), textWidth > width) {
-        const scale = Math.min(width / textWidth, height / baseFontSize);
-        ctx.fillText(text, width / 2, height / 2), ctx.scale(scale, scale);
-      } else baseFontSize = Math.floor(baseFontSize * width / textWidth), baseFontSize = Math.min(baseFontSize, height), ctx.font = `${fontStyle} ${fontVariant} ${fontWeight} ${baseFontSize}px ${fontFamily}`, ctx.fillText(text, width / 2, height / 2);
-    };
-    const generatePoints = function (center, radius) {
-      let startAngle = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-      let count = arguments.length > 3 ? arguments[3] : undefined;
-      const angle = 2 * Math.PI / count;
-      return new Array(count).fill(0).map((entry, index) => polarToCartesian$1(center, radius, startAngle + index * angle));
-    };
-    const generateCardioidPoints = function (center, radius) {
-      let startAngle = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-      let count = arguments.length > 3 ? arguments[3] : undefined;
-      const angle = 2 * Math.PI / count,
-        func = getShapeFunction("cardioid");
-      return new Array(count).fill(0).map((entry, index) => {
-        const theta = startAngle + index * angle,
-          r = radius * func(theta);
-        return polarToCartesian$1(center, r, theta);
-      });
-    };
-    const drawRegularPolygon = (ctx, points) => {
-      ctx.beginPath(), points.forEach((p, index) => {
-        0 === index ? ctx.moveTo(p.x, p.y) : ctx.lineTo(p.x, p.y);
-      }), ctx.closePath(), ctx.fill();
-    };
-    const drawCardioid = (ctx, points) => {
-      let prev;
-      ctx.beginPath(), points.forEach((p, index) => {
-        0 === index ? ctx.moveTo(p.x, p.y) : ctx.bezierCurveTo(p.x, p.y, prev.x, prev.y, p.x, p.y), prev = p;
-      }), ctx.closePath(), ctx.fill();
-    };
-    const drawGeometricMask = (shape, width, height, ctx) => {
-      const {
-          fill: fill,
-          hollow: hollow
-        } = shape,
-        {
-          center: center,
-          maxRadius: maxRadius
-        } = getMaxRadiusAndCenter(shape.shape, [width, height]);
-      ctx.fillStyle = null != fill ? fill : "black", hollow && (ctx.globalCompositeOperation = "xor");
-      const cx = center[0],
-        cy = center[1];
-      if ("cardioid" === shape.shape) drawCardioid(ctx, generateCardioidPoints({
-        x: cx,
-        y: cy
-      }, maxRadius, 0, 100));else if ("circle" === shape.shape) ctx.beginPath(), ctx.arc(cx, cy, maxRadius, 0, 2 * Math.PI, !0), ctx.fill();else if ("diamond" === shape.shape) drawRegularPolygon(ctx, generatePoints({
-        x: cx,
-        y: cy
-      }, maxRadius, -Math.PI / 2, 4));else if ("square" === shape.shape) drawRegularPolygon(ctx, generatePoints({
-        x: cx,
-        y: cy
-      }, maxRadius, -Math.PI / 4, 4));else if ("pentagon" === shape.shape) drawRegularPolygon(ctx, generatePoints({
-        x: cx,
-        y: cy
-      }, maxRadius, Math.PI / 2, 5));else if ("triangle" === shape.shape || "triangleUpright" === shape.shape) drawRegularPolygon(ctx, generatePoints({
-        x: cx,
-        y: cy
-      }, maxRadius, -Math.PI / 2, 3));else if ("triangleForward" === shape.shape) drawRegularPolygon(ctx, generatePoints({
-        x: cx,
-        y: cy
-      }, maxRadius, 0, 3));else if ("star" === shape.shape) {
-        const outterPoints = generatePoints({
-            x: cx,
-            y: cy
-          }, maxRadius, -Math.PI / 2, 5),
-          innerPoints = generatePoints({
-            x: cx,
-            y: cy
-          }, maxRadius / (2 * Math.cos(Math.PI / 5)), -Math.PI / 2 + Math.PI / 5, 5),
-          points = [];
-        for (let i = 0; i < 5; i++) points.push(outterPoints[i]), points.push(innerPoints[i]);
-        drawRegularPolygon(ctx, points);
-      } else ctx.fillRect(0, 0, width, height);
-    };
-
     const GROUP_ATTRIBUTES = ["x", "y", "dx", "dy", "scaleX", "scaleY", "angle", "anchor", "postMatrix", "visible", "clip", "pickable", "childrenPickable", "zIndex", "cursor"];
     class AbstractComponent extends Group$1 {
       constructor(attributes, options) {
@@ -35795,7 +35582,7 @@
       return x;
     }
     const sqrt$1 = x => x < 0 ? -Math.sqrt(-x) : Math.sqrt(x);
-    const square = x => x < 0 ? -x * x : x * x;
+    const square$1 = x => x < 0 ? -x * x : x * x;
     const logNegative = x => -Math.log(-x);
     const expNegative = x => -Math.exp(-x);
     const pow10 = x => isFinite(x) ? Math.pow(10, x) : x < 0 ? 0 : x;
@@ -36683,7 +36470,7 @@
 
     class SqrtScale extends LinearScale {
       constructor() {
-        super(sqrt$1, square), this.type = ScaleEnum.Sqrt;
+        super(sqrt$1, square$1), this.type = ScaleEnum.Sqrt;
       }
       clone() {
         return new SqrtScale().domain(this._domain, !0).range(this._range, !0).unknown(this._unknown).clamp(this.clamp(), null, !0).interpolate(this._interpolate);
@@ -43946,7 +43733,6 @@
         SeriesMarkNameEnum["stackLabel"] = "stackLabel";
         SeriesMarkNameEnum["word"] = "word";
         SeriesMarkNameEnum["fillingWord"] = "fillingWord";
-        SeriesMarkNameEnum["wordMask"] = "wordMask";
         SeriesMarkNameEnum["nodePoint"] = "nodePoint";
         SeriesMarkNameEnum["ripplePoint"] = "ripplePoint";
         SeriesMarkNameEnum["centerPoint"] = "centerPoint";
@@ -47722,12 +47508,7 @@
 
     Animate$1.mode |= AnimateMode.SET_ATTR_IMMEDIATELY;
     let GlobalAnimatorId = 0;
-    const isCustomAnimateCtor = custom => {
-      var _a;
-      if (isNil$1(custom) || isNil$1(custom.prototype)) return !1;
-      const prototype = null !== (_a = custom.prototype) && void 0 !== _a ? _a : {};
-      return prototype instanceof ACustomAnimate || "onBind" in prototype && "onStart" in prototype && "onEnd" in prototype && "onUpdate" in prototype;
-    };
+    const isCustomAnimateCtor = custom => !isNil$1(custom) && !isNil$1(custom.prototype) && (custom.prototype instanceof ACustomAnimate || "onBind" in custom.prototype && "onStart" in custom.prototype && "onEnd" in custom.prototype && "onUpdate" in custom.prototype);
     class Animator {
       constructor(element, unit, animationOptions) {
         this.id = GlobalAnimatorId++, this.isAnimating = !1, this.runnings = [], this.element = element, this.animationOptions = animationOptions, this.unit = unit;
@@ -49244,7 +49025,8 @@
           const mark = grammar,
             currentNode = this._markNodes.find(node => node.mark === mark);
           this._markNodes.forEach(node => {
-            node.mark.markType === GrammarMarkType.group && node.children.includes(currentNode) ? (node.children = node.children.filter(n => n !== currentNode), currentNode.parent = null) : mark.markType === GrammarMarkType.group && currentNode.children.includes(node) && (currentNode.children = currentNode.children.filter(n => n !== node), node.parent = null);
+            const targetMark = node.mark;
+            targetMark.markType === GrammarMarkType.group && targetMark.includesChild(mark, !1) ? (node.children = node.children.filter(n => n !== currentNode), currentNode.parent = null) : mark.markType === GrammarMarkType.group && mark.includesChild(targetMark, !1) && (currentNode.children = currentNode.children.filter(n => n !== node), node.parent = null);
           }), this._markNodes = this._markNodes.filter(n => n !== currentNode);
         }
         return this;
@@ -62365,7 +62147,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.12.0-alpha.6";
+    const version = "1.12.0-alpha.7";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -81251,9 +81033,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         'rect'
     ];
 
+    const WORD_CLOUD_WEIGHT = `${PREFIX}_WORD_CLOUD_WEIGHT`;
     const WORD_CLOUD_TEXT = `${PREFIX}_WORD_CLOUD_TEXT`;
 
-    const wordCloudSeriesMark = Object.assign(Object.assign({}, baseSeriesMark), { ["word"]: { name: "word", type: "text" }, ["fillingWord"]: { name: "fillingWord", type: "text" }, ["wordMask"]: { name: "wordMask", type: "rect" } });
+    const wordCloudSeriesMark = Object.assign(Object.assign({}, baseSeriesMark), { ["word"]: { name: "word", type: "text" }, ["fillingWord"]: { name: "fillingWord", type: "text" } });
 
     class BaseWordCloudSeries extends BaseSeries {
         constructor() {
@@ -81261,10 +81044,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._fontSizeRange = [DEFAULT_MIN_FONT_SIZE, DEFAULT_MIN_FONT_SIZE];
             this._isWordCloudShape = false;
             this._dataChange = true;
-            this.handleMaskCanvasUpdate = (canvas, imageUrl) => {
-                this._maskCanvas = canvas;
-                document.body.appendChild(canvas);
-            };
             this.getWordColor = (datum) => {
                 if (datum.isFillingWord) {
                     if (!this._fillingColorCallback || this._dataChange) {
@@ -81275,22 +81054,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     return this._fillingColorCallback(datum);
                 }
                 if (!this._keyWordColorCallback || this._dataChange) {
-                    this._keyWordColorCallback = this._spec.colorHexField
-                        ? datum => datum[this._spec.colorHexField]
+                    this._keyWordColorCallback = this._colorHexField
+                        ? datum => datum[this._colorHexField]
                         : this.initColorCallback(this._seriesField, false);
                 }
                 return this._keyWordColorCallback(datum);
             };
-            this._calculateFontWeight = (datum) => {
-                const stats = this.getRawDataStatisticsByField(this._valueField, true);
-                if (stats.min === stats.max) {
-                    return this._fontWeightRange[0];
-                }
-                return (this._fontWeightRange[0] +
-                    ((this._fontWeightRange[this._fontWeightRange.length - 1] - this._fontWeightRange[0]) *
-                        (datum[this._valueField] - stats.min)) /
-                        (stats.max - stats.min));
-            };
         }
         setValueField(field) {
             if (isValid$1(field)) {
@@ -81306,10 +81075,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
         }
         setAttrFromSpec() {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             super.setAttrFromSpec();
             this._padding = this._option.getChart().padding;
             this._nameField = this._spec.nameField;
+            this._fontFamilyField = this._spec.fontFamilyField;
+            this._fontWeightField = this._spec.fontWeightField;
+            this._fontStyleField = this._spec.fontStyleField;
+            this._colorHexField = this._spec.colorHexField;
             this._colorMode = (_a = this._spec.colorMode) !== null && _a !== void 0 ? _a : 'ordinal';
             this._colorList = this._spec.colorList;
             this.setValueField(this._spec.valueField);
@@ -81317,16 +81090,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._rotateAngles = (_c = this._spec.rotateAngles) !== null && _c !== void 0 ? _c : DEFAULT_ROTATE_ANGLES;
             this.setFontSizeRange(this._spec.fontSizeRange);
             this._maskShape = (_d = this._spec.maskShape) !== null && _d !== void 0 ? _d : DEFAULT_MASK_SHAPE;
-            this._textField = ((_e = this._spec.word) === null || _e === void 0 ? void 0 : _e.formatMethod) ? WORD_CLOUD_TEXT : this._nameField;
-            const wordCloudConfig = this._spec.wordCloudConfig;
+            this._keepAspect = this._spec.keepAspect;
+            this._random = (_e = this._spec.random) !== null && _e !== void 0 ? _e : DEFAULT_RANDOM;
+            this._fontPadding = (_g = (_f = this._spec.word) === null || _f === void 0 ? void 0 : _f.padding) !== null && _g !== void 0 ? _g : DEFAULT_FONT_PADDING;
+            this._textField = ((_h = this._spec.word) === null || _h === void 0 ? void 0 : _h.formatMethod) ? WORD_CLOUD_TEXT : this._nameField;
             this._wordCloudConfig = Object.assign({ drawOutOfBound: DEFAULT_DRAW_OUT_OF_BOUND, layoutMode: 'default', zoomToFit: DEFAULT_ZOOM_TO_FIT }, this._spec.wordCloudConfig);
-            if ((!wordCloudConfig || isNil$1(wordCloudConfig.layoutMode)) && !isTrueBrowser(this._option.mode)) {
-                this._wordCloudConfig.layoutMode = 'fast';
-            }
             this._wordCloudShapeConfig = Object.assign({ fillingSeriesField: this.getSeriesField(), fillingRotateAngles: DEFAULT_ROTATE_ANGLES, layoutMode: 'default' }, this._spec.wordCloudShapeConfig);
-            this._isWordCloudShape =
-                !SHAPE_TYPE.includes(this._maskShape) &&
-                    !['fast', 'grid', 'cloud'].includes(this._wordCloudConfig.layoutMode);
+            this._fillingFontPadding = (_k = (_j = this._spec.fillingWord) === null || _j === void 0 ? void 0 : _j.padding) !== null && _k !== void 0 ? _k : DEFAULT_FONT_PADDING;
+            this._isWordCloudShape = !SHAPE_TYPE.includes(this._maskShape);
             this._defaultFontFamily = this._option.getTheme().fontFamily;
         }
         initData() {
@@ -81338,10 +81109,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             });
         }
         initMark() {
-            var _a;
-            if ((_a = this._spec.wordMask) === null || _a === void 0 ? void 0 : _a.visible) {
-                this._maskMark = this._createMark(BaseWordCloudSeries.mark.wordMask, { dataView: false });
-            }
             this._wordMark = this._createMark(BaseWordCloudSeries.mark.word, {
                 key: DEFAULT_DATA_KEY,
                 defaultMorphElementKey: this._seriesField,
@@ -81350,61 +81117,41 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             });
         }
         initMarkStyle() {
-            this.initMarkStyleOfWord(this._wordMark, this._spec.word, this._spec.colorHexField, this._seriesField);
-            if (this._maskMark) {
-                this.setMarkStyle(this._maskMark, {
-                    width: () => {
-                        return this._region.getLayoutRect().width;
-                    },
-                    height: () => {
-                        return this._region.getLayoutRect().height;
-                    },
-                    background: () => {
-                        return this._maskCanvas;
-                    }
+            var _a, _b, _c;
+            const wordMark = this._wordMark;
+            const wordSpec = (_a = this._spec.word) !== null && _a !== void 0 ? _a : {};
+            if (wordMark) {
+                this.setMarkStyle(wordMark, {
+                    fill: this.getWordColor,
+                    text: (datum) => datum[this._textField],
+                    x: (datum) => datum.x,
+                    y: (datum) => datum.y,
+                    fontFamily: (datum) => datum.fontFamily,
+                    fontSize: (datum) => datum.fontSize,
+                    fontStyle: (datum) => datum.fontStyle,
+                    fontWeight: (datum) => datum.fontWeight,
+                    angle: (datum) => datum.angle,
+                    visible: (datum) => datum.visible
                 }, 'normal', exports.AttributeLevel.Series);
+                this.setMarkStyle(wordMark, {
+                    fontFamily: (_c = (_b = wordSpec.style) === null || _b === void 0 ? void 0 : _b.fontFamily) !== null && _c !== void 0 ? _c : this._defaultFontFamily
+                }, 'normal', exports.AttributeLevel.User_Mark);
             }
         }
-        initMarkStyleOfWord(wordMark, wordSpec, colorHexField, seriesField, isFillingWord) {
-            var _a, _b;
-            if (!wordMark) {
-                return;
-            }
-            this.setMarkStyle(wordMark, {
-                fill: this.getWordColor,
-                text: (wordSpec === null || wordSpec === void 0 ? void 0 : wordSpec.formatMethod)
-                    ? (datum) => {
-                        return wordSpec.formatMethod(datum);
-                    }
-                    : (datum) => datum[this._textField],
-                x: (datum) => datum.x,
-                y: (datum) => datum.y,
-                fontFamily: (datum) => datum.fontFamily,
-                fontSize: (datum) => datum.fontSize,
-                fontStyle: (datum) => datum.fontStyle,
-                fontWeight: (datum) => datum.fontWeight,
-                angle: (datum) => datum.angle,
-                visible: datum => datum.visible
-            }, 'normal', exports.AttributeLevel.Series);
-            this.setMarkStyle(wordMark, {
-                fontFamily: (_b = (_a = wordSpec === null || wordSpec === void 0 ? void 0 : wordSpec.style) === null || _a === void 0 ? void 0 : _a.fontFamily) !== null && _b !== void 0 ? _b : this._defaultFontFamily
-            }, 'normal', exports.AttributeLevel.User_Mark);
-        }
         initTooltip() {
             super.initTooltip();
             this._wordMark && this._tooltipHelper.activeTriggerSet.mark.add(this._wordMark);
         }
         initAnimation() {
-            [this._wordMark].forEach(mark => {
-                var _a, _b;
-                if (mark) {
-                    const appearPreset = (_b = (_a = this._spec) === null || _a === void 0 ? void 0 : _a.animationAppear) === null || _b === void 0 ? void 0 : _b.preset;
-                    const params = {
-                        animationConfig: () => { var _a, _b; return (_b = (_a = mark.getAnimationConfig()) === null || _a === void 0 ? void 0 : _a.appear) === null || _b === void 0 ? void 0 : _b[0]; }
-                    };
-                    mark.setAnimationConfig(animationConfig(Factory.getAnimationInKey('wordCloud')(params, appearPreset), userAnimationConfig("word", this._spec, this._markAttributeContext)));
-                }
-            });
+            var _a, _b;
+            const mark = this._wordMark;
+            if (mark) {
+                const appearPreset = (_b = (_a = this._spec) === null || _a === void 0 ? void 0 : _a.animationAppear) === null || _b === void 0 ? void 0 : _b.preset;
+                const params = {
+                    animationConfig: () => { var _a, _b; return (_b = (_a = mark.getAnimationConfig()) === null || _a === void 0 ? void 0 : _a.appear) === null || _b === void 0 ? void 0 : _b[0]; }
+                };
+                mark.setAnimationConfig(animationConfig(Factory.getAnimationInKey('wordCloud')(params, appearPreset), userAnimationConfig("word", this._spec, this._markAttributeContext)));
+            }
         }
         getWordOrdinalColorScale(field, isFillingWord) {
             var _a, _b, _c, _d, _e;
@@ -81414,39 +81161,53 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return (_e = (_d = new ColorOrdinalScale().domain(colorDomain)).range) === null || _e === void 0 ? void 0 : _e.call(_d, colorRange);
         }
         initColorCallback(field, isFillingWord) {
-            var _a, _b, _c, _d;
+            var _a;
             if (this._colorMode === 'ordinal') {
                 const scale = this.getWordOrdinalColorScale(field, isFillingWord);
                 return (datum) => {
-                    return scale.scale(datum[field !== null && field !== void 0 ? field : DEFAULT_DATA_SERIES_FIELD]);
+                    var _a;
+                    return scale.scale(datum[(_a = this._seriesField) !== null && _a !== void 0 ? _a : DEFAULT_DATA_SERIES_FIELD]);
                 };
             }
-            const colorList = (_a = (isFillingWord ? this._colorList : this._wordCloudShapeConfig.fillingColorList)) !== null && _a !== void 0 ? _a : this._option.globalScale.getScale('color').range();
+            let colorList = (_a = (isFillingWord ? this._colorList : this._wordCloudShapeConfig.fillingColorList)) !== null && _a !== void 0 ? _a : this._option.globalScale.getScale('color').range();
             if (colorList.length === 1) {
-                return (datum) => colorList[0];
+                colorList = [colorList[0], colorList[0]];
             }
-            if (this._valueField) {
-                const stats = this.getRawDataStatisticsByField(this._valueField, true);
-                if (stats.min === stats.max) {
-                    return colorList[0];
-                }
-                const scale = new LinearScale().domain([stats.min, stats.max]).range(colorList);
-                return (datum) => {
-                    return scale.scale(datum[this._valueField]);
-                };
-            }
-            const scale = new LinearScale().domain([0, (_d = (_c = (_b = this.getViewData()) === null || _b === void 0 ? void 0 : _b.latestData) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 1]).range(colorList);
-            return (datum) => {
-                return scale.scale(datum[DEFAULT_DATA_INDEX]);
-            };
+            return (datum) => colorList[0];
         }
         compile() {
+            var _a, _b;
             super.compile();
             const { width, height } = this._region.getLayoutRect();
             if (!isValidNumber$1(width) || !isValidNumber$1(height) || !(height > 0 && width > 0)) {
                 return;
             }
             const wordCloudTransforms = [];
+            const valueField = this._valueField;
+            const valueScale = new LinearScale();
+            const fontWeightRange = this._fontWeightRange;
+            if (valueField) {
+                const [minValue, maxValue] = extent$2((_a = this.getViewData()) === null || _a === void 0 ? void 0 : _a.latestData.map((datum) => +datum[valueField]));
+                valueScale.domain([minValue, maxValue], true).range(fontWeightRange);
+                wordCloudTransforms.push({
+                    type: 'map',
+                    as: WORD_CLOUD_WEIGHT,
+                    callback: (datum) => {
+                        if (minValue === maxValue) {
+                            return valueScale.scale(maxValue);
+                        }
+                        return valueScale.scale(datum[valueField]);
+                    }
+                });
+            }
+            const wordSpec = (_b = this._spec.word) !== null && _b !== void 0 ? _b : {};
+            if (wordSpec.formatMethod) {
+                wordCloudTransforms.push({
+                    type: 'map',
+                    as: WORD_CLOUD_TEXT,
+                    callback: wordSpec.formatMethod
+                });
+            }
             if (!this._isWordCloudShape) {
                 wordCloudTransforms.push(Object.assign({ type: 'wordcloud' }, this._wordCloudTransformOption()));
             }
@@ -81455,43 +81216,84 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             this._wordMark.getProduct().transform(wordCloudTransforms);
         }
-        _getCommonTransformOptions() {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+        _wordCloudTransformOption() {
+            var _a, _b, _c, _d, _e;
             const { width, height } = this._region.getLayoutRect();
-            const wordSpec = (_a = this._spec.word) !== null && _a !== void 0 ? _a : {};
-            const wordStyleSpec = (_b = wordSpec.style) !== null && _b !== void 0 ? _b : {};
+            const wordStyleSpec = (_b = (_a = this._spec.word) === null || _a === void 0 ? void 0 : _a.style) !== null && _b !== void 0 ? _b : {};
             return {
+                layoutType: !isTrueBrowser(this._option.mode) ? 'fast' : this._wordCloudConfig.layoutMode,
                 size: [width, height],
-                shape: isObject$2(this._maskShape) && this._maskShape.type === 'text' && isNil$1(this._maskShape.fontFamily)
-                    ? Object.assign({ fontFamily: (_c = this._option.getTheme()) === null || _c === void 0 ? void 0 : _c.fontFamily }, this._maskShape) : this._maskShape,
-                onUpdateMaskCanvas: isObject$2(this._maskShape) ? this.handleMaskCanvasUpdate : null,
+                shape: this._maskShape,
                 dataIndexKey: DEFAULT_DATA_KEY,
-                text: wordSpec.formatMethod
-                    ? (datum) => {
-                        return wordSpec.formatMethod(datum);
-                    }
-                    : { field: this._textField },
+                text: { field: this._textField },
                 fontSize: this._valueField ? { field: this._valueField } : this._fontSizeRange[0],
                 fontSizeRange: this._fontSizeRange === 'auto' ? null : this._fontSizeRange,
-                padding: (_e = (_d = this._spec.word) === null || _d === void 0 ? void 0 : _d.padding) !== null && _e !== void 0 ? _e : DEFAULT_FONT_PADDING,
-                fontFamily: (_g = (_f = this._spec.fontFamilyField) !== null && _f !== void 0 ? _f : wordStyleSpec.fontFamily) !== null && _g !== void 0 ? _g : this._defaultFontFamily,
-                fontWeight: this._spec.fontWeightField
-                    ? { field: this._spec.fontWeightField }
+                padding: this._fontPadding,
+                rotate: this._rotateAngles,
+                fontFamily: (_d = (_c = this._fontFamilyField) !== null && _c !== void 0 ? _c : wordStyleSpec.fontFamily) !== null && _d !== void 0 ? _d : this._defaultFontFamily,
+                fontWeight: this._fontWeightField
+                    ? { field: this._fontWeightField }
                     : this._valueField
-                        ? this._calculateFontWeight
+                        ? { field: WORD_CLOUD_WEIGHT }
                         : null,
-                fontStyle: (_h = this._spec.fontStyleField) !== null && _h !== void 0 ? _h : wordStyleSpec.fontStyle
+                fontStyle: (_e = this._fontStyleField) !== null && _e !== void 0 ? _e : wordStyleSpec.fontStyle,
+                randomVisible: this._random,
+                clip: this._wordCloudConfig.drawOutOfBound === 'clip',
+                shrink: this._wordCloudConfig.zoomToFit.shrink,
+                enlarge: this._wordCloudConfig.zoomToFit.enlarge,
+                minFontSize: this._wordCloudConfig.zoomToFit.fontSizeLimitMin,
+                progressiveTime: this._wordCloudConfig.progressiveTime,
+                progressiveStep: this._wordCloudConfig.progressiveStep
             };
         }
-        _wordCloudTransformOption() {
-            var _a;
-            return Object.assign(Object.assign({}, this._getCommonTransformOptions()), { layoutType: this._wordCloudConfig.layoutMode, rotate: this._rotateAngles, randomVisible: (_a = this._spec.random) !== null && _a !== void 0 ? _a : DEFAULT_RANDOM, clip: this._wordCloudConfig.drawOutOfBound === 'clip', shrink: this._wordCloudConfig.zoomToFit.shrink, enlarge: this._wordCloudConfig.zoomToFit.enlarge, minFontSize: this._wordCloudConfig.zoomToFit.fontSizeLimitMin, progressiveTime: this._wordCloudConfig.progressiveTime, progressiveStep: this._wordCloudConfig.progressiveStep, repeatFill: this._wordCloudConfig.zoomToFit.repeat });
-        }
         _wordCloudShapeTransformOption() {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            const { width, height } = this._region.getLayoutRect();
             const wordStyleSpec = (_b = (_a = this._spec.word) === null || _a === void 0 ? void 0 : _a.style) !== null && _b !== void 0 ? _b : {};
             const wordCloudShapeConfig = (_c = this._wordCloudShapeConfig) !== null && _c !== void 0 ? _c : {};
-            return Object.assign(Object.assign(Object.assign({}, wordCloudShapeConfig), this._getCommonTransformOptions()), { rotateList: this._rotateAngles, fillingFontFamily: (_e = (_d = wordCloudShapeConfig.fillingFontFamilyField) !== null && _d !== void 0 ? _d : wordStyleSpec.fontFamily) !== null && _e !== void 0 ? _e : this._defaultFontFamily, fillingPadding: (_g = (_f = this._spec.fillingWord) === null || _f === void 0 ? void 0 : _f.padding) !== null && _g !== void 0 ? _g : DEFAULT_FONT_PADDING, fillingFontStyle: (_h = wordCloudShapeConfig.fillingFontStyleField) !== null && _h !== void 0 ? _h : wordStyleSpec.fontStyle, fillingFontWeight: (_j = wordCloudShapeConfig.fillingFontWeightField) !== null && _j !== void 0 ? _j : wordStyleSpec.fontWeight });
+            const fillingRotateAngles = this._wordCloudShapeConfig.fillingRotateAngles;
+            return {
+                dataIndexKey: DEFAULT_DATA_KEY,
+                size: [width, height],
+                shape: this._maskShape,
+                text: { field: this._textField },
+                fontSize: this._valueField ? { field: this._valueField } : this._fontSizeRange[0],
+                fontSizeRange: this._fontSizeRange === 'auto' ? null : this._fontSizeRange,
+                padding: this._fontPadding,
+                rotateList: this._rotateAngles,
+                fontFamily: (_e = (_d = this._fontFamilyField) !== null && _d !== void 0 ? _d : wordStyleSpec.fontFamily) !== null && _e !== void 0 ? _e : this._defaultFontFamily,
+                fontWeight: this._fontWeightField
+                    ? { field: this._fontWeightField }
+                    : this._valueField
+                        ? { field: WORD_CLOUD_WEIGHT }
+                        : null,
+                fontStyle: (_f = this._fontStyleField) !== null && _f !== void 0 ? _f : wordStyleSpec.fontStyle,
+                fillingFontFamily: (_h = (_g = wordCloudShapeConfig.fillingFontFamilyField) !== null && _g !== void 0 ? _g : wordStyleSpec.fontFamily) !== null && _h !== void 0 ? _h : this._defaultFontFamily,
+                fillingPadding: this._fillingFontPadding,
+                fillingFontStyle: (_j = wordCloudShapeConfig.fillingFontStyleField) !== null && _j !== void 0 ? _j : wordStyleSpec.fontStyle,
+                fillingFontWeight: (_k = wordCloudShapeConfig.fillingFontWeightField) !== null && _k !== void 0 ? _k : wordStyleSpec.fontWeight,
+                fillingRotateList: fillingRotateAngles,
+                fillingTimes: wordCloudShapeConfig.fillingTimes,
+                fillingXStep: wordCloudShapeConfig.fillingXStep,
+                fillingYStep: wordCloudShapeConfig.fillingYStep,
+                fillingXRatioStep: wordCloudShapeConfig.fillingXRatioStep,
+                fillingYRatioStep: wordCloudShapeConfig.fillingYRatioStep,
+                fillingInitialOpacity: wordCloudShapeConfig.fillingInitialOpacity,
+                fillingDeltaOpacity: wordCloudShapeConfig.fillingDeltaOpacity,
+                fillingInitialFontSize: wordCloudShapeConfig.fillingInitialFontSize,
+                fillingDeltaFontSize: wordCloudShapeConfig.fillingDeltaFontSize,
+                ratio: wordCloudShapeConfig.ratio,
+                fillingRatio: wordCloudShapeConfig.fillingRatio,
+                removeWhiteBorder: wordCloudShapeConfig.removeWhiteBorder,
+                textLayoutTimes: wordCloudShapeConfig.textLayoutTimes,
+                fontSizeShrinkFactor: wordCloudShapeConfig.fontSizeShrinkFactor,
+                stepFactor: wordCloudShapeConfig.stepFactor,
+                layoutMode: wordCloudShapeConfig.layoutMode,
+                importantWordCount: wordCloudShapeConfig.importantWordCount,
+                globalShinkLimit: wordCloudShapeConfig.globalShinkLimit,
+                fontSizeEnlargeFactor: wordCloudShapeConfig.fontSizeEnlargeFactor,
+                fillingDeltaFontSizeFactor: wordCloudShapeConfig.fillingDeltaFontSizeFactor
+            };
         }
         getStatisticFields() {
             const fields = [];
@@ -81604,6 +81406,91 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }));
     };
 
+    const shapes = {
+      triangleForward: triangleForward,
+      triangleUpright: triangle,
+      triangle: triangle,
+      diamond: diamond,
+      square: square,
+      star: star,
+      cardioid: cardioid,
+      circle: circle,
+      pentagon: pentagon
+    };
+    function diamond() {
+      return function (theta) {
+        const thetaPrime = theta % (2 * Math.PI / 4);
+        return 1 / (Math.cos(thetaPrime) + Math.sin(thetaPrime));
+      };
+    }
+    function star() {
+      return function (theta) {
+        const thetaPrime = (theta + .955) % (2 * Math.PI / 10);
+        return (theta + .955) % (2 * Math.PI / 5) - 2 * Math.PI / 10 >= 0 ? 1 / (Math.cos(2 * Math.PI / 10 - thetaPrime) + 3.07768 * Math.sin(2 * Math.PI / 10 - thetaPrime)) : 1 / (Math.cos(thetaPrime) + 3.07768 * Math.sin(thetaPrime));
+      };
+    }
+    function square() {
+      return function (theta) {
+        return Math.min(1 / Math.abs(Math.cos(theta)), 1 / Math.abs(Math.sin(theta)));
+      };
+    }
+    function triangle() {
+      return function (theta) {
+        const thetaPrime = (theta + 3 * Math.PI / 2) % (2 * Math.PI / 3);
+        return 1 / (Math.cos(thetaPrime) + Math.sqrt(3) * Math.sin(thetaPrime));
+      };
+    }
+    function triangleForward() {
+      return function (theta) {
+        const thetaPrime = theta % (2 * Math.PI / 3);
+        return 1 / (Math.cos(thetaPrime) + Math.sqrt(3) * Math.sin(thetaPrime));
+      };
+    }
+    function cardioid() {
+      return function (theta) {
+        return 1 - Math.sin(theta);
+      };
+    }
+    function circle() {
+      return function () {
+        return 1;
+      };
+    }
+    function pentagon() {
+      return function (theta) {
+        const thetaPrime = (theta + .955) % (2 * Math.PI / 5);
+        return 1 / (Math.cos(thetaPrime) + .726543 * Math.sin(thetaPrime));
+      };
+    }
+    function getMaxRadiusAndCenter(shape, size) {
+      const w = size[0],
+        h = size[1];
+      let maxRadius = 1;
+      const center = [size[0] >> 1, size[1] >> 1];
+      switch (shape) {
+        case "cardioid":
+          center[1] = ~~(h / 2.7 * .6), maxRadius = Math.floor(Math.min(w / 2.3, h / 2.6));
+          break;
+        case "triangleForward":
+          maxRadius = h / Math.sqrt(.75) > w ? Math.floor(w / 2) : Math.floor(h / (2 * Math.sqrt(.75)));
+          break;
+        case "triangle":
+        case "triangleUpright":
+          center[1] = ~~(h / 1.5), maxRadius = Math.floor(Math.min(h / 1.5, w / 2));
+          break;
+        case "rect":
+          maxRadius = Math.floor(Math.max(h / 2, w / 2));
+          break;
+        default:
+          maxRadius = Math.floor(Math.min(w / 2, h / 2));
+      }
+      return {
+        maxRadius: maxRadius,
+        center: center
+      };
+    }
+    const getShapeFunction = type => shapes[type] ? shapes[type]() : shapes.circle();
+
     const randomHslColor = (min, max) => "hsl(" + (360 * Math.random()).toFixed() + "," + (30 * Math.random() + 70).toFixed() + "%," + (Math.random() * (max - min) + min).toFixed() + "%)";
     function functor$1(d) {
       return isFunction$1(d) ? d : function () {
@@ -81640,34 +81527,26 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           return degreeToRadian(rotates[Math.floor(random * rotates.length)]);
         };
       }
-      canRepeat() {
-        return !1;
-      }
       exceedTime() {
         var _a;
-        return this.options.progressiveStep > 0 ? this.progressiveIndex >= ((null !== (_a = this.currentStepIndex) && void 0 !== _a ? _a : -1) + 1) * this.options.progressiveStep : this.options.progressiveTime > 0 && new Date().getTime() - this.escapeTime > this.options.progressiveTime;
+        return this.options.progressiveStep > 0 ? this.progressiveIndex >= ((null !== (_a = this.currentStepIndex) && void 0 !== _a ? _a : 0) + 1) * this.options.progressiveStep : this.options.progressiveTime > 0 && new Date().getTime() - this.escapeTime > this.options.progressiveTime;
       }
       progressiveRun() {
         var _a;
-        if (this.options.progressiveStep > 0 ? this.currentStepIndex = (null !== (_a = this.currentStepIndex) && void 0 !== _a ? _a : -1) + 1 : this.options.progressiveTime > 0 && (this.escapeTime = Date.now()), this.data && this.progressiveIndex < this.data.length) {
+        if (this.options.progressiveStep > 0 ? this.currentStepIndex = (null !== (_a = this.currentStepIndex) && void 0 !== _a ? _a : 0) + 1 : this.options.progressiveTime > 0 && (this.escapeTime = Date.now()), this.data && this.progressiveIndex && this.progressiveIndex < this.data.length) {
           this.progressiveResult = [];
-          let i = this.progressiveIndex,
-            curWordTryCount = 0;
-          const maxSingleWordTryCount = this.options.maxSingleWordTryCount,
-            maxFailCount = Math.min(this.options.maxFailCount, this.originalData.length);
-          for (; i < this.data.length && this.failCount < maxFailCount;) {
-            const drawn = this.layoutWord(i);
-            if (curWordTryCount++, (drawn || curWordTryCount >= maxSingleWordTryCount) && (i++, curWordTryCount = 0, this.failCount = drawn ? 0 : this.failCount + 1), this.progressiveIndex = i, this.exceedTime()) break;
-            i === this.data.length && this.failCount < maxFailCount && this.options.repeatFill && this.canRepeat() && (this.data = [...this.data, ...this.originalData.map(entry => Object.assign(Object.assign({}, entry), {
-              isFill: !0
-            }))], this.isTryRepeatFill = !0);
+          const len = this.data.length;
+          let i = this.progressiveIndex;
+          for (; i < len;) {
+            this.layoutWord(i);
+            if (i++, this.progressiveIndex = i, this.exceedTime()) break;
           }
           return this.progressiveResult;
         }
         return this.result;
       }
       initProgressive() {
-        this.failCount = 0, this.progressiveIndex = 0, this.options.progressiveStep > 0 ? this.currentStepIndex = -1 : this.options.progressiveTime > 0 && (this.escapeTime = Date.now()), this.progressiveResult = [];
+        this.progressiveIndex = -1, this.options.progressiveStep > 0 ? this.currentStepIndex = 0 : this.options.progressiveTime > 0 && (this.escapeTime = Date.now()), this.progressiveResult = [];
       }
       output() {
         return this.result ? this.outputCallback(this.result) : null;
@@ -81698,9 +81577,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
       shape: "circle",
       progressiveTime: 0,
       progressiveStep: 0,
-      repeatFill: !1,
-      fillTextFontSize: 12,
-      maxFailCount: 20
+      backgroundColor: "#fff"
     };
 
     const spirals = {
@@ -81779,7 +81656,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           height: 1
         }));
         this.contextAndRatio = contextAndRatio, this._board = new Array((this._size[0] >> 5) * this._size[1]).fill(0), this._bounds = null;
-        words.length;
+        const n = words.length;
+        let i = 0;
         this.result = [];
         const data = words.map((d, i) => ({
           text: this.getText(d),
@@ -81805,7 +81683,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         })).sort(function (a, b) {
           return b.fontSize - a.fontSize;
         });
-        if (this.originalData = data, this.data = data, this.progressiveRun(), !this.options.clip && this.options.enlarge && this._bounds && this.shrinkBoard(this._bounds), this._bounds && ["cardioid", "triangle", "triangle-upright"].includes(this.options.shape)) {
+        this.data = data;
+        let curWordTryCount = 0;
+        for (; i < n;) {
+          if (this.layoutWord(i) || curWordTryCount >= 2 ? (i++, curWordTryCount = 0) : curWordTryCount++, this.progressiveIndex = i, this.exceedTime()) break;
+        }
+        if (!this.options.clip && this.options.enlarge && this._bounds && this.shrinkBoard(this._bounds), this._bounds && ["cardioid", "triangle", "triangle-upright"].includes(this.options.shape)) {
           const currentCenterY = (this._bounds[0].y + this._bounds[1].y) / 2;
           this._dy = -(currentCenterY - this._size[1] / 2);
         }
@@ -82038,8 +81921,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     }
     CloudLayout.defaultOptions = {
       enlarge: !1,
-      minFontSize: 2,
-      maxSingleWordTryCount: 2
+      minFontSize: 2
     };
     const isFullOutside = (tag, size) => tag.x + tag.x0 > size[0] || tag.y + tag.y0 > size[0] || tag.x + tag.x1 < 0 || tag.y + tag.y1 < 0,
       isPartOutside = (tag, size) => tag.x + tag.x0 < 0 || tag.y + tag.y0 < 0 || tag.x + tag.x1 > size[0] || tag.y + tag.y1 > size[1];
@@ -82103,7 +81985,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         let index = arguments.length > 2 ? arguments[2] : undefined;
         var _a;
         const sizeShrinkRatio = this.options.clip ? 1 : shrinkRatio,
-          fontSize = Math.max(Math.floor((this.isTryRepeatFill ? this.options.fillTextFontSize : this.getTextFontSize(item)) * sizeShrinkRatio), this.options.minFontSize);
+          fontSize = Math.max(Math.floor(this.getTextFontSize(item) * sizeShrinkRatio), this.options.minFontSize);
         let word = this.getText(item) + "";
         if (this.options.clip && (word = word.slice(0, Math.ceil(word.length * shrinkRatio))), !word) return null;
         const fontWeight = this.getTextFontWeight(item),
@@ -82161,12 +82043,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           text: word
         };
       }
-      calculateEmptyRate() {
-        const totalCount = this.ngx * this.ngy;
-        let emptyCount = 0;
-        for (let gx = 0; gx < this.ngx; gx++) for (let gy = 0; gy < this.ngy; gy++) this.grid[gx][gy] && emptyCount++;
-        return emptyCount / totalCount;
-      }
       canFitText(gx, gy, gw, gh, occupied) {
         let i = occupied.length;
         for (; i--;) {
@@ -82221,21 +82097,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           };
         this.result.push(output), this.progressiveResult && this.progressiveResult.push(output);
       }
-      initGrid(config) {
-        this.grid = [];
-        const shape = this.options.shape;
-        if (isObject$2(shape)) {
-          const canvas = generateMaskCanvas(shape, config.width, config.height);
-          let imageData = canvas.getContext("2d").getImageData(0, 0, this.ngx * this.gridSize, this.ngy * this.gridSize);
-          this.options.onUpdateMaskCanvas && this.options.onUpdateMaskCanvas(canvas);
-          let isEmptyPixel = generateIsEmptyPixel(shape.backgroundColor);
+      initGrid(canvas) {
+        let i;
+        if (this.grid = [], canvas) {
+          let bctx = document.createElement("canvas").getContext("2d");
+          bctx.fillStyle = this.options.backgroundColor, bctx.fillRect(0, 0, 1, 1);
+          let bgPixel = bctx.getImageData(0, 0, 1, 1).data,
+            imageData = canvas.getContext("2d").getImageData(0, 0, this.ngx * this.gridSize, this.ngy * this.gridSize).data;
           const singleGridLoop = (gx, gy) => {
             let y = this.gridSize;
             for (; y--;) {
               let x = this.gridSize;
-              for (; x--;) if (!isEmptyPixel(imageData, gy * this.gridSize + y, gx * this.gridSize + x)) return void (this.grid[gx][gy] = !0);
+              for (; x--;) for (i = 4; i--;) if (imageData[4 * ((gy * this.gridSize + y) * this.ngx * this.gridSize + (gx * this.gridSize + x)) + i] !== bgPixel[i]) return void (this.grid[gx][gy] = !1);
             }
-            this.grid[gx][gy] = !1;
           };
           let gx = this.ngx;
           for (; gx--;) {
@@ -82243,7 +82117,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             let gy = this.ngy;
             for (; gy--;) singleGridLoop(gx, gy), !1 !== this.grid[gx][gy] && (this.grid[gx][gy] = !0);
           }
-          imageData = isEmptyPixel = void 0;
+          imageData = bctx = bgPixel = void 0;
         } else {
           let gx = this.ngx;
           for (; gx--;) {
@@ -82253,22 +82127,24 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           }
         }
       }
-      canRepeat() {
-        return this.calculateEmptyRate() > .001;
-      }
       layout(data, config) {
-        this.initProgressive(), this.drawnCount = 0, this.isTryRepeatFill = !1, this.originalData = data, this.data = data, this.pointsAtRadius = [], this.ngx = Math.floor(config.width / this.gridSize), this.ngy = Math.floor(config.height / this.gridSize);
+        this.initProgressive(), this.data = data, this.pointsAtRadius = [], this.ngx = Math.floor(config.width / this.gridSize), this.ngy = Math.floor(config.height / this.gridSize);
         const {
           center: center,
           maxRadius: maxRadius
         } = getMaxRadiusAndCenter(this.options.shape, [config.width, config.height]);
-        return this.center = config.origin ? [config.origin[0] / this.gridSize, config.origin[1] / this.gridSize] : [center[0] / this.gridSize, center[1] / this.gridSize], this.maxRadius = Math.floor(maxRadius / this.gridSize), this.initGrid(config), this.result = [], this.progressiveRun();
+        this.center = config.origin ? [config.origin[0] / this.gridSize, config.origin[1] / this.gridSize] : [center[0] / this.gridSize, center[1] / this.gridSize], this.maxRadius = Math.floor(maxRadius / this.gridSize), this.initGrid(config.canvas), this.result = [];
+        let i = 0;
+        for (; i < data.length;) {
+          this.layoutWord(i);
+          if (i++, this.progressiveIndex = i, this.exceedTime()) break;
+        }
+        return this.result;
       }
     };
     GridLayout$1.defaultOptions = {
       gridSize: 8,
-      ellipticity: 1,
-      maxSingleWordTryCount: 1
+      ellipticity: 1
     };
 
     class FastLayout extends BaseLayout {
@@ -82356,19 +82232,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         clip = null !== (_f = options.clip) && void 0 !== _f && _f,
         minFontSize = options.minFontSize,
         randomVisible = options.randomVisible,
-        as = options.as ? Object.assign(Object.assign({}, OUTPUT$1), options.as) : OUTPUT$1,
+        as = options.as || OUTPUT$1,
         depth_3d = options.depth_3d,
         postProjection = options.postProjection;
       let fontSize = options.fontSize ? field$1(options.fontSize) : 14;
       const fontSizeRange = options.fontSizeRange;
       if (fontSizeRange && !isNumber$1(fontSize)) {
         const fsize = fontSize,
-          fontSizeSqrtScale = generateScale(extent$1(fsize, data), fontSizeRange);
+          fontSizeSqrtScale = generateSqrtScale(extent$1(fsize, data), fontSizeRange);
         fontSize = datum => fontSizeSqrtScale(fsize(datum));
       }
       let Layout = CloudLayout;
       "fast" === options.layoutType ? Layout = FastLayout : "grid" === options.layoutType && (Layout = GridLayout$1);
-      const layout = new Layout(Object.assign(Object.assign({}, options), {
+      const layout = new Layout({
         text: text,
         padding: padding,
         spiral: spiral,
@@ -82383,13 +82259,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         enlarge: enlarge,
         minFontSize: minFontSize,
         random: randomVisible,
+        progressiveStep: options.progressiveStep,
+        progressiveTime: options.progressiveTime,
         outputCallback: words => {
           const res = [];
           let t, w;
-          for (let i = 0, len = words.length; i < len; i++) w = words[i], t = w.datum, t[as.x] = w.x, t[as.y] = w.y, t[as.fontFamily] = w.fontFamily, t[as.fontSize] = w.fontSize, t[as.fontStyle] = w.fontStyle, t[as.fontWeight] = w.fontWeight, t[as.angle] = w.angle, "StereographicProjection" === postProjection && stereographicProjection(canvasSize, w, t, as, depth_3d), options.dataIndexKey && (t[options.dataIndexKey] = `${i}`), res.push(t);
+          for (let i = 0, len = words.length; i < len; i++) w = words[i], t = w.datum, t[as.x] = w.x, t[as.y] = w.y, t[as.fontFamily] = w.fontFamily, t[as.fontSize] = w.fontSize, t[as.fontStyle] = w.fontStyle, t[as.fontWeight] = w.fontWeight, t[as.angle] = w.angle, "StereographicProjection" === postProjection && stereographicProjection(canvasSize, w, t, as, depth_3d), res.push(t);
           return res;
         }
-      }));
+      });
       return layout.layout(data, {
         width: canvasSize[0],
         height: canvasSize[1]
@@ -82399,7 +82277,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     const field$1 = option => isString$1(option) || isNumber$1(option) || isFunction$1(option) || isArray$1(option) ? option : datum => datum[option.field],
       sqrt = x => x < 0 ? -Math.sqrt(-x) : Math.sqrt(x),
-      generateScale = (domain, range, type) => {
+      generateSqrtScale = (domain, range) => {
         if (domain[0] === domain[1]) return datum => range[0];
         const s0 = sqrt(domain[0]),
           s1 = sqrt(domain[1]),
@@ -82492,22 +82370,29 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
       };
     }
 
-    function segmentation(segmentationInput) {
+    function loadAndHandleImage(segmentationInput) {
+      const imagePromise = loadImage(segmentationInput.shapeUrl);
+      return imagePromise ? imagePromise.then(shapeImage => segmentationInput && segmentationInput.removeWhiteBorder && shapeImage ? removeBorder(shapeImage, segmentationInput.tempCanvas, segmentationInput.tempCtx) : shapeImage) : null;
+    }
+    function segmentation(shapeImage, segmentationInput) {
       const {
           size: size,
-          maskCanvas: maskCanvas
+          tempCanvas: tempCanvas,
+          tempCtx: ctx
         } = segmentationInput,
-        imageData = maskCanvas.getContext("2d").getImageData(0, 0, maskCanvas.width, maskCanvas.height),
+        shapeConfig = scaleAndMiddleShape(shapeImage, size);
+      tempCanvas.width = size[0], tempCanvas.height = size[1], ctx.clearRect(0, 0, tempCanvas.width, tempCanvas.height), ctx.drawImage(shapeImage, shapeConfig.x, shapeConfig.y, shapeConfig.width, shapeConfig.height);
+      const imageData = ctx.getImageData(0, 0, size[0], size[1]),
         labels = new Array(size[0] * size[1]).fill(0);
       let curLabel = 1;
       const offset = [[0, 1], [1, 0], [-1, 0], [0, -1]];
       let queue = [];
-      for (let i = 0; i < size[1]; i++) for (let j = 0; j < size[0]; j++) if (0 === labels[i * size[0] + j] && !segmentationInput.isEmptyPixel(imageData, i, j)) {
+      for (let i = 0; i < size[1]; i++) for (let j = 0; j < size[0]; j++) if (0 === labels[i * size[0] + j] && !isEmptyPixel(imageData, i, j)) {
         labels[i * size[0] + j] = curLabel, queue.push([i, j]);
         for (let k = 0; k < queue.length; k++) for (let m = 0; m < 4; m++) {
           let row = queue[k][0] + offset[m][0],
             col = queue[k][1] + offset[m][1];
-          row = row < 0 ? 0 : row >= size[1] ? size[1] - 1 : row, col = col < 0 ? 0 : col >= size[0] ? size[0] - 1 : col, 0 !== labels[row * size[0] + col] || segmentationInput.isEmptyPixel(imageData, row, col) || (labels[row * size[0] + col] = curLabel, queue.push([row, col]));
+          row = row < 0 ? 0 : row >= size[1] ? size[1] - 1 : row, col = col < 0 ? 0 : col >= size[0] ? size[0] - 1 : col, 0 !== labels[row * size[0] + col] || isEmptyPixel(imageData, row, col) || (labels[row * size[0] + col] = curLabel, queue.push([row, col]));
         }
         curLabel++, queue = [];
       }
@@ -82560,6 +82445,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         };
       return Object.assign(segmentationInput, {
         segmentation: segmentation,
+        shapeConfig: shapeConfig,
         shapeBounds: shapeBounds,
         shapeMaxR: shapeMaxR,
         shapeRatio: shapeRatio,
@@ -82577,31 +82463,33 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         return !1;
       }
     }
-    function removeBorder(image, canvas, isEmptyPixel) {
-      canvas.width = image.width, canvas.height = image.height;
-      const ctx = canvas.getContext("2d");
-      ctx.clearRect(0, 0, canvas.width, canvas.height), ctx.drawImage(image, 0, 0);
+    function isEmptyPixel(imageData, i, j) {
+      const width = imageData.width;
+      return 0 === imageData.data[i * width * 4 + 4 * j + 3] || 255 === imageData.data[i * width * 4 + 4 * j + 0] && 255 === imageData.data[i * width * 4 + 4 * j + 1] && 255 === imageData.data[i * width * 4 + 4 * j + 2];
+    }
+    function removeBorder(image, canvas, ctx) {
+      canvas.width = image.width, canvas.height = image.height, ctx.clearRect(0, 0, canvas.width, canvas.height), ctx.drawImage(image, 0, 0);
       const width = canvas.width,
         imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
       let top = 0,
         bottom = imageData.height,
         left = 0,
         right = imageData.width;
-      const rowBlank = (width, y) => {
-          for (let x = 0; x < width; ++x) if (!isEmptyPixel(imageData, y, x)) return !1;
-          return !0;
-        },
-        columnBlank = (x, y0, y1) => {
-          for (let y = y0; y < y1; ++y) if (!isEmptyPixel(imageData, y, x)) return !1;
-          return !0;
-        };
-      for (; top < bottom && rowBlank(width, top);) ++top;
-      for (; bottom - 1 > top && rowBlank(width, bottom - 1);) --bottom;
-      for (; left < right && columnBlank(left, top, bottom);) ++left;
-      for (; right - 1 > left && columnBlank(right - 1, top, bottom);) --right;
+      for (; top < bottom && rowBlank(imageData, width, top);) ++top;
+      for (; bottom - 1 > top && rowBlank(imageData, width, bottom - 1);) --bottom;
+      for (; left < right && columnBlank(imageData, width, left, top, bottom);) ++left;
+      for (; right - 1 > left && columnBlank(imageData, width, right - 1, top, bottom);) --right;
       const trimmed = ctx.getImageData(left, top, right - left, bottom - top);
       return canvas.width = trimmed.width, canvas.height = trimmed.height, ctx.clearRect(0, 0, canvas.width, canvas.height), ctx.putImageData(trimmed, 0, 0), canvas;
     }
+    function rowBlank(imageData, width, y) {
+      for (let x = 0; x < width; ++x) if (!isEmptyPixel(imageData, y, x)) return !1;
+      return !0;
+    }
+    function columnBlank(imageData, width, x, top, bottom) {
+      for (let y = top; y < bottom; ++y) if (!isEmptyPixel(imageData, y, x)) return !1;
+      return !0;
+    }
     function scaleAndMiddleShape(image, size) {
       const width = image.width,
         height = image.height;
@@ -82667,14 +82555,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           segmentation: {
             regions: regions
           },
+          tempCtx: ctx,
           tempCanvas: canvas,
           boardSize: boardSize,
           shapeCenter: shapeCenter,
           shapeMaxR: shapeMaxR,
           shapeRatio: shapeRatio
         } = segmentationOutput,
-        board = initBoardWithShape(segmentationOutput),
-        ctx = canvas.getContext("2d");
+        board = initBoardWithShape(segmentationOutput);
       for (const region of regions) {
         const {
           words: regionWords,
@@ -82709,13 +82597,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           segmentation: {
             regions: regions
           },
+          tempCtx: ctx,
           tempCanvas: canvas,
           boardSize: boardSize,
           shapeCenter: shapeCenter,
           shapeMaxR: shapeMaxR,
           shapeRatio: shapeRatio
         } = segmentationOutput,
-        ctx = canvas.getContext("2d"),
         boardOrigin = initBoardWithShape(segmentationOutput);
       let board = boardOrigin.slice(0);
       const fontFactor = layoutConfig.fontSizeShrinkFactor;
@@ -82777,13 +82665,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           segmentation: {
             regions: regions
           },
+          tempCtx: ctx,
           tempCanvas: canvas,
           boardSize: boardSize,
           shapeCenter: shapeCenter,
           shapeMaxR: shapeMaxR,
           shapeRatio: shapeRatio
         } = segmentationOutput,
-        ctx = canvas.getContext("2d"),
         boardOrigin = initBoardWithShape(segmentationOutput);
       let board = boardOrigin.slice(0);
       const fontFactor = layoutConfig.fontSizeEnlargeFactor,
@@ -83024,19 +82912,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           getFillingPadding: getFillingPadding,
           random: random,
           board: board,
-          minFillFontSize: minFillFontSize
+          minFillFoontSize: minFillFoontSize
         } = layoutConfig,
         {
           boardSize: boardSize,
           shapeBounds: shapeBounds,
+          tempCtx: ctx,
           tempCanvas: canvas,
           randomGenerator: randomGenerator
-        } = segmentationOutput,
-        ctx = canvas.getContext("2d");
+        } = segmentationOutput;
       let fontSize = fillingInitialFontSize,
         opacity = fillingInitialOpacity;
       const placedFillingWords = [];
-      for (let i = 0; i < fillingTimes; i++) filling1Time(fontSize, opacity), fontSize = Math.max(fontSize > fillingDeltaFontSize ? fontSize - fillingDeltaFontSize : fillingDeltaFontSize, minFillFontSize), opacity = opacity > fillingDeltaOpacity ? opacity - fillingDeltaOpacity : fillingDeltaOpacity;
+      for (let i = 0; i < fillingTimes; i++) filling1Time(fontSize, opacity), fontSize = Math.max(fontSize > fillingDeltaFontSize ? fontSize - fillingDeltaFontSize : fillingDeltaFontSize, minFillFoontSize), opacity = opacity > fillingDeltaOpacity ? opacity - fillingDeltaOpacity : fillingDeltaOpacity;
       return placedFillingWords;
       function filling1Time(fontSize, opacity) {
         const fillingWords = words.map(word => {
@@ -83140,6 +83028,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             size: options.size,
             ratio: options.ratio || .8,
             tempCanvas: void 0,
+            tempCtx: void 0,
+            removeWhiteBorder: options.removeWhiteBorder || !1,
             boardSize: [0, 0],
             random: !1,
             randomGenerator: void 0
@@ -83149,31 +83039,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             height: options.size[1]
           }),
           tempCtx = tempCanvas.getContext("2d");
-        tempCtx.textAlign = "center", tempCtx.textBaseline = "middle", segmentationInput.tempCanvas = tempCanvas;
+        tempCtx.textAlign = "center", tempCtx.textBaseline = "middle", segmentationInput.tempCanvas = tempCanvas, segmentationInput.tempCtx = tempCtx;
         const boardW = options.size[0] + 31 >> 5 << 5;
-        if (segmentationInput.boardSize = [boardW, options.size[1]], segmentationInput.random ? segmentationInput.randomGenerator = Math.random : segmentationInput.randomGenerator = fakeRandom(), this.segmentationInput = segmentationInput, isString$1(segmentationInput.shapeUrl)) {
-          segmentationInput.isEmptyPixel = generateIsEmptyPixel();
-          const imagePromise = loadImage(segmentationInput.shapeUrl);
-          imagePromise ? (this.isImageFinished = !1, this.isLayoutFinished = !1, imagePromise.then(shapeImage => {
-            this.isImageFinished = !0;
-            const maskCanvas = vglobal.createCanvas({
-              width: options.size[0],
-              height: options.size[1],
-              dpr: 1
-            });
-            segmentationInput.maskCanvas = maskCanvas;
-            const ctx = maskCanvas.getContext("2d");
-            options.removeWhiteBorder && removeBorder(shapeImage, maskCanvas, segmentationInput.isEmptyPixel);
-            const shapeConfig = scaleAndMiddleShape(shapeImage, options.size);
-            ctx.clearRect(0, 0, options.size[0], options.size[1]), ctx.drawImage(shapeImage, shapeConfig.x, shapeConfig.y, shapeConfig.width, shapeConfig.height), this.options.onUpdateMaskCanvas && this.options.onUpdateMaskCanvas(segmentationInput.maskCanvas);
-          }).catch(error => {
-            this.isImageFinished = !0;
-          })) : (this.isImageFinished = !0, this.isLayoutFinished = !0);
-        } else if (segmentationInput.shapeUrl && ("text" === segmentationInput.shapeUrl.type || "geometric" === segmentationInput.shapeUrl.type)) {
-          segmentationInput.isEmptyPixel = generateIsEmptyPixel(segmentationInput.shapeUrl.backgroundColor);
-          const maskCanvas = generateMaskCanvas(segmentationInput.shapeUrl, options.size[0], options.size[1]);
-          segmentationInput.maskCanvas = maskCanvas, this.options.onUpdateMaskCanvas && this.options.onUpdateMaskCanvas(maskCanvas), this.doLayout(), this.isImageFinished = !0, this.isLayoutFinished = !0;
-        }
+        segmentationInput.boardSize = [boardW, options.size[1]], segmentationInput.random ? segmentationInput.randomGenerator = Math.random : segmentationInput.randomGenerator = fakeRandom();
+        const imagePromise = loadAndHandleImage(segmentationInput);
+        imagePromise ? (this.segmentationInput = segmentationInput, this.isImageFinished = !1, this.isLayoutFinished = !1, imagePromise.then(shapeImage => {
+          this.shapeImage = shapeImage, this.isImageFinished = !0;
+        }).catch(error => {
+          this.shapeImage = null, this.isImageFinished = !0;
+        })) : (this.isImageFinished = !0, this.isLayoutFinished = !0);
       }
       unfinished() {
         return !this.isLayoutFinished;
@@ -83182,15 +83056,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         return this.progressiveResult;
       }
       progressiveRun() {
-        this.isImageFinished && !this.isLayoutFinished && (this.segmentationInput.maskCanvas && this.doLayout(), this.isLayoutFinished = !0);
+        this.isImageFinished && !this.isLayoutFinished && (this.shapeImage && this.doLayout(), this.isLayoutFinished = !0);
       }
       progressiveOutput() {
         return this.progressiveResult;
       }
       doLayout() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+        var _a, _b, _c;
         const segmentationInput = this.segmentationInput,
-          segmentationOutput = segmentation(segmentationInput),
+          segmentationOutput = segmentation(this.shapeImage, segmentationInput),
           options = this.options,
           data = this.data,
           colorMode = options.colorMode || "ordinal",
@@ -83216,33 +83090,33 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             ratio: options.ratio || .8,
             shapeUrl: options.shape,
             random: void 0 === options.random || options.random,
-            textLayoutTimes: null !== (_a = options.textLayoutTimes) && void 0 !== _a ? _a : 3,
-            removeWhiteBorder: options.removeWhiteBorder,
-            layoutMode: null !== (_b = options.layoutMode) && void 0 !== _b ? _b : "default",
-            fontSizeShrinkFactor: null !== (_c = options.fontSizeShrinkFactor) && void 0 !== _c ? _c : .8,
-            stepFactor: null !== (_d = options.stepFactor) && void 0 !== _d ? _d : 1,
-            importantWordCount: null !== (_e = options.importantWordCount) && void 0 !== _e ? _e : 10,
+            textLayoutTimes: options.textLayoutTimes || 3,
+            removeWhiteBorder: options.removeWhiteBorder || !1,
+            layoutMode: options.layoutMode || "default",
+            fontSizeShrinkFactor: options.fontSizeShrinkFactor || .8,
+            stepFactor: options.stepFactor || 1,
+            importantWordCount: options.importantWordCount || 10,
             globalShinkLimit: options.globalShinkLimit || .2,
-            fontSizeEnlargeFactor: null !== (_f = options.fontSizeEnlargeFactor) && void 0 !== _f ? _f : 1.5,
-            fillingRatio: null !== (_g = options.fillingRatio) && void 0 !== _g ? _g : .7,
-            fillingTimes: null !== (_h = options.fillingTimes) && void 0 !== _h ? _h : 4,
-            fillingXStep: options.fillingXRatioStep ? Math.max(Math.floor(options.size[0] * options.fillingXRatioStep), 1) : null !== (_j = options.fillingXStep) && void 0 !== _j ? _j : 4,
-            fillingYStep: options.fillingYRatioStep ? Math.max(Math.floor(options.size[1] * options.fillingYRatioStep), 1) : null !== (_k = options.fillingYStep) && void 0 !== _k ? _k : 4,
+            fontSizeEnlargeFactor: options.fontSizeEnlargeFactor || 1.5,
+            fillingRatio: options.fillingRatio || .7,
+            fillingTimes: options.fillingTimes || 4,
+            fillingXStep: options.fillingXRatioStep ? Math.max(Math.floor(options.size[0] * options.fillingXRatioStep), 1) : options.fillingXStep || 4,
+            fillingYStep: options.fillingYRatioStep ? Math.max(Math.floor(options.size[1] * options.fillingYRatioStep), 1) : options.fillingYStep || 4,
             fillingInitialFontSize: options.fillingInitialFontSize,
             fillingDeltaFontSize: options.fillingDeltaFontSize,
-            fillingInitialOpacity: null !== (_l = options.fillingInitialOpacity) && void 0 !== _l ? _l : .8,
-            fillingDeltaOpacity: null !== (_m = options.fillingDeltaOpacity) && void 0 !== _m ? _m : .05,
+            fillingInitialOpacity: options.fillingInitialOpacity || .8,
+            fillingDeltaOpacity: options.fillingDeltaOpacity || .05,
             getFillingFontFamily: field(options.fillingFontFamily || "sans-serif"),
             getFillingFontStyle: field(options.fillingFontStyle || "normal"),
             getFillingFontWeight: field(options.fillingFontWeight || "normal"),
-            getFillingPadding: field(null !== (_o = options.fillingPadding) && void 0 !== _o ? _o : .4),
-            fillingRotateList: null !== (_p = options.fillingRotateList) && void 0 !== _p ? _p : [0, 90],
-            fillingDeltaFontSizeFactor: null !== (_q = options.fillingDeltaFontSizeFactor) && void 0 !== _q ? _q : .2,
+            getFillingPadding: field(options.fillingPadding || .4),
+            fillingRotateList: options.fillingRotateList || [0, 90],
+            fillingDeltaFontSizeFactor: options.fillingDeltaFontSizeFactor || .2,
             fillingColorList: options.fillingColorList || ["#537EF5"],
             sameColorList: !1,
-            minInitFontSize: null !== (_r = options.minInitFontSize) && void 0 !== _r ? _r : 10,
-            minFontSize: null !== (_s = options.minFontSize) && void 0 !== _s ? _s : 4,
-            minFillFontSize: null !== (_t = options.minFillFontSize) && void 0 !== _t ? _t : 2
+            minInitFontSize: options.minInitFontSize || 10,
+            minFontSize: options.minFontSize || 4,
+            minFillFoontSize: options.minFillFoontSize || 2
           },
           sameColorList = colorListEqual(wordsConfig.colorList, layoutConfig.fillingColorList);
         layoutConfig.sameColorList = sameColorList, initColorScale(data, wordsConfig, layoutConfig, options), initFillingWordsFontSize(data, wordsConfig, layoutConfig, segmentationOutput);
@@ -83289,16 +83163,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             successedWords: successedWords,
             failedWords: failedWords
           } = cloud(words, layoutConfig, segmentationOutput),
-          textKey = null !== (_v = null === (_u = options.text) || void 0 === _u ? void 0 : _u.field) && void 0 !== _v ? _v : "textKey",
-          dataIndexKey = null !== (_w = options.dataIndexKey) && void 0 !== _w ? _w : "defaultDataIndexKey",
-          as = options.as ? Object.assign(Object.assign({}, OUTPUT), options.as) : OUTPUT;
+          textKey = null !== (_b = null === (_a = options.text) || void 0 === _a ? void 0 : _a.field) && void 0 !== _b ? _b : "textKey",
+          dataIndexKey = null !== (_c = options.dataIndexKey) && void 0 !== _c ? _c : "defaultDataIndexKey",
+          as = options.as || OUTPUT;
         let w, t;
         const modKeywords = [];
         for (let i = 0; i < words.length; ++i) w = words[i], t = w.datum, t[as.x] = w.x, t[as.y] = w.y, t[as.fontFamily] = w.fontFamily, t[as.fontSize] = w.fontSize, t[as.fontStyle] = w.fontStyle, t[as.fontWeight] = w.fontWeight, t[as.angle] = degreeToRadian(w.rotate), t[as.opacity] = w.opacity, t[as.visible] = w.visible, t[as.isFillingWord] = !1, t[as.color] = w.color, t[dataIndexKey] = `${w.text}_${i}_keyword`, modKeywords.push(t);
         const fillingWordsData = [];
         fillingWords.forEach((word, index) => {
           var _a, _b;
-          const t = Object.assign({}, word.datum);
+          const t = {};
           t[as.x] = word.x, t[as.y] = word.y, t[as.fontFamily] = word.fontFamily, t[as.fontSize] = word.fontSize, t[as.fontStyle] = word.fontStyle, t[as.fontWeight] = word.fontWeight, t[as.angle] = degreeToRadian(word.rotate), t[as.opacity] = word.opacity, t[as.visible] = word.visible, t[as.isFillingWord] = !0, t[as.color] = getFillingColor ? (null === (_a = options.colorField) || void 0 === _a ? void 0 : _a.field) === (null === (_b = options.fillingColorField) || void 0 === _b ? void 0 : _b.field) && sameColorList ? word.color : word.fillingColor : layoutConfig.fillingColorList[~~(segmentationInput.randomGenerator() * layoutConfig.fillingColorList.length)], t[textKey] = word.text, t[dataIndexKey] = `${word.text}_${index}_fillingWords`, fillingWordsData.push(t);
         }), this.view && this.view.emit && this.view.emit(WORDCLOUD_SHAPE_HOOK_EVENT.AFTER_WORDCLOUD_SHAPE_LAYOUT, {
           successedWords: successedWords,
@@ -83306,7 +83180,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }), this.progressiveResult = modKeywords.concat(fillingWordsData);
       }
       release() {
-        this.segmentationInput = null, this.data = null, this.progressiveResult = null, this.options = null;
+        this.segmentationInput = null, this.data = null, this.shapeImage = null, this.progressiveResult = null, this.options = null;
       }
     }
     const initColorScale = (data, wordsConfig, layoutConfig, options) => {
@@ -91477,7 +91351,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
 
     class WordCloudChartSpecTransformer extends BaseWordCloudChartSpecTransformer {
         _getDefaultSeriesSpec(spec) {
-            const series = Object.assign(Object.assign({}, super._getDefaultSeriesSpec(spec)), { nameField: spec.nameField, valueField: spec.valueField, seriesField: spec.seriesField, fontFamilyField: spec.fontFamilyField, fontWeightField: spec.fontWeightField, fontStyleField: spec.fontStyleField, colorHexField: spec.colorHexField, colorMode: spec.colorMode, colorList: spec.colorList, rotateAngles: spec.rotateAngles, fontWeightRange: spec.fontWeightRange, fontSizeRange: spec.fontSizeRange, maskShape: spec.maskShape, keepAspect: spec.keepAspect, random: spec.random, wordCloudConfig: spec.wordCloudConfig, wordCloudShapeConfig: spec.wordCloudShapeConfig, word: spec.word, fillingWord: spec.fillingWord, wordMask: spec.wordMask });
+            const series = Object.assign(Object.assign({}, super._getDefaultSeriesSpec(spec)), { nameField: spec.nameField, valueField: spec.valueField, seriesField: spec.seriesField, fontFamilyField: spec.fontFamilyField, fontWeightField: spec.fontWeightField, fontStyleField: spec.fontStyleField, colorHexField: spec.colorHexField, colorMode: spec.colorMode, colorList: spec.colorList, rotateAngles: spec.rotateAngles, fontWeightRange: spec.fontWeightRange, fontSizeRange: spec.fontSizeRange, maskShape: spec.maskShape, keepAspect: spec.keepAspect, random: spec.random, wordCloudConfig: spec.wordCloudConfig, wordCloudShapeConfig: spec.wordCloudShapeConfig, word: spec.word, fillingWord: spec.fillingWord });
             const seriesType = this.seriesType;
             if (seriesType) {
                 series.type = seriesType;