leafer-game 1.4.2 → 1.5.0

package/dist/web.module.js

@@ -4070,12 +4070,11 @@ function defineDataProcessor(target, key, defaultValue) {
     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;
         };
     }
@@ -5722,10 +5721,10 @@ let Leaf = class Leaf {
     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))
@@ -6052,7 +6051,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.4.2";
+const version = "1.5.0";
 
 const debug$5 = Debug.get('LeaferCanvas');
 class LeaferCanvas extends LeaferCanvasBase {
@@ -7120,7 +7119,11 @@ const State = {
     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 = {};
@@ -7544,9 +7547,6 @@ let UI = UI_1 = class UI extends Leaf {
             this.__drawPathByBox(pen);
         return pen;
     }
-    get editConfig() { return undefined; }
-    get editOuter() { return ''; }
-    get editInner() { return ''; }
     constructor(data) {
         super(data);
     }
@@ -7628,8 +7628,11 @@ let UI = UI_1 = class UI extends Leaf {
     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);
@@ -7928,7 +7931,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
     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 = {
@@ -8230,6 +8233,10 @@ let Leafer = Leafer_1 = class Leafer extends Group {
     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();
     }
@@ -10198,8 +10205,6 @@ ui$5.__updateHitCanvas = function () {
     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;
@@ -11863,13 +11868,14 @@ function toChar(data, charX, rowData, isOverflow) {
 }
 
 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) {
@@ -11881,7 +11887,7 @@ function layoutText(drawData, style) {
     }
     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)) {
@@ -11950,7 +11956,7 @@ function clipText(drawData, style, x, width) {
                     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;
@@ -12540,17 +12546,17 @@ State.getStyle = getStyle;
 State.updateStyle = updateStyle;
 State.updateEventStyle = updateEventStyle;
 const ui$3 = 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');
+UI.addAttr('selected', false, stateType, 'selectedStyle');
+UI.addAttr('disabled', false, stateType, 'disabledStyle');
+UI.addAttr('states', {}, stateStyleType);
+UI.addAttr('state', '', stateType);
+UI.addAttr('normalStyle', undefined, dataType);
+UI.addAttr('hoverStyle', undefined, stateStyleType);
+UI.addAttr('pressStyle', undefined, stateStyleType);
+UI.addAttr('focusStyle', undefined, stateStyleType);
+UI.addAttr('selectedStyle', undefined, stateStyleType);
+UI.addAttr('disabledStyle', undefined, stateStyleType);
+UI.addAttr('button', false, dataType);
 ui$3.focus = function (value = true) {
     this.waitLeafer(() => {
         let { focusData } = this.app.interaction;
@@ -13515,7 +13521,6 @@ const TransitionList = {
     innerShadow: shadow
 };
 const TransitionModule = {
-    list: TransitionList,
     value,
     number,
     color
@@ -13560,13 +13565,13 @@ function shadow(from, to, t) {
 
 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 = UI.prototype;
-animationType()(ui$2, 'animation');
-dataType()(ui$2, 'animationOut');
-dataType(true)(ui$2, 'transition');
-dataType()(ui$2, 'transitionOut');
+UI.addAttr('animation', undefined, animationType);
+UI.addAttr('animationOut', undefined, dataType);
+UI.addAttr('transition', true, dataType);
+UI.addAttr('transitionOut', undefined, dataType);
 ui$2.animate = function (keyframe, options, kill, isTemp) {
     if (keyframe === undefined)
         return this.__animate;
@@ -13740,7 +13745,7 @@ const HighCurveHelper = {
                     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;
@@ -13759,7 +13764,7 @@ const HighCurveHelper = {
                     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);
@@ -13795,7 +13800,7 @@ const HighCurveHelper = {
                     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;
@@ -13816,7 +13821,7 @@ const HighCurveHelper = {
                     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;
@@ -13867,10 +13872,10 @@ Transition.register('motionRotation', function (from, to, t) {
 const ui$1 = 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');
+UI.addAttr('motionPath', undefined, motionPathType);
+UI.addAttr('motionPrecision', 1, motionPathType);
+UI.addAttr('motion', undefined, motionPathType);
+UI.addAttr('motionRotation', true, motionPathType);
 ui$1.getMotionPathData = function () {
     return getMotionPathData(getMotionPath(this));
 };