leafer-game 1.4.2 → 1.5.0

package/dist/web.js

@@ -4073,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;
             };
         }
@@ -5725,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))
@@ -6055,7 +6054,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.4.2";
+    const version = "1.5.0";
 
     const debug$5 = Debug.get('LeaferCanvas');
     class LeaferCanvas extends LeaferCanvasBase {
@@ -7123,7 +7122,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 +7550,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 +7631,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 +7934,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 +8236,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 +10208,6 @@ var LeaferUI = (function (exports) {
         h.setStrokeOptions(data);
     };
     ui$5.__hit = function (inner) {
-        if (Platform.name === 'miniapp')
-            this.__drawHitPath(this.__hitCanvas);
         const data = this.__;
         if (data.__isHitPixel && this.__hitPixel(inner))
             return true;
@@ -11866,13 +11871,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 +11890,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 +11959,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;
@@ -12543,17 +12549,17 @@ var LeaferUI = (function (exports) {
     State.updateStyle = updateStyle;
     State.updateEventStyle = updateEventStyle;
     const ui$3 = exports.UI.prototype;
-    stateType(false, 'selectedStyle')(ui$3, 'selected');
-    stateType(false, 'disabledStyle')(ui$3, 'disabled');
-    stateStyleType({})(ui$3, 'states');
-    stateType('')(ui$3, 'state');
-    dataType()(ui$3, 'normalStyle');
-    stateStyleType()(ui$3, 'hoverStyle');
-    stateStyleType()(ui$3, 'pressStyle');
-    stateStyleType()(ui$3, 'focusStyle');
-    stateStyleType()(ui$3, 'selectedStyle');
-    stateStyleType()(ui$3, 'disabledStyle');
-    dataType(false)(ui$3, 'button');
+    exports.UI.addAttr('selected', false, stateType, 'selectedStyle');
+    exports.UI.addAttr('disabled', false, stateType, 'disabledStyle');
+    exports.UI.addAttr('states', {}, stateStyleType);
+    exports.UI.addAttr('state', '', stateType);
+    exports.UI.addAttr('normalStyle', undefined, dataType);
+    exports.UI.addAttr('hoverStyle', undefined, stateStyleType);
+    exports.UI.addAttr('pressStyle', undefined, stateStyleType);
+    exports.UI.addAttr('focusStyle', undefined, stateStyleType);
+    exports.UI.addAttr('selectedStyle', undefined, stateStyleType);
+    exports.UI.addAttr('disabledStyle', undefined, stateStyleType);
+    exports.UI.addAttr('button', false, dataType);
     ui$3.focus = function (value = true) {
         this.waitLeafer(() => {
             let { focusData } = this.app.interaction;
@@ -13518,7 +13524,6 @@ var LeaferUI = (function (exports) {
         innerShadow: shadow
     };
     const TransitionModule = {
-        list: TransitionList,
         value,
         number,
         color
@@ -13563,13 +13568,13 @@ var LeaferUI = (function (exports) {
 
     Plugin.add('animate', 'color');
     State.canAnimate = true;
-    Object.assign(Transition, Object.assign(Object.assign({}, TransitionModule), { register(attrName, fn) { Transition.list[attrName] = fn; },
-        get(attrName) { return Transition.list[attrName]; } }));
+    Object.assign(Transition.list, TransitionList);
+    Object.assign(Transition, TransitionModule);
     const ui$2 = exports.UI.prototype;
-    animationType()(ui$2, 'animation');
-    dataType()(ui$2, 'animationOut');
-    dataType(true)(ui$2, 'transition');
-    dataType()(ui$2, 'transitionOut');
+    exports.UI.addAttr('animation', undefined, animationType);
+    exports.UI.addAttr('animationOut', undefined, dataType);
+    exports.UI.addAttr('transition', true, dataType);
+    exports.UI.addAttr('transitionOut', undefined, dataType);
     ui$2.animate = function (keyframe, options, kill, isTemp) {
         if (keyframe === undefined)
             return this.__animate;
@@ -13743,7 +13748,7 @@ var LeaferUI = (function (exports) {
                         toX = data[i + 1];
                         toY = data[i + 2];
                         distance = segments[index];
-                        if (total + distance > motionDistance || !distanceData.total) {
+                        if (total + distance >= motionDistance || !distanceData.total) {
                             if (!i)
                                 x = toX, y = toY;
                             tempFrom.x = x;
@@ -13762,7 +13767,7 @@ var LeaferUI = (function (exports) {
                         toX = data[i + 5];
                         toY = data[i + 6];
                         distance = segments[index];
-                        if (total + distance > motionDistance) {
+                        if (total + distance >= motionDistance) {
                             x1 = data[i + 1], y1 = data[i + 2], x2 = data[i + 3], y2 = data[i + 4];
                             t = HighBezierHelper.getT(motionDistance - total, distance, x, y, x1, y1, x2, y2, toX, toY, motionPrecision);
                             BezierHelper.getPointAndSet(t, x, y, x1, y1, x2, y2, toX, toY, to);
@@ -13798,7 +13803,7 @@ var LeaferUI = (function (exports) {
                         toX = data[i + 1];
                         toY = data[i + 2];
                         distance = segments[index];
-                        if (total + distance > motionDistance || !distanceData.total) {
+                        if (total + distance >= motionDistance || !distanceData.total) {
                             if (!i)
                                 x = toX, y = toY;
                             tempFrom.x = x;
@@ -13819,7 +13824,7 @@ var LeaferUI = (function (exports) {
                         toX = data[i + 5];
                         toY = data[i + 6];
                         distance = segments[index];
-                        if (total + distance > motionDistance) {
+                        if (total + distance >= motionDistance) {
                             t = HighBezierHelper.getT(motionDistance - total, distance, x, y, x1, y1, x2, y2, toX, toY, motionPrecision);
                             HighBezierHelper.cut(path, t, x, y, x1, y1, x2, y2, toX, toY);
                             return path;
@@ -13870,10 +13875,10 @@ var LeaferUI = (function (exports) {
     const ui$1 = exports.UI.prototype;
     const { updateMatrix, updateAllMatrix } = LeafHelper;
     const { updateBounds } = BranchHelper;
-    motionPathType()(ui$1, 'motionPath');
-    motionPathType(1)(ui$1, 'motionPrecision');
-    motionPathType()(ui$1, 'motion');
-    motionPathType(true)(ui$1, 'motionRotation');
+    exports.UI.addAttr('motionPath', undefined, motionPathType);
+    exports.UI.addAttr('motionPrecision', 1, motionPathType);
+    exports.UI.addAttr('motion', undefined, motionPathType);
+    exports.UI.addAttr('motionRotation', true, motionPathType);
     ui$1.getMotionPathData = function () {
         return getMotionPathData(getMotionPath(this));
     };