leafer-ui 1.4.2 → 1.5.1

package/dist/web.js

@@ -2032,13 +2032,11 @@ var LeaferUI = (function (exports) {
             this.worldTransform = {};
             if (!config)
                 config = minSize;
-            if (!config.pixelRatio)
-                config.pixelRatio = Platform.devicePixelRatio;
             this.manager = manager;
             this.innerId = IncrementId.create(IncrementId.CNAVAS);
             const { width, height, pixelRatio } = config;
             this.autoLayout = !width || !height;
-            this.size.pixelRatio = pixelRatio;
+            this.size.pixelRatio = pixelRatio | Platform.devicePixelRatio;
             this.config = config;
             this.init();
         }
@@ -2235,7 +2233,7 @@ var LeaferUI = (function (exports) {
                 tempBounds$1.ceil();
         }
         isSameSize(size) {
-            return this.width === size.width && this.height === size.height && this.pixelRatio === size.pixelRatio;
+            return this.width === size.width && this.height === size.height && (!size.pixelRatio || this.pixelRatio === size.pixelRatio);
         }
         getSameCanvas(useSameWorldTransform, useSameSmooth) {
             const canvas = this.manager ? this.manager.get(this.size) : Creator.canvas(Object.assign({}, this.size));
@@ -4073,13 +4071,10 @@ 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);
-                return v;
+                return v === undefined ? defaultValue(this.__leaf) : v;
             };
         }
         if (key === 'width') {
@@ -5725,10 +5720,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))
@@ -6055,7 +6050,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.4.2";
+    const version = "1.5.1";
 
     const debug$5 = Debug.get('LeaferCanvas');
     class LeaferCanvas extends LeaferCanvasBase {
@@ -6177,7 +6172,7 @@ var LeaferUI = (function (exports) {
             else {
                 window.addEventListener('resize', this.windowListener = () => {
                     const pixelRatio = Platform.devicePixelRatio;
-                    if (this.pixelRatio !== pixelRatio) {
+                    if (!this.config.pixelRatio && this.pixelRatio !== pixelRatio) {
                         const { width, height } = this;
                         this.emitResize({ width, height, pixelRatio });
                     }
@@ -6194,7 +6189,7 @@ var LeaferUI = (function (exports) {
         checkAutoBounds(parentSize) {
             const view = this.view;
             const { x, y, width, height } = this.autoBounds.getBoundsFrom(parentSize);
-            const size = { width, height, pixelRatio: Platform.devicePixelRatio };
+            const size = { width, height, pixelRatio: this.config.pixelRatio ? this.pixelRatio : Platform.devicePixelRatio };
             if (!this.isSameSize(size)) {
                 const { style } = view;
                 style.marginLeft = x + 'px';
@@ -7123,7 +7118,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 = {};
@@ -7547,9 +7546,6 @@ var LeaferUI = (function (exports) {
                 this.__drawPathByBox(pen);
             return pen;
         }
-        get editConfig() { return undefined; }
-        get editOuter() { return ''; }
-        get editInner() { return ''; }
         constructor(data) {
             super(data);
         }
@@ -7631,8 +7627,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);
@@ -7931,7 +7930,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 = {
@@ -8233,6 +8232,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();
         }
@@ -10201,8 +10204,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;
@@ -11866,13 +11867,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) {
@@ -11884,7 +11886,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)) {
@@ -11953,7 +11955,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;