@visactor/vrender-core 0.22.0-vstory.15 → 0.22.0-vstory.16

package/dist/index.es.js

@@ -2963,24 +2963,40 @@ class CustomPath2D extends CurvePath {
                 case 's':
                     tempX = x + current[3];
                     tempY = y + current[4];
-                    controlX = 2 * x - controlX;
-                    controlY = 2 * y - controlY;
-                    this.bezierCurveTo(controlX + l, controlY + t, x + current[1] + l, y + current[2] + t, tempX + l, tempY + t);
-                    controlX = x + current[1];
-                    controlY = y + current[2];
+                    if (previous[0].match(/[CcSs]/) === null) {
+                        controlX = x;
+                        controlY = y;
+                    }
+                    else {
+                        controlX = 2 * x - controlX;
+                        controlY = 2 * y - controlY;
+                    }
+                    tempControlX = x + current[1];
+                    tempControlY = y + current[2];
+                    this.bezierCurveTo(controlX + l, controlY + t, tempControlX + l, tempControlY + t, tempX + l, tempY + t);
+                    controlX = tempControlX;
+                    controlY = tempControlY;
                     x = tempX;
                     y = tempY;
                     break;
                 case 'S':
                     tempX = current[3];
                     tempY = current[4];
-                    controlX = 2 * x - controlX;
-                    controlY = 2 * y - controlY;
-                    this.bezierCurveTo(controlX + l, controlY + t, current[1] + l, current[2] + t, tempX + l, tempY + t);
+                    if (previous[0].match(/[CcSs]/) === null) {
+                        controlX = x;
+                        controlY = y;
+                    }
+                    else {
+                        controlX = 2 * x - controlX;
+                        controlY = 2 * y - controlY;
+                    }
+                    tempControlX = current[1];
+                    tempControlY = current[2];
+                    this.bezierCurveTo(controlX + l, controlY + t, tempControlX + l, tempControlY + t, tempX + l, tempY + t);
+                    controlX = tempControlX;
+                    controlY = tempControlY;
                     x = tempX;
                     y = tempY;
-                    controlX = current[1];
-                    controlY = current[2];
                     break;
                 case 'q':
                     tempX = x + current[3];
@@ -3321,7 +3337,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, 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 DefaultRichTextAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultTextStyle), { upgradeAttrs: null, 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 });
 
@@ -12412,6 +12428,7 @@ class Graphic extends Node {
         }
         this.animates.set(animate.id, animate);
         animate.onRemove(() => {
+            animate.stop();
             this.animates.delete(animate.id);
         });
         return animate;
@@ -12712,7 +12729,9 @@ class Graphic extends Node {
             if (this.animates && this.animates.size) {
                 const timeline = stage.getTimeline();
                 this.animates.forEach(a => {
-                    a.setTimeline(timeline);
+                    if (a.timeline === defaultTimeline) {
+                        a.setTimeline(timeline);
+                    }
                 });
             }
             this._onSetStage && this._onSetStage(this, stage, layer);
@@ -12886,6 +12905,7 @@ class Graphic extends Node {
     detachShadow() {
         if (this.shadowRoot) {
             this.addUpdateBoundTag();
+            this.shadowRoot.release(true);
             this.shadowRoot = null;
         }
     }
@@ -12993,6 +13013,7 @@ class Graphic extends Node {
     }
     release() {
         this.releaseStatus = 'released';
+        this.stopAnimates();
         application.graphicService.onRelease(this);
     }
     _emitCustomEvent(type, context) {
@@ -13807,6 +13828,14 @@ 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) {
@@ -17950,7 +17979,10 @@ class Paragraph {
         }
     }
     drawBackground(ctx, top, ascent, deltaLeft, isLineFirst, textAlign, lineHeight) {
-        if (!(this.character.background && (!this.character.backgroundOpacity || this.character.backgroundOpacity > 0))) {
+        if (!(this.text !== '' &&
+            this.text !== '\n' &&
+            this.character.background &&
+            (!this.character.backgroundOpacity || this.character.backgroundOpacity > 0))) {
             return;
         }
         let baseline = top + ascent;
@@ -17984,34 +18016,10 @@ class Paragraph {
                 }
             }
         }
-        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);
-        ctx.fillRect(lrtb.left, lrtb.top, lrtb.right - lrtb.left, lrtb.bottom - lrtb.top);
-        ctx.fillStyle = fillStyle;
-        ctx.globalAlpha = globalAlpha;
+        return Object.assign(Object.assign({}, lrtb), { fillStyle: this.character.background, globalAlpha: this.character.backgroundOpacity });
     }
     draw(ctx, top, ascent, deltaLeft, isLineFirst, textAlign, lineHeight) {
         let baseline = top + ascent;
@@ -18436,11 +18444,35 @@ class Line {
                 }
             }
         }
+        let fillStyle = '';
+        let globalAlpha = -1;
+        let currBgList = [];
+        const bgList = [currBgList];
         this.paragraphs.forEach((paragraph, index) => {
             if (paragraph instanceof RichTextIcon) {
                 return;
             }
-            paragraph.drawBackground(ctx, y, this.ascent, x, index === 0, this.textAlign, this.height);
+            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);
         });
         this.paragraphs.forEach((paragraph, index) => {
             if (paragraph instanceof RichTextIcon) {
@@ -18910,8 +18942,8 @@ class RichText extends Graphic {
         return false;
     }
     combinedStyleToCharacter(config) {
-        const { fill, stroke, fontSize, fontFamily, fontStyle, fontWeight, lineWidth, opacity, fillOpacity, strokeOpacity } = this.attribute;
-        return Object.assign({ fill,
+        const { fill, stroke, fontSize, fontFamily, fontStyle, fontWeight, lineWidth, opacity, fillOpacity, lineHeight, strokeOpacity, upgradeAttrs } = this.attribute;
+        const out = Object.assign({ fill,
             stroke,
             fontSize,
             fontFamily,
@@ -18921,10 +18953,15 @@ class RichText extends Graphic {
             opacity,
             fillOpacity,
             strokeOpacity }, config);
+        if (upgradeAttrs === null || upgradeAttrs === void 0 ? void 0 : upgradeAttrs.lineHeight) {
+            out.lineHeight = lineHeight;
+        }
+        return out;
     }
     doUpdateFrameCache(tc) {
         var _a;
-        const { maxWidth, maxHeight, width, height, ellipsis, wordBreak, verticalDirection, textAlign, textBaseline, layoutDirection, singleLine, disableAutoWrapLine, editable, ascentDescentMode } = this.attribute;
+        const { maxWidth, maxHeight, width, height, ellipsis, wordBreak, verticalDirection, textAlign, textBaseline, layoutDirection, singleLine, disableAutoWrapLine, editable, ascentDescentMode, upgradeAttrs } = this.attribute;
+        const enableMultiBreakLine = upgradeAttrs && upgradeAttrs.multiBreakLine;
         let { textConfig: _tc = [] } = this.attribute;
         if (editable && _tc.length > 0 && !RichText.AllSingleCharacter(_tc)) {
             _tc = RichText.TransformTextConfig2SingleCharacter(_tc);
@@ -18959,7 +18996,16 @@ 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, ascentDescentMode));
+                        if (j === 0) {
+                            paragraphs.push(new Paragraph(textParts[j], false, richTextConfig, ascentDescentMode));
+                        }
+                        else if (textParts[j] || i === textConfig.length - 1) {
+                            paragraphs.push(new Paragraph(textParts[j], true, richTextConfig, ascentDescentMode));
+                        }
+                        else {
+                            const nextRichTextConfig = this.combinedStyleToCharacter(textConfig[i + 1]);
+                            paragraphs.push(new Paragraph(textParts[j], true, nextRichTextConfig, ascentDescentMode));
+                        }
                     }
                 }
                 else if (richTextConfig.text) {
@@ -18981,7 +19027,7 @@ class RichText extends Graphic {
         const frameHeight = richTextHeightEnable ? height : maxHeightFinite ? maxHeight : 0;
         const frame = new Frame(0, 0, frameWidth || 0, frameHeight || 0, ellipsis, wordBreak, verticalDirection, textAlign, textBaseline, layoutDirection || 'horizontal', !richTextWidthEnable && maxWidthFinite, !richTextHeightEnable && maxHeightFinite, singleLine || false, (_a = this._frameCache) === null || _a === void 0 ? void 0 : _a.icons);
         const wrapper = new Wrapper(frame);
-        wrapper.newLine = editable;
+        wrapper.newLine = enableMultiBreakLine;
         if (disableAutoWrapLine) {
             let lineCount = 0;
             let skip = false;
@@ -19029,7 +19075,7 @@ class RichText extends Graphic {
                 l.calcOffset(offsetSize, false);
             });
         }
-        if (editable) {
+        if (enableMultiBreakLine) {
             frame.lines.forEach(item => {
                 const lastParagraphs = item.paragraphs;
                 item.paragraphs = item.paragraphs.filter(p => p.text !== '');
@@ -26858,7 +26904,7 @@ function flatten_simplify(points, tolerance, highestQuality) {
 }
 
 function getDefaultCharacterConfig(attribute) {
-    const { fill = 'black', stroke = false, fontWeight = 'normal', fontFamily = 'Arial' } = attribute;
+    const { fill = 'black', stroke = false, fontWeight = 'normal', lineHeight, fontFamily = 'Arial' } = attribute;
     let { fontSize = 12 } = attribute;
     if (!isFinite(fontSize)) {
         fontSize = 12;
@@ -26868,7 +26914,8 @@ function getDefaultCharacterConfig(attribute) {
         stroke,
         fontSize,
         fontWeight,
-        fontFamily
+        fontFamily,
+        lineHeight
     };
 }
 function findConfigIndexByCursorIdx(textConfig, cursorIndex) {
@@ -27280,28 +27327,31 @@ class RichTextEditPlugin {
             throw new Error('不会走到这里 handleFocusOut');
         };
         this.handleMove = (e) => {
-            if (!this.isRichtext(e)) {
+            if (this.currRt && !this.currRt.attribute.editable) {
+                this.deFocus(true);
+            }
+            if (!this.isEditableRichtext(e)) {
+                this.handleLeave();
                 return;
             }
-            this.currRt = e.target;
-            this.handleEnter(e);
+            this.handleEnter();
             e.target.once('pointerleave', this.handleLeave, { capture: true });
             this.tryShowSelection(e, false);
         };
-        this.handleEnter = (e) => {
+        this.handleEnter = () => {
             this.editing = true;
             this.pluginService.stage.setCursor('text');
         };
-        this.handleLeave = (e) => {
+        this.handleLeave = () => {
             this.editing = false;
             this.pluginService.stage.setCursor('default');
         };
         this.handlePointerDown = (e) => {
-            if (this.editing) {
-                this.onFocus(e);
+            if (!this.editing || !this.isEditableRichtext(e)) {
+                this.deFocus(true);
             }
             else {
-                this.deFocus(true);
+                this.onFocus(e);
             }
             this.triggerRender();
             this.pointerDown = true;
@@ -27503,6 +27553,7 @@ 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();
@@ -27603,7 +27654,7 @@ class RichTextEditPlugin {
             zIndex: -1
         });
         const shadow = this.getShadow(this.currRt);
-        shadow.add(this.shadowBounds);
+        this.addEditLineOrBgOrBounds(this.shadowBounds, shadow);
         this.offsetLineBgAndShadowBounds();
         this.offsetShadowRoot();
     }
@@ -27636,10 +27687,27 @@ class RichTextEditPlugin {
     stopPropagation(e) {
         e.stopPropagation();
     }
+    addEditLineOrBgOrBounds(graphic, shadowRoot) {
+        let group = shadowRoot.getElementById('emptyBoundsContainer');
+        if (!group) {
+            group = createGroup({ x: 0, y: 0, width: 0, height: 0, boundsMode: 'empty' });
+            group.id = 'emptyBoundsContainer';
+            shadowRoot.add(group);
+        }
+        group.add(graphic);
+    }
+    removeEditLineOrBgOrBounds(graphic, shadowRoot) {
+        const group = shadowRoot.getElementById('emptyBoundsContainer');
+        if (!group) {
+            return;
+        }
+        group.removeChild(graphic);
+    }
     onFocus(e, data) {
         this.updateCbs && this.updateCbs.forEach(cb => cb('beforeOnfocus', this));
         this.deFocus(false);
         this.focusing = true;
+        this.editing = true;
         const target = e.target;
         if (!(target && target.type === 'richtext')) {
             return;
@@ -27663,8 +27731,8 @@ class RichTextEditPlugin {
             this.ticker.start(true);
             const g = createGroup({ x: 0, y: 0, width: 0, height: 0 });
             this.editBg = g;
-            shadowRoot.add(this.editLine);
-            shadowRoot.add(this.editBg);
+            this.addEditLineOrBgOrBounds(this.editLine, shadowRoot);
+            this.addEditLineOrBgOrBounds(this.editBg, shadowRoot);
         }
         data = data || this.computedCursorPosByEvent(e, cache);
         if (data) {
@@ -27729,32 +27797,33 @@ class RichTextEditPlugin {
         }
     }
     deFocus(trulyDeFocus = false) {
+        this.editing = false;
         this.updateCbs && this.updateCbs.forEach(cb => cb('beforeDefocus', this, { trulyDeFocus }));
-        const target = this.currRt;
-        if (!target) {
+        const currRt = this.currRt;
+        if (!currRt) {
             return;
         }
-        const { editOptions = {} } = target.attribute;
+        const { editOptions = {} } = currRt.attribute;
         if (editOptions.stopPropagation) {
-            target.removeEventListener('*', this.stopPropagation);
+            currRt.removeEventListener('*', this.stopPropagation);
         }
         if (trulyDeFocus) {
             this.trySyncPlaceholderToTextConfig();
-            target.detachShadow();
+            currRt.detachShadow();
         }
-        const currRt = this.currRt;
         this.currRt = null;
+        const shadowRoot = this.getShadow(currRt);
         if (this.editLine) {
-            this.editLine.parent && this.editLine.parent.removeChild(this.editLine);
+            this.removeEditLineOrBgOrBounds(this.editLine, shadowRoot);
             this.editLine.release();
             this.editLine = null;
-            this.editBg.parent && this.editBg.parent.removeChild(this.editBg);
+            this.removeEditLineOrBgOrBounds(this.editBg, shadowRoot);
             this.editBg.release();
             this.editBg = null;
         }
         if (trulyDeFocus) {
             if (this.shadowBounds) {
-                this.shadowBounds.parent && this.shadowBounds.parent.removeChild(this.shadowBounds);
+                this.removeEditLineOrBgOrBounds(this.shadowBounds, shadowRoot);
                 this.shadowBounds.release();
                 this.shadowBounds = null;
             }
@@ -27774,8 +27843,10 @@ 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();
@@ -27906,7 +27977,7 @@ class RichTextEditPlugin {
     }
     getShadow(rt) {
         const sr = rt.shadowRoot || rt.attachShadow();
-        sr.setAttributes({ boundsMode: 'empty' });
+        sr.setAttributes({ width: 1, height: 1 });
         return sr;
     }
     getLineByPoint(cache, p1) {
@@ -27967,7 +28038,10 @@ class RichTextEditPlugin {
         return -1;
     }
     isRichtext(e) {
-        return !!(e.target && e.target.type === 'richtext' && e.target.attribute.editable);
+        return !!(e.target && e.target.type === 'richtext');
+    }
+    isEditableRichtext(e) {
+        return this.isRichtext(e) && !!e.target.attribute.editable;
     }
     triggerRender() {
         this.pluginService.stage.renderNextFrame();
@@ -28130,7 +28204,7 @@ class RichTextEditPlugin {
         }
     }
     _forceFocusByEvent(e) {
-        this.handleEnter(e);
+        this.handleEnter();
         this.handlePointerDown(e);
         this.handlePointerUp(e);
     }

package/es/common/custom-path2d.js

@@ -204,15 +204,17 @@ export class CustomPath2D extends CurvePath {
                 break;
 
               case "s":
-                tempX = x + current[3], tempY = y + current[4], controlX = 2 * x - controlX, controlY = 2 * y - controlY, 
-                this.bezierCurveTo(controlX + l, controlY + t, x + current[1] + l, y + current[2] + t, tempX + l, tempY + t), 
-                controlX = x + current[1], controlY = y + current[2], x = tempX, y = tempY;
+                tempX = x + current[3], tempY = y + current[4], null === previous[0].match(/[CcSs]/) ? (controlX = x, 
+                controlY = y) : (controlX = 2 * x - controlX, controlY = 2 * y - controlY), tempControlX = x + current[1], 
+                tempControlY = y + current[2], this.bezierCurveTo(controlX + l, controlY + t, tempControlX + l, tempControlY + t, tempX + l, tempY + t), 
+                controlX = tempControlX, controlY = tempControlY, x = tempX, y = tempY;
                 break;
 
               case "S":
-                tempX = current[3], tempY = current[4], controlX = 2 * x - controlX, controlY = 2 * y - controlY, 
-                this.bezierCurveTo(controlX + l, controlY + t, current[1] + l, current[2] + t, tempX + l, tempY + t), 
-                x = tempX, y = tempY, controlX = current[1], controlY = current[2];
+                tempX = current[3], tempY = current[4], null === previous[0].match(/[CcSs]/) ? (controlX = x, 
+                controlY = y) : (controlX = 2 * x - controlX, controlY = 2 * y - controlY), tempControlX = current[1], 
+                tempControlY = current[2], this.bezierCurveTo(controlX + l, controlY + t, tempControlX + l, tempControlY + t, tempX + l, tempY + t), 
+                controlX = tempControlX, controlY = tempControlY, x = tempX, y = tempY;
                 break;
 
               case "q":