@visactor/vrender-core 0.22.0-vstory.11 → 0.22.0-vstory.12

package/dist/index.es.js

@@ -855,6 +855,12 @@ let DefaultGlobal = class DefaultGlobal {
     get env() {
         return this._env;
     }
+    get isImageAnonymous() {
+        return this._isImageAnonymous;
+    }
+    set isImageAnonymous(isImageAnonymous) {
+        this._isImageAnonymous = isImageAnonymous;
+    }
     get devicePixelRatio() {
         if (!this._env) {
             this.setEnv(defaultEnv);
@@ -923,6 +929,7 @@ let DefaultGlobal = class DefaultGlobal {
     }
     constructor(contributions) {
         this.contributions = contributions;
+        this._isImageAnonymous = true;
         this.id = Generator.GenAutoIncrementId();
         this.hooks = {
             onSetEnv: new SyncHook(['lastEnv', 'env', 'global'])
@@ -2355,7 +2362,12 @@ let Step$1 = class Step {
                 }
                 else {
                     const x1 = this._x * (1 - this._t) + x * this._t;
-                    this.context.lineTo(x1, this._y, this._lastDefined !== false && p.defined !== false, this.lastPoint);
+                    if (this._t === 0.5) {
+                        this.context.lineTo(x1, this._y, this._lastDefined !== false, this.lastPoint);
+                    }
+                    else {
+                        this.context.lineTo(x1, this._y, this._lastDefined !== false && p.defined !== false, this.lastPoint);
+                    }
                     this.context.lineTo(x1, y, this._lastDefined !== false && p.defined !== false, p);
                 }
                 break;
@@ -3307,7 +3319,7 @@ const DefaultRectAttribute = Object.assign(Object.assign({}, DefaultAttribute),
 const DefaultRect3dAttribute = Object.assign(Object.assign({}, DefaultAttribute), { width: 0, height: 0, x1: 0, y1: 0, cornerRadius: 0, length: 0, cornerType: 'round' });
 const DefaultSymbolAttribute = Object.assign(Object.assign({}, DefaultAttribute), { symbolType: 'circle', size: 10, keepDirIn3d: true, clipRange: 1 });
 const DefaultTextAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultTextStyle), { strokeBoundsBuffer: 0, keepDirIn3d: true });
-const DefaultRichTextAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultTextStyle), { editable: false, editOptions: null, width: 300, height: 300, ellipsis: true, wordBreak: 'break-word', verticalDirection: 'top', textAlign: 'left', textBaseline: 'top', layoutDirection: 'horizontal', textConfig: [], disableAutoWrapLine: false, maxHeight: undefined, maxWidth: undefined, singleLine: false });
+const DefaultRichTextAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultTextStyle), { editable: false, editOptions: null, ascentDescentMode: 'actual', width: 300, height: 300, ellipsis: true, wordBreak: 'break-word', verticalDirection: 'top', textAlign: 'left', textBaseline: 'top', layoutDirection: 'horizontal', textConfig: [], disableAutoWrapLine: false, maxHeight: undefined, maxWidth: undefined, singleLine: false });
 const DefaultImageAttribute = Object.assign(Object.assign({ repeatX: 'no-repeat', repeatY: 'no-repeat', image: '', width: 0, height: 0 }, DefaultAttribute), { fill: true, cornerRadius: 0, cornerType: 'round' });
 const DefaultRichTextIconAttribute = Object.assign(Object.assign({}, DefaultImageAttribute), { backgroundShowMode: 'never', backgroundWidth: 0, backgroundHeight: 0, textAlign: 'left', textBaseline: 'middle', direction: 'horizontal', margin: 0, id: '', width: 20, height: 20, backgroundFill: 'rgba(101, 117, 168, 0.1)', backgroundFillOpacity: 1, backgroundStroke: false, backgroundStrokeOpacity: 1, backgroundRadius: 4, opacity: 1 });
 
@@ -3922,7 +3934,7 @@ function testLetter2(string, index) {
     }
     return i + 1;
 }
-function measureTextCanvas(text, character) {
+function measureTextCanvas(text, character, mode = 'actual') {
     const textMeasure = application.graphicUtil.textMeasure;
     const measurement = textMeasure.measureText(text, character);
     const result = {
@@ -3931,16 +3943,18 @@ function measureTextCanvas(text, character) {
         descent: 0,
         width: 0
     };
-    if (typeof measurement.fontBoundingBoxAscent !== 'number' || typeof measurement.fontBoundingBoxDescent !== 'number') {
-        result.width = measurement.width;
+    const ascent = mode === 'actual' ? measurement.actualBoundingBoxAscent : measurement.fontBoundingBoxAscent;
+    const descent = mode === 'actual' ? measurement.actualBoundingBoxDescent : measurement.fontBoundingBoxDescent;
+    if (typeof ascent !== 'number' || typeof descent !== 'number') {
+        result.width = Math.floor(measurement.width);
         result.height = character.fontSize || 0;
         result.ascent = result.height;
         result.descent = 0;
     }
     else {
-        result.width = measurement.width;
-        result.height = Math.floor(measurement.fontBoundingBoxAscent + measurement.fontBoundingBoxDescent);
-        result.ascent = Math.floor(measurement.fontBoundingBoxAscent);
+        result.width = Math.floor(measurement.width);
+        result.height = Math.floor(ascent + descent);
+        result.ascent = Math.floor(ascent);
         result.descent = result.height - result.ascent;
     }
     return result;
@@ -8287,7 +8301,7 @@ class CbAnimate extends ACustomAnimate {
 class Animate {
     constructor(id = Generator.GenAutoIncrementId(), timeline = defaultTimeline, slience) {
         this.id = id;
-        this.timeline = timeline;
+        this.timeline = timeline || defaultTimeline;
         this.status = AnimateStatus.INITIAL;
         this.tailAnimate = new SubAnimate(this);
         this.subAnimates = [this.tailAnimate];
@@ -9173,11 +9187,12 @@ class IncreaseCount extends ACustomAnimate {
         return;
     }
     onUpdate(end, ratio, out) {
+        var _a;
         if (this.valid === false) {
             return;
         }
         if (end) {
-            out.text = this.toNumber;
+            out.text = (_a = this.to) === null || _a === void 0 ? void 0 : _a.text;
         }
         else {
             out.text = (this.fromNumber + (this.toNumber - this.fromNumber) * ratio).toFixed(this.decimalLength);
@@ -11729,10 +11744,10 @@ class ResourceLoader {
     static GetFile(url, type) {
         let data = ResourceLoader.cache.get(url);
         if (data) {
-            if (data.loadState === 'init' || data.loadState === 'fail') {
+            if (data.loadState === 'fail') {
                 return Promise.reject();
             }
-            else if (data.loadState === 'loading') {
+            else if (data.loadState === 'init' || data.loadState === 'loading') {
                 return data.dataPromise.then(data => data.data);
             }
             return Promise.resolve(data.data);
@@ -12385,7 +12400,6 @@ class Graphic extends Node {
         }
         this.animates.set(animate.id, animate);
         animate.onRemove(() => {
-            animate.stop();
             this.animates.delete(animate.id);
         });
         return animate;
@@ -12686,9 +12700,7 @@ class Graphic extends Node {
             if (this.animates && this.animates.size) {
                 const timeline = stage.getTimeline();
                 this.animates.forEach(a => {
-                    if (a.timeline === defaultTimeline) {
-                        a.setTimeline(timeline);
-                    }
+                    a.setTimeline(timeline);
                 });
             }
             this._onSetStage && this._onSetStage(this, stage, layer);
@@ -12862,7 +12874,6 @@ class Graphic extends Node {
     detachShadow() {
         if (this.shadowRoot) {
             this.addUpdateBoundTag();
-            this.shadowRoot.release(true);
             this.shadowRoot = null;
         }
     }
@@ -12970,7 +12981,6 @@ class Graphic extends Node {
     }
     release() {
         this.releaseStatus = 'released';
-        this.stopAnimates();
         application.graphicService.onRelease(this);
     }
     _emitCustomEvent(type, context) {
@@ -13785,14 +13795,6 @@ class Group extends Graphic {
     getNoWorkAnimateAttr() {
         return Group.NOWORK_ANIMATE_ATTR;
     }
-    release(all) {
-        if (all) {
-            this.forEachChildren((g) => {
-                g.release(all);
-            });
-        }
-        super.release();
-    }
 }
 Group.NOWORK_ANIMATE_ATTR = NOWORK_ANIMATE_ATTR;
 function createGroup(attributes) {
@@ -17211,7 +17213,7 @@ let Line$1 = class Line extends Graphic {
         const { points = lineTheme.points, connectedType } = attribute;
         const b = aabbBounds;
         points.forEach(p => {
-            if (p.defined !== false || connectedType === 'zero' || connectedType === 'connect') {
+            if (p.defined !== false || connectedType === 'connect') {
                 b.add(p.x, p.y);
             }
         });
@@ -17222,7 +17224,7 @@ let Line$1 = class Line extends Graphic {
         const b = aabbBounds;
         segments.forEach(s => {
             s.points.forEach(p => {
-                if (p.defined !== false || connectedType === 'zero' || connectedType === 'connect') {
+                if (p.defined !== false || connectedType === 'connect') {
                     b.add(p.x, p.y);
                 }
             });
@@ -17857,17 +17859,22 @@ function getFixedLRTB(left, right, top, bottom) {
     const topInt = Math.round(top);
     const rightInt = Math.round(right);
     const bottomInt = Math.round(bottom);
+    const _left = left > leftInt ? leftInt : leftInt - 0.5;
+    const _top = top > topInt ? topInt : topInt - 0.5;
+    const _right = rightInt > right ? rightInt : rightInt + 0.5;
+    const _bottom = bottomInt > bottom ? bottomInt : bottomInt + 0.5;
     return {
-        left: leftInt,
-        top: topInt,
-        right: rightInt,
-        bottom: bottomInt
+        left: _left,
+        top: _top,
+        right: _right,
+        bottom: _bottom
     };
 }
 class Paragraph {
-    constructor(text, newLine, character) {
+    constructor(text, newLine, character, ascentDescentMode) {
         this.fontSize = character.fontSize || 16;
         this.textBaseline = character.textBaseline || 'alphabetic';
+        this.ascentDescentMode = ascentDescentMode;
         const lineHeight = calculateLineHeight(character.lineHeight, this.fontSize);
         if (typeof lineHeight === 'number') {
             this.lineHeight = lineHeight > this.fontSize ? lineHeight : this.fontSize;
@@ -17876,7 +17883,7 @@ class Paragraph {
             this.lineHeight = Math.floor(1.2 * this.fontSize);
         }
         this.height = this.lineHeight;
-        const { ascent, height, descent, width } = measureTextCanvas(text, character);
+        const { ascent, height, descent, width } = measureTextCanvas(text, character, this.ascentDescentMode);
         let halfDetaHeight = 0;
         let deltaAscent = 0;
         let deltaDescent = 0;
@@ -17922,7 +17929,7 @@ class Paragraph {
         this.ellipsisStr = '...';
     }
     updateWidth() {
-        const { width } = measureTextCanvas(this.text, this.character);
+        const { width } = measureTextCanvas(this.text, this.character, this.ascentDescentMode);
         this.width = width;
         if (this.direction === 'vertical') {
             this.widthOrigin = this.width;
@@ -17958,17 +17965,41 @@ class Paragraph {
             text = text.slice(0, index);
             text += this.ellipsisStr;
             if (textAlign === 'right' || textAlign === 'end') {
-                const { width } = measureTextCanvas(this.text.slice(index), this.character);
+                const { width } = measureTextCanvas(this.text.slice(index), this.character, this.ascentDescentMode);
                 if (direction === 'vertical') ;
                 else {
                     left -= this.ellipsisWidth - width;
                 }
             }
         }
+        switch (this.character.script) {
+            case 'super':
+                baseline -= this.ascent * (1 / 3);
+                break;
+            case 'sub':
+                baseline += this.descent / 2;
+                break;
+        }
+        if (direction === 'vertical') {
+            ctx.save();
+            ctx.rotateAbout(Math.PI / 2, left, baseline);
+            ctx.translate(-this.heightOrigin || -this.lineHeight / 2, -this.descent / 2);
+            ctx.translate(left, baseline);
+            left = 0;
+            baseline = 0;
+        }
+        const fillStyle = ctx.fillStyle;
+        const globalAlpha = ctx.globalAlpha;
+        ctx.fillStyle = this.character.background;
+        if (this.character.backgroundOpacity !== void 0) {
+            ctx.globalAlpha = this.character.backgroundOpacity;
+        }
         const right = left + (this.widthOrigin || this.width);
         const bottom = top + lineHeight;
         const lrtb = getFixedLRTB(left, right, top, bottom);
-        return Object.assign(Object.assign({}, lrtb), { fillStyle: this.character.background, globalAlpha: this.character.backgroundOpacity });
+        ctx.fillRect(lrtb.left, lrtb.top, lrtb.right - lrtb.left, lrtb.bottom - lrtb.top);
+        ctx.fillStyle = fillStyle;
+        ctx.globalAlpha = globalAlpha;
     }
     draw(ctx, top, ascent, deltaLeft, isLineFirst, textAlign, lineHeight) {
         let baseline = top + ascent;
@@ -17995,7 +18026,7 @@ class Paragraph {
             text = text.slice(0, index);
             text += this.ellipsisStr;
             if (textAlign === 'right' || textAlign === 'end') {
-                const { width } = measureTextCanvas(this.text.slice(index), this.character);
+                const { width } = measureTextCanvas(this.text.slice(index), this.character, this.ascentDescentMode);
                 if (direction === 'vertical') ;
                 else {
                     left -= this.ellipsisWidth - width;
@@ -18032,14 +18063,14 @@ class Paragraph {
                     const right = left + (this.widthOrigin || this.width);
                     const bottom = top + (this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
                     const lrtb = getFixedLRTB(left, right, top, bottom);
-                    ctx.fillRect(lrtb.left, lrtb.top, lrtb.right - lrtb.left, lrtb.bottom - lrtb.top);
+                    ctx.fillRect(lrtb.left, 1 + baseline, lrtb.right - lrtb.left, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
                 }
                 if (this.character.lineThrough) {
                     const top = 1 + baseline - this.ascent / 2;
                     const right = left + (this.widthOrigin || this.width);
                     const bottom = top + (this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
                     const lrtb = getFixedLRTB(left, right, top, bottom);
-                    ctx.fillRect(lrtb.left, lrtb.top, lrtb.right - lrtb.left, lrtb.bottom - lrtb.top);
+                    ctx.fillRect(lrtb.left, 1 + baseline - this.ascent / 2, lrtb.right - lrtb.left, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
                 }
             }
             else if (this.character.textDecoration === 'underline') {
@@ -18047,14 +18078,14 @@ class Paragraph {
                 const right = left + (this.widthOrigin || this.width);
                 const bottom = top + (this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
                 const lrtb = getFixedLRTB(left, right, top, bottom);
-                ctx.fillRect(lrtb.left, lrtb.top, lrtb.right - lrtb.left, lrtb.bottom - lrtb.top);
+                ctx.fillRect(lrtb.left, 1 + baseline, lrtb.right - lrtb.left, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
             }
             else if (this.character.textDecoration === 'line-through') {
                 const top = 1 + baseline - this.ascent / 2;
                 const right = left + (this.widthOrigin || this.width);
                 const bottom = top + (this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
                 const lrtb = getFixedLRTB(left, right, top, bottom);
-                ctx.fillRect(lrtb.left, lrtb.top, lrtb.right - lrtb.left, lrtb.bottom - lrtb.top);
+                ctx.fillRect(lrtb.left, 1 + baseline - this.ascent / 2, lrtb.right - lrtb.left, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1);
             }
         }
         if (direction === 'vertical') {
@@ -18074,7 +18105,7 @@ class Paragraph {
             const index = getStrByWithCanvas(text, width - this.ellipsisWidth + this.ellipsisOtherParagraphWidth, this.character, text.length - 1);
             text = text.slice(0, index);
             text += this.ellipsisStr;
-            const { width: measureWidth } = measureTextCanvas(this.text.slice(index), this.character);
+            const { width: measureWidth } = measureTextCanvas(this.text.slice(index), this.character, this.ascentDescentMode);
             return width + this.ellipsisWidth - measureWidth;
         }
         return width;
@@ -18083,8 +18114,8 @@ class Paragraph {
 function seperateParagraph(paragraph, index) {
     const text1 = paragraph.text.slice(0, index);
     const text2 = paragraph.text.slice(index);
-    const p1 = new Paragraph(text1, paragraph.newLine, paragraph.character);
-    const p2 = new Paragraph(text2, true, paragraph.character);
+    const p1 = new Paragraph(text1, paragraph.newLine, paragraph.character, paragraph.ascentDescentMode);
+    const p2 = new Paragraph(text2, true, paragraph.character, paragraph.ascentDescentMode);
     return [p1, p2];
 }
 
@@ -18374,7 +18405,7 @@ class Line {
                     }
                     const ellipsis = drawEllipsis === true ? '...' : drawEllipsis || '';
                     paragraph.ellipsisStr = ellipsis;
-                    const { width } = measureTextCanvas(ellipsis, paragraph.character);
+                    const { width } = measureTextCanvas(ellipsis, paragraph.character, paragraph.ascentDescentMode);
                     const ellipsisWidth = width || 0;
                     if (ellipsisWidth <= this.blankWidth + otherParagraphWidth) {
                         lastLine && (paragraph.ellipsis = 'add');
@@ -18393,35 +18424,11 @@ class Line {
                 }
             }
         }
-        let fillStyle = '';
-        let globalAlpha = -1;
-        let currBgList = [];
-        const bgList = [currBgList];
         this.paragraphs.forEach((paragraph, index) => {
             if (paragraph instanceof RichTextIcon) {
                 return;
             }
-            const data = paragraph.drawBackground(ctx, y, this.ascent, x, index === 0, this.textAlign, this.height);
-            if (!data) {
-                return;
-            }
-            if (!(fillStyle === data.fillStyle && globalAlpha === data.globalAlpha)) {
-                currBgList = [];
-                bgList.push(currBgList);
-                fillStyle = data.fillStyle;
-                globalAlpha = data.globalAlpha;
-            }
-            currBgList.push(data);
-        });
-        bgList.forEach(bg => {
-            if (bg.length === 0) {
-                return;
-            }
-            const data = bg[0];
-            const end = bg[bg.length - 1];
-            ctx.fillStyle = data.fillStyle;
-            ctx.globalAlpha = data.globalAlpha;
-            ctx.fillRect(data.left, data.top, end.right - data.left, end.bottom - data.top);
+            paragraph.drawBackground(ctx, y, this.ascent, x, index === 0, this.textAlign, this.height);
         });
         this.paragraphs.forEach((paragraph, index) => {
             if (paragraph instanceof RichTextIcon) {
@@ -18450,7 +18457,7 @@ class Line {
             if (paragraph instanceof RichTextIcon) {
                 break;
             }
-            const { width } = measureTextCanvas(ellipsis, paragraph.character);
+            const { width } = measureTextCanvas(ellipsis, paragraph.character, paragraph.ascentDescentMode);
             const ellipsisWidth = width || 0;
             if (ellipsisWidth <= this.blankWidth + otherParagraphWidth) {
                 paragraph.ellipsis = 'add';
@@ -18770,16 +18777,7 @@ class RichText extends Graphic {
         return tc.every(item => item.isComposing ||
             !(item.text && isString(item.text) && RichText.splitText(item.text).length > 1));
     }
-    static splitEmoji(text) {
-        return [...new Intl.Segmenter().segment(text)].map(x => x.segment);
-    }
     static splitText(text) {
-        try {
-            const arr = this.splitEmoji(text);
-            return arr;
-        }
-        catch (e) {
-        }
         return Array.from(text);
     }
     static TransformTextConfig2SingleCharacter(textConfig) {
@@ -18896,7 +18894,7 @@ class RichText extends Graphic {
     }
     doUpdateFrameCache(tc) {
         var _a;
-        const { maxWidth, maxHeight, width, height, ellipsis, wordBreak, verticalDirection, textAlign, textBaseline, layoutDirection, singleLine, disableAutoWrapLine, editable } = this.attribute;
+        const { maxWidth, maxHeight, width, height, ellipsis, wordBreak, verticalDirection, textAlign, textBaseline, layoutDirection, singleLine, disableAutoWrapLine, editable, ascentDescentMode } = this.attribute;
         let { textConfig: _tc = [] } = this.attribute;
         if (editable && _tc.length > 0 && !RichText.AllSingleCharacter(_tc)) {
             _tc = RichText.TransformTextConfig2SingleCharacter(_tc);
@@ -18931,11 +18929,11 @@ class RichText extends Graphic {
                 if (richTextConfig.text && richTextConfig.text.includes('\n')) {
                     const textParts = richTextConfig.text.split('\n');
                     for (let j = 0; j < textParts.length; j++) {
-                        paragraphs.push(new Paragraph(textParts[j], j !== 0, richTextConfig));
+                        paragraphs.push(new Paragraph(textParts[j], j !== 0, richTextConfig, ascentDescentMode));
                     }
                 }
                 else if (richTextConfig.text) {
-                    paragraphs.push(new Paragraph(richTextConfig.text, false, richTextConfig));
+                    paragraphs.push(new Paragraph(richTextConfig.text, false, richTextConfig, ascentDescentMode));
                 }
             }
         }
@@ -20838,8 +20836,8 @@ class DefaultImageRenderContribution extends DefaultRectRenderContribution {
         this.useStyle = true;
         this.order = 0;
     }
-    drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
-        return super.drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
+    drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
+        return super.drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
     }
 }
 const defaultImageRenderContribution = new DefaultImageRenderContribution();
@@ -21437,7 +21435,7 @@ let DefaultCanvasLineRender = class DefaultCanvasLineRender extends BaseRender {
         this._draw(line, lineAttribute, false, drawContext, params);
     }
     drawSegmentItem(context, cache, fill, stroke, fillOpacity, strokeOpacity, attribute, defaultAttribute, clipRange, clipRangeByDimension, offsetX, offsetY, line, fillCb, strokeCb) {
-        var _a, _b, _c, _d, _e;
+        var _a;
         if (!cache) {
             return;
         }
@@ -21476,60 +21474,6 @@ let DefaultCanvasLineRender = class DefaultCanvasLineRender extends BaseRender {
                 context.stroke();
             }
         }
-        let { connectedType, connectedX, connectedY, connectedStyle } = attribute;
-        if (isArray(defaultAttribute)) {
-            connectedType = (_b = connectedType !== null && connectedType !== void 0 ? connectedType : defaultAttribute[0].connectedType) !== null && _b !== void 0 ? _b : defaultAttribute[1].connectedType;
-            connectedX = (_c = connectedX !== null && connectedX !== void 0 ? connectedX : defaultAttribute[0].connectedX) !== null && _c !== void 0 ? _c : defaultAttribute[1].connectedX;
-            connectedY = (_d = connectedY !== null && connectedY !== void 0 ? connectedY : defaultAttribute[0].connectedY) !== null && _d !== void 0 ? _d : defaultAttribute[1].connectedY;
-            connectedStyle = (_e = connectedStyle !== null && connectedStyle !== void 0 ? connectedStyle : defaultAttribute[0].connectedStyle) !== null && _e !== void 0 ? _e : defaultAttribute[1].connectedStyle;
-        }
-        else {
-            connectedType = connectedType !== null && connectedType !== void 0 ? connectedType : defaultAttribute.connectedType;
-            connectedX = connectedX !== null && connectedX !== void 0 ? connectedX : defaultAttribute.connectedX;
-            connectedY = connectedY !== null && connectedY !== void 0 ? connectedY : defaultAttribute.connectedY;
-            connectedStyle = connectedStyle !== null && connectedStyle !== void 0 ? connectedStyle : defaultAttribute.connectedStyle;
-        }
-        if (connectedType !== 'connect' && connectedType !== 'zero') {
-            connectedType = 'none';
-        }
-        if (connectedType !== 'none') {
-            context.beginPath();
-            drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {
-                offsetX,
-                offsetY,
-                offsetZ: z,
-                drawConnect: true,
-                mode: connectedType,
-                zeroX: connectedX,
-                zeroY: connectedY
-            });
-            const da = [];
-            if (isArray(defaultAttribute)) {
-                defaultAttribute.forEach(i => da.push(i));
-            }
-            else {
-                da.push(defaultAttribute);
-            }
-            da.push(attribute);
-            if (fill !== false) {
-                if (fillCb) {
-                    fillCb(context, attribute, defaultAttribute);
-                }
-                else if (fillOpacity) {
-                    context.setCommonStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da);
-                    context.fill();
-                }
-            }
-            if (stroke !== false) {
-                if (strokeCb) {
-                    strokeCb(context, attribute, defaultAttribute);
-                }
-                else if (strokeOpacity) {
-                    context.setStrokeStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da);
-                    context.stroke();
-                }
-            }
-        }
         return !!ret;
     }
     drawLinearLineHighPerformance(line, context, fill, stroke, fillOpacity, strokeOpacity, offsetX, offsetY, lineAttribute, drawContext, params, fillCb, strokeCb) {
@@ -21566,7 +21510,7 @@ let DefaultCanvasLineRender = class DefaultCanvasLineRender extends BaseRender {
     }
     drawShape(line, context, x, y, drawContext, params, fillCb, strokeCb) {
         const lineAttribute = getTheme(line, params === null || params === void 0 ? void 0 : params.theme).line;
-        const { fill = lineAttribute.fill, stroke = lineAttribute.stroke, fillOpacity = lineAttribute.fillOpacity, strokeOpacity = lineAttribute.strokeOpacity, segments, points, closePath, curveTension = lineAttribute.curveTension } = line.attribute;
+        const { fill = lineAttribute.fill, stroke = lineAttribute.stroke, fillOpacity = lineAttribute.fillOpacity, strokeOpacity = lineAttribute.strokeOpacity, segments, points, closePath, curveTension = lineAttribute.curveTension, connectedType = lineAttribute.connectedType } = line.attribute;
         const data = this.valid(line, lineAttribute, fillCb, strokeCb);
         if (!data) {
             return;
@@ -21579,6 +21523,12 @@ let DefaultCanvasLineRender = class DefaultCanvasLineRender extends BaseRender {
         if (clipRange === 1 && !segments && !points.some(p => p.defined === false) && curveType === 'linear') {
             return this.drawLinearLineHighPerformance(line, context, !!fill, !!stroke, fillOpacity, strokeOpacity, x, y, lineAttribute, drawContext, params, fillCb, strokeCb);
         }
+        function parsePoint(points, connectedType) {
+            if (connectedType === 'none') {
+                return points;
+            }
+            return points.filter(p => p.defined !== false);
+        }
         if (line.shouldUpdateShape()) {
             const { points, segments } = line.attribute;
             const _points = points;
@@ -21610,7 +21560,7 @@ let DefaultCanvasLineRender = class DefaultCanvasLineRender extends BaseRender {
                         startPoint.y = lastSeg.endY;
                         startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined;
                     }
-                    const data = calcLineCache(seg.points, curveType, {
+                    const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
                         startPoint,
                         curveTension
                     });
@@ -21636,7 +21586,7 @@ let DefaultCanvasLineRender = class DefaultCanvasLineRender extends BaseRender {
                 }
             }
             else if (points && points.length) {
-                line.cache = calcLineCache(_points, curveType, { curveTension });
+                line.cache = calcLineCache(parsePoint(_points, connectedType), curveType, { curveTension });
             }
             else {
                 line.cache = null;
@@ -21688,10 +21638,6 @@ DefaultCanvasLineRender = __decorate([
 
 function drawAreaSegments(path, segPath, percent, params) {
     var _a;
-    const { drawConnect = false, mode = 'none' } = params || {};
-    if (drawConnect && mode === 'none') {
-        return;
-    }
     const { top, bottom } = segPath;
     if (top.curves.length !== bottom.curves.length) {
         return;
@@ -21700,90 +21646,28 @@ function drawAreaSegments(path, segPath, percent, params) {
         const topList = [];
         const bottomList = [];
         let lastDefined = true;
-        if (drawConnect) {
-            let defined0 = true;
-            let lastCurve;
-            let lastBottomCurve;
-            const n = top.curves.length;
-            top.curves.forEach((curve, i) => {
-                const bototmCurve = bottom.curves[n - i - 1];
-                let currentTopCurve = curve;
-                let currentBottomCurve = bototmCurve;
-                if (curve.originP1 === curve.originP2) {
-                    lastCurve = curve;
-                    lastBottomCurve = bototmCurve;
-                    return;
-                }
-                if (lastCurve && lastCurve.originP1 === lastCurve.originP2) {
-                    currentTopCurve = lastCurve;
-                    currentBottomCurve = lastBottomCurve;
-                }
-                if (curve.defined) {
-                    if (!defined0) {
-                        topList.push(currentTopCurve);
-                        bottomList.push(currentBottomCurve);
-                        drawAreaConnectBlock(path, topList, bottomList, params);
-                        topList.length = 0;
-                        bottomList.length = 0;
-                        defined0 = !defined0;
-                    }
+        for (let i = 0, n = top.curves.length; i < n; i++) {
+            const topCurve = top.curves[i];
+            if (lastDefined !== topCurve.defined) {
+                if (lastDefined) {
+                    drawAreaBlock(path, topList, bottomList, params);
+                    topList.length = 0;
+                    bottomList.length = 0;
                 }
                 else {
-                    const { originP1, originP2 } = curve;
-                    let validTopCurve;
-                    let validBottomCurve;
-                    if (originP1 && originP1.defined !== false) {
-                        validTopCurve = currentTopCurve;
-                        validBottomCurve = currentBottomCurve;
-                    }
-                    else if (originP1 && originP2.defined !== false) {
-                        validTopCurve = curve;
-                        validBottomCurve = bototmCurve;
-                    }
-                    if (defined0) {
-                        defined0 = !defined0;
-                        topList.push(validTopCurve || curve);
-                        bottomList.push(validBottomCurve || bototmCurve);
-                    }
-                    else {
-                        if (validTopCurve) {
-                            defined0 = !defined0;
-                            topList.push(validTopCurve || curve);
-                            bottomList.push(validBottomCurve || bototmCurve);
-                            drawAreaConnectBlock(path, topList, bottomList, params);
-                            topList.length = 0;
-                            bottomList.length = 0;
-                        }
-                    }
-                }
-                lastCurve = curve;
-            });
-            drawAreaConnectBlock(path, topList, bottomList, params);
-        }
-        else {
-            for (let i = 0, n = top.curves.length; i < n; i++) {
-                const topCurve = top.curves[i];
-                if (lastDefined !== topCurve.defined) {
-                    if (lastDefined) {
-                        drawAreaBlock(path, topList, bottomList, params);
-                        topList.length = 0;
-                        bottomList.length = 0;
-                    }
-                    else {
-                        topList.push(topCurve);
-                        bottomList.push(bottom.curves[n - i - 1]);
-                    }
-                    lastDefined = !lastDefined;
+                    topList.push(topCurve);
+                    bottomList.push(bottom.curves[n - i - 1]);
                 }
-                else {
-                    if (lastDefined) {
-                        topList.push(topCurve);
-                        bottomList.push(bottom.curves[n - i - 1]);
-                    }
+                lastDefined = !lastDefined;
+            }
+            else {
+                if (lastDefined) {
+                    topList.push(topCurve);
+                    bottomList.push(bottom.curves[n - i - 1]);
                 }
             }
-            drawAreaBlock(path, topList, bottomList, params);
         }
+        drawAreaBlock(path, topList, bottomList, params);
         return;
     }
     if (percent <= 0) {
@@ -21807,9 +21691,6 @@ function drawAreaSegments(path, segPath, percent, params) {
     let lastDefined = true;
     const topList = [];
     const bottomList = [];
-    let defined0 = true;
-    let lastTopCurve;
-    let lastBottomCurve;
     for (let i = 0, n = top.curves.length; i < n; i++) {
         const topCurve = top.curves[i];
         const curCurveLength = topCurve.getLength(direction);
@@ -21818,127 +21699,50 @@ function drawAreaSegments(path, segPath, percent, params) {
             break;
         }
         drawedLengthUntilLast += curCurveLength;
-        if (drawConnect) {
-            const bototmCurve = bottom.curves[n - i - 1];
-            let currentTopCurve = topCurve;
-            let currentBottomCurve = bototmCurve;
-            if (topCurve.originP1 === topCurve.originP2) {
-                lastTopCurve = topCurve;
-                lastBottomCurve = bototmCurve;
-                continue;
-            }
-            if (lastTopCurve && lastTopCurve.originP1 === lastTopCurve.originP2) {
-                currentTopCurve = lastTopCurve;
-                currentBottomCurve = lastBottomCurve;
-            }
-            if (topCurve.defined) {
-                if (!defined0) {
-                    topList.push(currentTopCurve);
-                    bottomList.push(currentBottomCurve);
-                    drawAreaConnectBlock(path, topList, bottomList, params);
-                    topList.length = 0;
-                    bottomList.length = 0;
-                    defined0 = !defined0;
-                }
+        let tc = null;
+        let bc = null;
+        if (lastDefined !== topCurve.defined) {
+            if (lastDefined) {
+                drawAreaBlock(path, topList, bottomList, params);
+                topList.length = 0;
+                bottomList.length = 0;
             }
             else {
-                const { originP1, originP2 } = topCurve;
-                let validTopCurve;
-                let validBottomCurve;
-                if (originP1 && originP1.defined !== false) {
-                    validTopCurve = currentTopCurve;
-                    validBottomCurve = currentBottomCurve;
-                }
-                else if (originP1 && originP2.defined !== false) {
-                    validTopCurve = topCurve;
-                    validBottomCurve = bototmCurve;
-                }
-                if (defined0) {
-                    defined0 = !defined0;
-                    topList.push(validTopCurve || topCurve);
-                    bottomList.push(validBottomCurve || bototmCurve);
-                }
-                else {
-                    if (validTopCurve) {
-                        defined0 = !defined0;
-                        topList.push(validTopCurve || topCurve);
-                        bottomList.push(validBottomCurve || bototmCurve);
-                        drawAreaConnectBlock(path, topList, bottomList, params);
-                        topList.length = 0;
-                        bottomList.length = 0;
-                    }
-                }
+                tc = topCurve;
+                bc = bottom.curves[n - i - 1];
             }
-            lastTopCurve = topCurve;
+            lastDefined = !lastDefined;
         }
         else {
-            let tc = null;
-            let bc = null;
-            if (lastDefined !== topCurve.defined) {
-                if (lastDefined) {
-                    drawAreaBlock(path, topList, bottomList, params);
-                    topList.length = 0;
-                    bottomList.length = 0;
+            if (lastDefined) {
+                tc = topCurve;
+                bc = bottom.curves[n - i - 1];
+            }
+        }
+        if (tc && bc) {
+            if (percent < 1) {
+                if (tc.p2 && tc.p3) {
+                    tc = divideCubic(tc, percent)[0];
                 }
                 else {
-                    tc = topCurve;
-                    bc = bottom.curves[n - i - 1];
+                    tc = divideLinear(tc, percent)[0];
                 }
-                lastDefined = !lastDefined;
-            }
-            else {
-                if (lastDefined) {
-                    tc = topCurve;
-                    bc = bottom.curves[n - i - 1];
+                if (bc.p2 && bc.p3) {
+                    bc = divideCubic(bc, 1 - percent)[1];
                 }
-            }
-            if (tc && bc) {
-                if (percent < 1) {
-                    if (tc.p2 && tc.p3) {
-                        tc = divideCubic(tc, percent)[0];
-                    }
-                    else {
-                        tc = divideLinear(tc, percent)[0];
-                    }
-                    if (bc.p2 && bc.p3) {
-                        bc = divideCubic(bc, 1 - percent)[1];
-                    }
-                    else {
-                        bc = divideLinear(bc, 1 - percent)[1];
-                    }
+                else {
+                    bc = divideLinear(bc, 1 - percent)[1];
                 }
-                tc.defined = lastDefined;
-                bc.defined = lastDefined;
-                topList.push(tc);
-                bottomList.push(bc);
             }
-            tc = null;
-            bc = null;
+            tc.defined = lastDefined;
+            bc.defined = lastDefined;
+            topList.push(tc);
+            bottomList.push(bc);
         }
+        tc = null;
+        bc = null;
     }
-    if (drawConnect) {
-        drawAreaConnectBlock(path, topList, bottomList, params);
-    }
-    else {
-        drawAreaBlock(path, topList, bottomList, params);
-    }
-}
-function drawAreaConnectBlock(path, topList, bottomList, params) {
-    if (topList.length < 2) {
-        return;
-    }
-    const { offsetX = 0, offsetY = 0, offsetZ = 0, mode } = params || {};
-    let curve = topList[0];
-    path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);
-    curve = topList[topList.length - 1];
-    let end = curve.p3 || curve.p1;
-    path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ);
-    curve = bottomList[bottomList.length - 1];
-    path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ);
-    curve = bottomList[0];
-    end = curve.p3 || curve.p1;
-    path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ);
-    path.closePath();
+    drawAreaBlock(path, topList, bottomList, params);
 }
 function drawAreaBlock(path, topList, bottomList, params) {
     const { offsetX = 0, offsetY = 0, offsetZ = 0 } = params || {};
@@ -22052,7 +21856,7 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
     drawShape(area, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c, _d, _e, _f;
         const areaAttribute = getTheme(area, params === null || params === void 0 ? void 0 : params.theme).area;
-        const { fill = areaAttribute.fill, stroke = areaAttribute.stroke, fillOpacity = areaAttribute.fillOpacity, z = areaAttribute.z, strokeOpacity = areaAttribute.strokeOpacity, curveTension = areaAttribute.curveTension } = area.attribute;
+        const { fill = areaAttribute.fill, stroke = areaAttribute.stroke, fillOpacity = areaAttribute.fillOpacity, z = areaAttribute.z, strokeOpacity = areaAttribute.strokeOpacity, curveTension = areaAttribute.curveTension, connectedType = areaAttribute.connectedType } = area.attribute;
         const data = this.valid(area, areaAttribute, fillCb, strokeCb);
         if (!data) {
             return;
@@ -22064,6 +21868,12 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
         if (closePath && curveType === 'linear') {
             curveType = 'linearClosed';
         }
+        function parsePoint(points, connectedType) {
+            if (connectedType !== 'connect') {
+                return points;
+            }
+            return points.filter(p => p.defined !== false);
+        }
         if (clipRange === 1 && !segments && !points.some(p => p.defined === false) && curveType === 'linear') {
             return this.drawLinearAreaHighPerformance(area, context, !!fill, doStroke, fillOpacity, strokeOpacity, x, y, areaAttribute, drawContext, params, fillCb, strokeCb);
         }
@@ -22086,7 +21896,7 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
                         startPoint.x = lastTopSeg.endX;
                         startPoint.y = lastTopSeg.endY;
                     }
-                    const data = calcLineCache(seg.points, curveType, {
+                    const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
                         startPoint,
                         curveTension
                     });
@@ -22115,7 +21925,7 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
                             });
                     }
                     if (bottomPoints.length > 1) {
-                        lastBottomSeg = calcLineCache(bottomPoints, curveType === 'stepBefore' ? 'stepAfter' : curveType === 'stepAfter' ? 'stepBefore' : curveType, { curveTension });
+                        lastBottomSeg = calcLineCache(parsePoint(bottomPoints, connectedType), curveType === 'stepBefore' ? 'stepAfter' : curveType === 'stepAfter' ? 'stepBefore' : curveType, { curveTension });
                         bottomCaches.unshift(lastBottomSeg);
                     }
                 }
@@ -22125,12 +21935,12 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
                 }));
             }
             else if (points && points.length) {
-                const topPoints = points;
+                const topPoints = parsePoint(points, connectedType);
                 const bottomPoints = [];
-                for (let i = points.length - 1; i >= 0; i--) {
+                for (let i = topPoints.length - 1; i >= 0; i--) {
                     bottomPoints.push({
-                        x: (_e = points[i].x1) !== null && _e !== void 0 ? _e : points[i].x,
-                        y: (_f = points[i].y1) !== null && _f !== void 0 ? _f : points[i].y
+                        x: (_e = topPoints[i].x1) !== null && _e !== void 0 ? _e : topPoints[i].x,
+                        y: (_f = topPoints[i].y1) !== null && _f !== void 0 ? _f : topPoints[i].y
                     });
                 }
                 const topCache = calcLineCache(topPoints, curveType, { curveTension });
@@ -22185,17 +21995,9 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
         this._draw(area, areaAttribute, false, drawContext, params);
     }
     drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
-        let ret = false;
-        ret =
-            ret ||
-                this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, false, fillCb, strokeCb);
-        ret =
-            ret ||
-                this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, true, fillCb, strokeCb);
-        return ret;
+        return this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb);
     }
-    _drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, connect, fillCb, strokeCb) {
-        var _a, _b, _c, _d;
+    _drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
         if (!(cache &&
             cache.top &&
             cache.bottom &&
@@ -22205,35 +22007,6 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
             cache.bottom.curves.length)) {
             return;
         }
-        let { connectedType, connectedX, connectedY, connectedStyle } = attribute;
-        const da = [];
-        if (connect) {
-            if (isArray(defaultAttribute)) {
-                connectedType = (_a = connectedType !== null && connectedType !== void 0 ? connectedType : defaultAttribute[0].connectedType) !== null && _a !== void 0 ? _a : defaultAttribute[1].connectedType;
-                connectedX = (_b = connectedX !== null && connectedX !== void 0 ? connectedX : defaultAttribute[0].connectedX) !== null && _b !== void 0 ? _b : defaultAttribute[1].connectedX;
-                connectedY = (_c = connectedY !== null && connectedY !== void 0 ? connectedY : defaultAttribute[0].connectedY) !== null && _c !== void 0 ? _c : defaultAttribute[1].connectedY;
-                connectedStyle = (_d = connectedStyle !== null && connectedStyle !== void 0 ? connectedStyle : defaultAttribute[0].connectedStyle) !== null && _d !== void 0 ? _d : defaultAttribute[1].connectedStyle;
-            }
-            else {
-                connectedType = connectedType !== null && connectedType !== void 0 ? connectedType : defaultAttribute.connectedType;
-                connectedX = connectedX !== null && connectedX !== void 0 ? connectedX : defaultAttribute.connectedX;
-                connectedY = connectedY !== null && connectedY !== void 0 ? connectedY : defaultAttribute.connectedY;
-                connectedStyle = connectedStyle !== null && connectedStyle !== void 0 ? connectedStyle : defaultAttribute.connectedStyle;
-            }
-            if (connectedType !== 'connect' && connectedType !== 'zero') {
-                connectedType = 'none';
-            }
-            if (isArray(defaultAttribute)) {
-                defaultAttribute.forEach(i => da.push(i));
-            }
-            else {
-                da.push(defaultAttribute);
-            }
-            da.push(attribute);
-        }
-        if (connect && connectedType === 'none') {
-            return false;
-        }
         context.beginPath();
         const ret = false;
         const { points, segments } = area.attribute;
@@ -22268,11 +22041,7 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
             offsetX,
             offsetY,
             offsetZ,
-            direction,
-            drawConnect: connect,
-            mode: connectedType,
-            zeroX: connectedX,
-            zeroY: connectedY
+            direction
         });
         this.beforeRenderStep(area, context, offsetX, offsetY, !!fillOpacity, false, fill, false, defaultAttribute, drawContext, fillCb, null, { attribute });
         context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute);
@@ -22283,7 +22052,7 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
                     fillCb(context, attribute, defaultAttribute);
                 }
                 else if (fillOpacity) {
-                    context.setCommonStyle(area, connect ? connectedStyle : attribute, originX - offsetX, originY - offsetY, connect ? da : defaultAttribute);
+                    context.setCommonStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute);
                     context.fill();
                 }
             }
@@ -22300,14 +22069,10 @@ let DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
                         drawSegments(context.camera ? context : context.nativeContext, stroke[0] ? cache.top : cache.bottom, clipRange, direction === Direction$1.ROW ? 'x' : 'y', {
                             offsetX,
                             offsetY,
-                            offsetZ,
-                            drawConnect: connect,
-                            mode: connectedType,
-                            zeroX: connectedX,
-                            zeroY: connectedY
+                            offsetZ
                         });
                     }
-                    context.setStrokeStyle(area, connect ? connectedStyle : attribute, originX - offsetX, originY - offsetY, connect ? da : defaultAttribute);
+                    context.setStrokeStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute);
                     context.stroke();
                 }
             }
@@ -27146,12 +26911,12 @@ class EditModule {
             this.composingConfigIdx = this.cursorIndex < 0 ? 0 : findConfigIndexByCursorIdx(textConfig, this.cursorIndex);
             if (this.cursorIndex < 0) {
                 const config = textConfig[0];
-                textConfig.unshift(Object.assign(Object.assign(Object.assign({}, getDefaultCharacterConfig(this.currRt.attribute)), config), { text: '' }));
+                textConfig.unshift(Object.assign(Object.assign(Object.assign({ fill: 'black' }, getDefaultCharacterConfig(this.currRt.attribute)), config), { text: '' }));
             }
             else {
                 const configIdx = this.composingConfigIdx;
                 const lastConfig = textConfig[configIdx] || textConfig[configIdx - 1];
-                textConfig.splice(configIdx, 0, Object.assign(Object.assign({}, lastConfig), { text: '' }));
+                textConfig.splice(configIdx, 0, Object.assign(Object.assign({ fill: 'black' }, lastConfig), { text: '' }));
             }
         };
         this.handleCompositionEnd = () => {
@@ -27281,7 +27046,7 @@ class EditModule {
         const text = lastConfig.text;
         const textList = text ? Array.from(text.toString()) : [];
         for (let i = 0; i < textList.length; i++) {
-            textConfig.splice(i + configIdx, 0, Object.assign(Object.assign(Object.assign(Object.assign({}, getDefaultCharacterConfig(this.currRt.attribute)), { fill: 'black' }), lastConfig), { isComposing: false, text: textList[i] }));
+            textConfig.splice(i + configIdx, 0, Object.assign(Object.assign({ fill: 'black' }, lastConfig), { isComposing: false, text: textList[i] }));
         }
         this.currRt.setAttributes({ textConfig });
         const nextConfigIdx = configIdx + textList.length;
@@ -27359,7 +27124,7 @@ class Selection {
     getFormat(key) {
         return this.getAllFormat(key)[0];
     }
-    getAllFormat(key, includeUndefined) {
+    getAllFormat(key) {
         const valSet = new Set();
         const minCursorIdx = Math.min(this.selectionStartCursorIdx, this.curCursorIdx);
         const maxCursorIdx = Math.max(this.selectionStartCursorIdx, this.curCursorIdx);
@@ -27368,12 +27133,7 @@ class Selection {
         }
         for (let i = Math.ceil(minCursorIdx); i <= Math.floor(maxCursorIdx); i++) {
             const val = this._getFormat(key, i);
-            if (includeUndefined) {
-                valSet.add(val);
-            }
-            else {
-                val !== undefined && valSet.add(val);
-            }
+            val && valSet.add(val);
         }
         return Array.from(valSet.values());
     }
@@ -27473,31 +27233,28 @@ class RichTextEditPlugin {
             throw new Error('不会走到这里 handleFocusOut');
         };
         this.handleMove = (e) => {
-            if (this.currRt && !this.currRt.attribute.editable) {
-                this.deFocus(true);
-            }
-            if (!this.isEditableRichtext(e)) {
-                this.handleLeave();
+            if (!this.isRichtext(e)) {
                 return;
             }
-            this.handleEnter();
+            this.currRt = e.target;
+            this.handleEnter(e);
             e.target.once('pointerleave', this.handleLeave);
             this.tryShowSelection(e, false);
         };
-        this.handleEnter = () => {
+        this.handleEnter = (e) => {
             this.editing = true;
             this.pluginService.stage.setCursor('text');
         };
-        this.handleLeave = () => {
+        this.handleLeave = (e) => {
             this.editing = false;
             this.pluginService.stage.setCursor('default');
         };
         this.handlePointerDown = (e) => {
-            if (!this.editing || !this.isEditableRichtext(e)) {
-                this.deFocus(true);
+            if (this.editing) {
+                this.onFocus(e);
             }
             else {
-                this.onFocus(e);
+                this.deFocus(true);
             }
             this.triggerRender();
             this.pointerDown = true;
@@ -27635,12 +27392,6 @@ class RichTextEditPlugin {
                 return;
             }
             const { lines } = cache;
-            if (lines.length === 0) {
-                return;
-            }
-            if (!lines[0].paragraphs || lines[0].paragraphs.length === 0) {
-                return;
-            }
             const totalCursorCount = lines.reduce((total, line) => total + line.paragraphs.length, 0) - 1;
             this.selectionRange(-0.1, totalCursorCount + 0.1);
             e.preventDefault();
@@ -27699,7 +27450,6 @@ class RichTextEditPlugin {
             else if (this.curCursorIdx > totalCursorCount + 0.1) {
                 this.curCursorIdx = totalCursorCount + 0.1;
             }
-            this.selectionStartCursorIdx = this.curCursorIdx;
             const pos = this.computedCursorPosByCursorIdx(this.curCursorIdx, this.currRt);
             this.setCursorAndTextArea(pos.x, pos.y1, pos.y2, this.currRt);
             this.hideSelection();
@@ -27766,7 +27516,7 @@ class RichTextEditPlugin {
         if (placeholderFontSize) {
             textConfigItem.fontSize = placeholderFontSize;
         }
-        this.shadowPlaceHolder = createRichText(Object.assign(Object.assign({}, this.currRt.attribute), { x: 0, y: 0, pickable: false, editable: false, editOptions: null, angle: 0, _debug_bounds: false, textConfig: [textConfigItem] }));
+        this.shadowPlaceHolder = createRichText(Object.assign(Object.assign({}, this.currRt.attribute), { x: 0, y: 0, angle: 0, _debug_bounds: false, textConfig: [textConfigItem] }));
         shadow.add(this.shadowPlaceHolder);
     }
     tryShowInputBounds() {
@@ -27779,12 +27529,11 @@ class RichTextEditPlugin {
             return;
         }
         const { attribute } = this.currRt;
-        let b = this.currRt.AABBBounds;
+        const b = this.currRt.AABBBounds;
         let h = b.height();
         if (!attribute.textConfig.length && this.editLine) {
             const { points } = this.editLine.attribute;
             h = points[1].y - points[0].y;
-            b = getRichTextBounds(Object.assign({}, this.shadowPlaceHolder.attribute));
         }
         this.shadowBounds = this.shadowBounds || createRect({});
         this.shadowBounds.setAttributes({
@@ -27809,7 +27558,7 @@ class RichTextEditPlugin {
         if (textConfig && textConfig.length) {
             return;
         }
-        if (!(editOptions && editOptions.placeholder && editOptions.syncPlaceHolderToTextConfig)) {
+        if (!(editOptions && editOptions.placeholder)) {
             return;
         }
         const { placeholder } = editOptions;
@@ -27900,15 +27649,16 @@ class RichTextEditPlugin {
         }
     }
     deFocus(trulyDeFocus = false) {
-        const currRt = this.currRt;
-        if (!currRt) {
+        this.updateCbs && this.updateCbs.forEach(cb => cb('beforeDefocus', this, { trulyDeFocus }));
+        const target = this.currRt;
+        if (!target) {
             return;
         }
-        this.updateCbs && this.updateCbs.forEach(cb => cb('beforeDefocus', this, { trulyDeFocus }));
         if (trulyDeFocus) {
             this.trySyncPlaceholderToTextConfig();
-            currRt.detachShadow();
+            target.detachShadow();
         }
+        const currRt = this.currRt;
         this.currRt = null;
         if (this.editLine) {
             this.editLine.parent && this.editLine.parent.removeChild(this.editLine);
@@ -27940,10 +27690,8 @@ class RichTextEditPlugin {
             cleared = true;
         }
         cleared && currRt.setAttributes({ textConfig });
-        currRt.removeEventListener('pointerleave', this.handleLeave);
     }
     addAnimateToLine(line) {
-        line.setAttributes({ opacity: 1 });
         line.animates &&
             line.animates.forEach(animate => {
                 animate.stop();
@@ -28002,9 +27750,6 @@ class RichTextEditPlugin {
         };
         let line0Info = this.getLineByPoint(cache, startCursorPos);
         let line1Info = this.getLineByPoint(cache, endCursorPos);
-        if (!line0Info || !line1Info) {
-            return;
-        }
         if (startCursorPos.y > endCursorPos.y ||
             (startCursorPos.y === endCursorPos.y && startCursorPos.x > endCursorPos.x)) {
             [startCursorPos, endCursorPos] = [endCursorPos, startCursorPos];
@@ -28138,10 +27883,7 @@ class RichTextEditPlugin {
         return -1;
     }
     isRichtext(e) {
-        return !!(e.target && e.target.type === 'richtext');
-    }
-    isEditableRichtext(e) {
-        return this.isRichtext(e) && !!e.target.attribute.editable;
+        return !!(e.target && e.target.type === 'richtext' && e.target.attribute.editable);
     }
     triggerRender() {
         this.pluginService.stage.renderNextFrame();
@@ -28300,7 +28042,7 @@ class RichTextEditPlugin {
         }
     }
     _forceFocusByEvent(e) {
-        this.handleEnter();
+        this.handleEnter(e);
         this.handlePointerDown(e);
         this.handlePointerUp(e);
     }