@leafer-in/editor 1.4.0 → 1.4.2

package/dist/editor.esm.js

@@ -1,4 +1,4 @@
-import { Event, defineKey, getMatrixData, getBoundsData, UI, Paint, MatrixHelper, BoundsHelper, LeafBoundsHelper, Group, Rect, Bounds, LeafList, PointHelper, AroundHelper, MathHelper, Direction9, Box, Text, Matrix, Debug, PropertyEvent, LeafHelper, DataHelper, RenderEvent, getPointData, Plugin as Plugin$1, Creator, dataType } from '@leafer-ui/draw';
+import { Event, defineKey, MatrixHelper, BoundsHelper, LeafBoundsHelper, getMatrixData, getBoundsData, UI, Paint, Group, Rect, Bounds, LeafList, Direction9, AroundHelper, MathHelper, PointHelper, Box, Text, Matrix, Debug, LeafHelper, PropertyEvent, DataHelper, RenderEvent, getPointData, Plugin as Plugin$1, Creator, dataType } from '@leafer-ui/draw';
 import { PointerEvent, DragEvent, MoveEvent, ZoomEvent, Plugin, RotateEvent, KeyEvent } from '@leafer-ui/core';
 import '@leafer-in/resize';
 
@@ -160,7 +160,7 @@ class Stroker extends 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]) : [];
@@ -439,7 +439,7 @@ const { within } = 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;
@@ -527,6 +527,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 Bounds(element.__localBoxBounds);
+            localBounds.scaleOf(element.getLocalPointByInner(origin), scaleX, scaleY);
+            if (!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 @@ 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) {
@@ -1082,7 +1092,14 @@ const bounds = new Bounds();
 function simulate(editor) {
     const { simulateTarget, list } = editor;
     const { zoomLayer } = list[0].leafer.zoomLayer;
-    simulateTarget.safeChange(() => simulateTarget.reset(bounds.setListWithFn(list, (leaf) => leaf.getBounds('box', 'page')).get()));
+    simulateTarget.safeChange(() => {
+        bounds.setListWithFn(list, (leaf) => leaf.getBounds('box', 'page'));
+        if (bounds.width === 0)
+            bounds.width = 0.1;
+        if (bounds.height === 0)
+            bounds.height = 0.1;
+        simulateTarget.reset(bounds.get());
+    });
     zoomLayer.add(simulateTarget);
 }
 
@@ -1439,9 +1456,9 @@ class Editor extends 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));
@@ -1649,10 +1666,10 @@ class Editor extends 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() {