@leafer/worker 1.6.0 → 1.6.1

package/dist/worker.module.js

@@ -6125,7 +6125,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.6.0";
+const version = "1.6.1";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() { return true; }
@@ -6582,6 +6582,15 @@ class Renderer {
     }
     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);
@@ -6667,7 +6676,7 @@ class Renderer {
         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);
     }
@@ -6676,12 +6685,12 @@ class Renderer {
         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)
@@ -6708,22 +6717,14 @@ class Renderer {
     }
     __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();
         });
     }
@@ -9694,8 +9695,7 @@ class InteractionBase {
         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);
@@ -9977,9 +9977,11 @@ class InteractionBase {
         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);
@@ -9999,8 +10001,10 @@ class InteractionBase {
         return hasLong;
     }
     longPressWaitCancel() {
-        clearTimeout(this.longPressTimer);
-        this.longPressed = false;
+        if (this.longPressTimer) {
+            clearTimeout(this.longPressTimer);
+            this.longPressed = false;
+        }
     }
     __onResize() {
         const { dragOut } = this.m;
@@ -14543,6 +14547,7 @@ interaction.multiTouch = function (data, list) {
         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));