@leafer-ui/worker 1.4.1 → 1.5.0

package/dist/worker.js

@@ -3638,7 +3638,12 @@ var LeaferUI = (function (exports) {
             return R.map[key];
         },
         remove(key) {
-            delete R.map[key];
+            const r = R.map[key];
+            if (r) {
+                if (r.destroy)
+                    r.destroy();
+                delete R.map[key];
+            }
         },
         loadImage(key, format) {
             return new Promise((resolve, reject) => {
@@ -3664,6 +3669,7 @@ var LeaferUI = (function (exports) {
     const R = Resource;
 
     const ImageManager = {
+        maxRecycled: 100,
         recycledList: [],
         patternTasker: new TaskProcessor(),
         get(config) {
@@ -3680,13 +3686,8 @@ var LeaferUI = (function (exports) {
         },
         clearRecycled() {
             const list = I$1.recycledList;
-            if (list.length > 100) {
-                list.forEach(image => {
-                    if (!image.use && image.url) {
-                        Resource.remove(image.url);
-                        image.destroy();
-                    }
-                });
+            if (list.length > I$1.maxRecycled) {
+                list.forEach(image => (!image.use && image.url) && Resource.remove(image.url));
                 list.length = 0;
             }
         },
@@ -4072,12 +4073,11 @@ var LeaferUI = (function (exports) {
         if (defaultValue === undefined) {
             property.get = function () { return this[computedKey]; };
         }
-        else if (typeof defaultValue === 'object') {
-            const { clone } = DataHelper;
+        else if (typeof defaultValue === 'function') {
             property.get = function () {
                 let v = this[computedKey];
                 if (v === undefined)
-                    this[computedKey] = v = clone(defaultValue);
+                    this[computedKey] = v = defaultValue(this.__leaf);
                 return v;
             };
         }
@@ -5724,10 +5724,10 @@ var LeaferUI = (function (exports) {
         static changeAttr(attrName, defaultValue, fn) {
             fn ? this.addAttr(attrName, defaultValue, fn) : defineDataProcessor(this.prototype, attrName, defaultValue);
         }
-        static addAttr(attrName, defaultValue, fn) {
+        static addAttr(attrName, defaultValue, fn, helpValue) {
             if (!fn)
                 fn = boundsType;
-            fn(defaultValue)(this.prototype, attrName);
+            fn(defaultValue, helpValue)(this.prototype, attrName);
         }
         __emitLifeEvent(type) {
             if (this.hasEvent(type))
@@ -6054,7 +6054,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.4.1";
+    const version = "1.5.0";
 
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() { return true; }
@@ -6941,7 +6941,11 @@ var LeaferUI = (function (exports) {
         setStyleName() { return Plugin.need('state'); },
         set() { return Plugin.need('state'); }
     };
-    const Transition = {};
+    const Transition = {
+        list: {},
+        register(attrName, fn) { Transition.list[attrName] = fn; },
+        get(attrName) { return Transition.list[attrName]; }
+    };
 
     const { parse, objectToCanvasData } = PathConvert;
     const emptyPaint = {};
@@ -7365,9 +7369,6 @@ var LeaferUI = (function (exports) {
                 this.__drawPathByBox(pen);
             return pen;
         }
-        get editConfig() { return undefined; }
-        get editOuter() { return ''; }
-        get editInner() { return ''; }
         constructor(data) {
             super(data);
         }
@@ -7449,8 +7450,11 @@ var LeaferUI = (function (exports) {
         export(_filename, _options) {
             return Plugin.need('export');
         }
+        syncExport(_filename, _options) {
+            return Plugin.need('export');
+        }
         clone(data) {
-            const json = this.toJSON();
+            const json = DataHelper.clone(this.toJSON());
             if (data)
                 Object.assign(json, data);
             return UI_1.one(json);
@@ -7749,7 +7753,7 @@ var LeaferUI = (function (exports) {
         get layoutLocked() { return !this.layouter.running; }
         get FPS() { return this.renderer ? this.renderer.FPS : 60; }
         get cursorPoint() { return (this.interaction && this.interaction.hoverData) || { x: this.width / 2, y: this.height / 2 }; }
-        get clientBounds() { return this.canvas && this.canvas.getClientBounds(); }
+        get clientBounds() { return (this.canvas && this.canvas.getClientBounds(true)) || getBoundsData(); }
         constructor(userConfig, data) {
             super(data);
             this.config = {
@@ -8051,6 +8055,10 @@ var LeaferUI = (function (exports) {
         getPagePointByClient(clientPoint, updateClient) {
             return this.getPagePoint(this.getWorldPointByClient(clientPoint, updateClient));
         }
+        getClientPointByWorld(worldPoint) {
+            const { x, y } = this.clientBounds;
+            return { x: x + worldPoint.x, y: y + worldPoint.y };
+        }
         updateClientBounds() {
             this.canvas && this.canvas.updateClientBounds();
         }
@@ -10019,8 +10027,6 @@ var LeaferUI = (function (exports) {
         h.setStrokeOptions(data);
     };
     ui$1.__hit = function (inner) {
-        if (Platform.name === 'miniapp')
-            this.__drawHitPath(this.__hitCanvas);
         const data = this.__;
         if (data.__isHitPixel && this.__hitPixel(inner))
             return true;
@@ -11375,13 +11381,14 @@ var LeaferUI = (function (exports) {
     }
 
     function layoutText(drawData, style) {
-        const { rows, bounds } = drawData;
+        const { rows, bounds } = drawData, countRows = rows.length;
         const { __lineHeight, __baseLine, __letterSpacing, __clipText, textAlign, verticalAlign, paraSpacing, autoSizeAlign } = style;
-        let { x, y, width, height } = bounds, realHeight = __lineHeight * rows.length + (paraSpacing ? paraSpacing * (drawData.paraNumber - 1) : 0);
+        let { x, y, width, height } = bounds, realHeight = __lineHeight * countRows + (paraSpacing ? paraSpacing * (drawData.paraNumber - 1) : 0);
         let starY = __baseLine;
         if (__clipText && realHeight > height) {
             realHeight = Math.max(height, __lineHeight);
-            drawData.overflow = rows.length;
+            if (countRows > 1)
+                drawData.overflow = countRows;
         }
         else if (height || autoSizeAlign) {
             switch (verticalAlign) {
@@ -11393,7 +11400,7 @@ var LeaferUI = (function (exports) {
         }
         starY += y;
         let row, rowX, rowWidth, layoutWidth = (width || autoSizeAlign) ? width : drawData.maxWidth;
-        for (let i = 0, len = rows.length; i < len; i++) {
+        for (let i = 0, len = countRows; i < len; i++) {
             row = rows[i];
             row.x = x;
             if (row.width < width || (row.width > width && !__clipText)) {
@@ -11462,7 +11469,7 @@ var LeaferUI = (function (exports) {
                         if (i === end && charRight < right) {
                             break;
                         }
-                        else if (charRight < right && char.char !== ' ') {
+                        else if ((charRight < right && char.char !== ' ') || !i) {
                             row.data.splice(i + 1);
                             row.width -= char.width;
                             break;