@leafer-in/resize 1.0.1 → 1.0.3

package/dist/resize.cjs

@@ -13,9 +13,6 @@ const PathScaler = {
             command = data[i];
             switch (command) {
                 case M:
-                    scalePoints(data, scaleX, scaleY, i, 1);
-                    i += 3;
-                    break;
                 case L:
                     scalePoints(data, scaleX, scaleY, i, 1);
                     i += 3;
@@ -82,6 +79,7 @@ const PathScaler = {
 const { scalePoints } = PathScaler;
 
 const matrix = draw.MatrixHelper.get();
+const { topLeft, top, topRight, right, bottom, left } = draw.Direction9;
 function scaleResize(leaf, scaleX, scaleY) {
     if (leaf.pathInputed) {
         scaleResizePath(leaf, scaleX, scaleY);
@@ -94,15 +92,36 @@ function scaleResize(leaf, scaleX, scaleY) {
     }
 }
 function scaleResizeFontSize(leaf, scaleX, scaleY) {
-    const { width, height } = leaf.__localBoxBounds;
-    if (scaleX !== 1) {
-        leaf.fontSize *= scaleX;
-        leaf.y -= height * (scaleX - scaleY) / 2;
-    }
-    else if (scaleY !== 1) {
-        leaf.fontSize *= scaleY;
-        leaf.x -= width * (scaleY - scaleX) / 2;
+    const { app } = leaf;
+    const editor = app && app.editor;
+    let fontScale = scaleX;
+    if (editor.editing) {
+        const layout = leaf.__layout;
+        let { width, height } = layout.boxBounds;
+        width *= scaleY - scaleX;
+        height *= scaleX - scaleY;
+        switch (editor.resizeDirection) {
+            case top:
+            case bottom:
+                fontScale = scaleY;
+                layout.affectScaleOrRotation ? leaf.moveInner(-width / 2, 0) : leaf.x -= width / 2;
+                break;
+            case left:
+            case right:
+                layout.affectScaleOrRotation ? leaf.moveInner(0, -height / 2) : leaf.y -= height / 2;
+                break;
+            case topLeft:
+            case topRight:
+                layout.affectScaleOrRotation ? leaf.moveInner(0, -height) : leaf.y -= height;
+                break;
+        }
     }
+    leaf.fontSize *= fontScale;
+    const data = leaf.__;
+    if (!data.__autoWidth)
+        leaf.width *= fontScale;
+    if (!data.__autoHeight)
+        leaf.height *= fontScale;
 }
 function scaleResizePath(leaf, scaleX, scaleY) {
     PathScaler.scale(leaf.__.path, scaleX, scaleY);
@@ -148,7 +167,7 @@ leaf.resizeHeight = function (height) {
     this.scaleOf(this.__layout.boxBounds, this.__.lockRatio ? scale : 1, scale, true);
 };
 draw.Text.prototype.__scaleResize = function (scaleX, scaleY) {
-    if (this.__.__autoSize && (this.__.resizeFontSize || (this.editConfig && this.editConfig.editSize === 'font-size'))) {
+    if (this.__.resizeFontSize || (this.editConfig && this.editConfig.editSize === 'font-size')) {
         scaleResizeFontSize(this, scaleX, scaleY);
     }
     else {

package/dist/resize.esm.js

@@ -1,4 +1,4 @@
-import { PathCommandMap, MatrixHelper, Leaf, Text, Path, Line, Polygon, Group, Box } from '@leafer-ui/draw';
+import { PathCommandMap, MatrixHelper, Direction9, Leaf, Text, Path, Line, Polygon, Group, Box } from '@leafer-ui/draw';
 
 const { M, L, C, Q, Z, N, D, X, G, F, O, P, U } = PathCommandMap;
 const PathScaler = {
@@ -11,9 +11,6 @@ const PathScaler = {
             command = data[i];
             switch (command) {
                 case M:
-                    scalePoints(data, scaleX, scaleY, i, 1);
-                    i += 3;
-                    break;
                 case L:
                     scalePoints(data, scaleX, scaleY, i, 1);
                     i += 3;
@@ -80,6 +77,7 @@ const PathScaler = {
 const { scalePoints } = PathScaler;
 
 const matrix = MatrixHelper.get();
+const { topLeft, top, topRight, right, bottom, left } = Direction9;
 function scaleResize(leaf, scaleX, scaleY) {
     if (leaf.pathInputed) {
         scaleResizePath(leaf, scaleX, scaleY);
@@ -92,15 +90,36 @@ function scaleResize(leaf, scaleX, scaleY) {
     }
 }
 function scaleResizeFontSize(leaf, scaleX, scaleY) {
-    const { width, height } = leaf.__localBoxBounds;
-    if (scaleX !== 1) {
-        leaf.fontSize *= scaleX;
-        leaf.y -= height * (scaleX - scaleY) / 2;
-    }
-    else if (scaleY !== 1) {
-        leaf.fontSize *= scaleY;
-        leaf.x -= width * (scaleY - scaleX) / 2;
+    const { app } = leaf;
+    const editor = app && app.editor;
+    let fontScale = scaleX;
+    if (editor.editing) {
+        const layout = leaf.__layout;
+        let { width, height } = layout.boxBounds;
+        width *= scaleY - scaleX;
+        height *= scaleX - scaleY;
+        switch (editor.resizeDirection) {
+            case top:
+            case bottom:
+                fontScale = scaleY;
+                layout.affectScaleOrRotation ? leaf.moveInner(-width / 2, 0) : leaf.x -= width / 2;
+                break;
+            case left:
+            case right:
+                layout.affectScaleOrRotation ? leaf.moveInner(0, -height / 2) : leaf.y -= height / 2;
+                break;
+            case topLeft:
+            case topRight:
+                layout.affectScaleOrRotation ? leaf.moveInner(0, -height) : leaf.y -= height;
+                break;
+        }
     }
+    leaf.fontSize *= fontScale;
+    const data = leaf.__;
+    if (!data.__autoWidth)
+        leaf.width *= fontScale;
+    if (!data.__autoHeight)
+        leaf.height *= fontScale;
 }
 function scaleResizePath(leaf, scaleX, scaleY) {
     PathScaler.scale(leaf.__.path, scaleX, scaleY);
@@ -146,7 +165,7 @@ leaf.resizeHeight = function (height) {
     this.scaleOf(this.__layout.boxBounds, this.__.lockRatio ? scale : 1, scale, true);
 };
 Text.prototype.__scaleResize = function (scaleX, scaleY) {
-    if (this.__.__autoSize && (this.__.resizeFontSize || (this.editConfig && this.editConfig.editSize === 'font-size'))) {
+    if (this.__.resizeFontSize || (this.editConfig && this.editConfig.editSize === 'font-size')) {
         scaleResizeFontSize(this, scaleX, scaleY);
     }
     else {

package/dist/resize.esm.min.js

@@ -1 +1 @@
-import{PathCommandMap as t,MatrixHelper as e,Leaf as i,Text as s,Path as o,Line as n,Polygon as c,Group as a,Box as h}from"@leafer-ui/draw";const{M:_,L:l,C:r,Q:p,Z:f,N:u,D:d,X:z,G:b,F:g,O:k,P:R,U:y}=t,x={scale(t,e,i){if(!t)return;let s,o=0,n=t.length;for(;o<n;)switch(s=t[o],s){case _:case l:S(t,e,i,o,1),o+=3;break;case r:S(t,e,i,o,3),o+=7;break;case p:S(t,e,i,o,2),o+=5;break;case f:o+=1;break;case u:S(t,e,i,o,2),o+=5;break;case d:S(t,e,i,o,2),o+=9;break;case z:S(t,e,i,o,2),o+=6;break;case b:S(t,e,i,o,2),o+=9;break;case g:S(t,e,i,o,2),o+=5;break;case k:t[o]=b,t.splice(o+4,0,t[o+3],0),S(t,e,i,o,2),o+=9,n+=2;break;case R:t[o]=g,t.splice(o+4,0,t[o+3]),S(t,e,i,o,2),o+=5,n+=1;break;case y:S(t,e,i,o,2),o+=6}},scalePoints(t,e,i,s,o){for(let n=o?s+1:0,c=o?n+2*o:t.length;n<c;n+=2)t[n]*=e,t[n+1]*=i}},{scalePoints:S}=x,w=e.get();function B(t,e,i){t.pathInputed?P(t,e,i):(1!==e&&(t.width*=e),1!==i&&(t.height*=i))}function C(t,e,i){const{width:s,height:o}=t.__localBoxBounds;1!==e?(t.fontSize*=e,t.y-=o*(e-i)/2):1!==i&&(t.fontSize*=i,t.x-=s*(i-e)/2)}function P(t,e,i){x.scale(t.__.path,e,i),t.path=t.__.path}function m(t,e,i){x.scalePoints(t.__.points,e,i),t.points=t.__.points}function I(t,e,i){const{children:s}=t;for(let t=0;t<s.length;t++)w.a=e,w.d=i,s[t].transform(w,!0)}const O=i.prototype;O.scaleResize=function(t,e=t,i){const s=this;i||s.editConfig&&"scale"===s.editConfig.editSize?(s.scaleX*=t,s.scaleY*=e):(t<0&&(s.scaleX*=-1,t=-t),e<0&&(s.scaleY*=-1,e=-e),this.__scaleResize(t,e))},O.__scaleResize=function(t,e){B(this,t,e)},O.resizeWidth=function(t){const e=t/this.getBounds("box","local").width;this.scaleOf(this.__layout.boxBounds,e,this.__.lockRatio?e:1,!0)},O.resizeHeight=function(t){const e=t/this.getBounds("box","local").height;this.scaleOf(this.__layout.boxBounds,this.__.lockRatio?e:1,e,!0)},s.prototype.__scaleResize=function(t,e){this.__.__autoSize&&(this.__.resizeFontSize||this.editConfig&&"font-size"===this.editConfig.editSize)?C(this,t,e):B(this,t,e)},o.prototype.__scaleResize=function(t,e){P(this,t,e)},n.prototype.__scaleResize=function(t,e){this.pathInputed?P(this,t,e):this.points?m(this,t,e):this.width*=t},c.prototype.__scaleResize=function(t,e){this.pathInputed?P(this,t,e):this.points?m(this,t,e):B(this,t,e)},a.prototype.__scaleResize=function(t,e){I(this,t,e)},h.prototype.__scaleResize=function(t,e){this.__.__autoSize&&this.children.length?I(this,t,e):(B(this,t,e),this.__.resizeChildren&&I(this,t,e))};export{x as PathScaler,B as scaleResize,C as scaleResizeFontSize,I as scaleResizeGroup,P as scaleResizePath,m as scaleResizePoints};
+import{PathCommandMap as t,MatrixHelper as e,Direction9 as i,Leaf as s,Text as o,Path as a,Line as n,Polygon as c,Group as h,Box as l}from"@leafer-ui/draw";const{M:r,L:_,C:f,Q:p,Z:u,N:d,D:g,X:z,G:b,F:k,O:R,P:y,U:w}=t,S={scale(t,e,i){if(!t)return;let s,o=0,a=t.length;for(;o<a;)switch(s=t[o],s){case r:case _:m(t,e,i,o,1),o+=3;break;case f:m(t,e,i,o,3),o+=7;break;case p:m(t,e,i,o,2),o+=5;break;case u:o+=1;break;case d:m(t,e,i,o,2),o+=5;break;case g:m(t,e,i,o,2),o+=9;break;case z:m(t,e,i,o,2),o+=6;break;case b:m(t,e,i,o,2),o+=9;break;case k:m(t,e,i,o,2),o+=5;break;case R:t[o]=b,t.splice(o+4,0,t[o+3],0),m(t,e,i,o,2),o+=9,a+=2;break;case y:t[o]=k,t.splice(o+4,0,t[o+3]),m(t,e,i,o,2),o+=5,a+=1;break;case w:m(t,e,i,o,2),o+=6}},scalePoints(t,e,i,s,o){for(let a=o?s+1:0,n=o?a+2*o:t.length;a<n;a+=2)t[a]*=e,t[a+1]*=i}},{scalePoints:m}=S,x=e.get(),{topLeft:C,top:I,topRight:O,right:B,bottom:P,left:v}=i;function X(t,e,i){t.pathInputed?F(t,e,i):(1!==e&&(t.width*=e),1!==i&&(t.height*=i))}function D(t,e,i){const{app:s}=t,o=s&&s.editor;let a=e;if(o.editing){const s=t.__layout;let{width:n,height:c}=s.boxBounds;switch(n*=i-e,c*=e-i,o.resizeDirection){case I:case P:a=i,s.affectScaleOrRotation?t.moveInner(-n/2,0):t.x-=n/2;break;case v:case B:s.affectScaleOrRotation?t.moveInner(0,-c/2):t.y-=c/2;break;case C:case O:s.affectScaleOrRotation?t.moveInner(0,-c):t.y-=c}}t.fontSize*=a;const n=t.__;n.__autoWidth||(t.width*=a),n.__autoHeight||(t.height*=a)}function F(t,e,i){S.scale(t.__.path,e,i),t.path=t.__.path}function H(t,e,i){S.scalePoints(t.__.points,e,i),t.points=t.__.points}function L(t,e,i){const{children:s}=t;for(let t=0;t<s.length;t++)x.a=e,x.d=i,s[t].transform(x,!0)}const W=s.prototype;W.scaleResize=function(t,e=t,i){const s=this;i||s.editConfig&&"scale"===s.editConfig.editSize?(s.scaleX*=t,s.scaleY*=e):(t<0&&(s.scaleX*=-1,t=-t),e<0&&(s.scaleY*=-1,e=-e),this.__scaleResize(t,e))},W.__scaleResize=function(t,e){X(this,t,e)},W.resizeWidth=function(t){const e=t/this.getBounds("box","local").width;this.scaleOf(this.__layout.boxBounds,e,this.__.lockRatio?e:1,!0)},W.resizeHeight=function(t){const e=t/this.getBounds("box","local").height;this.scaleOf(this.__layout.boxBounds,this.__.lockRatio?e:1,e,!0)},o.prototype.__scaleResize=function(t,e){this.__.resizeFontSize||this.editConfig&&"font-size"===this.editConfig.editSize?D(this,t,e):X(this,t,e)},a.prototype.__scaleResize=function(t,e){F(this,t,e)},n.prototype.__scaleResize=function(t,e){this.pathInputed?F(this,t,e):this.points?H(this,t,e):this.width*=t},c.prototype.__scaleResize=function(t,e){this.pathInputed?F(this,t,e):this.points?H(this,t,e):X(this,t,e)},h.prototype.__scaleResize=function(t,e){L(this,t,e)},l.prototype.__scaleResize=function(t,e){this.__.__autoSize&&this.children.length?L(this,t,e):(X(this,t,e),this.__.resizeChildren&&L(this,t,e))};export{S as PathScaler,X as scaleResize,D as scaleResizeFontSize,L as scaleResizeGroup,F as scaleResizePath,H as scaleResizePoints};

package/dist/resize.js

@@ -13,9 +13,6 @@ this.LeaferIN.resize = (function (exports, draw) {
                 command = data[i];
                 switch (command) {
                     case M:
-                        scalePoints(data, scaleX, scaleY, i, 1);
-                        i += 3;
-                        break;
                     case L:
                         scalePoints(data, scaleX, scaleY, i, 1);
                         i += 3;
@@ -82,6 +79,7 @@ this.LeaferIN.resize = (function (exports, draw) {
     const { scalePoints } = PathScaler;
 
     const matrix = draw.MatrixHelper.get();
+    const { topLeft, top, topRight, right, bottom, left } = draw.Direction9;
     function scaleResize(leaf, scaleX, scaleY) {
         if (leaf.pathInputed) {
             scaleResizePath(leaf, scaleX, scaleY);
@@ -94,15 +92,36 @@ this.LeaferIN.resize = (function (exports, draw) {
         }
     }
     function scaleResizeFontSize(leaf, scaleX, scaleY) {
-        const { width, height } = leaf.__localBoxBounds;
-        if (scaleX !== 1) {
-            leaf.fontSize *= scaleX;
-            leaf.y -= height * (scaleX - scaleY) / 2;
-        }
-        else if (scaleY !== 1) {
-            leaf.fontSize *= scaleY;
-            leaf.x -= width * (scaleY - scaleX) / 2;
+        const { app } = leaf;
+        const editor = app && app.editor;
+        let fontScale = scaleX;
+        if (editor.editing) {
+            const layout = leaf.__layout;
+            let { width, height } = layout.boxBounds;
+            width *= scaleY - scaleX;
+            height *= scaleX - scaleY;
+            switch (editor.resizeDirection) {
+                case top:
+                case bottom:
+                    fontScale = scaleY;
+                    layout.affectScaleOrRotation ? leaf.moveInner(-width / 2, 0) : leaf.x -= width / 2;
+                    break;
+                case left:
+                case right:
+                    layout.affectScaleOrRotation ? leaf.moveInner(0, -height / 2) : leaf.y -= height / 2;
+                    break;
+                case topLeft:
+                case topRight:
+                    layout.affectScaleOrRotation ? leaf.moveInner(0, -height) : leaf.y -= height;
+                    break;
+            }
         }
+        leaf.fontSize *= fontScale;
+        const data = leaf.__;
+        if (!data.__autoWidth)
+            leaf.width *= fontScale;
+        if (!data.__autoHeight)
+            leaf.height *= fontScale;
     }
     function scaleResizePath(leaf, scaleX, scaleY) {
         PathScaler.scale(leaf.__.path, scaleX, scaleY);
@@ -148,7 +167,7 @@ this.LeaferIN.resize = (function (exports, draw) {
         this.scaleOf(this.__layout.boxBounds, this.__.lockRatio ? scale : 1, scale, true);
     };
     draw.Text.prototype.__scaleResize = function (scaleX, scaleY) {
-        if (this.__.__autoSize && (this.__.resizeFontSize || (this.editConfig && this.editConfig.editSize === 'font-size'))) {
+        if (this.__.resizeFontSize || (this.editConfig && this.editConfig.editSize === 'font-size')) {
             scaleResizeFontSize(this, scaleX, scaleY);
         }
         else {

package/dist/resize.min.cjs

@@ -1 +1 @@
-"use strict";var e=require("@leafer-ui/draw");const{M:t,L:s,C:i,Q:o,Z:a,N:n,D:c,X:h,G:l,F:r,O:_,P:p,U:u}=e.PathCommandMap,f={scale(e,f,d){if(!e)return;let g,R=0,b=e.length;for(;R<b;)switch(g=e[R],g){case t:case s:z(e,f,d,R,1),R+=3;break;case i:z(e,f,d,R,3),R+=7;break;case o:z(e,f,d,R,2),R+=5;break;case a:R+=1;break;case n:z(e,f,d,R,2),R+=5;break;case c:z(e,f,d,R,2),R+=9;break;case h:z(e,f,d,R,2),R+=6;break;case l:z(e,f,d,R,2),R+=9;break;case r:z(e,f,d,R,2),R+=5;break;case _:e[R]=l,e.splice(R+4,0,e[R+3],0),z(e,f,d,R,2),R+=9,b+=2;break;case p:e[R]=r,e.splice(R+4,0,e[R+3]),z(e,f,d,R,2),R+=5,b+=1;break;case u:z(e,f,d,R,2),R+=6}},scalePoints(e,t,s,i,o){for(let a=o?i+1:0,n=o?a+2*o:e.length;a<n;a+=2)e[a]*=t,e[a+1]*=s}},{scalePoints:z}=f,d=e.MatrixHelper.get();function g(e,t,s){e.pathInputed?b(e,t,s):(1!==t&&(e.width*=t),1!==s&&(e.height*=s))}function R(e,t,s){const{width:i,height:o}=e.__localBoxBounds;1!==t?(e.fontSize*=t,e.y-=o*(t-s)/2):1!==s&&(e.fontSize*=s,e.x-=i*(s-t)/2)}function b(e,t,s){f.scale(e.__.path,t,s),e.path=e.__.path}function x(e,t,s){f.scalePoints(e.__.points,t,s),e.points=e.__.points}function k(e,t,s){const{children:i}=e;for(let e=0;e<i.length;e++)d.a=t,d.d=s,i[e].transform(d,!0)}const y=e.Leaf.prototype;y.scaleResize=function(e,t=e,s){const i=this;s||i.editConfig&&"scale"===i.editConfig.editSize?(i.scaleX*=e,i.scaleY*=t):(e<0&&(i.scaleX*=-1,e=-e),t<0&&(i.scaleY*=-1,t=-t),this.__scaleResize(e,t))},y.__scaleResize=function(e,t){g(this,e,t)},y.resizeWidth=function(e){const t=e/this.getBounds("box","local").width;this.scaleOf(this.__layout.boxBounds,t,this.__.lockRatio?t:1,!0)},y.resizeHeight=function(e){const t=e/this.getBounds("box","local").height;this.scaleOf(this.__layout.boxBounds,this.__.lockRatio?t:1,t,!0)},e.Text.prototype.__scaleResize=function(e,t){this.__.__autoSize&&(this.__.resizeFontSize||this.editConfig&&"font-size"===this.editConfig.editSize)?R(this,e,t):g(this,e,t)},e.Path.prototype.__scaleResize=function(e,t){b(this,e,t)},e.Line.prototype.__scaleResize=function(e,t){this.pathInputed?b(this,e,t):this.points?x(this,e,t):this.width*=e},e.Polygon.prototype.__scaleResize=function(e,t){this.pathInputed?b(this,e,t):this.points?x(this,e,t):g(this,e,t)},e.Group.prototype.__scaleResize=function(e,t){k(this,e,t)},e.Box.prototype.__scaleResize=function(e,t){this.__.__autoSize&&this.children.length?k(this,e,t):(g(this,e,t),this.__.resizeChildren&&k(this,e,t))},exports.PathScaler=f,exports.scaleResize=g,exports.scaleResizeFontSize=R,exports.scaleResizeGroup=k,exports.scaleResizePath=b,exports.scaleResizePoints=x;
+"use strict";var e=require("@leafer-ui/draw");const{M:t,L:i,C:s,Q:o,Z:a,N:c,D:n,X:h,G:r,F:l,O:_,P:p,U:f}=e.PathCommandMap,u={scale(e,u,z){if(!e)return;let g,R=0,b=e.length;for(;R<b;)switch(g=e[R],g){case t:case i:d(e,u,z,R,1),R+=3;break;case s:d(e,u,z,R,3),R+=7;break;case o:d(e,u,z,R,2),R+=5;break;case a:R+=1;break;case c:d(e,u,z,R,2),R+=5;break;case n:d(e,u,z,R,2),R+=9;break;case h:d(e,u,z,R,2),R+=6;break;case r:d(e,u,z,R,2),R+=9;break;case l:d(e,u,z,R,2),R+=5;break;case _:e[R]=r,e.splice(R+4,0,e[R+3],0),d(e,u,z,R,2),R+=9,b+=2;break;case p:e[R]=l,e.splice(R+4,0,e[R+3]),d(e,u,z,R,2),R+=5,b+=1;break;case f:d(e,u,z,R,2),R+=6}},scalePoints(e,t,i,s,o){for(let a=o?s+1:0,c=o?a+2*o:e.length;a<c;a+=2)e[a]*=t,e[a+1]*=i}},{scalePoints:d}=u,z=e.MatrixHelper.get(),{topLeft:g,top:R,topRight:b,right:k,bottom:x,left:y}=e.Direction9;function P(e,t,i){e.pathInputed?w(e,t,i):(1!==t&&(e.width*=t),1!==i&&(e.height*=i))}function S(e,t,i){const{app:s}=e,o=s&&s.editor;let a=t;if(o.editing){const s=e.__layout;let{width:c,height:n}=s.boxBounds;switch(c*=i-t,n*=t-i,o.resizeDirection){case R:case x:a=i,s.affectScaleOrRotation?e.moveInner(-c/2,0):e.x-=c/2;break;case y:case k:s.affectScaleOrRotation?e.moveInner(0,-n/2):e.y-=n/2;break;case g:case b:s.affectScaleOrRotation?e.moveInner(0,-n):e.y-=n}}e.fontSize*=a;const c=e.__;c.__autoWidth||(e.width*=a),c.__autoHeight||(e.height*=a)}function w(e,t,i){u.scale(e.__.path,t,i),e.path=e.__.path}function m(e,t,i){u.scalePoints(e.__.points,t,i),e.points=e.__.points}function C(e,t,i){const{children:s}=e;for(let e=0;e<s.length;e++)z.a=t,z.d=i,s[e].transform(z,!0)}const B=e.Leaf.prototype;B.scaleResize=function(e,t=e,i){const s=this;i||s.editConfig&&"scale"===s.editConfig.editSize?(s.scaleX*=e,s.scaleY*=t):(e<0&&(s.scaleX*=-1,e=-e),t<0&&(s.scaleY*=-1,t=-t),this.__scaleResize(e,t))},B.__scaleResize=function(e,t){P(this,e,t)},B.resizeWidth=function(e){const t=e/this.getBounds("box","local").width;this.scaleOf(this.__layout.boxBounds,t,this.__.lockRatio?t:1,!0)},B.resizeHeight=function(e){const t=e/this.getBounds("box","local").height;this.scaleOf(this.__layout.boxBounds,this.__.lockRatio?t:1,t,!0)},e.Text.prototype.__scaleResize=function(e,t){this.__.resizeFontSize||this.editConfig&&"font-size"===this.editConfig.editSize?S(this,e,t):P(this,e,t)},e.Path.prototype.__scaleResize=function(e,t){w(this,e,t)},e.Line.prototype.__scaleResize=function(e,t){this.pathInputed?w(this,e,t):this.points?m(this,e,t):this.width*=e},e.Polygon.prototype.__scaleResize=function(e,t){this.pathInputed?w(this,e,t):this.points?m(this,e,t):P(this,e,t)},e.Group.prototype.__scaleResize=function(e,t){C(this,e,t)},e.Box.prototype.__scaleResize=function(e,t){this.__.__autoSize&&this.children.length?C(this,e,t):(P(this,e,t),this.__.resizeChildren&&C(this,e,t))},exports.PathScaler=u,exports.scaleResize=P,exports.scaleResizeFontSize=S,exports.scaleResizeGroup=C,exports.scaleResizePath=w,exports.scaleResizePoints=m;

package/dist/resize.min.js

@@ -1 +1 @@
-this.LeaferIN=this.LeaferIN||{},this.LeaferIN.resize=function(e,t){"use strict";const{M:s,L:i,C:o,Q:a,Z:n,N:c,D:h,X:l,G:_,F:r,O:f,P:p,U:u}=t.PathCommandMap,z={scale(e,t,z){if(!e)return;let g,R=0,b=e.length;for(;R<b;)switch(g=e[R],g){case s:case i:d(e,t,z,R,1),R+=3;break;case o:d(e,t,z,R,3),R+=7;break;case a:d(e,t,z,R,2),R+=5;break;case n:R+=1;break;case c:d(e,t,z,R,2),R+=5;break;case h:d(e,t,z,R,2),R+=9;break;case l:d(e,t,z,R,2),R+=6;break;case _:d(e,t,z,R,2),R+=9;break;case r:d(e,t,z,R,2),R+=5;break;case f:e[R]=_,e.splice(R+4,0,e[R+3],0),d(e,t,z,R,2),R+=9,b+=2;break;case p:e[R]=r,e.splice(R+4,0,e[R+3]),d(e,t,z,R,2),R+=5,b+=1;break;case u:d(e,t,z,R,2),R+=6}},scalePoints(e,t,s,i,o){for(let a=o?i+1:0,n=o?a+2*o:e.length;a<n;a+=2)e[a]*=t,e[a+1]*=s}},{scalePoints:d}=z,g=t.MatrixHelper.get();function R(e,t,s){e.pathInputed?k(e,t,s):(1!==t&&(e.width*=t),1!==s&&(e.height*=s))}function b(e,t,s){const{width:i,height:o}=e.__localBoxBounds;1!==t?(e.fontSize*=t,e.y-=o*(t-s)/2):1!==s&&(e.fontSize*=s,e.x-=i*(s-t)/2)}function k(e,t,s){z.scale(e.__.path,t,s),e.path=e.__.path}function y(e,t,s){z.scalePoints(e.__.points,t,s),e.points=e.__.points}function P(e,t,s){const{children:i}=e;for(let e=0;e<i.length;e++)g.a=t,g.d=s,i[e].transform(g,!0)}const x=t.Leaf.prototype;return x.scaleResize=function(e,t=e,s){const i=this;s||i.editConfig&&"scale"===i.editConfig.editSize?(i.scaleX*=e,i.scaleY*=t):(e<0&&(i.scaleX*=-1,e=-e),t<0&&(i.scaleY*=-1,t=-t),this.__scaleResize(e,t))},x.__scaleResize=function(e,t){R(this,e,t)},x.resizeWidth=function(e){const t=e/this.getBounds("box","local").width;this.scaleOf(this.__layout.boxBounds,t,this.__.lockRatio?t:1,!0)},x.resizeHeight=function(e){const t=e/this.getBounds("box","local").height;this.scaleOf(this.__layout.boxBounds,this.__.lockRatio?t:1,t,!0)},t.Text.prototype.__scaleResize=function(e,t){this.__.__autoSize&&(this.__.resizeFontSize||this.editConfig&&"font-size"===this.editConfig.editSize)?b(this,e,t):R(this,e,t)},t.Path.prototype.__scaleResize=function(e,t){k(this,e,t)},t.Line.prototype.__scaleResize=function(e,t){this.pathInputed?k(this,e,t):this.points?y(this,e,t):this.width*=e},t.Polygon.prototype.__scaleResize=function(e,t){this.pathInputed?k(this,e,t):this.points?y(this,e,t):R(this,e,t)},t.Group.prototype.__scaleResize=function(e,t){P(this,e,t)},t.Box.prototype.__scaleResize=function(e,t){this.__.__autoSize&&this.children.length?P(this,e,t):(R(this,e,t),this.__.resizeChildren&&P(this,e,t))},e.PathScaler=z,e.scaleResize=R,e.scaleResizeFontSize=b,e.scaleResizeGroup=P,e.scaleResizePath=k,e.scaleResizePoints=y,e}({},LeaferUI);
+this.LeaferIN=this.LeaferIN||{},this.LeaferIN.resize=function(e,t){"use strict";const{M:i,L:s,C:o,Q:a,Z:n,N:c,D:h,X:r,G:l,F:_,O:f,P:p,U:u}=t.PathCommandMap,d={scale(e,t,d){if(!e)return;let g,R=0,b=e.length;for(;R<b;)switch(g=e[R],g){case i:case s:z(e,t,d,R,1),R+=3;break;case o:z(e,t,d,R,3),R+=7;break;case a:z(e,t,d,R,2),R+=5;break;case n:R+=1;break;case c:z(e,t,d,R,2),R+=5;break;case h:z(e,t,d,R,2),R+=9;break;case r:z(e,t,d,R,2),R+=6;break;case l:z(e,t,d,R,2),R+=9;break;case _:z(e,t,d,R,2),R+=5;break;case f:e[R]=l,e.splice(R+4,0,e[R+3],0),z(e,t,d,R,2),R+=9,b+=2;break;case p:e[R]=_,e.splice(R+4,0,e[R+3]),z(e,t,d,R,2),R+=5,b+=1;break;case u:z(e,t,d,R,2),R+=6}},scalePoints(e,t,i,s,o){for(let a=o?s+1:0,n=o?a+2*o:e.length;a<n;a+=2)e[a]*=t,e[a+1]*=i}},{scalePoints:z}=d,g=t.MatrixHelper.get(),{topLeft:R,top:b,topRight:k,right:y,bottom:I,left:P}=t.Direction9;function S(e,t,i){e.pathInputed?L(e,t,i):(1!==t&&(e.width*=t),1!==i&&(e.height*=i))}function x(e,t,i){const{app:s}=e,o=s&&s.editor;let a=t;if(o.editing){const s=e.__layout;let{width:n,height:c}=s.boxBounds;switch(n*=i-t,c*=t-i,o.resizeDirection){case b:case I:a=i,s.affectScaleOrRotation?e.moveInner(-n/2,0):e.x-=n/2;break;case P:case y:s.affectScaleOrRotation?e.moveInner(0,-c/2):e.y-=c/2;break;case R:case k:s.affectScaleOrRotation?e.moveInner(0,-c):e.y-=c}}e.fontSize*=a;const n=e.__;n.__autoWidth||(e.width*=a),n.__autoHeight||(e.height*=a)}function L(e,t,i){d.scale(e.__.path,t,i),e.path=e.__.path}function m(e,t,i){d.scalePoints(e.__.points,t,i),e.points=e.__.points}function w(e,t,i){const{children:s}=e;for(let e=0;e<s.length;e++)g.a=t,g.d=i,s[e].transform(g,!0)}const C=t.Leaf.prototype;return C.scaleResize=function(e,t=e,i){const s=this;i||s.editConfig&&"scale"===s.editConfig.editSize?(s.scaleX*=e,s.scaleY*=t):(e<0&&(s.scaleX*=-1,e=-e),t<0&&(s.scaleY*=-1,t=-t),this.__scaleResize(e,t))},C.__scaleResize=function(e,t){S(this,e,t)},C.resizeWidth=function(e){const t=e/this.getBounds("box","local").width;this.scaleOf(this.__layout.boxBounds,t,this.__.lockRatio?t:1,!0)},C.resizeHeight=function(e){const t=e/this.getBounds("box","local").height;this.scaleOf(this.__layout.boxBounds,this.__.lockRatio?t:1,t,!0)},t.Text.prototype.__scaleResize=function(e,t){this.__.resizeFontSize||this.editConfig&&"font-size"===this.editConfig.editSize?x(this,e,t):S(this,e,t)},t.Path.prototype.__scaleResize=function(e,t){L(this,e,t)},t.Line.prototype.__scaleResize=function(e,t){this.pathInputed?L(this,e,t):this.points?m(this,e,t):this.width*=e},t.Polygon.prototype.__scaleResize=function(e,t){this.pathInputed?L(this,e,t):this.points?m(this,e,t):S(this,e,t)},t.Group.prototype.__scaleResize=function(e,t){w(this,e,t)},t.Box.prototype.__scaleResize=function(e,t){this.__.__autoSize&&this.children.length?w(this,e,t):(S(this,e,t),this.__.resizeChildren&&w(this,e,t))},e.PathScaler=d,e.scaleResize=S,e.scaleResizeFontSize=x,e.scaleResizeGroup=w,e.scaleResizePath=L,e.scaleResizePoints=m,e}({},LeaferUI);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-in/resize",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "@leafer-in/resize",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer-ui/draw": "1.0.1",
-    "@leafer-ui/interface": "1.0.1"
+    "@leafer-ui/draw": "^1.0.3",
+    "@leafer-ui/interface": "^1.0.3"
   }
 }

package/src/PathScaler.ts

@@ -17,9 +17,6 @@ export const PathScaler = {
             command = data[i]
             switch (command) {
                 case M:  //moveto(x, y)
-                    scalePoints(data, scaleX, scaleY, i, 1)
-                    i += 3
-                    break
                 case L:  //lineto(x, y)
                     scalePoints(data, scaleX, scaleY, i, 1)
                     i += 3

package/src/resize.ts

@@ -41,7 +41,7 @@ leaf.resizeHeight = function (height: number): void {
 // UI
 
 Text.prototype.__scaleResize = function (scaleX: number, scaleY: number): void {
-    if (this.__.__autoSize && (this.__.resizeFontSize || (this.editConfig && this.editConfig.editSize === 'font-size'))) {
+    if (this.__.resizeFontSize || (this.editConfig && this.editConfig.editSize === 'font-size')) {
         scaleResizeFontSize(this, scaleX, scaleY)
     } else {
         scaleResize(this, scaleX, scaleY)

package/src/scaler.ts

@@ -1,10 +1,11 @@
 import { IBranch, ILeaf, ILine, IPolygon, IText } from '@leafer-ui/interface'
-import { MatrixHelper } from '@leafer-ui/draw'
+import { Direction9, MatrixHelper } from '@leafer-ui/draw'
 
 import { PathScaler } from './PathScaler'
 
 
 const matrix = MatrixHelper.get()
+const { topLeft, top, topRight, right, bottom, left } = Direction9
 
 export function scaleResize(leaf: ILeaf, scaleX: number, scaleY: number): void {
     if (leaf.pathInputed) {
@@ -17,14 +18,43 @@ export function scaleResize(leaf: ILeaf, scaleX: number, scaleY: number): void {
 }
 
 export function scaleResizeFontSize(leaf: IText, scaleX: number, scaleY: number): void {
-    const { width, height } = leaf.__localBoxBounds
-    if (scaleX !== 1) {
-        leaf.fontSize *= scaleX
-        leaf.y -= height * (scaleX - scaleY) / 2
-    } else if (scaleY !== 1) {
-        leaf.fontSize *= scaleY
-        leaf.x -= width * (scaleY - scaleX) / 2
+    const { app } = leaf
+    const editor = app && app.editor
+
+    let fontScale = scaleX
+
+    if (editor.editing) {
+
+        const layout = leaf.__layout
+
+        let { width, height } = layout.boxBounds
+        width *= scaleY - scaleX
+        height *= scaleX - scaleY
+
+        switch (editor.resizeDirection) {
+            case top:
+            case bottom:
+                fontScale = scaleY
+                layout.affectScaleOrRotation ? leaf.moveInner(-width / 2, 0) : leaf.x -= width / 2
+                break
+            case left:
+            case right:
+                layout.affectScaleOrRotation ? leaf.moveInner(0, -height / 2) : leaf.y -= height / 2
+                break
+            case topLeft:
+            case topRight:
+                layout.affectScaleOrRotation ? leaf.moveInner(0, -height) : leaf.y -= height
+                break
+        }
+
     }
+
+    leaf.fontSize *= fontScale
+
+    const data = leaf.__
+    if (!data.__autoWidth) leaf.width *= fontScale
+    if (!data.__autoHeight) leaf.height *= fontScale
+
 }
 
 export function scaleResizePath(leaf: ILeaf, scaleX: number, scaleY: number): void {