@leafer-in/view 1.0.0-rc.18 → 1.0.0-rc.19

package/dist/view.esm.js

@@ -31,15 +31,15 @@ Leafer.prototype.zoom = function (zoomType, padding, fixed) {
     const { zoomLayer } = this;
     const limitBounds = this.canvas.bounds.clone().shrink(padding ? padding : 30), bounds = new Bounds();
     const center = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 };
-    let scale;
+    let changeScale;
+    const { scaleX } = this.__;
     if (typeof zoomType === 'string') {
-        const { scaleX } = this.__;
         switch (zoomType) {
             case 'in':
-                scale = getZoomScale(scaleX, 'in');
+                changeScale = getZoomScale(scaleX, 'in');
                 break;
             case 'out':
-                scale = getZoomScale(scaleX, 'out');
+                changeScale = getZoomScale(scaleX, 'out');
                 break;
             case 'fit':
                 zoomType = this.boxBounds;
@@ -55,10 +55,11 @@ Leafer.prototype.zoom = function (zoomType, padding, fixed) {
         }
     }
     else if (typeof zoomType === 'number') {
-        scale = zoomType;
+        changeScale = zoomType / scaleX;
     }
-    if (scale) {
-        zoomLayer.scaleOfWorld(center, this.validScale(scale));
+    if (changeScale) {
+        if (changeScale !== 1)
+            zoomLayer.scaleOfWorld(center, this.validScale(changeScale));
     }
     else if (typeof zoomType === 'object') {
         const isArray = zoomType instanceof Array;

package/dist/view.esm.min.js

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

package/dist/view.js

@@ -32,15 +32,15 @@
         const { zoomLayer } = this;
         const limitBounds = this.canvas.bounds.clone().shrink(padding ? padding : 30), bounds = new draw.Bounds();
         const center = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 };
-        let scale;
+        let changeScale;
+        const { scaleX } = this.__;
         if (typeof zoomType === 'string') {
-            const { scaleX } = this.__;
             switch (zoomType) {
                 case 'in':
-                    scale = getZoomScale(scaleX, 'in');
+                    changeScale = getZoomScale(scaleX, 'in');
                     break;
                 case 'out':
-                    scale = getZoomScale(scaleX, 'out');
+                    changeScale = getZoomScale(scaleX, 'out');
                     break;
                 case 'fit':
                     zoomType = this.boxBounds;
@@ -56,10 +56,11 @@
             }
         }
         else if (typeof zoomType === 'number') {
-            scale = zoomType;
+            changeScale = zoomType / scaleX;
         }
-        if (scale) {
-            zoomLayer.scaleOfWorld(center, this.validScale(scale));
+        if (changeScale) {
+            if (changeScale !== 1)
+                zoomLayer.scaleOfWorld(center, this.validScale(changeScale));
         }
         else if (typeof zoomType === 'object') {
             const isArray = zoomType instanceof Array;

package/dist/view.min.js

@@ -1 +1 @@
-!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.Leafer.prototype.zoom=function(i,s,o){const{zoomLayer:h}=this,n=this.canvas.bounds.clone().shrink(s||30),a=new t.Bounds,r={x:n.x+n.width/2,y:n.y+n.height/2};let c;if("string"==typeof i){const{scaleX:s}=this.__;switch(i){case"in":c=e(s,"in");break;case"out":c=e(s,"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&&(c=i);if(c)h.scaleOfWorld(r,this.validScale(c));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:c,height:d}=a;let f=n.x-s,l=n.y-r;if(o)f+=Math.max((n.width-c)/2,0),l+=Math.max((n.height-d)/2,0);else{const t=this.validScale(Math.min(n.width/c,n.height/d));f+=(n.width-c*t)/2,l+=(n.height-d*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.Leafer.prototype.zoom=function(i,s,o){const{zoomLayer:h}=this,n=this.canvas.bounds.clone().shrink(s||30),a=new t.Bounds,r={x:n.x+n.width/2,y:n.y+n.height/2};let c;const{scaleX:d}=this.__;if("string"==typeof i)switch(i){case"in":c=e(d,"in");break;case"out":c=e(d,"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&&(c=i/d);if(c)1!==c&&h.scaleOfWorld(r,this.validScale(c));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:c,height:d}=a;let f=n.x-s,l=n.y-r;if(o)f+=Math.max((n.width-c)/2,0),l+=Math.max((n.height-d)/2,0);else{const t=this.validScale(Math.min(n.width/c,n.height/d));f+=(n.width-c*t)/2,l+=(n.height-d*t)/2,h.scaleOfWorld(a,t),a.scaleOf(a,t)}return h.move(f,l),a.move(f,l)}return h.worldBoxBounds}}(LeaferUI);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-in/view",
-  "version": "1.0.0-rc.18",
+  "version": "1.0.0-rc.19",
   "description": "@leafer-in/view",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -28,10 +28,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer-ui/draw": "1.0.0-rc.18"
+    "@leafer-ui/draw": "1.0.0-rc.19"
   },
   "devDependencies": {
-    "@leafer-ui/interface": "1.0.0-rc.18",
-    "@leafer-in/interface": "1.0.0-rc.18"
+    "@leafer-ui/interface": "1.0.0-rc.19",
+    "@leafer-in/interface": "1.0.0-rc.19"
   }
 }

package/src/index.ts

@@ -10,18 +10,17 @@ Leafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fi
     const limitBounds = this.canvas.bounds.clone().shrink(padding ? padding : 30), bounds = new Bounds()
     const center: IPointData = { x: limitBounds.x + limitBounds.width / 2, y: limitBounds.y + limitBounds.height / 2 }
 
-    let scale: number
+    let changeScale: number
+    const { scaleX } = this.__
 
     if (typeof zoomType === 'string') {
 
-        const { scaleX } = this.__
-
         switch (zoomType) {
             case 'in':
-                scale = getZoomScale(scaleX, 'in')
+                changeScale = getZoomScale(scaleX, 'in')
                 break
             case 'out':
-                scale = getZoomScale(scaleX, 'out')
+                changeScale = getZoomScale(scaleX, 'out')
                 break
             case 'fit':
                 zoomType = this.boxBounds
@@ -37,13 +36,13 @@ Leafer.prototype.zoom = function (zoomType: IZoomType, padding?: IFourNumber, fi
         }
 
     } else if (typeof zoomType === 'number') {
-        scale = zoomType
+        changeScale = zoomType / scaleX
     }
 
 
-    if (scale) {
+    if (changeScale) {
 
-        zoomLayer.scaleOfWorld(center, this.validScale(scale))
+        if (changeScale !== 1) zoomLayer.scaleOfWorld(center, this.validScale(changeScale))
 
     } else if (typeof zoomType === 'object') {