@leafer-in/editor 2.1.9 → 2.1.11

package/dist/editor.cjs

@@ -491,17 +491,16 @@ const {topLeft: topLeft, top: top, topRight: topRight, right: right$1, bottomRig
 const {toPoint: toPoint} = draw.AroundHelper, {within: within, sign: sign} = draw.MathHelper, {abs: abs} = Math;
 
 const EditDataHelper = {
-    getScaleData(target, startBounds, direction, totalMoveOrScale, lockRatio, around, flipable, scaleMode, boundsType) {
+    getScaleData(target, startBounds, direction, totalMoveOrScale, lockRatio, around, flipable, scaleMode) {
         let align, origin = {}, scaleX = 1, scaleY = 1, lockScale;
         const {widthRange: widthRange, heightRange: heightRange, dragBounds: dragBounds, worldTransform: worldTransform, boxBounds: boxBounds} = target;
         const {width: width, height: height} = startBounds, worldScaleX = abs(worldTransform.scaleX), worldScaleY = abs(worldTransform.scaleY);
-        const innerBounds = target.getBounds(boundsType, "inner");
         const originChangedScaleX = target.scaleX / startBounds.scaleX;
         const originChangedScaleY = target.scaleY / startBounds.scaleY;
         const signX = sign(originChangedScaleX);
         const signY = sign(originChangedScaleY);
-        const changedScaleX = scaleMode ? originChangedScaleX : signX * innerBounds.width / width;
-        const changedScaleY = scaleMode ? originChangedScaleY : signY * innerBounds.height / height;
+        const changedScaleX = scaleMode ? originChangedScaleX : signX * boxBounds.width / width;
+        const changedScaleY = scaleMode ? originChangedScaleY : signY * boxBounds.height / height;
         if (draw.isNumber(totalMoveOrScale)) {
             scaleX = scaleY = Math.sqrt(totalMoveOrScale);
         } else {
@@ -586,11 +585,10 @@ const EditDataHelper = {
         if (useScaleX) scaleX /= changedScaleX;
         if (useScaleY) scaleY /= changedScaleY;
         if (!flipable) {
-            if (scaleX < 0) scaleX = 1 / innerBounds.width / worldScaleX;
-            if (scaleY < 0) scaleY = 1 / innerBounds.height / worldScaleY;
+            if (scaleX < 0) scaleX = 1 / boxBounds.width / worldScaleX;
+            if (scaleY < 0) scaleY = 1 / boxBounds.height / worldScaleY;
         }
-        toPoint(around || align, innerBounds, origin, true);
-        this.checkOrigin(target, origin, boundsType);
+        toPoint(around || align, boxBounds, origin, true);
         if (dragBounds) {
             const scaleData = {
                 x: scaleX,
@@ -601,19 +599,15 @@ const EditDataHelper = {
             scaleY = scaleData.y;
         }
         if (useScaleX && widthRange) {
-            const nowWidth = innerBounds.width * target.scaleX;
+            const nowWidth = boxBounds.width * target.scaleX;
             scaleX = within(nowWidth * scaleX, widthRange) / nowWidth;
         }
         if (useScaleY && heightRange) {
-            const nowHeight = innerBounds.height * target.scaleY;
+            const nowHeight = boxBounds.height * target.scaleY;
             scaleY = within(nowHeight * scaleY, heightRange) / nowHeight;
         }
-        let minWidth = 1, minHeight = 1;
-        if (boundsType !== "box") {
-            minWidth += (innerBounds.width - boxBounds.width) * worldScaleX;
-            minHeight += (innerBounds.height - boxBounds.height) * worldScaleY;
-        }
-        const worldWidth = worldScaleX * innerBounds.width, worldHeight = worldScaleY * innerBounds.height;
+        const minWidth = 1, minHeight = 1;
+        const worldWidth = worldScaleX * boxBounds.width, worldHeight = worldScaleY * boxBounds.height;
         if (useScaleX && abs(scaleX * worldWidth) < minWidth) scaleX = sign(scaleX) * minWidth / worldWidth;
         if (useScaleY && abs(scaleY * worldHeight) < minHeight) scaleY = sign(scaleY) * minHeight / worldHeight;
         if (lockRatio && scaleX !== scaleY) {
@@ -632,7 +626,7 @@ const EditDataHelper = {
             around: around
         };
     },
-    getRotateData(target, direction, current, last, around, boundsType) {
+    getRotateData(target, direction, current, last, around) {
         let align, origin = {};
         switch (direction) {
           case topLeft:
@@ -654,14 +648,13 @@ const EditDataHelper = {
           default:
             align = "center";
         }
-        toPoint(around || align, target.getBounds(boundsType, "inner"), origin, true);
-        this.checkOrigin(target, origin, boundsType);
+        toPoint(around || align, target.boxBounds, origin, true);
         return {
             origin: origin,
             rotation: draw.PointHelper.getRotation(last, target.getWorldPointByBox(origin), current)
         };
     },
-    getSkewData(target, direction, move, around, boundsType) {
+    getSkewData(target, direction, move, around) {
         let align, origin = {}, skewX = 0, skewY = 0;
         let last;
         switch (direction) {
@@ -704,12 +697,10 @@ const EditDataHelper = {
             align = "left";
             skewY = 1;
         }
-        const innerBounds = target.getBounds(boundsType, "inner");
-        const {width: width, height: height} = innerBounds;
+        const {boxBounds: boxBounds} = target, {width: width, height: height} = boxBounds;
         last.x = last.x * width;
         last.y = last.y * height;
-        toPoint(around || align, innerBounds, origin, true);
-        this.checkOrigin(target, origin, boundsType);
+        toPoint(around || align, boxBounds, origin, true);
         const rotation = draw.PointHelper.getRotation(last, origin, {
             x: last.x + (skewX ? move.x : 0),
             y: last.y + (skewY ? move.y : 0)
@@ -721,13 +712,6 @@ const EditDataHelper = {
             skewY: skewY
         };
     },
-    checkOrigin(target, origin, boundsType) {
-        if (boundsType !== "box") {
-            const {boxBounds: boxBounds} = target, innerBounds = target.getBounds(boundsType, "inner");
-            origin.x += innerBounds.x - boxBounds.x;
-            origin.y += innerBounds.y - boxBounds.y;
-        }
-    },
     getAround(around, altKey) {
         return altKey && !around ? "center" : around;
     },
@@ -1022,9 +1006,14 @@ class EditBox extends draw.Group {
         if (this.app) this.rect.syncEventer = this.app.interaction.bottomList = null;
     }
     updateBounds(bounds) {
-        const {editor: editor, mergeConfig: mergeConfig, single: single, rect: rect, circle: circle, buttons: buttons, resizePoints: resizePoints, rotatePoints: rotatePoints, resizeLines: resizeLines} = this;
+        const {editor: editor, target: target, mergeConfig: mergeConfig, single: single, rect: rect, circle: circle, buttons: buttons, resizePoints: resizePoints, rotatePoints: rotatePoints, resizeLines: resizeLines} = this;
         const {editMask: editMask} = editor;
         const {middlePoint: middlePoint, resizeable: resizeable, rotateable: rotateable, hideOnSmall: hideOnSmall, editBox: editBox, editBoxType: editBoxType, mask: mask, dimOthers: dimOthers, bright: bright, spread: spread, hideRotatePoints: hideRotatePoints, hideResizeLines: hideResizeLines} = mergeConfig;
+        if (editBoxType === "stroke") {
+            const {scaleX: scaleX, scaleY: scaleY} = target.worldTransform, {strokeBoxSpread: strokeBoxSpread} = target.__layout;
+            strokeBoxSpread && draw.BoundsHelper.spread(bounds, [ strokeBoxSpread * Math.abs(scaleY), strokeBoxSpread * Math.abs(scaleX) ]);
+        }
+        if (spread) draw.BoundsHelper.spread(bounds, spread);
         editMask.visible = mask ? true : 0;
         if (!draw.isUndefined(dimOthers) || !draw.isUndefined(bright)) {
             editor.setDimOthers(dimOthers);
@@ -1033,8 +1022,6 @@ class EditBox extends draw.Group {
         } else if (editor.hasDimOthers) {
             editor.cancelDimOthers();
         }
-        if (editBoxType === "stroke") draw.BoundsHelper.spread(bounds, editor.element.__layout.strokeBoxSpread);
-        if (spread) draw.BoundsHelper.spread(bounds, spread);
         if (this.view.worldOpacity) {
             const {width: width, height: height} = bounds;
             const smallSize = draw.isNumber(hideOnSmall) ? hideOnSmall : 10;
@@ -1171,7 +1158,7 @@ class EditBox extends draw.Group {
         this.dragPoint = null;
     }
     onTransformStart(e) {
-        const {hideOnMove: hideOnMove, editBoxType: editBoxType} = this.mergedConfig;
+        const {hideOnMove: hideOnMove} = this.mergedConfig;
         if (this.moving || this.gesturing) this.editor.opacity = hideOnMove ? 0 : 1;
         if (this.resizing) draw.ResizeEvent.resizingKeys = this.editor.leafList.keys;
         const {dragStartData: dragStartData, target: target} = this;
@@ -1182,7 +1169,7 @@ class EditBox extends draw.Group {
             x: target.x,
             y: target.y
         };
-        dragStartData.bounds = Object.assign({}, target.getLayoutBounds(editBoxType, "local"));
+        dragStartData.bounds = Object.assign({}, target.getLayoutBounds("box", "local"));
         dragStartData.rotation = target.rotation;
     }
     onTransformEnd(e) {
@@ -1555,6 +1542,9 @@ function registerEditTool() {
 const registerInnerEditor = registerEditTool;
 
 const EditToolCreator = {
+    EditTool: "EditTool",
+    LineEditTool: "LineEditTool",
+    PointsEditTool: "PointsEditTool",
     list: {},
     register(EditTool, name) {
         const {tag: tag} = EditTool.prototype;
@@ -1746,7 +1736,7 @@ class TransformTool {
     }
     onScale(e) {
         const {target: target, mergeConfig: mergeConfig, single: single, dragStartData: dragStartData} = this.editBox;
-        let {around: around, lockRatio: lockRatio, flipable: flipable, editSize: editSize, editBoxType: editBoxType} = mergeConfig, totalMove;
+        let {around: around, lockRatio: lockRatio, flipable: flipable, editSize: editSize} = mergeConfig, totalMove;
         if (e instanceof core.ZoomEvent) {
             if (!around) around = target.getBoxPoint(e);
             totalMove = e.totalScale;
@@ -1755,7 +1745,7 @@ class TransformTool {
         }
         const {direction: direction} = e.current;
         if (e.shiftKey || target.lockRatio) lockRatio = true;
-        const data = EditDataHelper.getScaleData(target, dragStartData.bounds, direction, totalMove, lockRatio, EditDataHelper.getAround(around, e.altKey), flipable, !single || editSize === "scale", editBoxType);
+        const data = EditDataHelper.getScaleData(target, dragStartData.bounds, direction, totalMove, lockRatio, EditDataHelper.getAround(around, e.altKey), flipable, !single || editSize === "scale");
         const targetX = target.x, targetY = target.y;
         if (e instanceof core.DragEvent && this.editTool && this.editTool.onScaleWithDrag) {
             data.drag = e;
@@ -1767,7 +1757,7 @@ class TransformTool {
     }
     onRotate(e) {
         const {target: target, mergeConfig: mergeConfig, dragStartData: dragStartData} = this.editBox;
-        const {around: around, rotateAround: rotateAround, rotateGap: rotateGap, diagonalRotateKey: diagonalRotateKey, editBoxType: editBoxType} = mergeConfig;
+        const {around: around, rotateAround: rotateAround, rotateGap: rotateGap, diagonalRotateKey: diagonalRotateKey} = mergeConfig;
         const {direction: direction} = e.current;
         let origin, rotation;
         if (e instanceof core.RotateEvent) {
@@ -1775,7 +1765,7 @@ class TransformTool {
             origin = rotateAround ? draw.AroundHelper.getPoint(rotateAround, target.boxBounds) : target.getBoxPoint(e);
         } else {
             const isDiagonalRotate = diagonalRotateKey ? e.isHoldKeys(diagonalRotateKey) : e.shiftKey;
-            const data = EditDataHelper.getRotateData(target, direction, e, dragStartData, isDiagonalRotate ? null : rotateAround || target.around || target.origin || around || "center", editBoxType);
+            const data = EditDataHelper.getRotateData(target, direction, e, dragStartData, isDiagonalRotate ? null : rotateAround || target.around || target.origin || around || "center");
             rotation = dragStartData.rotation + data.rotation - target.rotation;
             origin = data.origin;
         }
@@ -1787,8 +1777,8 @@ class TransformTool {
     }
     onSkew(e) {
         const {target: target, mergeConfig: mergeConfig} = this.editBox;
-        const {around: around, editBoxType: editBoxType} = mergeConfig;
-        const {origin: origin, skewX: skewX, skewY: skewY} = EditDataHelper.getSkewData(target, e.current.direction, e.getInnerMove(target), EditDataHelper.getAround(around, e.altKey), editBoxType);
+        const {around: around} = mergeConfig;
+        const {origin: origin, skewX: skewX, skewY: skewY} = EditDataHelper.getSkewData(target, e.current.direction, e.getInnerMove(target), EditDataHelper.getAround(around, e.altKey));
         if (!skewX && !skewY) return;
         this.skewOf(origin, skewX, skewY);
     }
@@ -1849,7 +1839,7 @@ class TransformTool {
     scaleOf(origin, scaleX, scaleY = scaleX, _resize) {
         if (!this.checkTransform("resizeable")) return;
         const {target: target, mergeConfig: mergeConfig, single: single, editor: editor} = this.editBox;
-        const {beforeScale: beforeScale, editBoxType: editBoxType} = mergeConfig;
+        const {beforeScale: beforeScale} = mergeConfig;
         if (beforeScale) {
             const check = beforeScale({
                 target: target,
@@ -1867,8 +1857,7 @@ class TransformTool {
             worldOrigin: worldOrigin,
             scaleX: scaleX,
             scaleY: scaleY,
-            transform: transform,
-            editBoxType: editBoxType
+            transform: transform
         };
         this.emitEvent(new EditorScaleEvent(EditorScaleEvent.BEFORE_SCALE, data));
         const event = new EditorScaleEvent(EditorScaleEvent.SCALE, data);
@@ -1896,7 +1885,7 @@ class TransformTool {
     rotateOf(origin, rotation) {
         if (!this.checkTransform("rotateable")) return;
         const {target: target, mergeConfig: mergeConfig, single: single, editor: editor} = this.editBox;
-        const {beforeRotate: beforeRotate, editBoxType: editBoxType} = mergeConfig;
+        const {beforeRotate: beforeRotate} = mergeConfig;
         if (beforeRotate) {
             const check = beforeRotate({
                 target: target,
@@ -1912,8 +1901,7 @@ class TransformTool {
             editor: editor,
             worldOrigin: worldOrigin,
             rotation: rotation,
-            transform: transform,
-            editBoxType: editBoxType
+            transform: transform
         };
         this.emitEvent(new EditorRotateEvent(EditorRotateEvent.BEFORE_ROTATE, data));
         const event = new EditorRotateEvent(EditorRotateEvent.ROTATE, data);
@@ -1923,7 +1911,7 @@ class TransformTool {
     skewOf(origin, skewX, skewY = 0, _resize) {
         if (!this.checkTransform("skewable")) return;
         const {target: target, mergeConfig: mergeConfig, single: single, editor: editor} = this.editBox;
-        const {beforeSkew: beforeSkew, editBoxType: editBoxType} = mergeConfig;
+        const {beforeSkew: beforeSkew} = mergeConfig;
         if (beforeSkew) {
             const check = beforeSkew({
                 target: target,
@@ -1941,8 +1929,7 @@ class TransformTool {
             worldOrigin: worldOrigin,
             skewX: skewX,
             skewY: skewY,
-            transform: transform,
-            editBoxType: editBoxType
+            transform: transform
         };
         this.emitEvent(new EditorSkewEvent(EditorSkewEvent.BEFORE_SKEW, data));
         const event = new EditorSkewEvent(EditorSkewEvent.SKEW, data);
@@ -2123,11 +2110,9 @@ exports.Editor = class Editor extends draw.Group {
     unloadEditTool(onlyTool) {
         let tool = this.editTool;
         if (tool) {
-            if (!onlyTool) {
-                this.editBox.unload();
-                this.editTool = null;
-            }
+            if (!onlyTool) this.editBox.unload();
             tool.unload();
+            if (!onlyTool) this.editTool = null;
             tool.editTarget = null;
         }
     }
@@ -2400,32 +2385,32 @@ exports.EditTool = class EditTool extends InnerEditor {
         app.unlockLayout();
     }
     onScale(e) {
-        const {scaleX: scaleX, scaleY: scaleY, transform: transform, worldOrigin: worldOrigin, editor: editor, editBoxType: editBoxType} = e;
+        const {scaleX: scaleX, scaleY: scaleY, transform: transform, worldOrigin: worldOrigin, editor: editor} = e;
         const {app: app, list: list} = editor;
         app.lockLayout();
         list.forEach(target => {
             const resize = editor.getEditSize(target) !== "scale";
-            if (transform) target.transformWorld(transform, resize, false, editBoxType); else target.scaleOfWorld(worldOrigin, scaleX, scaleY, resize, false, editBoxType);
+            if (transform) target.transformWorld(transform, resize, false); else target.scaleOfWorld(worldOrigin, scaleX, scaleY, resize, false);
         });
         app.unlockLayout();
     }
     onRotate(e) {
-        const {rotation: rotation, transform: transform, worldOrigin: worldOrigin, editor: editor, editBoxType: editBoxType} = e;
+        const {rotation: rotation, transform: transform, worldOrigin: worldOrigin, editor: editor} = e;
         const {app: app, list: list} = editor;
         app.lockLayout();
         list.forEach(target => {
             const resize = editor.getEditSize(target) !== "scale";
-            if (transform) target.transformWorld(transform, resize, false, editBoxType); else target.rotateOfWorld(worldOrigin, rotation);
+            if (transform) target.transformWorld(transform, resize, false); else target.rotateOfWorld(worldOrigin, rotation);
         });
         app.unlockLayout();
     }
     onSkew(e) {
-        const {skewX: skewX, skewY: skewY, transform: transform, worldOrigin: worldOrigin, editor: editor, editBoxType: editBoxType} = e;
+        const {skewX: skewX, skewY: skewY, transform: transform, worldOrigin: worldOrigin, editor: editor} = e;
         const {app: app, list: list} = editor;
         app.lockLayout();
         list.forEach(target => {
             const resize = editor.getEditSize(target) !== "scale";
-            if (transform) target.transformWorld(transform, resize, false, editBoxType); else target.skewOfWorld(worldOrigin, skewX, skewY, resize);
+            if (transform) target.transformWorld(transform, resize, false); else target.skewOfWorld(worldOrigin, skewX, skewY, resize);
         });
         app.unlockLayout();
     }
@@ -2569,8 +2554,10 @@ draw.UI.addAttr("editConfig", undefined, draw.dataType);
 
 draw.UI.addAttr("editOuter", ui => {
     ui.updateLayout();
-    const name = (ui.tag === "Line" || ui.pathInputed ? "" : ui.points ? "Points" : ui.tag) + "EditTool";
-    return ui.__.__isLinePath ? "LineEditTool" : EditToolCreator.list[name] ? name : "EditTool";
+    const {EditTool: EditTool, LineEditTool: LineEditTool, PointsEditTool: PointsEditTool} = EditToolCreator;
+    const name = ui.pathInputed || ui.isPointsMode ? PointsEditTool : ui.tag + "EditTool";
+    const hasTool = EditToolCreator.list[name];
+    return ui.__.__isLinePath && !(name == PointsEditTool && hasTool) ? LineEditTool : hasTool ? name : EditTool;
 }, draw.dataType);
 
 draw.UI.addAttr("editInner", "PathEditor", draw.dataType);