@leafer-in/view 1.3.3 → 1.4.1

package/dist/view.cjs

@@ -30,7 +30,8 @@ function getFixBounds(bounds, scaleBounds) {
 }
 
 draw.Plugin.add('view');
-draw.Leafer.prototype.zoom = function (zoomType, padding, fixed) {
+draw.Leafer.prototype.zoom = function (zoomType, padding, fixed, transition) {
+    this.killAnimate();
     const { zoomLayer } = this;
     const limitBounds = this.canvas.bounds.clone().shrink(padding !== undefined ? padding : 30), bounds = new draw.Bounds();
     const center = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 };
@@ -61,10 +62,12 @@ draw.Leafer.prototype.zoom = function (zoomType, padding, fixed) {
         changeScale = zoomType / scaleX;
     }
     if (changeScale) {
-        if (changeScale !== 1)
-            zoomLayer.scaleOfWorld(center, this.getValidScale(changeScale));
+        changeScale = this.getValidScale(changeScale);
+        zoomLayer.scaleOfWorld(center, changeScale, changeScale, false, transition);
     }
     else if (typeof zoomType === 'object') {
+        const { x, y, scaleX, scaleY } = zoomLayer;
+        const data = { x, y, scaleX, scaleY };
         const isArray = zoomType instanceof Array;
         if (isArray || zoomType.tag) {
             const list = isArray ? zoomType : [zoomType];
@@ -74,21 +77,26 @@ draw.Leafer.prototype.zoom = function (zoomType, padding, fixed) {
             const innerBounds = getFixBounds(zoomType, limitBounds);
             bounds.set(zoomLayer.getWorldBounds(innerBounds));
         }
-        const { x, y, width, height } = bounds;
-        let moveX = limitBounds.x - x, moveY = limitBounds.y - y;
+        const { width, height } = bounds;
+        let moveX = limitBounds.x - bounds.x, moveY = limitBounds.y - bounds.y;
         if (fixed) {
             moveX += Math.max((limitBounds.width - width) / 2, 0);
             moveY += Math.max((limitBounds.height - height) / 2, 0);
         }
         else {
-            const fitScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height));
-            moveX += (limitBounds.width - width * fitScale) / 2;
-            moveY += (limitBounds.height - height * fitScale) / 2;
-            zoomLayer.scaleOfWorld(bounds, fitScale);
-            bounds.scaleOf(bounds, fitScale);
+            changeScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height));
+            moveX += (limitBounds.width - width * changeScale) / 2;
+            moveY += (limitBounds.height - height * changeScale) / 2;
+            draw.PointHelper.scaleOf(data, bounds, changeScale);
+            bounds.scaleOf(bounds, changeScale);
+            data.scaleX *= changeScale;
+            data.scaleY *= changeScale;
         }
-        zoomLayer.move(moveX, moveY);
-        return bounds.move(moveX, moveY);
+        draw.PointHelper.move(data, moveX, moveY);
+        bounds.move(moveX, moveY);
+        zoomLayer.set(data, transition);
+        return bounds;
     }
     return zoomLayer.worldBoxBounds;
 };
+//# sourceMappingURL=view.cjs.map

package/dist/view.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"view.cjs","sources":["../../../../../../src/in/packages/view/src/helper.ts","../../../../../../src/in/packages/view/src/index.ts"],"sourcesContent":["import { IBoundsData } from '@leafer-ui/interface'\n\n\nexport function getZoomScale(scaleX: number, type: 'in' | 'out'): number {\n    let scale = 1\n    const out = type === 'out', absScale = Math.abs(scaleX)\n    if (absScale > 1) {\n        while (out ? scale < absScale : scale <= absScale) scale *= 2\n        if (out) scale /= 2\n    } else {\n        while (out ? scale >= absScale : scale > absScale) scale /= 2\n        if (!out) scale *= 2\n    }\n    return scale / scaleX\n}\n\nexport function getFixBounds(bounds: IBoundsData, scaleBounds: IBoundsData): IBoundsData {\n    let { x, y, width, height } = bounds\n    let fix: boolean\n    if (!height) height = width * (scaleBounds.height / scaleBounds.width), fix = true\n    if (!width) width = height * (scaleBounds.width / scaleBounds.height), fix = true\n    return fix ? { x, y, width, height } : bounds\n}","import { ILeaf, IBoundsData, IZoomType, IFourNumber, IPointData, ITransition } from '@leafer-ui/interface'\nimport { Leafer, Bounds, LeafBoundsHelper, Plugin, PointHelper } from '@leafer-ui/draw'\n\nimport { getFixBounds, getZoomScale } from './helper'\n\n\nPlugin.add('view')\n\n\nLeafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fixed?: boolean, transition?: ITransition): IBoundsData {\n\n    this.killAnimate()\n\n    const { zoomLayer } = this\n    const limitBounds = this.canvas.bounds.clone().shrink(padding !== undefined ? padding : 30), bounds = new Bounds()\n    const center: IPointData = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 }\n\n    let changeScale: number\n    const { scaleX } = this.__\n\n    if (typeof zoomType === 'string') {\n\n        switch (zoomType) {\n            case 'in':\n                changeScale = getZoomScale(scaleX, 'in')\n                break\n            case 'out':\n                changeScale = getZoomScale(scaleX, 'out')\n                break\n            case 'fit':\n                zoomType = this.boxBounds\n                break\n            case 'fit-width':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.height = 0\n                break\n            case 'fit-height':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.width = 0\n                break\n        }\n\n    } else if (typeof zoomType === 'number') {\n        changeScale = zoomType / scaleX\n    }\n\n\n    if (changeScale) {\n\n        changeScale = this.getValidScale(changeScale)\n        zoomLayer.scaleOfWorld(center, changeScale, changeScale, false, transition)\n\n    } else if (typeof zoomType === 'object') {\n\n        const { x, y, scaleX, scaleY } = zoomLayer\n        const data = { x, y, scaleX, scaleY }\n\n        const isArray = zoomType instanceof Array\n\n        if (isArray || (zoomType as ILeaf).tag) {\n            const list: ILeaf[] = isArray ? zoomType as ILeaf[] : [zoomType as ILeaf]\n            bounds.setListWithFn(list, LeafBoundsHelper.worldBounds)\n        } else {\n            const innerBounds = getFixBounds(zoomType as IBoundsData, limitBounds)\n            bounds.set(zoomLayer.getWorldBounds(innerBounds))\n        }\n\n        const { width, height } = bounds\n        let moveX = limitBounds.x - bounds.x, moveY = limitBounds.y - bounds.y\n\n        if (fixed) {\n\n            moveX += Math.max((limitBounds.width - width) / 2, 0)\n            moveY += Math.max((limitBounds.height - height) / 2, 0)\n\n        } else {\n\n            changeScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height))\n            moveX += (limitBounds.width - width * changeScale) / 2\n            moveY += (limitBounds.height - height * changeScale) / 2\n\n            PointHelper.scaleOf(data, bounds, changeScale)\n            bounds.scaleOf(bounds, changeScale)\n\n            data.scaleX *= changeScale\n            data.scaleY *= changeScale\n        }\n\n        PointHelper.move(data, moveX, moveY)\n        bounds.move(moveX, moveY)\n\n        zoomLayer.set(data, transition)\n\n        return bounds\n\n    }\n\n    return zoomLayer.worldBoxBounds\n\n}"],"names":["Plugin","Leafer","Bounds","LeafBoundsHelper","PointHelper"],"mappings":";;;;AAGgB,SAAA,YAAY,CAAC,MAAc,EAAE,IAAkB,EAAA;IAC3D,IAAI,KAAK,GAAG,CAAC;AACb,IAAA,MAAM,GAAG,GAAG,IAAI,KAAK,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;AACvD,IAAA,IAAI,QAAQ,GAAG,CAAC,EAAE;AACd,QAAA,OAAO,GAAG,GAAG,KAAK,GAAG,QAAQ,GAAG,KAAK,IAAI,QAAQ;YAAE,KAAK,IAAI,CAAC;AAC7D,QAAA,IAAI,GAAG;YAAE,KAAK,IAAI,CAAC;;SAChB;AACH,QAAA,OAAO,GAAG,GAAG,KAAK,IAAI,QAAQ,GAAG,KAAK,GAAG,QAAQ;YAAE,KAAK,IAAI,CAAC;AAC7D,QAAA,IAAI,CAAC,GAAG;YAAE,KAAK,IAAI,CAAC;;IAExB,OAAO,KAAK,GAAG,MAAM;AACzB;AAEgB,SAAA,YAAY,CAAC,MAAmB,EAAE,WAAwB,EAAA;IACtE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;AACpC,IAAA,IAAI,GAAY;AAChB,IAAA,IAAI,CAAC,MAAM;AAAE,QAAA,MAAM,GAAG,KAAK,IAAI,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,GAAG,GAAG,IAAI;AAClF,IAAA,IAAI,CAAC,KAAK;AAAE,QAAA,KAAK,GAAG,MAAM,IAAI,WAAW,CAAC,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,EAAE,GAAG,GAAG,IAAI;AACjF,IAAA,OAAO,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;AACjD;;AChBAA,WAAM,CAAC,GAAG,CAAC,MAAM,CAAC;AAGlBC,WAAM,CAAC,SAAS,CAAC,IAAI,GAAG,UAAU,QAAmB,EAAE,OAAqB,EAAE,KAAe,EAAE,UAAwB,EAAA;IAEnH,IAAI,CAAC,WAAW,EAAE;AAElB,IAAA,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI;AAC1B,IAAA,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,GAAG,OAAO,GAAG,EAAE,CAAC,EAAE,MAAM,GAAG,IAAIC,WAAM,EAAE;IAClH,MAAM,MAAM,GAAe,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,GAAG,WAAW,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;AAElH,IAAA,IAAI,WAAmB;AACvB,IAAA,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE;AAE1B,IAAA,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAE9B,QAAQ,QAAQ;AACZ,YAAA,KAAK,IAAI;AACL,gBAAA,WAAW,GAAG,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC;gBACxC;AACJ,YAAA,KAAK,KAAK;AACN,gBAAA,WAAW,GAAG,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;gBACzC;AACJ,YAAA,KAAK,KAAK;AACN,gBAAA,QAAQ,GAAG,IAAI,CAAC,SAAS;gBACzB;AACJ,YAAA,KAAK,WAAW;gBACZ,QAAQ,GAAG,IAAIA,WAAM,CAAC,IAAI,CAAC,SAAS,CAAC;AACrC,gBAAA,QAAQ,CAAC,MAAM,GAAG,CAAC;gBACnB;AACJ,YAAA,KAAK,YAAY;gBACb,QAAQ,GAAG,IAAIA,WAAM,CAAC,IAAI,CAAC,SAAS,CAAC;AACrC,gBAAA,QAAQ,CAAC,KAAK,GAAG,CAAC;gBAClB;;;AAGL,SAAA,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;AACrC,QAAA,WAAW,GAAG,QAAQ,GAAG,MAAM;;IAInC,IAAI,WAAW,EAAE;AAEb,QAAA,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;AAC7C,QAAA,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC;;AAExE,SAAA,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAErC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS;QAC1C,MAAM,IAAI,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE;AAErC,QAAA,MAAM,OAAO,GAAG,QAAQ,YAAY,KAAK;AAEzC,QAAA,IAAI,OAAO,IAAK,QAAkB,CAAC,GAAG,EAAE;AACpC,YAAA,MAAM,IAAI,GAAY,OAAO,GAAG,QAAmB,GAAG,CAAC,QAAiB,CAAC;YACzE,MAAM,CAAC,aAAa,CAAC,IAAI,EAAEC,qBAAgB,CAAC,WAAW,CAAC;;aACrD;YACH,MAAM,WAAW,GAAG,YAAY,CAAC,QAAuB,EAAE,WAAW,CAAC;YACtE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;;AAGrD,QAAA,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;AAChC,QAAA,IAAI,KAAK,GAAG,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,KAAK,GAAG,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;QAEtE,IAAI,KAAK,EAAE;AAEP,YAAA,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,KAAK,GAAG,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;AACrD,YAAA,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC;;aAEpD;YAEH,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,GAAG,KAAK,EAAE,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;AAClG,YAAA,KAAK,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,KAAK,GAAG,WAAW,IAAI,CAAC;AACtD,YAAA,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,MAAM,GAAG,WAAW,IAAI,CAAC;YAExDC,gBAAW,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC;AAC9C,YAAA,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC;AAEnC,YAAA,IAAI,CAAC,MAAM,IAAI,WAAW;AAC1B,YAAA,IAAI,CAAC,MAAM,IAAI,WAAW;;QAG9BA,gBAAW,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC;AACpC,QAAA,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;AAEzB,QAAA,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC;AAE/B,QAAA,OAAO,MAAM;;IAIjB,OAAO,SAAS,CAAC,cAAc;AAEnC,CAAC;;"}

package/dist/view.esm.js

@@ -1,4 +1,4 @@
-import { Plugin, Leafer, Bounds, LeafBoundsHelper } from '@leafer-ui/draw';
+import { Plugin, Leafer, Bounds, LeafBoundsHelper, PointHelper } from '@leafer-ui/draw';
 
 function getZoomScale(scaleX, type) {
     let scale = 1;
@@ -28,7 +28,8 @@ function getFixBounds(bounds, scaleBounds) {
 }
 
 Plugin.add('view');
-Leafer.prototype.zoom = function (zoomType, padding, fixed) {
+Leafer.prototype.zoom = function (zoomType, padding, fixed, transition) {
+    this.killAnimate();
     const { zoomLayer } = this;
     const limitBounds = this.canvas.bounds.clone().shrink(padding !== undefined ? padding : 30), bounds = new Bounds();
     const center = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 };
@@ -59,10 +60,12 @@ Leafer.prototype.zoom = function (zoomType, padding, fixed) {
         changeScale = zoomType / scaleX;
     }
     if (changeScale) {
-        if (changeScale !== 1)
-            zoomLayer.scaleOfWorld(center, this.getValidScale(changeScale));
+        changeScale = this.getValidScale(changeScale);
+        zoomLayer.scaleOfWorld(center, changeScale, changeScale, false, transition);
     }
     else if (typeof zoomType === 'object') {
+        const { x, y, scaleX, scaleY } = zoomLayer;
+        const data = { x, y, scaleX, scaleY };
         const isArray = zoomType instanceof Array;
         if (isArray || zoomType.tag) {
             const list = isArray ? zoomType : [zoomType];
@@ -72,21 +75,26 @@ Leafer.prototype.zoom = function (zoomType, padding, fixed) {
             const innerBounds = getFixBounds(zoomType, limitBounds);
             bounds.set(zoomLayer.getWorldBounds(innerBounds));
         }
-        const { x, y, width, height } = bounds;
-        let moveX = limitBounds.x - x, moveY = limitBounds.y - y;
+        const { width, height } = bounds;
+        let moveX = limitBounds.x - bounds.x, moveY = limitBounds.y - bounds.y;
         if (fixed) {
             moveX += Math.max((limitBounds.width - width) / 2, 0);
             moveY += Math.max((limitBounds.height - height) / 2, 0);
         }
         else {
-            const fitScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height));
-            moveX += (limitBounds.width - width * fitScale) / 2;
-            moveY += (limitBounds.height - height * fitScale) / 2;
-            zoomLayer.scaleOfWorld(bounds, fitScale);
-            bounds.scaleOf(bounds, fitScale);
+            changeScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height));
+            moveX += (limitBounds.width - width * changeScale) / 2;
+            moveY += (limitBounds.height - height * changeScale) / 2;
+            PointHelper.scaleOf(data, bounds, changeScale);
+            bounds.scaleOf(bounds, changeScale);
+            data.scaleX *= changeScale;
+            data.scaleY *= changeScale;
         }
-        zoomLayer.move(moveX, moveY);
-        return bounds.move(moveX, moveY);
+        PointHelper.move(data, moveX, moveY);
+        bounds.move(moveX, moveY);
+        zoomLayer.set(data, transition);
+        return bounds;
     }
     return zoomLayer.worldBoxBounds;
 };
+//# sourceMappingURL=view.esm.js.map

package/dist/view.esm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"view.esm.js","sources":["../../../../../../src/in/packages/view/src/helper.ts","../../../../../../src/in/packages/view/src/index.ts"],"sourcesContent":["import { IBoundsData } from '@leafer-ui/interface'\n\n\nexport function getZoomScale(scaleX: number, type: 'in' | 'out'): number {\n    let scale = 1\n    const out = type === 'out', absScale = Math.abs(scaleX)\n    if (absScale > 1) {\n        while (out ? scale < absScale : scale <= absScale) scale *= 2\n        if (out) scale /= 2\n    } else {\n        while (out ? scale >= absScale : scale > absScale) scale /= 2\n        if (!out) scale *= 2\n    }\n    return scale / scaleX\n}\n\nexport function getFixBounds(bounds: IBoundsData, scaleBounds: IBoundsData): IBoundsData {\n    let { x, y, width, height } = bounds\n    let fix: boolean\n    if (!height) height = width * (scaleBounds.height / scaleBounds.width), fix = true\n    if (!width) width = height * (scaleBounds.width / scaleBounds.height), fix = true\n    return fix ? { x, y, width, height } : bounds\n}","import { ILeaf, IBoundsData, IZoomType, IFourNumber, IPointData, ITransition } from '@leafer-ui/interface'\nimport { Leafer, Bounds, LeafBoundsHelper, Plugin, PointHelper } from '@leafer-ui/draw'\n\nimport { getFixBounds, getZoomScale } from './helper'\n\n\nPlugin.add('view')\n\n\nLeafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fixed?: boolean, transition?: ITransition): IBoundsData {\n\n    this.killAnimate()\n\n    const { zoomLayer } = this\n    const limitBounds = this.canvas.bounds.clone().shrink(padding !== undefined ? padding : 30), bounds = new Bounds()\n    const center: IPointData = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 }\n\n    let changeScale: number\n    const { scaleX } = this.__\n\n    if (typeof zoomType === 'string') {\n\n        switch (zoomType) {\n            case 'in':\n                changeScale = getZoomScale(scaleX, 'in')\n                break\n            case 'out':\n                changeScale = getZoomScale(scaleX, 'out')\n                break\n            case 'fit':\n                zoomType = this.boxBounds\n                break\n            case 'fit-width':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.height = 0\n                break\n            case 'fit-height':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.width = 0\n                break\n        }\n\n    } else if (typeof zoomType === 'number') {\n        changeScale = zoomType / scaleX\n    }\n\n\n    if (changeScale) {\n\n        changeScale = this.getValidScale(changeScale)\n        zoomLayer.scaleOfWorld(center, changeScale, changeScale, false, transition)\n\n    } else if (typeof zoomType === 'object') {\n\n        const { x, y, scaleX, scaleY } = zoomLayer\n        const data = { x, y, scaleX, scaleY }\n\n        const isArray = zoomType instanceof Array\n\n        if (isArray || (zoomType as ILeaf).tag) {\n            const list: ILeaf[] = isArray ? zoomType as ILeaf[] : [zoomType as ILeaf]\n            bounds.setListWithFn(list, LeafBoundsHelper.worldBounds)\n        } else {\n            const innerBounds = getFixBounds(zoomType as IBoundsData, limitBounds)\n            bounds.set(zoomLayer.getWorldBounds(innerBounds))\n        }\n\n        const { width, height } = bounds\n        let moveX = limitBounds.x - bounds.x, moveY = limitBounds.y - bounds.y\n\n        if (fixed) {\n\n            moveX += Math.max((limitBounds.width - width) / 2, 0)\n            moveY += Math.max((limitBounds.height - height) / 2, 0)\n\n        } else {\n\n            changeScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height))\n            moveX += (limitBounds.width - width * changeScale) / 2\n            moveY += (limitBounds.height - height * changeScale) / 2\n\n            PointHelper.scaleOf(data, bounds, changeScale)\n            bounds.scaleOf(bounds, changeScale)\n\n            data.scaleX *= changeScale\n            data.scaleY *= changeScale\n        }\n\n        PointHelper.move(data, moveX, moveY)\n        bounds.move(moveX, moveY)\n\n        zoomLayer.set(data, transition)\n\n        return bounds\n\n    }\n\n    return zoomLayer.worldBoxBounds\n\n}"],"names":[],"mappings":"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"}

package/dist/view.esm.min.js

@@ -1 +1,2 @@
-import{Plugin as t,Leafer as e,Bounds as i,LeafBoundsHelper as o}from"@leafer-ui/draw";function h(t,e){let i=1;const o="out"===e,h=Math.abs(t);if(h>1){for(;o?i<h:i<=h;)i*=2;o&&(i/=2)}else{for(;o?i>=h:i>h;)i/=2;o||(i*=2)}return i/t}t.add("view"),e.prototype.zoom=function(t,e,s){const{zoomLayer:n}=this,a=this.canvas.bounds.clone().shrink(void 0!==e?e:30),r=new i,d={x:a.x+a.width/2,y:a.y+a.height/2};let c;const{scaleX:l}=this.__;if("string"==typeof t)switch(t){case"in":c=h(l,"in");break;case"out":c=h(l,"out");break;case"fit":t=this.boxBounds;break;case"fit-width":(t=new i(this.boxBounds)).height=0;break;case"fit-height":(t=new i(this.boxBounds)).width=0}else"number"==typeof t&&(c=t/l);if(c)1!==c&&n.scaleOfWorld(d,this.getValidScale(c));else if("object"==typeof t){const e=t instanceof Array;if(e||t.tag){const i=e?t:[t];r.setListWithFn(i,o.worldBounds)}else{const e=function(t,e){let i,{x:o,y:h,width:s,height:n}=t;return n||(n=s*(e.height/e.width),i=!0),s||(s=n*(e.width/e.height),i=!0),i?{x:o,y:h,width:s,height:n}:t}(t,a);r.set(n.getWorldBounds(e))}const{x:i,y:h,width:d,height:c}=r;let l=a.x-i,f=a.y-h;if(s)l+=Math.max((a.width-d)/2,0),f+=Math.max((a.height-c)/2,0);else{const t=this.getValidScale(Math.min(a.width/d,a.height/c));l+=(a.width-d*t)/2,f+=(a.height-c*t)/2,n.scaleOfWorld(r,t),r.scaleOf(r,t)}return n.move(l,f),r.move(l,f)}return n.worldBoxBounds};
+import{Plugin as t,Leafer as e,Bounds as i,LeafBoundsHelper as s,PointHelper as h}from"@leafer-ui/draw";function o(t,e){let i=1;const s="out"===e,h=Math.abs(t);if(h>1){for(;s?i<h:i<=h;)i*=2;s&&(i/=2)}else{for(;s?i>=h:i>h;)i/=2;s||(i*=2)}return i/t}t.add("view"),e.prototype.zoom=function(t,e,a,n){this.killAnimate();const{zoomLayer:c}=this,l=this.canvas.bounds.clone().shrink(void 0!==e?e:30),r=new i,d={x:l.x+l.width/2,y:l.y+l.height/2};let f;const{scaleX:u}=this.__;if("string"==typeof t)switch(t){case"in":f=o(u,"in");break;case"out":f=o(u,"out");break;case"fit":t=this.boxBounds;break;case"fit-width":(t=new i(this.boxBounds)).height=0;break;case"fit-height":(t=new i(this.boxBounds)).width=0}else"number"==typeof t&&(f=t/u);if(f)f=this.getValidScale(f),c.scaleOfWorld(d,f,f,!1,n);else if("object"==typeof t){const{x:e,y:i,scaleX:o,scaleY:d}=c,u={x:e,y:i,scaleX:o,scaleY:d},w=t instanceof Array;if(w||t.tag){const e=w?t:[t];r.setListWithFn(e,s.worldBounds)}else{const e=function(t,e){let i,{x:s,y:h,width:o,height:a}=t;return a||(a=o*(e.height/e.width),i=!0),o||(o=a*(e.width/e.height),i=!0),i?{x:s,y:h,width:o,height:a}:t}(t,l);r.set(c.getWorldBounds(e))}const{width:g,height:x}=r;let y=l.x-r.x,b=l.y-r.y;return a?(y+=Math.max((l.width-g)/2,0),b+=Math.max((l.height-x)/2,0)):(f=this.getValidScale(Math.min(l.width/g,l.height/x)),y+=(l.width-g*f)/2,b+=(l.height-x*f)/2,h.scaleOf(u,r,f),r.scaleOf(r,f),u.scaleX*=f,u.scaleY*=f),h.move(u,y,b),r.move(y,b),c.set(u,n),r}return c.worldBoxBounds};
+//# sourceMappingURL=view.esm.min.js.map

package/dist/view.esm.min.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"view.esm.min.js","sources":["../../../../../../src/in/packages/view/src/helper.ts","../../../../../../src/in/packages/view/src/index.ts"],"sourcesContent":["import { IBoundsData } from '@leafer-ui/interface'\n\n\nexport function getZoomScale(scaleX: number, type: 'in' | 'out'): number {\n    let scale = 1\n    const out = type === 'out', absScale = Math.abs(scaleX)\n    if (absScale > 1) {\n        while (out ? scale < absScale : scale <= absScale) scale *= 2\n        if (out) scale /= 2\n    } else {\n        while (out ? scale >= absScale : scale > absScale) scale /= 2\n        if (!out) scale *= 2\n    }\n    return scale / scaleX\n}\n\nexport function getFixBounds(bounds: IBoundsData, scaleBounds: IBoundsData): IBoundsData {\n    let { x, y, width, height } = bounds\n    let fix: boolean\n    if (!height) height = width * (scaleBounds.height / scaleBounds.width), fix = true\n    if (!width) width = height * (scaleBounds.width / scaleBounds.height), fix = true\n    return fix ? { x, y, width, height } : bounds\n}","import { ILeaf, IBoundsData, IZoomType, IFourNumber, IPointData, ITransition } from '@leafer-ui/interface'\nimport { Leafer, Bounds, LeafBoundsHelper, Plugin, PointHelper } from '@leafer-ui/draw'\n\nimport { getFixBounds, getZoomScale } from './helper'\n\n\nPlugin.add('view')\n\n\nLeafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fixed?: boolean, transition?: ITransition): IBoundsData {\n\n    this.killAnimate()\n\n    const { zoomLayer } = this\n    const limitBounds = this.canvas.bounds.clone().shrink(padding !== undefined ? padding : 30), bounds = new Bounds()\n    const center: IPointData = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 }\n\n    let changeScale: number\n    const { scaleX } = this.__\n\n    if (typeof zoomType === 'string') {\n\n        switch (zoomType) {\n            case 'in':\n                changeScale = getZoomScale(scaleX, 'in')\n                break\n            case 'out':\n                changeScale = getZoomScale(scaleX, 'out')\n                break\n            case 'fit':\n                zoomType = this.boxBounds\n                break\n            case 'fit-width':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.height = 0\n                break\n            case 'fit-height':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.width = 0\n                break\n        }\n\n    } else if (typeof zoomType === 'number') {\n        changeScale = zoomType / scaleX\n    }\n\n\n    if (changeScale) {\n\n        changeScale = this.getValidScale(changeScale)\n        zoomLayer.scaleOfWorld(center, changeScale, changeScale, false, transition)\n\n    } else if (typeof zoomType === 'object') {\n\n        const { x, y, scaleX, scaleY } = zoomLayer\n        const data = { x, y, scaleX, scaleY }\n\n        const isArray = zoomType instanceof Array\n\n        if (isArray || (zoomType as ILeaf).tag) {\n            const list: ILeaf[] = isArray ? zoomType as ILeaf[] : [zoomType as ILeaf]\n            bounds.setListWithFn(list, LeafBoundsHelper.worldBounds)\n        } else {\n            const innerBounds = getFixBounds(zoomType as IBoundsData, limitBounds)\n            bounds.set(zoomLayer.getWorldBounds(innerBounds))\n        }\n\n        const { width, height } = bounds\n        let moveX = limitBounds.x - bounds.x, moveY = limitBounds.y - bounds.y\n\n        if (fixed) {\n\n            moveX += Math.max((limitBounds.width - width) / 2, 0)\n            moveY += Math.max((limitBounds.height - height) / 2, 0)\n\n        } else {\n\n            changeScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height))\n            moveX += (limitBounds.width - width * changeScale) / 2\n            moveY += (limitBounds.height - height * changeScale) / 2\n\n            PointHelper.scaleOf(data, bounds, changeScale)\n            bounds.scaleOf(bounds, changeScale)\n\n            data.scaleX *= changeScale\n            data.scaleY *= changeScale\n        }\n\n        PointHelper.move(data, moveX, moveY)\n        bounds.move(moveX, moveY)\n\n        zoomLayer.set(data, transition)\n\n        return bounds\n\n    }\n\n    return zoomLayer.worldBoxBounds\n\n}"],"names":["getZoomScale","scaleX","type","scale","out","absScale","Math","abs","Plugin","add","Leafer","prototype","zoom","zoomType","padding","fixed","transition","this","killAnimate","zoomLayer","limitBounds","canvas","bounds","clone","shrink","undefined","Bounds","center","x","width","y","height","changeScale","__","boxBounds","getValidScale","scaleOfWorld","scaleY","data","isArray","Array","tag","list","setListWithFn","LeafBoundsHelper","worldBounds","innerBounds","scaleBounds","fix","getFixBounds","set","getWorldBounds","moveX","moveY","max","min","PointHelper","scaleOf","move","worldBoxBounds"],"mappings":"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"}

package/dist/view.js

@@ -29,7 +29,8 @@
     }
 
     draw.Plugin.add('view');
-    draw.Leafer.prototype.zoom = function (zoomType, padding, fixed) {
+    draw.Leafer.prototype.zoom = function (zoomType, padding, fixed, transition) {
+        this.killAnimate();
         const { zoomLayer } = this;
         const limitBounds = this.canvas.bounds.clone().shrink(padding !== undefined ? padding : 30), bounds = new draw.Bounds();
         const center = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 };
@@ -60,10 +61,12 @@
             changeScale = zoomType / scaleX;
         }
         if (changeScale) {
-            if (changeScale !== 1)
-                zoomLayer.scaleOfWorld(center, this.getValidScale(changeScale));
+            changeScale = this.getValidScale(changeScale);
+            zoomLayer.scaleOfWorld(center, changeScale, changeScale, false, transition);
         }
         else if (typeof zoomType === 'object') {
+            const { x, y, scaleX, scaleY } = zoomLayer;
+            const data = { x, y, scaleX, scaleY };
             const isArray = zoomType instanceof Array;
             if (isArray || zoomType.tag) {
                 const list = isArray ? zoomType : [zoomType];
@@ -73,23 +76,28 @@
                 const innerBounds = getFixBounds(zoomType, limitBounds);
                 bounds.set(zoomLayer.getWorldBounds(innerBounds));
             }
-            const { x, y, width, height } = bounds;
-            let moveX = limitBounds.x - x, moveY = limitBounds.y - y;
+            const { width, height } = bounds;
+            let moveX = limitBounds.x - bounds.x, moveY = limitBounds.y - bounds.y;
             if (fixed) {
                 moveX += Math.max((limitBounds.width - width) / 2, 0);
                 moveY += Math.max((limitBounds.height - height) / 2, 0);
             }
             else {
-                const fitScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height));
-                moveX += (limitBounds.width - width * fitScale) / 2;
-                moveY += (limitBounds.height - height * fitScale) / 2;
-                zoomLayer.scaleOfWorld(bounds, fitScale);
-                bounds.scaleOf(bounds, fitScale);
+                changeScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height));
+                moveX += (limitBounds.width - width * changeScale) / 2;
+                moveY += (limitBounds.height - height * changeScale) / 2;
+                draw.PointHelper.scaleOf(data, bounds, changeScale);
+                bounds.scaleOf(bounds, changeScale);
+                data.scaleX *= changeScale;
+                data.scaleY *= changeScale;
             }
-            zoomLayer.move(moveX, moveY);
-            return bounds.move(moveX, moveY);
+            draw.PointHelper.move(data, moveX, moveY);
+            bounds.move(moveX, moveY);
+            zoomLayer.set(data, transition);
+            return bounds;
         }
         return zoomLayer.worldBoxBounds;
     };
 
 })(LeaferUI);
+//# sourceMappingURL=view.js.map

package/dist/view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"view.js","sources":["../../../../../../src/in/packages/view/src/helper.ts","../../../../../../src/in/packages/view/src/index.ts"],"sourcesContent":["import { IBoundsData } from '@leafer-ui/interface'\n\n\nexport function getZoomScale(scaleX: number, type: 'in' | 'out'): number {\n    let scale = 1\n    const out = type === 'out', absScale = Math.abs(scaleX)\n    if (absScale > 1) {\n        while (out ? scale < absScale : scale <= absScale) scale *= 2\n        if (out) scale /= 2\n    } else {\n        while (out ? scale >= absScale : scale > absScale) scale /= 2\n        if (!out) scale *= 2\n    }\n    return scale / scaleX\n}\n\nexport function getFixBounds(bounds: IBoundsData, scaleBounds: IBoundsData): IBoundsData {\n    let { x, y, width, height } = bounds\n    let fix: boolean\n    if (!height) height = width * (scaleBounds.height / scaleBounds.width), fix = true\n    if (!width) width = height * (scaleBounds.width / scaleBounds.height), fix = true\n    return fix ? { x, y, width, height } : bounds\n}","import { ILeaf, IBoundsData, IZoomType, IFourNumber, IPointData, ITransition } from '@leafer-ui/interface'\nimport { Leafer, Bounds, LeafBoundsHelper, Plugin, PointHelper } from '@leafer-ui/draw'\n\nimport { getFixBounds, getZoomScale } from './helper'\n\n\nPlugin.add('view')\n\n\nLeafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fixed?: boolean, transition?: ITransition): IBoundsData {\n\n    this.killAnimate()\n\n    const { zoomLayer } = this\n    const limitBounds = this.canvas.bounds.clone().shrink(padding !== undefined ? padding : 30), bounds = new Bounds()\n    const center: IPointData = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 }\n\n    let changeScale: number\n    const { scaleX } = this.__\n\n    if (typeof zoomType === 'string') {\n\n        switch (zoomType) {\n            case 'in':\n                changeScale = getZoomScale(scaleX, 'in')\n                break\n            case 'out':\n                changeScale = getZoomScale(scaleX, 'out')\n                break\n            case 'fit':\n                zoomType = this.boxBounds\n                break\n            case 'fit-width':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.height = 0\n                break\n            case 'fit-height':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.width = 0\n                break\n        }\n\n    } else if (typeof zoomType === 'number') {\n        changeScale = zoomType / scaleX\n    }\n\n\n    if (changeScale) {\n\n        changeScale = this.getValidScale(changeScale)\n        zoomLayer.scaleOfWorld(center, changeScale, changeScale, false, transition)\n\n    } else if (typeof zoomType === 'object') {\n\n        const { x, y, scaleX, scaleY } = zoomLayer\n        const data = { x, y, scaleX, scaleY }\n\n        const isArray = zoomType instanceof Array\n\n        if (isArray || (zoomType as ILeaf).tag) {\n            const list: ILeaf[] = isArray ? zoomType as ILeaf[] : [zoomType as ILeaf]\n            bounds.setListWithFn(list, LeafBoundsHelper.worldBounds)\n        } else {\n            const innerBounds = getFixBounds(zoomType as IBoundsData, limitBounds)\n            bounds.set(zoomLayer.getWorldBounds(innerBounds))\n        }\n\n        const { width, height } = bounds\n        let moveX = limitBounds.x - bounds.x, moveY = limitBounds.y - bounds.y\n\n        if (fixed) {\n\n            moveX += Math.max((limitBounds.width - width) / 2, 0)\n            moveY += Math.max((limitBounds.height - height) / 2, 0)\n\n        } else {\n\n            changeScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height))\n            moveX += (limitBounds.width - width * changeScale) / 2\n            moveY += (limitBounds.height - height * changeScale) / 2\n\n            PointHelper.scaleOf(data, bounds, changeScale)\n            bounds.scaleOf(bounds, changeScale)\n\n            data.scaleX *= changeScale\n            data.scaleY *= changeScale\n        }\n\n        PointHelper.move(data, moveX, moveY)\n        bounds.move(moveX, moveY)\n\n        zoomLayer.set(data, transition)\n\n        return bounds\n\n    }\n\n    return zoomLayer.worldBoxBounds\n\n}"],"names":["Plugin","Leafer","Bounds","LeafBoundsHelper","PointHelper"],"mappings":"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"}

package/dist/view.min.cjs

@@ -1 +1,2 @@
-"use strict";var t=require("@leafer-ui/draw");function e(t,e){let i=1;const s="out"===e,o=Math.abs(t);if(o>1){for(;s?i<o:i<=o;)i*=2;s&&(i/=2)}else{for(;s?i>=o:i>o;)i/=2;s||(i*=2)}return i/t}t.Plugin.add("view"),t.Leafer.prototype.zoom=function(i,s,o){const{zoomLayer:h}=this,n=this.canvas.bounds.clone().shrink(void 0!==s?s:30),a=new t.Bounds,r={x:n.x+n.width/2,y:n.y+n.height/2};let d;const{scaleX:c}=this.__;if("string"==typeof i)switch(i){case"in":d=e(c,"in");break;case"out":d=e(c,"out");break;case"fit":i=this.boxBounds;break;case"fit-width":(i=new t.Bounds(this.boxBounds)).height=0;break;case"fit-height":(i=new t.Bounds(this.boxBounds)).width=0}else"number"==typeof i&&(d=i/c);if(d)1!==d&&h.scaleOfWorld(r,this.getValidScale(d));else if("object"==typeof i){const e=i instanceof Array;if(e||i.tag){const s=e?i:[i];a.setListWithFn(s,t.LeafBoundsHelper.worldBounds)}else{const t=function(t,e){let i,{x:s,y:o,width:h,height:n}=t;return n||(n=h*(e.height/e.width),i=!0),h||(h=n*(e.width/e.height),i=!0),i?{x:s,y:o,width:h,height:n}:t}(i,n);a.set(h.getWorldBounds(t))}const{x:s,y:r,width:d,height:c}=a;let l=n.x-s,u=n.y-r;if(o)l+=Math.max((n.width-d)/2,0),u+=Math.max((n.height-c)/2,0);else{const t=this.getValidScale(Math.min(n.width/d,n.height/c));l+=(n.width-d*t)/2,u+=(n.height-c*t)/2,h.scaleOfWorld(a,t),a.scaleOf(a,t)}return h.move(l,u),a.move(l,u)}return h.worldBoxBounds};
+"use strict";var e=require("@leafer-ui/draw");function t(e,t){let i=1;const s="out"===t,o=Math.abs(e);if(o>1){for(;s?i<o:i<=o;)i*=2;s&&(i/=2)}else{for(;s?i>=o:i>o;)i/=2;s||(i*=2)}return i/e}e.Plugin.add("view"),e.Leafer.prototype.zoom=function(i,s,o,h){this.killAnimate();const{zoomLayer:n}=this,a=this.canvas.bounds.clone().shrink(void 0!==s?s:30),r=new e.Bounds,l={x:a.x+a.width/2,y:a.y+a.height/2};let c;const{scaleX:d}=this.__;if("string"==typeof i)switch(i){case"in":c=t(d,"in");break;case"out":c=t(d,"out");break;case"fit":i=this.boxBounds;break;case"fit-width":(i=new e.Bounds(this.boxBounds)).height=0;break;case"fit-height":(i=new e.Bounds(this.boxBounds)).width=0}else"number"==typeof i&&(c=i/d);if(c)c=this.getValidScale(c),n.scaleOfWorld(l,c,c,!1,h);else if("object"==typeof i){const{x:t,y:s,scaleX:l,scaleY:d}=n,u={x:t,y:s,scaleX:l,scaleY:d},f=i instanceof Array;if(f||i.tag){const t=f?i:[i];r.setListWithFn(t,e.LeafBoundsHelper.worldBounds)}else{const e=function(e,t){let i,{x:s,y:o,width:h,height:n}=e;return n||(n=h*(t.height/t.width),i=!0),h||(h=n*(t.width/t.height),i=!0),i?{x:s,y:o,width:h,height:n}:e}(i,a);r.set(n.getWorldBounds(e))}const{width:w,height:g}=r;let x=a.x-r.x,y=a.y-r.y;return o?(x+=Math.max((a.width-w)/2,0),y+=Math.max((a.height-g)/2,0)):(c=this.getValidScale(Math.min(a.width/w,a.height/g)),x+=(a.width-w*c)/2,y+=(a.height-g*c)/2,e.PointHelper.scaleOf(u,r,c),r.scaleOf(r,c),u.scaleX*=c,u.scaleY*=c),e.PointHelper.move(u,x,y),r.move(x,y),n.set(u,h),r}return n.worldBoxBounds};
+//# sourceMappingURL=view.min.cjs.map

package/dist/view.min.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"view.min.cjs","sources":["../../../../../../src/in/packages/view/src/helper.ts","../../../../../../src/in/packages/view/src/index.ts"],"sourcesContent":["import { IBoundsData } from '@leafer-ui/interface'\n\n\nexport function getZoomScale(scaleX: number, type: 'in' | 'out'): number {\n    let scale = 1\n    const out = type === 'out', absScale = Math.abs(scaleX)\n    if (absScale > 1) {\n        while (out ? scale < absScale : scale <= absScale) scale *= 2\n        if (out) scale /= 2\n    } else {\n        while (out ? scale >= absScale : scale > absScale) scale /= 2\n        if (!out) scale *= 2\n    }\n    return scale / scaleX\n}\n\nexport function getFixBounds(bounds: IBoundsData, scaleBounds: IBoundsData): IBoundsData {\n    let { x, y, width, height } = bounds\n    let fix: boolean\n    if (!height) height = width * (scaleBounds.height / scaleBounds.width), fix = true\n    if (!width) width = height * (scaleBounds.width / scaleBounds.height), fix = true\n    return fix ? { x, y, width, height } : bounds\n}","import { ILeaf, IBoundsData, IZoomType, IFourNumber, IPointData, ITransition } from '@leafer-ui/interface'\nimport { Leafer, Bounds, LeafBoundsHelper, Plugin, PointHelper } from '@leafer-ui/draw'\n\nimport { getFixBounds, getZoomScale } from './helper'\n\n\nPlugin.add('view')\n\n\nLeafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fixed?: boolean, transition?: ITransition): IBoundsData {\n\n    this.killAnimate()\n\n    const { zoomLayer } = this\n    const limitBounds = this.canvas.bounds.clone().shrink(padding !== undefined ? padding : 30), bounds = new Bounds()\n    const center: IPointData = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 }\n\n    let changeScale: number\n    const { scaleX } = this.__\n\n    if (typeof zoomType === 'string') {\n\n        switch (zoomType) {\n            case 'in':\n                changeScale = getZoomScale(scaleX, 'in')\n                break\n            case 'out':\n                changeScale = getZoomScale(scaleX, 'out')\n                break\n            case 'fit':\n                zoomType = this.boxBounds\n                break\n            case 'fit-width':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.height = 0\n                break\n            case 'fit-height':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.width = 0\n                break\n        }\n\n    } else if (typeof zoomType === 'number') {\n        changeScale = zoomType / scaleX\n    }\n\n\n    if (changeScale) {\n\n        changeScale = this.getValidScale(changeScale)\n        zoomLayer.scaleOfWorld(center, changeScale, changeScale, false, transition)\n\n    } else if (typeof zoomType === 'object') {\n\n        const { x, y, scaleX, scaleY } = zoomLayer\n        const data = { x, y, scaleX, scaleY }\n\n        const isArray = zoomType instanceof Array\n\n        if (isArray || (zoomType as ILeaf).tag) {\n            const list: ILeaf[] = isArray ? zoomType as ILeaf[] : [zoomType as ILeaf]\n            bounds.setListWithFn(list, LeafBoundsHelper.worldBounds)\n        } else {\n            const innerBounds = getFixBounds(zoomType as IBoundsData, limitBounds)\n            bounds.set(zoomLayer.getWorldBounds(innerBounds))\n        }\n\n        const { width, height } = bounds\n        let moveX = limitBounds.x - bounds.x, moveY = limitBounds.y - bounds.y\n\n        if (fixed) {\n\n            moveX += Math.max((limitBounds.width - width) / 2, 0)\n            moveY += Math.max((limitBounds.height - height) / 2, 0)\n\n        } else {\n\n            changeScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height))\n            moveX += (limitBounds.width - width * changeScale) / 2\n            moveY += (limitBounds.height - height * changeScale) / 2\n\n            PointHelper.scaleOf(data, bounds, changeScale)\n            bounds.scaleOf(bounds, changeScale)\n\n            data.scaleX *= changeScale\n            data.scaleY *= changeScale\n        }\n\n        PointHelper.move(data, moveX, moveY)\n        bounds.move(moveX, moveY)\n\n        zoomLayer.set(data, transition)\n\n        return bounds\n\n    }\n\n    return zoomLayer.worldBoxBounds\n\n}"],"names":["getZoomScale","scaleX","type","scale","out","absScale","Math","abs","Plugin","add","Leafer","prototype","zoom","zoomType","padding","fixed","transition","this","killAnimate","zoomLayer","limitBounds","canvas","bounds","clone","shrink","undefined","Bounds","center","x","width","y","height","changeScale","__","boxBounds","getValidScale","scaleOfWorld","scaleY","data","isArray","Array","tag","list","setListWithFn","LeafBoundsHelper","worldBounds","innerBounds","scaleBounds","fix","getFixBounds","set","getWorldBounds","moveX","moveY","max","min","PointHelper","scaleOf","move","worldBoxBounds"],"mappings":"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"}

package/dist/view.min.js

@@ -1 +1,2 @@
-!function(t){"use strict";function e(t,e){let i=1;const o="out"===e,s=Math.abs(t);if(s>1){for(;o?i<s:i<=s;)i*=2;o&&(i/=2)}else{for(;o?i>=s:i>s;)i/=2;o||(i*=2)}return i/t}t.Plugin.add("view"),t.Leafer.prototype.zoom=function(i,o,s){const{zoomLayer:h}=this,n=this.canvas.bounds.clone().shrink(void 0!==o?o:30),a=new t.Bounds,d={x:n.x+n.width/2,y:n.y+n.height/2};let r;const{scaleX:c}=this.__;if("string"==typeof i)switch(i){case"in":r=e(c,"in");break;case"out":r=e(c,"out");break;case"fit":i=this.boxBounds;break;case"fit-width":(i=new t.Bounds(this.boxBounds)).height=0;break;case"fit-height":(i=new t.Bounds(this.boxBounds)).width=0}else"number"==typeof i&&(r=i/c);if(r)1!==r&&h.scaleOfWorld(d,this.getValidScale(r));else if("object"==typeof i){const e=i instanceof Array;if(e||i.tag){const o=e?i:[i];a.setListWithFn(o,t.LeafBoundsHelper.worldBounds)}else{const t=function(t,e){let i,{x:o,y:s,width:h,height:n}=t;return n||(n=h*(e.height/e.width),i=!0),h||(h=n*(e.width/e.height),i=!0),i?{x:o,y:s,width:h,height:n}:t}(i,n);a.set(h.getWorldBounds(t))}const{x:o,y:d,width:r,height:c}=a;let f=n.x-o,l=n.y-d;if(s)f+=Math.max((n.width-r)/2,0),l+=Math.max((n.height-c)/2,0);else{const t=this.getValidScale(Math.min(n.width/r,n.height/c));f+=(n.width-r*t)/2,l+=(n.height-c*t)/2,h.scaleOfWorld(a,t),a.scaleOf(a,t)}return h.move(f,l),a.move(f,l)}return h.worldBoxBounds}}(LeaferUI);
+!function(t){"use strict";function e(t,e){let i=1;const s="out"===e,o=Math.abs(t);if(o>1){for(;s?i<o:i<=o;)i*=2;s&&(i/=2)}else{for(;s?i>=o:i>o;)i/=2;s||(i*=2)}return i/t}t.Plugin.add("view"),t.Leafer.prototype.zoom=function(i,s,o,h){this.killAnimate();const{zoomLayer:n}=this,a=this.canvas.bounds.clone().shrink(void 0!==s?s:30),c=new t.Bounds,l={x:a.x+a.width/2,y:a.y+a.height/2};let d;const{scaleX:r}=this.__;if("string"==typeof i)switch(i){case"in":d=e(r,"in");break;case"out":d=e(r,"out");break;case"fit":i=this.boxBounds;break;case"fit-width":(i=new t.Bounds(this.boxBounds)).height=0;break;case"fit-height":(i=new t.Bounds(this.boxBounds)).width=0}else"number"==typeof i&&(d=i/r);if(d)d=this.getValidScale(d),n.scaleOfWorld(l,d,d,!1,h);else if("object"==typeof i){const{x:e,y:s,scaleX:l,scaleY:r}=n,u={x:e,y:s,scaleX:l,scaleY:r},f=i instanceof Array;if(f||i.tag){const e=f?i:[i];c.setListWithFn(e,t.LeafBoundsHelper.worldBounds)}else{const t=function(t,e){let i,{x:s,y:o,width:h,height:n}=t;return n||(n=h*(e.height/e.width),i=!0),h||(h=n*(e.width/e.height),i=!0),i?{x:s,y:o,width:h,height:n}:t}(i,a);c.set(n.getWorldBounds(t))}const{width:w,height:g}=c;let x=a.x-c.x,y=a.y-c.y;return o?(x+=Math.max((a.width-w)/2,0),y+=Math.max((a.height-g)/2,0)):(d=this.getValidScale(Math.min(a.width/w,a.height/g)),x+=(a.width-w*d)/2,y+=(a.height-g*d)/2,t.PointHelper.scaleOf(u,c,d),c.scaleOf(c,d),u.scaleX*=d,u.scaleY*=d),t.PointHelper.move(u,x,y),c.move(x,y),n.set(u,h),c}return n.worldBoxBounds}}(LeaferUI);
+//# sourceMappingURL=view.min.js.map

package/dist/view.min.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"view.min.js","sources":["../../../../../../src/in/packages/view/src/helper.ts","../../../../../../src/in/packages/view/src/index.ts"],"sourcesContent":["import { IBoundsData } from '@leafer-ui/interface'\n\n\nexport function getZoomScale(scaleX: number, type: 'in' | 'out'): number {\n    let scale = 1\n    const out = type === 'out', absScale = Math.abs(scaleX)\n    if (absScale > 1) {\n        while (out ? scale < absScale : scale <= absScale) scale *= 2\n        if (out) scale /= 2\n    } else {\n        while (out ? scale >= absScale : scale > absScale) scale /= 2\n        if (!out) scale *= 2\n    }\n    return scale / scaleX\n}\n\nexport function getFixBounds(bounds: IBoundsData, scaleBounds: IBoundsData): IBoundsData {\n    let { x, y, width, height } = bounds\n    let fix: boolean\n    if (!height) height = width * (scaleBounds.height / scaleBounds.width), fix = true\n    if (!width) width = height * (scaleBounds.width / scaleBounds.height), fix = true\n    return fix ? { x, y, width, height } : bounds\n}","import { ILeaf, IBoundsData, IZoomType, IFourNumber, IPointData, ITransition } from '@leafer-ui/interface'\nimport { Leafer, Bounds, LeafBoundsHelper, Plugin, PointHelper } from '@leafer-ui/draw'\n\nimport { getFixBounds, getZoomScale } from './helper'\n\n\nPlugin.add('view')\n\n\nLeafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fixed?: boolean, transition?: ITransition): IBoundsData {\n\n    this.killAnimate()\n\n    const { zoomLayer } = this\n    const limitBounds = this.canvas.bounds.clone().shrink(padding !== undefined ? padding : 30), bounds = new Bounds()\n    const center: IPointData = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 }\n\n    let changeScale: number\n    const { scaleX } = this.__\n\n    if (typeof zoomType === 'string') {\n\n        switch (zoomType) {\n            case 'in':\n                changeScale = getZoomScale(scaleX, 'in')\n                break\n            case 'out':\n                changeScale = getZoomScale(scaleX, 'out')\n                break\n            case 'fit':\n                zoomType = this.boxBounds\n                break\n            case 'fit-width':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.height = 0\n                break\n            case 'fit-height':\n                zoomType = new Bounds(this.boxBounds)\n                zoomType.width = 0\n                break\n        }\n\n    } else if (typeof zoomType === 'number') {\n        changeScale = zoomType / scaleX\n    }\n\n\n    if (changeScale) {\n\n        changeScale = this.getValidScale(changeScale)\n        zoomLayer.scaleOfWorld(center, changeScale, changeScale, false, transition)\n\n    } else if (typeof zoomType === 'object') {\n\n        const { x, y, scaleX, scaleY } = zoomLayer\n        const data = { x, y, scaleX, scaleY }\n\n        const isArray = zoomType instanceof Array\n\n        if (isArray || (zoomType as ILeaf).tag) {\n            const list: ILeaf[] = isArray ? zoomType as ILeaf[] : [zoomType as ILeaf]\n            bounds.setListWithFn(list, LeafBoundsHelper.worldBounds)\n        } else {\n            const innerBounds = getFixBounds(zoomType as IBoundsData, limitBounds)\n            bounds.set(zoomLayer.getWorldBounds(innerBounds))\n        }\n\n        const { width, height } = bounds\n        let moveX = limitBounds.x - bounds.x, moveY = limitBounds.y - bounds.y\n\n        if (fixed) {\n\n            moveX += Math.max((limitBounds.width - width) / 2, 0)\n            moveY += Math.max((limitBounds.height - height) / 2, 0)\n\n        } else {\n\n            changeScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height))\n            moveX += (limitBounds.width - width * changeScale) / 2\n            moveY += (limitBounds.height - height * changeScale) / 2\n\n            PointHelper.scaleOf(data, bounds, changeScale)\n            bounds.scaleOf(bounds, changeScale)\n\n            data.scaleX *= changeScale\n            data.scaleY *= changeScale\n        }\n\n        PointHelper.move(data, moveX, moveY)\n        bounds.move(moveX, moveY)\n\n        zoomLayer.set(data, transition)\n\n        return bounds\n\n    }\n\n    return zoomLayer.worldBoxBounds\n\n}"],"names":["getZoomScale","scaleX","type","scale","out","absScale","Math","abs","Plugin","add","Leafer","prototype","zoom","zoomType","padding","fixed","transition","this","killAnimate","zoomLayer","limitBounds","canvas","bounds","clone","shrink","undefined","Bounds","center","x","width","y","height","changeScale","__","boxBounds","getValidScale","scaleOfWorld","scaleY","data","isArray","Array","tag","list","setListWithFn","LeafBoundsHelper","worldBounds","innerBounds","scaleBounds","fix","getFixBounds","set","getWorldBounds","moveX","moveY","max","min","PointHelper","scaleOf","move","worldBoxBounds"],"mappings":"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"}

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@leafer-in/view",
-  "version": "1.3.3",
+  "version": "1.4.1",
   "description": "@leafer-in/view",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "type": "module",
   "main": "dist/view.esm.js",
   "exports": {
-    "import": "./dist/view.esm.js",
-    "require": "./dist/view.cjs",
+    "import": "./dist/view.esm.min.js",
+    "require": "./dist/view.min.cjs",
     "types": "./types/index.d.ts"
   },
   "types": "types/index.d.ts",
-  "unpkg": "dist/view.js",
-  "jsdelivr": "dist/view.js",
+  "unpkg": "dist/view.min.js",
+  "jsdelivr": "dist/view.min.js",
   "files": [
     "src",
     "types",
@@ -34,8 +34,8 @@
     "leaferjs"
   ],
   "peerDependencies": {
-    "@leafer-ui/draw": "^1.3.3",
-    "@leafer-ui/interface": "^1.3.3",
-    "@leafer-in/interface": "^1.3.3"
+    "@leafer-ui/draw": "^1.4.1",
+    "@leafer-ui/interface": "^1.4.1",
+    "@leafer-in/interface": "^1.4.1"
   }
 }

package/src/index.ts

@@ -1,5 +1,5 @@
-import { ILeaf, IBoundsData, IZoomType, IFourNumber, IPointData } from '@leafer-ui/interface'
-import { Leafer, Bounds, LeafBoundsHelper, Plugin } from '@leafer-ui/draw'
+import { ILeaf, IBoundsData, IZoomType, IFourNumber, IPointData, ITransition } from '@leafer-ui/interface'
+import { Leafer, Bounds, LeafBoundsHelper, Plugin, PointHelper } from '@leafer-ui/draw'
 
 import { getFixBounds, getZoomScale } from './helper'
 
@@ -7,7 +7,9 @@ import { getFixBounds, getZoomScale } from './helper'
 Plugin.add('view')
 
 
-Leafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fixed?: boolean): IBoundsData {
+Leafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fixed?: boolean, transition?: ITransition): IBoundsData {
+
+    this.killAnimate()
 
     const { zoomLayer } = this
     const limitBounds = this.canvas.bounds.clone().shrink(padding !== undefined ? padding : 30), bounds = new Bounds()
@@ -45,10 +47,14 @@ Leafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fi
 
     if (changeScale) {
 
-        if (changeScale !== 1) zoomLayer.scaleOfWorld(center, this.getValidScale(changeScale))
+        changeScale = this.getValidScale(changeScale)
+        zoomLayer.scaleOfWorld(center, changeScale, changeScale, false, transition)
 
     } else if (typeof zoomType === 'object') {
 
+        const { x, y, scaleX, scaleY } = zoomLayer
+        const data = { x, y, scaleX, scaleY }
+
         const isArray = zoomType instanceof Array
 
         if (isArray || (zoomType as ILeaf).tag) {
@@ -59,8 +65,8 @@ Leafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fi
             bounds.set(zoomLayer.getWorldBounds(innerBounds))
         }
 
-        const { x, y, width, height } = bounds
-        let moveX = limitBounds.x - x, moveY = limitBounds.y - y
+        const { width, height } = bounds
+        let moveX = limitBounds.x - bounds.x, moveY = limitBounds.y - bounds.y
 
         if (fixed) {
 
@@ -69,17 +75,23 @@ Leafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fi
 
         } else {
 
-            const fitScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height))
-            moveX += (limitBounds.width - width * fitScale) / 2
-            moveY += (limitBounds.height - height * fitScale) / 2
+            changeScale = this.getValidScale(Math.min(limitBounds.width / width, limitBounds.height / height))
+            moveX += (limitBounds.width - width * changeScale) / 2
+            moveY += (limitBounds.height - height * changeScale) / 2
 
-            zoomLayer.scaleOfWorld(bounds, fitScale)
-            bounds.scaleOf(bounds, fitScale)
+            PointHelper.scaleOf(data, bounds, changeScale)
+            bounds.scaleOf(bounds, changeScale)
 
+            data.scaleX *= changeScale
+            data.scaleY *= changeScale
         }
 
-        zoomLayer.move(moveX, moveY)
-        return bounds.move(moveX, moveY)
+        PointHelper.move(data, moveX, moveY)
+        bounds.move(moveX, moveY)
+
+        zoomLayer.set(data, transition)
+
+        return bounds
 
     }