leafer-ui 1.0.0-rc.2 → 1.0.0-rc.3

package/dist/web.module.js

@@ -1048,6 +1048,9 @@ const EventCreator = {
             }
         }
     },
+    has(type) {
+        return !!this.nameList[type];
+    },
     get(type, ...params) {
         return new nameList[type](...params);
     }
@@ -5158,6 +5161,8 @@ const LeafEventer = {
         this.on(type, listener, { once: true, capture });
     },
     emit(type, event, capture) {
+        if (!event && EventCreator.has(type))
+            event = EventCreator.get(type, { type, target: this, current: this });
         const map = __getListenerMap(this, capture);
         const list = map[type];
         if (list) {
@@ -8272,14 +8277,19 @@ let Polygon = class Polygon extends UI {
     __updateRenderPath() {
         if (this.__.points && this.__.curve) {
             drawPoints$1(this.__.__pathForRender = [], this.__.points, this.__.curve, true);
-            this.__updateNaturalSize();
         }
         else {
             super.__updateRenderPath();
         }
     }
     __updateBoxBounds() {
-        this.__.points ? toBounds$2(this.__.path, this.__layout.boxBounds) : super.__updateBoxBounds();
+        if (this.__.points) {
+            toBounds$2(this.__.__pathForRender, this.__layout.boxBounds);
+            this.__updateNaturalSize();
+        }
+        else {
+            super.__updateBoxBounds();
+        }
     }
 };
 __decorate([
@@ -8373,7 +8383,7 @@ let Line = class Line extends UI {
     }
     __updateBoxBounds() {
         if (this.points) {
-            toBounds$1(this.__.path, this.__layout.boxBounds);
+            toBounds$1(this.__.__pathForRender, this.__layout.boxBounds);
             this.__updateNaturalSize();
         }
         else {
@@ -9999,7 +10009,7 @@ function getTextCase(char, textCase, firstChar) {
 const { trimRight } = TextRowHelper;
 const { Letter, Single, Before, After, Symbol, Break } = CharType;
 let word, row, wordWidth, rowWidth, realWidth;
-let char, charWidth, charType, lastCharType, langBreak, afterBreak, paraStart;
+let char, charWidth, startCharSize, charSize, charType, lastCharType, langBreak, afterBreak, paraStart;
 let textDrawData, rows = [], bounds;
 function createRows(drawData, content, style) {
     textDrawData = drawData;
@@ -10012,7 +10022,7 @@ function createRows(drawData, content, style) {
     if (charMode) {
         paraStart = true;
         lastCharType = null;
-        wordWidth = rowWidth = 0;
+        startCharSize = charWidth = charSize = wordWidth = rowWidth = 0;
         word = { data: [] }, row = { words: [] };
         for (let i = 0, len = content.length; i < len; i++) {
             char = content[i];
@@ -10028,8 +10038,11 @@ function createRows(drawData, content, style) {
                 if (charType === Letter && textCase !== 'none')
                     char = getTextCase(char, textCase, !wordWidth);
                 charWidth = canvas.measureText(char).width;
-                if (__letterSpacing)
+                if (__letterSpacing) {
+                    if (__letterSpacing < 0)
+                        charSize = charWidth;
                     charWidth += __letterSpacing;
+                }
                 langBreak = (charType === Single && (lastCharType === Single || lastCharType === Letter)) || (lastCharType === Single && charType !== After);
                 afterBreak = ((charType === Before || charType === Single) && (lastCharType === Symbol || lastCharType === After));
                 realWidth = paraStart && paraIndent ? width - paraIndent : width;
@@ -10079,6 +10092,8 @@ function createRows(drawData, content, style) {
     }
 }
 function addChar(char, width) {
+    if (charSize && !startCharSize)
+        startCharSize = charSize;
     word.data.push({ char, width });
     wordWidth += width;
 }
@@ -10095,6 +10110,11 @@ function addRow() {
         row.paraStart = true;
         paraStart = false;
     }
+    if (charSize) {
+        row.startCharSize = startCharSize;
+        row.endCharSize = charSize;
+        startCharSize = 0;
+    }
     row.width = rowWidth;
     if (bounds.width)
         trimRight(row);
@@ -10168,7 +10188,7 @@ function toChar(data, charX, rowData) {
 
 function layoutText(drawData, style) {
     const { rows, bounds } = drawData;
-    const { __lineHeight, __baseLine, textAlign, verticalAlign, paraSpacing, textOverflow } = style;
+    const { __lineHeight, __baseLine, __letterSpacing, textAlign, verticalAlign, paraSpacing, textOverflow } = style;
     let { x, y, width, height } = bounds, realHeight = __lineHeight * rows.length + (paraSpacing ? paraSpacing * (drawData.paraNumber - 1) : 0);
     let starY = __baseLine;
     if (textOverflow !== 'show' && realHeight > height) {
@@ -10185,7 +10205,7 @@ function layoutText(drawData, style) {
         }
     }
     starY += y;
-    let row;
+    let row, rowX, rowWidth;
     for (let i = 0, len = rows.length; i < len; i++) {
         row = rows[i];
         row.x = x;
@@ -10204,20 +10224,22 @@ function layoutText(drawData, style) {
             row.isOverflow = true;
             drawData.overflow = i + 1;
         }
-        if (row.width < 0) {
-            const charWidth = row.words[0].data[0].width;
-            const rowX = row.x + row.width;
-            if (rowX < bounds.x)
-                bounds.x = rowX - charWidth;
-            if (-row.width > bounds.width)
-                bounds.width = -row.width + style.fontSize + charWidth;
-        }
-        else {
-            if (row.x < bounds.x)
-                bounds.x = row.x;
-            if (row.width > bounds.width)
-                bounds.width = row.width;
+        rowX = row.x;
+        rowWidth = row.width;
+        if (__letterSpacing < 0) {
+            if (row.width < 0) {
+                rowWidth = -row.width + style.fontSize + __letterSpacing;
+                rowX -= rowWidth;
+                rowWidth += style.fontSize;
+            }
+            else {
+                rowWidth -= __letterSpacing;
+            }
         }
+        if (rowX < bounds.x)
+            bounds.x = rowX;
+        if (rowWidth > bounds.width)
+            bounds.width = rowWidth;
     }
     bounds.y = y;
     bounds.height = realHeight;
@@ -10269,10 +10291,9 @@ const TextConvert = {
         if (typeof content !== 'string')
             content = String(content);
         let x = 0, y = 0;
-        let { width, height, padding } = style;
-        const { textDecoration, textOverflow, __font } = style;
-        if (!width)
-            width = 0;
+        let width = style.__getInput('width') || 0;
+        let height = style.__getInput('height') || 0;
+        const { textDecoration, textOverflow, __font, padding } = style;
         if (padding) {
             const [top, right, bottom, left] = MathHelper.fourNumber(padding);
             if (width) {