@leafer-in/editor 1.4.0 → 1.4.1

package/dist/editor.cjs

@@ -162,7 +162,7 @@ class Stroker extends draw.UI {
 }
 __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]) : [];
@@ -441,7 +441,7 @@ const { within } = draw.MathHelper;
 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;
@@ -529,6 +529,17 @@ const EditDataHelper = {
             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;
@@ -537,7 +548,6 @@ const EditDataHelper = {
             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) {
@@ -1441,9 +1451,9 @@ class Editor extends draw.Group {
         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));
@@ -1651,10 +1661,10 @@ class Editor extends draw.Group {
 }
 __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() {