@leafer-game/worker 1.3.1 → 1.3.2

package/dist/worker.module.js

@@ -6007,7 +6007,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.3.1";
+const version = "1.3.2";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() { return true; }
@@ -6539,7 +6539,7 @@ class Renderer {
     partRender() {
         const { canvas, updateBlocks: list } = this;
         if (!list)
-            return debug$3.warn('PartRender: need update attr');
+            return;
         this.mergeBlocks();
         list.forEach(block => { if (canvas.bounds.hit(block) && !block.isEmpty())
             this.clipRender(block); });
@@ -7395,7 +7395,7 @@ let UI = UI_1 = class UI extends Leaf {
     animate(_keyframe, _options, _type, _isTemp) {
         return Plugin.need('animate');
     }
-    killAnimate(_type, _killStyle) { }
+    killAnimate(_type, _nextStyle) { }
     export(_filename, _options) {
         return Plugin.need('export');
     }
@@ -7891,8 +7891,6 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         this.created = true;
     }
     __onReady() {
-        if (this.ready)
-            return;
         this.ready = true;
         this.emitLeafer(LeaferEvent.BEFORE_READY);
         this.emitLeafer(LeaferEvent.READY);
@@ -7906,6 +7904,20 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         this.emitLeafer(LeaferEvent.VIEW_READY);
         WaitHelper.run(this.__viewReadyWait);
     }
+    __onLayoutEnd() {
+        const { grow, growWidth, growHeight } = this.config;
+        if (grow) {
+            let { width, height, pixelRatio } = this;
+            const bounds = grow === 'box' ? this.worldBoxBounds : this.__world;
+            if (growWidth !== false)
+                width = Math.max(1, bounds.x + bounds.width);
+            if (growHeight !== false)
+                height = Math.max(1, bounds.y + bounds.height);
+            this.__doResize({ width, height, pixelRatio });
+        }
+        if (!this.ready)
+            this.__onReady();
+    }
     __onNextRender() {
         if (this.viewReady) {
             WaitHelper.run(this.__nextRenderWait);
@@ -7999,10 +8011,9 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         const runId = Run.start('FirstCreate ' + this.innerName);
         this.once(LeaferEvent.START, () => Run.end(runId));
         this.once(LayoutEvent.START, () => this.updateLazyBounds());
-        this.once(LayoutEvent.END, () => this.__onReady());
         this.once(RenderEvent.START, () => this.__onCreated());
         this.once(RenderEvent.END, () => this.__onViewReady());
-        this.__eventIds.push(this.on_(WatchEvent.DATA, this.__onWatchData, this), this.on_(RenderEvent.NEXT, this.__onNextRender, this));
+        this.__eventIds.push(this.on_(WatchEvent.DATA, this.__onWatchData, this), this.on_(LayoutEvent.END, this.__onLayoutEnd, this), this.on_(RenderEvent.NEXT, this.__onNextRender, this));
     }
     __removeListenEvents() {
         this.off_(this.__eventIds);
@@ -11249,7 +11260,7 @@ function layoutChar(drawData, style, width, _height) {
     rows.forEach(row => {
         if (row.words) {
             indentWidth = paraIndent && row.paraStart ? paraIndent : 0;
-            addWordWidth = (width && textAlign === 'justify' && row.words.length > 1) ? (width - row.width - indentWidth) / (row.words.length - 1) : 0;
+            addWordWidth = (width && (textAlign === 'justify' || textAlign === 'both') && row.words.length > 1) ? (width - row.width - indentWidth) / (row.words.length - 1) : 0;
             mode = (letterSpacing || row.isOverflow) ? CharMode : (addWordWidth > 0.01 ? WordMode : TextMode);
             if (row.isOverflow && !letterSpacing)
                 row.textMode = true;
@@ -11271,7 +11282,7 @@ function layoutChar(drawData, style, width, _height) {
                     else {
                         charX = toChar(word.data, charX, row.data, row.isOverflow);
                     }
-                    if (!row.paraEnd && addWordWidth) {
+                    if (addWordWidth && (!row.paraEnd || textAlign === 'both')) {
                         charX += addWordWidth;
                         row.width += addWordWidth;
                     }
@@ -11746,7 +11757,9 @@ function updateStyle(leaf, style, type) {
         type = null;
     let transition = type ? getTransition(type, style, leaf) : false;
     const fromStyle = transition ? getFromStyle(leaf, style) : undefined;
-    leaf.killAnimate('transition');
+    const nextStyle = State.canAnimate && getStyle(leaf);
+    if (nextStyle)
+        leaf.killAnimate('transition');
     if (normalStyle)
         leaf.set(normalStyle, 'temp');
     const statesStyle = getStyle(leaf);
@@ -12119,8 +12132,11 @@ function animationType(defaultValue) {
     return decorateLeafAttr(defaultValue, (key) => attr({
         set(value) {
             this.__setAttr(key, value);
-            if (this.leafer)
-                value ? this.animate(value, undefined, 'animation') : this.killAnimate('animation');
+            if (this.leafer) {
+                this.killAnimate('animation');
+                if (value)
+                    this.animate(value, undefined, 'animation');
+            }
         }
     }));
 }
@@ -12157,6 +12173,7 @@ let Animate = class Animate extends Eventer {
     get completed() { return this.time >= this.duration && !this.started; }
     get frame() { return this.frames[this.nowIndex]; }
     get frameTotalTime() { return this.frame.totalTime || this.frame.duration || 0; }
+    get nowReverse() { return (this.mainReverse ? 1 : 0) + (this.frameReverse ? 1 : 0) === 1; }
     get realEnding() {
         let count;
         const { ending, reverse, loop } = this;
@@ -12173,6 +12190,12 @@ let Animate = class Animate extends Eventer {
     }
     constructor(target, keyframe, options, isTemp) {
         super();
+        if (keyframe) {
+            if (keyframe.keyframes)
+                options = keyframe, keyframe = keyframe.keyframes;
+            else if (keyframe.style)
+                options = keyframe, keyframe = keyframe.style;
+        }
         this.init(target, keyframe, options, isTemp);
     }
     init(target, keyframe, options, isTemp) {
@@ -12188,16 +12211,14 @@ let Animate = class Animate extends Eventer {
                 break;
             case 'object': this.config = options, options.event && (this.event = options.event);
         }
-        if (!keyframe)
-            return;
-        this.keyframes = keyframe instanceof Array ? keyframe : [keyframe];
+        this.keyframes = keyframe instanceof Array ? keyframe : (keyframe ? [keyframe] : []);
         const { easing, attrs } = this;
         this.easingFn = AnimateEasing.get(easing);
         if (attrs || this.attrsMap)
             this.attrsMap = attrs ? attrs.reduce((map, value) => { map[value] = true; return map; }, {}) : undefined;
         this.frames = [];
         this.create();
-        if (this.autoplay)
+        if (this.autoplay && this.frames.length)
             this.timer = setTimeout(() => {
                 this.timer = 0;
                 this.play();
@@ -12246,7 +12267,7 @@ let Animate = class Animate extends Eventer {
     }
     create() {
         const { target, frames, keyframes, config } = this, { length } = keyframes, joinBefore = length > 1 ? this.join : true;
-        let addedDuration = 0, totalAutoDuration = 0, before, keyframe, item, style;
+        let totalTime = 0, totalAutoTime = 0, before, keyframe, item, style, times;
         if (length > 1)
             this.fromStyle = {}, this.toStyle = {};
         for (let i = 0; i < length; i++) {
@@ -12255,27 +12276,32 @@ let Animate = class Animate extends Eventer {
             if (!before)
                 before = joinBefore ? target : style;
             item = { style, beforeStyle: {} };
+            times = 1;
             if (keyframe.style) {
-                const { duration, autoDuration, delay, autoDelay, easing } = keyframe;
+                const { duration, autoDuration, delay, autoDelay, easing, swing, loop } = keyframe;
+                if (swing)
+                    item.swing = typeof swing === 'number' ? swing : 2, times = item.swing * 2 - 1;
+                if (loop)
+                    item.loop = times = typeof loop === 'number' ? loop : 2;
                 if (duration) {
-                    item.duration = duration, addedDuration += duration;
+                    item.duration = duration, totalTime += duration * times;
                     if (delay)
                         item.totalTime = duration + delay;
                 }
                 else {
                     if (autoDuration)
-                        item.autoDuration = autoDuration, totalAutoDuration += autoDuration;
+                        item.autoDuration = autoDuration, totalAutoTime += autoDuration * times;
                 }
                 if (delay)
-                    item.delay = delay, addedDuration += delay;
+                    item.delay = delay, totalTime += delay * times;
                 else if (autoDelay)
-                    item.autoDelay = autoDelay, totalAutoDuration += autoDelay;
+                    item.autoDelay = autoDelay, totalAutoTime += autoDelay * times;
                 if (easing)
                     item.easingFn = AnimateEasing.get(easing);
             }
             if (!item.autoDuration && item.duration === undefined) {
                 if (length > 1)
-                    (i > 0 || joinBefore) ? totalAutoDuration++ : item.duration = 0;
+                    (i > 0 || joinBefore) ? totalAutoTime += times : item.duration = 0;
                 else
                     item.duration = this.duration;
             }
@@ -12291,14 +12317,14 @@ let Animate = class Animate extends Eventer {
             before = style;
             frames.push(item);
         }
-        if (totalAutoDuration) {
-            if (this.duration <= addedDuration || !(config && config.duration))
-                this.changeDuration(addedDuration + frameDuration * totalAutoDuration);
-            this.allocateTime((this.duration - addedDuration) / totalAutoDuration);
+        if (totalAutoTime) {
+            if (this.duration <= totalTime || !(config && config.duration))
+                this.changeDuration(totalTime + frameDuration * totalAutoTime);
+            this.allocateTime((this.duration - totalTime) / totalAutoTime);
         }
         else {
-            if (addedDuration)
-                this.changeDuration(addedDuration);
+            if (totalTime)
+                this.changeDuration(totalTime);
         }
         this.emit(AnimateEvent.CREATED, this);
     }
@@ -12325,7 +12351,7 @@ let Animate = class Animate extends Eventer {
                 if (frame.autoDelay)
                     frame.delay = frame.autoDelay * partTime;
                 if (frame.delay)
-                    frame.totalTime = frame.duration, frame.totalTime += frame.delay;
+                    frame.totalTime = frame.duration + frame.delay;
             }
         }
     }
@@ -12343,7 +12369,7 @@ let Animate = class Animate extends Eventer {
         if (realTime < duration) {
             while (realTime - this.playedTotalTime > this.frameTotalTime) {
                 this.transition(1);
-                this.nowReverse ? this.reverseNextFrame() : this.nextFrame();
+                this.mainReverse ? this.reverseNextFrame() : this.nextFrame();
             }
             const itemDelay = this.nowReverse ? 0 : (this.frame.delay || 0);
             const itemPlayedTime = realTime - this.playedTotalTime - itemDelay;
@@ -12367,9 +12393,9 @@ let Animate = class Animate extends Eventer {
                 const { loop, loopDelay, swing } = this;
                 if (loop !== false || swing) {
                     this.looped ? this.looped++ : this.looped = 1;
-                    if (!(typeof loop === 'number' && (!loop || this.looped >= loop))) {
+                    if (this.needLoop(this.looped, loop, swing)) {
                         if (swing)
-                            this.nowReverse = !this.nowReverse;
+                            this.mainReverse = !this.mainReverse;
                         if (loopDelay)
                             this.timer = setTimeout(() => { this.timer = 0, this.begin(); }, loopDelay / this.speed * 1000);
                         else
@@ -12384,8 +12410,8 @@ let Animate = class Animate extends Eventer {
     start(seek) {
         this.requestAnimateTime = 1;
         const { reverse } = this;
-        if (reverse || this.nowReverse)
-            this.nowReverse = reverse;
+        if (reverse || this.mainReverse)
+            this.mainReverse = reverse;
         if (this.looped)
             this.looped = 0;
         if (seek)
@@ -12403,12 +12429,12 @@ let Animate = class Animate extends Eventer {
     }
     begin(seek) {
         this.playedTotalTime = this.time = 0;
-        this.nowReverse ? this.setTo() : this.setFrom();
+        this.mainReverse ? this.setTo() : this.setFrom();
         if (!seek)
             this.requestAnimate();
     }
     end() {
-        this.nowReverse ? this.setFrom() : this.setTo();
+        this.mainReverse ? this.setFrom() : this.setTo();
     }
     complete() {
         this.requestAnimateTime = 0;
@@ -12431,15 +12457,19 @@ let Animate = class Animate extends Eventer {
         this.setStyle(this.toStyle);
     }
     nextFrame() {
+        if (this.needLoopFrame())
+            return this.increaseTime();
         if (this.nowIndex + 1 >= this.frames.length)
             return;
-        this.playedTotalTime += this.frameTotalTime;
+        this.increaseTime();
         this.nowIndex++;
     }
     reverseNextFrame() {
+        if (this.needLoopFrame())
+            return this.increaseTime();
         if (this.nowIndex - 1 < 0)
             return;
-        this.playedTotalTime += this.frameTotalTime;
+        this.increaseTime();
         this.nowIndex--;
     }
     transition(t) {
@@ -12475,6 +12505,27 @@ let Animate = class Animate extends Eventer {
             target.__ ? target.set(style, this.isTemp ? 'temp' : false) : Object.assign(target, style);
         }
     }
+    increaseTime() {
+        this.playedTotalTime += this.frameTotalTime;
+    }
+    needLoop(looped, loop, swing) {
+        return !(this.needStopLoop(looped, loop) || this.needStopLoop(looped, swing, true));
+    }
+    needStopLoop(looped, times, swing) {
+        return typeof times === 'number' && (!times || looped >= (swing ? times * 2 - 1 : times));
+    }
+    needLoopFrame() {
+        const { loop, swing } = this.frame;
+        if (loop || swing) {
+            this.frameLooped ? this.frameLooped++ : this.frameLooped = 1;
+            if (swing)
+                this.frameReverse = !this.frameReverse;
+            if (this.needLoop(this.frameLooped, loop, swing))
+                return true;
+            this.frameLooped = this.frameReverse = undefined;
+        }
+        return false;
+    }
     clearTimer(fn) {
         if (this.timer) {
             clearTimeout(this.timer), this.timer = 0;
@@ -12534,6 +12585,64 @@ Animate = __decorate([
     useModule(LeafEventer)
 ], Animate);
 
+let AnimateList = class AnimateList extends Animate {
+    get completed() { return this.list.every(item => item.completed); }
+    get endingStyle() { return this._endingStyle; }
+    constructor(target, animation, isTemp) {
+        super(target, null);
+        this.list = [];
+        this.updateList(animation, isTemp);
+    }
+    updateList(animation, isTemp) {
+        this.fromStyle = {};
+        this.toStyle = {};
+        this._endingStyle = {};
+        if (!animation)
+            animation = this.list.filter(item => {
+                const { completed } = item;
+                if (completed)
+                    item.destroy();
+                return !completed;
+            });
+        this.list = animation.map(item => {
+            const animate = item.target ? item : new Animate(this.target, item, isTemp);
+            Object.assign(this.fromStyle, animate.fromStyle);
+            Object.assign(this.toStyle, animate.toStyle);
+            Object.assign(this._endingStyle, animate.endingStyle);
+            return animate;
+        });
+    }
+    play() {
+        this.each(item => item.play());
+    }
+    pause() {
+        this.each(item => item.pause());
+    }
+    stop() {
+        this.each(item => item.stop());
+    }
+    seek(time) {
+        this.each(item => item.seek(time));
+    }
+    kill(complete, killStyle) {
+        this.each(item => item.kill(complete, killStyle));
+        this.destroy();
+    }
+    each(func) {
+        this.list.forEach(func);
+    }
+    destroy(complete) {
+        const { list } = this;
+        if (list.length) {
+            this.each(item => item.destroy(complete));
+            list.length = 0;
+        }
+    }
+};
+AnimateList = __decorate([
+    useModule(LeafEventer)
+], AnimateList);
+
 const colorNames = {
     transparent: 'FFF0',
     aliceblue: 'F0F8FF',
@@ -12914,23 +13023,40 @@ dataType()(ui$2, 'transitionOut');
 ui$2.animate = function (keyframe, options, kill, isTemp) {
     if (keyframe === undefined)
         return this.__animate;
-    if (typeof keyframe === 'object') {
-        if (keyframe.keyframes)
-            options = keyframe, keyframe = keyframe.keyframes;
-        else if (keyframe.style)
-            options = keyframe, keyframe = keyframe.style;
-    }
-    const animate = new Animate(this, keyframe, options, isTemp);
-    this.killAnimate(kill, animate.toStyle);
-    return this.__animate = animate;
+    const isAnimationList = keyframe instanceof Array && !options && kill;
+    let nextAnimate = isAnimationList ? new AnimateList(this, keyframe, isTemp) : new Animate(this, keyframe, options, isTemp);
+    this.killAnimate(kill, nextAnimate.toStyle);
+    const animate = this.__animate;
+    if (animate) {
+        if (nextAnimate instanceof AnimateList)
+            nextAnimate.list.unshift(animate);
+        else
+            nextAnimate = new AnimateList(this, [animate, nextAnimate]);
+    }
+    return this.__animate = nextAnimate;
 };
-ui$2.killAnimate = function (_type, killStyle) {
+ui$2.killAnimate = function (_type, nextStyle) {
     const animate = this.__animate;
-    if (animate)
-        animate.kill(true, killStyle), this.__animate = null;
+    if (animate) {
+        let kill = false;
+        if (nextStyle && !animate.completed) {
+            if (animate instanceof AnimateList)
+                animate.updateList();
+            const { toStyle } = animate;
+            for (let key in nextStyle)
+                if (key in toStyle) {
+                    kill = true;
+                    break;
+                }
+        }
+        else
+            kill = true;
+        if (kill)
+            animate.kill(true, nextStyle), this.__animate = null;
+    }
 };
 ui$2.__runAnimation = function (type, complete) {
-    this.animate(type === 'in' ? this.animation : this.animationOut);
+    this.animate(type === 'in' ? this.animation : this.animationOut, undefined, 'animation');
     if (complete)
         this.__animate.on(AnimateEvent.COMPLETED, complete);
 };
@@ -13424,4 +13550,4 @@ Creator.finder = function (target) {
     return new Finder(target);
 };
 
-export { AlignHelper, Animate, AnimateEasing, AnimateEvent, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Finder, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Robot, RobotData, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isNull, layoutProcessor, maskType, motionPathType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, stateStyleType, stateType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$4 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };
+export { AlignHelper, Animate, AnimateEasing, AnimateEvent, AnimateList, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Finder, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Robot, RobotData, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isNull, layoutProcessor, maskType, motionPathType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, stateStyleType, stateType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$4 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };