@leafer/miniapp 1.12.2 → 1.12.4

package/dist/miniapp.module.js

@@ -246,11 +246,13 @@ const Platform = {
             const ctx = canvas.getContext("2d");
             if (opacity) ctx.globalAlpha = opacity;
             ctx.imageSmoothingEnabled = smooth === false ? false : true;
-            if (clip) {
-                const scaleX = width / clip.width, scaleY = height / clip.height;
-                ctx.setTransform(scaleX, 0, 0, scaleY, -clip.x * scaleX, -clip.y * scaleY);
-                ctx.drawImage(image, 0, 0, image.width, image.height);
-            } else ctx.drawImage(image, 0, 0, width, height);
+            if (image) {
+                if (clip) {
+                    const scaleX = width / clip.width, scaleY = height / clip.height;
+                    ctx.setTransform(scaleX, 0, 0, scaleY, -clip.x * scaleX, -clip.y * scaleY);
+                    ctx.drawImage(image, 0, 0, image.width, image.height);
+                } else ctx.drawImage(image, 0, 0, width, height);
+            }
             return canvas;
         },
         setPatternTransform(pattern, transform, paint) {
@@ -4117,6 +4119,10 @@ class LeaferImage {
     get url() {
         return this.config.url;
     }
+    get crossOrigin() {
+        const {crossOrigin: crossOrigin} = this.config;
+        return isUndefined(crossOrigin) ? Platform.image.crossOrigin : crossOrigin;
+    }
     get completed() {
         return this.ready || !!this.error;
     }
@@ -4134,12 +4140,14 @@ class LeaferImage {
         ImageManager.isFormat("svg", config) && (this.isSVG = true);
         ImageManager.hasAlphaPixel(config) && (this.hasAlphaPixel = true);
     }
-    load(onSuccess, onError) {
+    load(onSuccess, onError, thumbSize) {
         if (!this.loading) {
             this.loading = true;
-            const {crossOrigin: crossOrigin} = this.config;
             Resource.tasker.add(() => __awaiter(this, void 0, void 0, function*() {
-                return yield Platform.origin.loadImage(this.url, isUndefined(crossOrigin) ? Platform.image.crossOrigin : crossOrigin, this).then(img => this.setView(img)).catch(e => {
+                return yield Platform.origin.loadImage(this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
+                    if (thumbSize) this.setThumbView(img);
+                    this.setView(img);
+                }).catch(e => {
                     this.error = e;
                     this.onComplete(false);
                 });
@@ -4160,9 +4168,11 @@ class LeaferImage {
     }
     setView(img) {
         this.ready = true;
-        this.width = img.naturalWidth || img.width;
-        this.height = img.naturalHeight || img.height;
-        this.view = img;
+        if (!this.width) {
+            this.width = img.width;
+            this.height = img.height;
+            this.view = img;
+        }
         this.onComplete(true);
     }
     onComplete(isSuccess) {
@@ -4208,6 +4218,19 @@ class LeaferImage {
         Platform.image.setPatternTransform(pattern, transform, paint);
         return pattern;
     }
+    getLoadUrl(_thumbSize) {
+        return this.url;
+    }
+    setThumbView(_view) {}
+    getThumbSize(_lod) {
+        return undefined;
+    }
+    getMinLevel() {
+        return undefined;
+    }
+    getLevelData(_level, _width, _height) {
+        return undefined;
+    }
     clearLevels(_checkUse) {}
     destroy() {
         this.clearLevels();
@@ -6937,7 +6960,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.12.2";
+const version = "1.12.4";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() {
@@ -10313,6 +10336,10 @@ MoveEvent.DRAG_ANIMATE = "move.drag_animate";
 
 MoveEvent.END = "move.end";
 
+MoveEvent.PULL_DOWN = "move.pull_down";
+
+MoveEvent.REACH_BOTTOM = "move.reach_bottom";
+
 MoveEvent = __decorate([ registerUIEvent() ], MoveEvent);
 
 let TouchEvent = class TouchEvent extends UIEvent {};
@@ -11894,7 +11921,7 @@ function image(ui, attrName, paint, boxBounds, firstUse) {
             ignoreRender(ui, false);
             onLoadError(ui, event, error);
             leafPaint.loadId = undefined;
-        });
+        }, paint.lod && image.getThumbSize(paint.lod));
         if (ui.placeholderColor) {
             if (!ui.placeholderDelay) image.isPlacehold = true; else setTimeout(() => {
                 if (!image.ready) {
@@ -15901,15 +15928,28 @@ UI.setEditInner = function(editorName) {
     this.changeAttr("editInner", editorName);
 };
 
+function getScrollType(leafer) {
+    const {scroll: scroll, disabled: disabled} = leafer.app.config.move;
+    return !scroll || disabled ? "" : scroll === true ? "free" : scroll;
+}
+
 function addViewport(leafer, mergeConfig, custom) {
     addViewportConfig(leafer.parentApp ? leafer.parentApp : leafer, mergeConfig);
     if (leafer.isApp || custom) return;
     leafer.__eventIds.push(leafer.on_(MoveEvent.BEFORE_MOVE, e => {
         const move = leafer.getValidMove(e.moveX, e.moveY, false);
+        if (getScrollType(leafer).includes("limit")) {
+            const testMove = leafer.getValidMove(0, 0);
+            if (testMove.x || testMove.y) {
+                const maxX = 100, maxY = 200, resistance = e.moveType === "drag" ? .3 : .05;
+                if (Math.abs(testMove.x) > maxX) move.x = 0; else move.x *= resistance;
+                if (Math.abs(testMove.y) > maxY) move.y = 0; else move.y *= resistance;
+            }
+        }
         leafer.zoomLayer.move(move);
     }), leafer.on_(MoveEvent.DRAG_ANIMATE, () => {
-        const move = leafer.getValidMove(0, 0);
-        if (move.x || move.y) leafer.interaction.stopDragAnimate();
+        const testMove = leafer.getValidMove(0, 0);
+        if (testMove.x || testMove.y) leafer.interaction.stopDragAnimate();
     }), leafer.on_(MoveEvent.END, e => {
         LeafHelper.animateMove(leafer.zoomLayer, leafer.getValidMove(e.moveX, e.moveY));
     }), leafer.on_(ZoomEvent.BEFORE_ZOOM, e => {
@@ -16215,15 +16255,15 @@ leafer.initType = function(type) {
 };
 
 leafer.getValidMove = function(moveX, moveY, checkLimit = true) {
-    const {scroll: scroll, disabled: disabled} = this.app.config.move;
+    const {disabled: disabled} = this.app.config.move;
     move$4.set(moveX, moveY);
-    if (scroll) {
-        const type = scroll === true ? "" : scroll;
-        if (type.includes("x")) move$4.y = 0; else if (type.includes("y")) move$4.x = 0; else Math.abs(move$4.x) > Math.abs(move$4.y) ? move$4.y = 0 : move$4.x = 0;
-        if (checkLimit && type.includes("limit")) {
+    const scrollType = getScrollType(this);
+    if (scrollType) {
+        if (scrollType.includes("x")) move$4.y = 0; else if (scrollType.includes("y")) move$4.x = 0; else Math.abs(move$4.x) > Math.abs(move$4.y) ? move$4.y = 0 : move$4.x = 0;
+        if (checkLimit && scrollType.includes("limit")) {
             bounds.set(this.__world).addPoint(this.zoomLayer);
             DragBoundsHelper.getValidMove(bounds, this.canvas.bounds, "auto", move$4, true);
-            if (type.includes("x")) move$4.y = 0; else if (type.includes("y")) move$4.x = 0;
+            if (scrollType.includes("x")) move$4.y = 0; else if (scrollType.includes("y")) move$4.x = 0;
         }
     }
     return {
@@ -18167,8 +18207,8 @@ let AnimateList = class AnimateList extends Animate {
         this.each(item => item.stop());
         this.emitType(AnimateEvent.STOP);
     }
-    seek(time) {
-        this.each(item => item.seek(time));
+    seek(time, includeDelay) {
+        this.each(item => item.seek(time, includeDelay));
         this.emitType(AnimateEvent.SEEK);
     }
     kill(complete, killStyle) {