@leafer-editor/worker 1.12.2 → 1.12.4

package/dist/worker.js

@@ -228,11 +228,13 @@ var LeaferUI = function(exports) {
                 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) {
@@ -3875,6 +3877,10 @@ var LeaferUI = function(exports) {
         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;
         }
@@ -3892,12 +3898,14 @@ var LeaferUI = function(exports) {
             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);
                     });
@@ -3918,9 +3926,11 @@ var LeaferUI = function(exports) {
         }
         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) {
@@ -3966,6 +3976,19 @@ var LeaferUI = function(exports) {
             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();
@@ -6526,7 +6549,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "1.12.2";
+    const version = "1.12.4";
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() {
             return true;
@@ -9416,6 +9439,8 @@ var LeaferUI = function(exports) {
     exports.MoveEvent.MOVE = "move";
     exports.MoveEvent.DRAG_ANIMATE = "move.drag_animate";
     exports.MoveEvent.END = "move.end";
+    exports.MoveEvent.PULL_DOWN = "move.pull_down";
+    exports.MoveEvent.REACH_BOTTOM = "move.reach_bottom";
     exports.MoveEvent = __decorate([ registerUIEvent() ], exports.MoveEvent);
     exports.TouchEvent = class TouchEvent extends UIEvent {};
     exports.TouchEvent = __decorate([ registerUIEvent() ], exports.TouchEvent);
@@ -10790,7 +10815,7 @@ var LeaferUI = function(exports) {
                 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) {
@@ -14532,15 +14557,27 @@ var LeaferUI = function(exports) {
     exports.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_(exports.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_(exports.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_(exports.MoveEvent.END, e => {
             LeafHelper.animateMove(leafer.zoomLayer, leafer.getValidMove(e.moveX, e.moveY));
         }), leafer.on_(exports.ZoomEvent.BEFORE_ZOOM, e => {
@@ -14825,15 +14862,15 @@ var LeaferUI = function(exports) {
         LeaferTypeCreator.run(type, this);
     };
     leafer.getValidMove = function(moveX, moveY, checkLimit = true) {
-        const {scroll: scroll, disabled: disabled} = this.app.config.move;
+        const {disabled: disabled} = this.app.config.move;
         move.set(moveX, moveY);
-        if (scroll) {
-            const type = scroll === true ? "" : scroll;
-            if (type.includes("x")) move.y = 0; else if (type.includes("y")) move.x = 0; else Math.abs(move.x) > Math.abs(move.y) ? move.y = 0 : move.x = 0;
-            if (checkLimit && type.includes("limit")) {
+        const scrollType = getScrollType(this);
+        if (scrollType) {
+            if (scrollType.includes("x")) move.y = 0; else if (scrollType.includes("y")) move.x = 0; else Math.abs(move.x) > Math.abs(move.y) ? move.y = 0 : move.x = 0;
+            if (checkLimit && scrollType.includes("limit")) {
                 bounds.set(this.__world).addPoint(this.zoomLayer);
                 DragBoundsHelper.getValidMove(bounds, this.canvas.bounds, "auto", move, true);
-                if (type.includes("x")) move.y = 0; else if (type.includes("y")) move.x = 0;
+                if (scrollType.includes("x")) move.y = 0; else if (scrollType.includes("y")) move.x = 0;
             }
         }
         return {