@leafer-in/editor 1.4.0 → 1.4.1

package/dist/editor.js

@@ -160,7 +160,7 @@ this.LeaferIN.editor = (function (exports, draw, core) {
     }
     __decorate([
         targetAttr(onTarget$1)
-    ], Stroker.prototype, "target", undefined);
+    ], Stroker.prototype, "target", void 0);
     function onTarget$1(stroker) {
         const value = stroker.target;
         stroker.list = value ? (value instanceof Array ? value : [value]) : [];
@@ -439,7 +439,7 @@ this.LeaferIN.editor = (function (exports, draw, core) {
     const EditDataHelper = {
         getScaleData(element, startBounds, direction, totalMove, lockRatio, around, flipable, scaleMode) {
             let align, origin = {}, scaleX = 1, scaleY = 1;
-            const { boxBounds, widthRange, heightRange } = element;
+            const { boxBounds, widthRange, heightRange, dragBounds } = element;
             const { width, height } = startBounds;
             if (around) {
                 totalMove.x *= 2;
@@ -527,6 +527,17 @@ this.LeaferIN.editor = (function (exports, draw, core) {
                 if (scaleY < 0)
                     scaleY = 1 / boxBounds.height / worldTransform.scaleY;
             }
+            toPoint(around || align, boxBounds, origin, true);
+            if (dragBounds) {
+                const allowBounds = dragBounds === 'parent' ? element.parent.boxBounds : dragBounds;
+                const localBounds = new draw.Bounds(element.__localBoxBounds);
+                localBounds.scaleOf(element.getLocalPointByInner(origin), scaleX, scaleY);
+                if (!draw.BoundsHelper.includes(allowBounds, localBounds)) {
+                    const realBounds = localBounds.getIntersect(allowBounds);
+                    scaleX *= realBounds.width / localBounds.width;
+                    scaleY *= realBounds.height / localBounds.height;
+                }
+            }
             if (widthRange) {
                 const nowWidth = boxBounds.width * element.scaleX;
                 scaleX = within(nowWidth * scaleX, widthRange) / nowWidth;
@@ -535,7 +546,6 @@ this.LeaferIN.editor = (function (exports, draw, core) {
                 const nowHeight = boxBounds.height * element.scaleY;
                 scaleY = within(nowHeight * scaleY, heightRange) / nowHeight;
             }
-            toPoint(around || align, boxBounds, origin, true);
             return { origin, scaleX, scaleY, direction, lockRatio, around };
         },
         getRotateData(bounds, direction, current, last, around) {
@@ -1439,9 +1449,9 @@ ${filterStyle}
             this.skewOf(origin, skewX, skewY);
         }
         move(x, y = 0) {
+            const { element } = this;
             if (!this.checkTransform('moveable'))
                 return;
-            const { element } = this;
             const world = element.getWorldPointByLocal(typeof x === 'object' ? Object.assign({}, x) : { x, y }, null, true);
             if (this.multiple)
                 element.safeChange(() => element.move(x, y));
@@ -1649,10 +1659,10 @@ ${filterStyle}
     }
     __decorate([
         targetAttr(onHover)
-    ], Editor.prototype, "hoverTarget", undefined);
+    ], Editor.prototype, "hoverTarget", void 0);
     __decorate([
         targetAttr(onTarget)
-    ], Editor.prototype, "target", undefined);
+    ], Editor.prototype, "target", void 0);
 
     class InnerEditor {
         static registerInnerEditor() {