@leafer/worker 1.6.0 → 1.6.1

package/dist/worker.js

@@ -6128,7 +6128,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.6.0";
+    const version = "1.6.1";
 
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() { return true; }
@@ -6585,6 +6585,15 @@ var LeaferUI = (function (exports) {
         }
         checkRender() {
             if (this.running) {
+                const { target } = this;
+                if (target.isApp) {
+                    target.emit(RenderEvent.CHILD_START, target);
+                    target.children.forEach(leafer => {
+                        leafer.renderer.FPS = this.FPS;
+                        leafer.renderer.checkRender();
+                    });
+                    target.emit(RenderEvent.CHILD_END, target);
+                }
                 if (this.changed && this.canvas.view)
                     this.render();
                 this.target.emit(RenderEvent.NEXT);
@@ -6670,7 +6679,7 @@ var LeaferUI = (function (exports) {
             bounds.spread(Renderer.clipSpread).ceil();
             canvas.clearWorld(bounds, true);
             canvas.clipWorld(bounds, true);
-            this.__render(bounds, block.includes(this.target.__world), realBounds);
+            this.__render(bounds, realBounds);
             canvas.restore();
             Run.end(t);
         }
@@ -6679,12 +6688,12 @@ var LeaferUI = (function (exports) {
             const { canvas } = this;
             canvas.save();
             canvas.clear();
-            this.__render(canvas.bounds, true);
+            this.__render(canvas.bounds);
             canvas.restore();
             Run.end(t);
         }
-        __render(bounds, includes, realBounds) {
-            const { canvas } = this, options = includes ? { includes } : { bounds, includes };
+        __render(bounds, realBounds) {
+            const { canvas } = this, includes = bounds.includes(this.target.__world), options = includes ? { includes } : { bounds, includes };
             if (this.needFill)
                 canvas.fillWorld(bounds, this.config.fill);
             if (Debug.showRepaint)
@@ -6711,22 +6720,14 @@ var LeaferUI = (function (exports) {
         }
         __requestRender() {
             const target = this.target;
-            if (target.parentApp)
-                return target.parentApp.renderer.update(false);
-            if (this.requestTime)
+            if (this.requestTime || !target)
                 return;
+            if (target.parentApp)
+                return target.parentApp.requestRender(false);
             const requestTime = this.requestTime = Date.now();
             Platform.requestRender(() => {
                 this.FPS = Math.min(60, Math.ceil(1000 / (Date.now() - requestTime)));
                 this.requestTime = 0;
-                if (target.isApp) {
-                    target.emit(RenderEvent.CHILD_START, target);
-                    target.children.forEach(leafer => {
-                        leafer.renderer.FPS = this.FPS;
-                        leafer.renderer.checkRender();
-                    });
-                    target.emit(RenderEvent.CHILD_END, target);
-                }
                 this.checkRender();
             });
         }
@@ -9697,8 +9698,7 @@ var LeaferUI = (function (exports) {
             if (this.downData) {
                 const canDrag = PointHelper.getDistance(this.downData, data) > this.p.dragDistance;
                 if (canDrag) {
-                    if (this.waitTap || this.longPressTimer)
-                        this.pointerWaitCancel();
+                    this.pointerWaitCancel();
                     this.waitRightTap = false;
                 }
                 this.dragger.checkDrag(data, canDrag);
@@ -9980,9 +9980,11 @@ var LeaferUI = (function (exports) {
             this.waitTap = true;
         }
         tapWaitCancel() {
-            clearTimeout(this.tapTimer);
-            this.waitTap = false;
-            this.tapCount = 0;
+            if (this.waitTap) {
+                clearTimeout(this.tapTimer);
+                this.waitTap = false;
+                this.tapCount = 0;
+            }
         }
         longPressWait(data) {
             clearTimeout(this.longPressTimer);
@@ -10002,8 +10004,10 @@ var LeaferUI = (function (exports) {
             return hasLong;
         }
         longPressWaitCancel() {
-            clearTimeout(this.longPressTimer);
-            this.longPressed = false;
+            if (this.longPressTimer) {
+                clearTimeout(this.longPressTimer);
+                this.longPressed = false;
+            }
         }
         __onResize() {
             const { dragOut } = this.m;
@@ -14546,6 +14550,7 @@ ${filterStyle$1}
             return;
         const { move, rotation, scale, center } = MultiTouchHelper.getData(list);
         Object.assign(data, center);
+        this.pointerWaitCancel();
         this.rotate(getRotateEventData(rotation, data));
         this.zoom(getZoomEventData(scale, data));
         this.move(getMoveEventData(move, data));