@leafer-in/editor 1.6.6 → 1.7.0

package/dist/editor.esm.js

@@ -1,5 +1,5 @@
 import { Event, defineKey, isNull, MatrixHelper, BoundsHelper, LeafBoundsHelper, getMatrixData, getBoundsData, UI, Paint, Group, Rect, Bounds, LeafList, Direction9, AroundHelper, MathHelper, PointHelper, Box, ResizeEvent, Text, Matrix, Debug, LeafHelper, PropertyEvent, DataHelper, Plugin, RenderEvent, getPointData, Creator, dataType } from '@leafer-ui/draw';
-import { PointerEvent, DragEvent, MoveEvent, ZoomEvent, RotateEvent, KeyEvent } from '@leafer-ui/core';
+import { PointerEvent, DragEvent, MoveEvent, ZoomEvent, KeyEvent, RotateEvent, useModule } from '@leafer-ui/core';
 import '@leafer-in/resize';
 
 /******************************************************************************
@@ -45,41 +45,10 @@ class EditorEvent extends Event {
 }
 EditorEvent.BEFORE_SELECT = 'editor.before_select';
 EditorEvent.SELECT = 'editor.select';
+EditorEvent.AFTER_SELECT = 'editor.after_select';
 EditorEvent.BEFORE_HOVER = 'editor.before_hover';
 EditorEvent.HOVER = 'editor.hover';
 
-class EditorMoveEvent extends EditorEvent {
-    constructor(type, data) {
-        super(type, data);
-    }
-}
-EditorMoveEvent.BEFORE_MOVE = 'editor.before_move';
-EditorMoveEvent.MOVE = 'editor.move';
-
-class EditorScaleEvent extends EditorEvent {
-    constructor(type, data) {
-        super(type, data);
-    }
-}
-EditorScaleEvent.BEFORE_SCALE = 'editor.before_scale';
-EditorScaleEvent.SCALE = 'editor.scale';
-
-class EditorRotateEvent extends EditorEvent {
-    constructor(type, data) {
-        super(type, data);
-    }
-}
-EditorRotateEvent.BEFORE_ROTATE = 'editor.before_rotate';
-EditorRotateEvent.ROTATE = 'editor.rotate';
-
-class EditorSkewEvent extends EditorEvent {
-    constructor(type, data) {
-        super(type, data);
-    }
-}
-EditorSkewEvent.BEFORE_SKEW = 'editor.before_skew';
-EditorSkewEvent.SKEW = 'editor.skew';
-
 function targetAttr(fn) {
     return (target, key) => {
         const privateKey = '_' + key;
@@ -490,16 +459,16 @@ const { topLeft, top, topRight, right: right$1, bottomRight, bottom, bottomLeft,
 const { toPoint } = AroundHelper;
 const { within } = MathHelper;
 const EditDataHelper = {
-    getScaleData(element, startBounds, direction, totalMove, lockRatio, around, flipable, scaleMode) {
+    getScaleData(target, startBounds, direction, totalMove, lockRatio, around, flipable, scaleMode) {
         let align, origin = {}, scaleX = 1, scaleY = 1;
-        const { boxBounds, widthRange, heightRange, dragBounds, worldBoxBounds } = element;
+        const { boxBounds, widthRange, heightRange, dragBounds, worldBoxBounds } = target;
         const { width, height } = startBounds;
         if (around) {
             totalMove.x *= 2;
             totalMove.y *= 2;
         }
-        const originChangedScaleX = element.scaleX / startBounds.scaleX;
-        const originChangedScaleY = element.scaleY / startBounds.scaleY;
+        const originChangedScaleX = target.scaleX / startBounds.scaleX;
+        const originChangedScaleY = target.scaleY / startBounds.scaleY;
         const signX = originChangedScaleX < 0 ? -1 : 1;
         const signY = originChangedScaleY < 0 ? -1 : 1;
         const changedScaleX = scaleMode ? originChangedScaleX : signX * boxBounds.width / width;
@@ -575,7 +544,7 @@ const EditDataHelper = {
         if (useScaleY)
             scaleY /= changedScaleY;
         if (!flipable) {
-            const { worldTransform } = element;
+            const { worldTransform } = target;
             if (scaleX < 0)
                 scaleX = 1 / boxBounds.width / worldTransform.scaleX;
             if (scaleY < 0)
@@ -583,9 +552,9 @@ const EditDataHelper = {
         }
         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);
+            const allowBounds = dragBounds === 'parent' ? target.parent.boxBounds : dragBounds;
+            const localBounds = new Bounds(target.__localBoxBounds);
+            localBounds.scaleOf(target.getLocalPointByInner(origin), scaleX, scaleY);
             if (!BoundsHelper.includes(allowBounds, localBounds)) {
                 const realBounds = localBounds.getIntersect(allowBounds);
                 const fitScaleX = realBounds.width / localBounds.width, fitScaleY = realBounds.height / localBounds.height;
@@ -596,11 +565,11 @@ const EditDataHelper = {
             }
         }
         if (useScaleX && widthRange) {
-            const nowWidth = boxBounds.width * element.scaleX;
+            const nowWidth = boxBounds.width * target.scaleX;
             scaleX = within(nowWidth * scaleX, widthRange) / nowWidth;
         }
         if (useScaleY && heightRange) {
-            const nowHeight = boxBounds.height * element.scaleY;
+            const nowHeight = boxBounds.height * target.scaleY;
             scaleY = within(nowHeight * scaleY, heightRange) / nowHeight;
         }
         if (useScaleX && Math.abs(scaleX * worldBoxBounds.width) < 1)
@@ -611,7 +580,7 @@ const EditDataHelper = {
             scaleY = scaleX = Math.min(scaleX, scaleY);
         return { origin, scaleX, scaleY, direction, lockRatio, around };
     },
-    getRotateData(bounds, direction, current, last, around) {
+    getRotateData(target, direction, current, last, around) {
         let align, origin = {};
         switch (direction) {
             case topLeft:
@@ -629,8 +598,8 @@ const EditDataHelper = {
             default:
                 align = 'center';
         }
-        toPoint(around || align, bounds, origin, true);
-        return { origin, rotation: PointHelper.getRotation(last, origin, current) };
+        toPoint(around || align, target.boxBounds, origin, true);
+        return { origin, rotation: PointHelper.getRotation(last, target.getWorldPointByBox(origin), current) };
     },
     getSkewData(bounds, direction, move, around) {
         let align, origin = {}, skewX = 0, skewY = 0;
@@ -727,9 +696,9 @@ const EditDataHelper = {
 };
 
 const cacheCursors = {};
-function updateCursor(editor, e) {
-    const { editBox } = editor, point = editBox.enterPoint;
-    if (!point || !editor.editing || !editBox.visible)
+function updateCursor(editBox, e) {
+    const { enterPoint: point } = editBox;
+    if (!point || !editBox.editor.editing || !editBox.visible)
         return;
     if (point.name === 'circle')
         return;
@@ -738,9 +707,8 @@ function updateCursor(editor, e) {
             point.cursor = 'pointer';
         return;
     }
-    let { rotation } = editBox;
-    const { resizeCursor, rotateCursor, skewCursor, resizeable, rotateable, skewable } = editor.mergeConfig;
-    const { pointType } = point, { flippedX, flippedY } = editBox;
+    let { rotation, flippedX, flippedY } = editBox;
+    const { pointType } = point, { resizeCursor, rotateCursor, skewCursor, resizeable, rotateable, skewable } = editBox.mergeConfig;
     let showResize = pointType.includes('resize');
     if (showResize && rotateable && (e.metaKey || e.ctrlKey || !resizeable))
         showResize = false;
@@ -757,9 +725,9 @@ function updateCursor(editor, e) {
         cacheCursors[key] = point.cursor = { url: toDataURL(url, rotation), x, y };
     }
 }
-function updateMoveCursor(editor) {
-    const { moveCursor, moveable } = editor.mergeConfig;
-    editor.editBox.rect.cursor = moveable ? moveCursor : undefined;
+function updateMoveCursor(editBox) {
+    const { moveCursor, moveable } = editBox.mergeConfig;
+    editBox.rect.cursor = moveable ? moveCursor : undefined;
 }
 function toDataURL(svg, rotation) {
     return '"data:image/svg+xml,' + encodeURIComponent(svg.replace('{{rotation}}', rotation.toString())) + '"';
@@ -774,6 +742,15 @@ class EditPoint extends Box {
 
 const fourDirection = ['top', 'right', 'bottom', 'left'], editConfig = undefined;
 class EditBox extends Group {
+    get mergeConfig() {
+        const { config } = this, { mergeConfig } = this.editor;
+        return this.mergedConfig = config ? Object.assign(Object.assign({}, mergeConfig), config) : mergeConfig;
+    }
+    get target() { return this._target || this.editor.element; }
+    set target(target) { this._target = target; }
+    get single() { return !!this._target || this.editor.single; }
+    get transformTool() { return this._transformTool || this.editor; }
+    set transformTool(tool) { this._transformTool = tool; }
     get flipped() { return this.flippedX || this.flippedY; }
     get flippedX() { return this.scaleX < 0; }
     get flippedY() { return this.scaleY < 0; }
@@ -816,8 +793,7 @@ class EditBox extends Group {
         this.add(view);
     }
     load() {
-        const { mergeConfig, element, single } = this.editor;
-        const { rect, circle, resizePoints } = this;
+        const { target, mergeConfig, single, rect, circle, resizePoints } = this;
         const { stroke, strokeWidth } = mergeConfig;
         const pointsStyle = this.getPointsStyle();
         const middlePointsStyle = this.getMiddlePointsStyle();
@@ -830,18 +806,26 @@ class EditBox extends Group {
         }
         circle.set(this.getPointStyle(mergeConfig.circle || mergeConfig.rotatePoint || pointsStyle[0]));
         rect.set(Object.assign({ stroke, strokeWidth, editConfig }, (mergeConfig.rect || {})));
-        rect.hittable = !single;
-        rect.syncEventer = single && this.editor;
-        if (single) {
-            element.syncEventer = rect;
-            this.app.interaction.bottomList = [{ target: rect, proxy: element }];
+        const syncEventer = single && this.transformTool.editTool;
+        rect.hittable = !syncEventer;
+        rect.syncEventer = syncEventer && this.editor;
+        if (syncEventer) {
+            target.syncEventer = rect;
+            this.app.interaction.bottomList = [{ target: rect, proxy: target }];
         }
+        updateMoveCursor(this);
+    }
+    update() {
+        const { editor } = this;
+        const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = this.target.getLayoutBounds('box', editor, true);
+        this.set({ x, y, scaleX, scaleY, rotation, skewX, skewY });
+        this.updateBounds({ x: 0, y: 0, width, height });
     }
-    update(bounds) {
-        const { rect, circle, buttons, resizePoints, rotatePoints, resizeLines, editor } = this;
-        const { mergeConfig, element, multiple, editMask } = editor;
+    updateBounds(bounds) {
+        const { editMask } = this.editor;
+        const { mergeConfig, single, rect, circle, buttons, resizePoints, rotatePoints, resizeLines } = this;
         const { middlePoint, resizeable, rotateable, hideOnSmall, editBox, mask } = mergeConfig;
-        this.visible = !element.locked;
+        this.visible = !this.target.locked;
         editMask.visible = mask ? true : 0;
         if (this.view.worldOpacity) {
             const { width, height } = bounds;
@@ -875,25 +859,25 @@ class EditBox extends Group {
             }
             circle.visible = showPoints && rotateable && !!(mergeConfig.circle || mergeConfig.rotatePoint);
             if (circle.visible)
-                this.layoutCircle(mergeConfig);
+                this.layoutCircle();
             if (rect.path)
                 rect.path = null;
-            rect.set(Object.assign(Object.assign({}, bounds), { visible: multiple ? true : editBox }));
+            rect.set(Object.assign(Object.assign({}, bounds), { visible: single ? editBox : true }));
             buttons.visible = showPoints && buttons.children.length > 0 || 0;
             if (buttons.visible)
-                this.layoutButtons(mergeConfig);
+                this.layoutButtons();
         }
         else
             rect.set(bounds);
     }
-    layoutCircle(config) {
-        const { circleDirection, circleMargin, buttonsMargin, buttonsDirection, middlePoint } = config;
+    layoutCircle() {
+        const { circleDirection, circleMargin, buttonsMargin, buttonsDirection, middlePoint } = this.mergedConfig;
         const direction = fourDirection.indexOf(circleDirection || ((this.buttons.children.length && buttonsDirection === 'bottom') ? 'top' : 'bottom'));
         this.setButtonPosition(this.circle, direction, circleMargin || buttonsMargin, !!middlePoint);
     }
-    layoutButtons(config) {
+    layoutButtons() {
         const { buttons } = this;
-        const { buttonsDirection, buttonsFixed, buttonsMargin, middlePoint } = config;
+        const { buttonsDirection, buttonsFixed, buttonsMargin, middlePoint } = this.mergedConfig;
         const { flippedX, flippedY } = this;
         let index = fourDirection.indexOf(buttonsDirection);
         if ((index % 2 && flippedX) || ((index + 1) % 2 && flippedY)) {
@@ -926,16 +910,16 @@ class EditBox extends Group {
         this.visible = false;
     }
     getPointStyle(userStyle) {
-        const { stroke, strokeWidth, pointFill, pointSize, pointRadius } = this.editor.mergeConfig;
+        const { stroke, strokeWidth, pointFill, pointSize, pointRadius } = this.mergedConfig;
         const defaultStyle = { fill: pointFill, stroke, strokeWidth, around: 'center', strokeAlign: 'center', width: pointSize, height: pointSize, cornerRadius: pointRadius, offsetX: 0, offsetY: 0, editConfig };
         return userStyle ? Object.assign(defaultStyle, userStyle) : defaultStyle;
     }
     getPointsStyle() {
-        const { point } = this.editor.mergeConfig;
+        const { point } = this.mergedConfig;
         return point instanceof Array ? point : [point];
     }
     getMiddlePointsStyle() {
-        const { middlePoint } = this.editor.mergeConfig;
+        const { middlePoint } = this.mergedConfig;
         return middlePoint instanceof Array ? middlePoint : (middlePoint ? [middlePoint] : this.getPointsStyle());
     }
     onSelect(e) {
@@ -948,16 +932,16 @@ class EditBox extends Group {
     onDragStart(e) {
         this.dragging = true;
         const point = this.dragPoint = e.current, { pointType } = point;
-        const { editor, dragStartData } = this, { element } = editor;
+        const { editor, dragStartData } = this, { target } = this;
         if (point.name === 'rect') {
             this.moving = true;
-            editor.opacity = editor.mergeConfig.hideOnMove ? 0 : 1;
+            editor.opacity = this.mergeConfig.hideOnMove ? 0 : 1;
         }
         dragStartData.x = e.x;
         dragStartData.y = e.y;
-        dragStartData.point = { x: element.x, y: element.y };
-        dragStartData.bounds = Object.assign({}, element.getLayoutBounds('box', 'local'));
-        dragStartData.rotation = element.rotation;
+        dragStartData.point = { x: target.x, y: target.y };
+        dragStartData.bounds = Object.assign({}, target.getLayoutBounds('box', 'local'));
+        dragStartData.rotation = target.rotation;
         if (pointType && pointType.includes('resize'))
             ResizeEvent.resizingKeys = editor.leafList.keys;
     }
@@ -972,22 +956,31 @@ class EditBox extends Group {
             ResizeEvent.resizingKeys = null;
     }
     onDrag(e) {
-        const { editor } = this;
-        const { pointType } = this.enterPoint = e.current;
-        if (pointType.includes('rotate') || e.metaKey || e.ctrlKey || !editor.mergeConfig.resizeable) {
-            editor.onRotate(e);
-            if (pointType === 'resize-rotate')
-                editor.onScale(e);
-        }
-        else if (pointType === 'resize')
-            editor.onScale(e);
-        if (pointType === 'skew')
-            editor.onSkew(e);
-        updateCursor(editor, e);
+        const { transformTool } = this, point = e.current;
+        if (point.name === 'rect') {
+            transformTool.onMove(e);
+            updateMoveCursor(this);
+        }
+        else {
+            const { pointType } = this.enterPoint = point;
+            if (pointType.includes('rotate') || e.metaKey || e.ctrlKey || !this.mergeConfig.resizeable) {
+                transformTool.onRotate(e);
+                if (pointType === 'resize-rotate')
+                    transformTool.onScale(e);
+            }
+            else if (pointType === 'resize')
+                transformTool.onScale(e);
+            if (pointType === 'skew')
+                transformTool.onSkew(e);
+            updateCursor(this, e);
+        }
+    }
+    onKey(e) {
+        updateCursor(this, e);
     }
     onArrow(e) {
         const { editor } = this;
-        if (editor.editing && editor.mergeConfig.keyEvent) {
+        if (editor.editing && this.mergeConfig.keyEvent) {
             let x = 0, y = 0;
             const distance = e.shiftKey ? 10 : 1;
             switch (e.code) {
@@ -1008,27 +1001,28 @@ class EditBox extends Group {
         }
     }
     onDoubleTap(e) {
-        if (this.editor.mergeConfig.openInner === 'double')
+        const { openInner, preventEditInner } = this.mergeConfig;
+        if (openInner === 'double' && !preventEditInner)
             this.openInner(e);
     }
     onLongPress(e) {
-        if (this.editor.mergeConfig.openInner === 'long')
+        const { openInner, preventEditInner } = this.mergeConfig;
+        if (openInner === 'long' && preventEditInner)
             this.openInner(e);
     }
     openInner(e) {
-        const { editor } = this;
-        if (editor.single) {
-            const { element } = editor;
-            if (element.locked)
+        const { editor, target } = this;
+        if (this.single) {
+            if (target.locked)
                 return;
-            if (element.isBranch && !element.editInner) {
-                if (element.textBox) {
-                    const { children } = element;
+            if (target.isBranch && !target.editInner) {
+                if (target.textBox) {
+                    const { children } = target;
                     const find = children.find(item => item.editable && item instanceof Text) || children.find(item => item instanceof Text);
                     if (find)
                         return editor.openInnerEditor(find);
                 }
-                editor.openGroup(element);
+                editor.openGroup(target);
                 editor.target = editor.selector.findDeepOne(e);
             }
             else {
@@ -1037,7 +1031,6 @@ class EditBox extends Group {
         }
     }
     listenPointEvents(point, type, direction) {
-        const { editor } = this;
         point.direction = direction;
         point.pointType = type;
         const events = [
@@ -1047,19 +1040,25 @@ class EditBox extends Group {
             [PointerEvent.LEAVE, () => { this.enterPoint = null; }],
         ];
         if (point.name !== 'circle')
-            events.push([PointerEvent.ENTER, (e) => { this.enterPoint = point, updateCursor(editor, e); }]);
+            events.push([PointerEvent.ENTER, (e) => { this.enterPoint = point, updateCursor(this, e); }]);
         this.__eventIds.push(point.on_(events));
     }
     __listenEvents() {
-        const { rect, editor } = this;
-        this.__eventIds.push(editor.on_(EditorEvent.SELECT, this.onSelect, this), rect.on_([
+        const { rect, editor, __eventIds: events } = this;
+        events.push(editor.on_(EditorEvent.SELECT, this.onSelect, this), rect.on_([
             [DragEvent.START, this.onDragStart, this],
-            [DragEvent.DRAG, editor.onMove, editor],
+            [DragEvent.DRAG, this.onDrag, this],
             [DragEvent.END, this.onDragEnd, this],
-            [PointerEvent.ENTER, () => updateMoveCursor(editor)],
+            [PointerEvent.ENTER, () => updateMoveCursor(this)],
             [PointerEvent.DOUBLE_TAP, this.onDoubleTap, this],
             [PointerEvent.LONG_PRESS, this.onLongPress, this]
         ]));
+        this.waitLeafer(() => {
+            events.push(editor.app.on_([
+                [[KeyEvent.HOLD, KeyEvent.UP], this.onKey, this],
+                [KeyEvent.DOWN, this.onArrow, this]
+            ]));
+        });
     }
     __removeListenEvents() {
         this.off_(this.__eventIds);
@@ -1090,11 +1089,12 @@ class EditMask extends UI {
             if (options.bounds && !options.bounds.hit(editor.editBox.rect.__world, options.matrix))
                 return;
             canvas.saveBlendMode('destination-out');
+            options = Object.assign(Object.assign({}, options), { shape: true });
             editor.list.forEach(item => {
-                item.__renderShape(canvas, options);
-                const { __box, parent } = item;
-                if ((item = __box) || ((item = parent) && parent.textBox))
-                    item.__renderShape(canvas, options);
+                item.__render(canvas, options);
+                const { parent } = item;
+                if (parent && parent.textBox)
+                    parent.__renderShape(canvas, options);
             });
             canvas.restoreBlendMode();
         }
@@ -1189,7 +1189,7 @@ const config = {
 const bounds = new Bounds();
 function simulate(editor) {
     const { simulateTarget, list } = editor;
-    const { zoomLayer } = list[0].leafer.zoomLayer;
+    const { zoomLayer } = list[0].leafer;
     simulateTarget.safeChange(() => {
         bounds.setListWithFn(list, (leaf) => leaf.getBounds('box', 'page'));
         if (bounds.width === 0)
@@ -1211,15 +1211,14 @@ function onTarget(editor, oldValue) {
     else {
         editor.simulateTarget.remove();
         editor.leafList.reset();
-        editor.closeInnerEditor();
     }
-    editor.emitEvent(new EditorEvent(EditorEvent.SELECT, { editor, value: target, oldValue }));
+    editor.closeInnerEditor();
+    const data = { editor, value: target, oldValue };
+    editor.emitEvent(new EditorEvent(EditorEvent.SELECT, data));
     editor.checkOpenedGroups();
     if (editor.editing) {
         editor.waitLeafer(() => {
-            updateMoveCursor(editor);
             editor.updateEditTool();
-            editor.update();
             editor.listenTargetEvents();
         });
     }
@@ -1227,6 +1226,7 @@ function onTarget(editor, oldValue) {
         editor.updateEditTool();
         editor.removeTargetEvents();
     }
+    editor.emitEvent(new EditorEvent(EditorEvent.AFTER_SELECT, data));
 }
 function onHover(editor, oldValue) {
     editor.emitEvent(new EditorEvent(EditorEvent.HOVER, { editor, value: editor.hoverTarget, oldValue }));
@@ -1398,93 +1398,45 @@ class SimulateElement extends Rect {
     }
 }
 
-class Editor extends Group {
-    get list() { return this.leafList.list; }
-    get dragHoverExclude() { return [this.editBox.rect]; }
-    get editing() { return !!this.list.length; }
-    get groupOpening() { return !!this.openedGroupList.length; }
-    get multiple() { return this.list.length > 1; }
-    get single() { return this.list.length === 1; }
-    get dragging() { return this.editBox.dragging; }
-    get moving() { return this.editBox.moving; }
-    get dragPoint() { return this.editBox.dragPoint; }
-    get element() { return this.multiple ? this.simulateTarget : this.list[0]; }
-    get buttons() { return this.editBox.buttons; }
-    constructor(userConfig, data) {
-        super(data);
-        this.leafList = new LeafList();
-        this.openedGroupList = new LeafList();
-        this.simulateTarget = new SimulateElement(this);
-        this.editBox = new EditBox(this);
-        this.editToolList = {};
-        this.selector = new EditSelect(this);
-        this.editMask = new EditMask(this);
-        this.targetEventIds = [];
-        let mergedConfig = DataHelper.clone(config);
-        if (userConfig)
-            mergedConfig = DataHelper.default(userConfig, mergedConfig);
-        this.mergedConfig = this.config = mergedConfig;
-        this.addMany(this.editMask, this.selector, this.editBox);
-        if (!Plugin.has('resize'))
-            this.config.editSize = 'scale';
-    }
-    select(target) {
-        this.target = target;
-    }
-    cancel() {
-        this.target = null;
-    }
-    hasItem(item) {
-        return this.leafList.has(item);
-    }
-    addItem(item) {
-        if (!this.hasItem(item) && !item.locked)
-            this.leafList.add(item), this.target = this.leafList.list;
-    }
-    removeItem(item) {
-        if (this.hasItem(item))
-            this.leafList.remove(item), this.target = this.leafList.list;
-    }
-    shiftItem(item) {
-        this.hasItem(item) ? this.removeItem(item) : this.addItem(item);
-    }
-    update() {
-        if (this.editing) {
-            if (!this.element.parent)
-                return this.cancel();
-            if (this.innerEditing)
-                this.innerEditor.update();
-            this.editTool.update();
-            this.selector.update();
-        }
+class EditorMoveEvent extends EditorEvent {
+    constructor(type, data) {
+        super(type, data);
     }
-    updateEditBox() {
-        if (this.multiple)
-            simulate(this);
-        this.update();
+}
+EditorMoveEvent.BEFORE_MOVE = 'editor.before_move';
+EditorMoveEvent.MOVE = 'editor.move';
+
+class EditorScaleEvent extends EditorEvent {
+    constructor(type, data) {
+        super(type, data);
     }
-    updateEditTool() {
-        const tool = this.editTool;
-        if (tool) {
-            this.editBox.unload();
-            tool.unload();
-            this.editTool = null;
-        }
-        if (this.editing) {
-            const tag = this.single ? this.list[0].editOuter : 'EditTool';
-            this.editTool = this.editToolList[tag] = this.editToolList[tag] || EditToolCreator.get(tag, this);
-            this.editBox.load();
-            this.editTool.load();
-        }
+}
+EditorScaleEvent.BEFORE_SCALE = 'editor.before_scale';
+EditorScaleEvent.SCALE = 'editor.scale';
+
+class EditorRotateEvent extends EditorEvent {
+    constructor(type, data) {
+        super(type, data);
     }
-    getEditSize(_ui) {
-        return this.mergeConfig.editSize;
+}
+EditorRotateEvent.BEFORE_ROTATE = 'editor.before_rotate';
+EditorRotateEvent.ROTATE = 'editor.rotate';
+
+class EditorSkewEvent extends EditorEvent {
+    constructor(type, data) {
+        super(type, data);
     }
+}
+EditorSkewEvent.BEFORE_SKEW = 'editor.before_skew';
+EditorSkewEvent.SKEW = 'editor.skew';
+
+class TransformTool {
     onMove(e) {
+        const { target, mergeConfig, dragStartData } = this.editBox;
         if (e instanceof MoveEvent) {
             if (e.moveType !== 'drag') {
-                const { moveable, resizeable } = this.mergeConfig;
-                const move = e.getLocalMove(this.element);
+                const { moveable, resizeable } = mergeConfig;
+                const move = e.getLocalMove(target);
                 if (moveable === 'move')
                     e.stop(), this.move(move.x, move.y);
                 else if (resizeable === 'zoom')
@@ -1499,22 +1451,22 @@ class Editor extends Group {
                 else
                     total.x = 0;
             }
-            this.move(DragEvent.getValidMove(this.element, this.editBox.dragStartData.point, total));
+            this.move(DragEvent.getValidMove(target, dragStartData.point, total));
         }
     }
     onScale(e) {
-        const { element } = this;
-        let { around, lockRatio, resizeable, flipable, editSize } = this.mergeConfig;
+        const { target, mergeConfig, single, dragStartData } = this.editBox;
+        let { around, lockRatio, resizeable, flipable, editSize } = mergeConfig;
         if (e instanceof ZoomEvent) {
             if (resizeable === 'zoom')
-                e.stop(), this.scaleOf(element.getBoxPoint(e), e.scale, e.scale);
+                e.stop(), this.scaleOf(target.getBoxPoint(e), e.scale, e.scale);
         }
         else {
             const { direction } = e.current;
-            if (e.shiftKey || element.lockRatio)
+            if (e.shiftKey || target.lockRatio)
                 lockRatio = true;
-            const data = EditDataHelper.getScaleData(element, this.editBox.dragStartData.bounds, direction, e.getInnerTotal(element), lockRatio, EditDataHelper.getAround(around, e.altKey), flipable, this.multiple || editSize === 'scale');
-            if (this.editTool.onScaleWithDrag) {
+            const data = EditDataHelper.getScaleData(target, dragStartData.bounds, direction, e.getInnerTotal(target), lockRatio, EditDataHelper.getAround(around, e.altKey), flipable, !single || editSize === 'scale');
+            if (this.editTool && this.editTool.onScaleWithDrag) {
                 data.drag = e;
                 this.scaleWithDrag(data);
             }
@@ -1524,38 +1476,38 @@ class Editor extends Group {
         }
     }
     onRotate(e) {
-        const { skewable, rotateable, around, rotateGap } = this.mergeConfig;
+        const { target, mergeConfig, dragStartData } = this.editBox;
+        const { skewable, rotateable, around, rotateGap } = mergeConfig;
         const { direction, name } = e.current;
         if (skewable && name === 'resize-line')
             return this.onSkew(e);
-        const { element } = this, { dragStartData } = this.editBox;
         let origin, rotation;
         if (e instanceof RotateEvent) {
             if (rotateable === 'rotate')
-                e.stop(), rotation = e.rotation, origin = element.getBoxPoint(e);
+                e.stop(), rotation = e.rotation, origin = target.getBoxPoint(e);
             else
                 return;
-            if (element.scaleX * element.scaleY < 0)
+            if (target.scaleX * target.scaleY < 0)
                 rotation = -rotation;
         }
         else {
-            const data = EditDataHelper.getRotateData(element.boxBounds, direction, e.getBoxPoint(element), element.getBoxPoint(dragStartData), e.shiftKey ? null : (element.around || element.origin || around || 'center'));
+            const data = EditDataHelper.getRotateData(target, direction, e, dragStartData, e.shiftKey ? null : (target.around || target.origin || around || 'center'));
             rotation = data.rotation;
             origin = data.origin;
         }
-        if (element.scaleX * element.scaleY < 0)
+        if (target.scaleX * target.scaleY < 0)
             rotation = -rotation;
         if (e instanceof DragEvent)
-            rotation = dragStartData.rotation + rotation - element.rotation;
-        rotation = MathHelper.float(MathHelper.getGapRotation(rotation, rotateGap, element.rotation), 2);
+            rotation = dragStartData.rotation + rotation - target.rotation;
+        rotation = MathHelper.float(MathHelper.getGapRotation(rotation, rotateGap, target.rotation), 2);
         if (!rotation)
             return;
         this.rotateOf(origin, rotation);
     }
     onSkew(e) {
-        const { element } = this;
-        const { around } = this.mergeConfig;
-        const { origin, skewX, skewY } = EditDataHelper.getSkewData(element.boxBounds, e.current.direction, e.getInnerMove(element), EditDataHelper.getAround(around, e.altKey));
+        const { target, mergeConfig } = this.editBox;
+        const { around } = mergeConfig;
+        const { origin, skewX, skewY } = EditDataHelper.getSkewData(target.boxBounds, e.current.direction, e.getInnerMove(target), EditDataHelper.getAround(around, e.altKey));
         if (!skewX && !skewY)
             return;
         this.skewOf(origin, skewX, skewY);
@@ -1565,7 +1517,8 @@ class Editor extends Group {
             return;
         if (typeof x === 'object')
             y = x.y, x = x.x;
-        const { element: target } = this, { beforeMove } = this.mergeConfig;
+        const { target, mergeConfig, single, editor } = this.editBox;
+        const { beforeMove } = mergeConfig;
         if (beforeMove) {
             const check = beforeMove({ target, x, y });
             if (typeof check === 'object')
@@ -1574,25 +1527,26 @@ class Editor extends Group {
                 return;
         }
         const world = target.getWorldPointByLocal({ x, y }, null, true);
-        if (this.multiple)
+        if (!single)
             target.safeChange(() => target.move(x, y));
-        const data = { target, editor: this, moveX: world.x, moveY: world.y };
+        const data = { target, editor, moveX: world.x, moveY: world.y };
         this.emitEvent(new EditorMoveEvent(EditorMoveEvent.BEFORE_MOVE, data));
         const event = new EditorMoveEvent(EditorMoveEvent.MOVE, data);
-        this.editTool.onMove(event);
+        this.doMove(event);
         this.emitEvent(event);
     }
     scaleWithDrag(data) {
         if (!this.checkTransform('resizeable'))
             return;
-        const { element: target } = this, { beforeScale } = this.mergeConfig;
+        const { target, mergeConfig, editor } = this.editBox;
+        const { beforeScale } = mergeConfig;
         if (beforeScale) {
             const { origin, scaleX, scaleY, drag } = data;
             const check = beforeScale({ target, drag, origin, scaleX, scaleY });
             if (check === false)
                 return;
         }
-        data = Object.assign(Object.assign({}, data), { target, editor: this, worldOrigin: target.getWorldPoint(data.origin) });
+        data = Object.assign(Object.assign({}, data), { target, editor, worldOrigin: target.getWorldPoint(data.origin) });
         this.emitEvent(new EditorScaleEvent(EditorScaleEvent.BEFORE_SCALE, data));
         const event = new EditorScaleEvent(EditorScaleEvent.SCALE, data);
         this.editTool.onScaleWithDrag(event);
@@ -1601,7 +1555,8 @@ class Editor extends Group {
     scaleOf(origin, scaleX, scaleY = scaleX, _resize) {
         if (!this.checkTransform('resizeable'))
             return;
-        const { element: target } = this, { beforeScale } = this.mergeConfig;
+        const { target, mergeConfig, single, editor } = this.editBox;
+        const { beforeScale } = mergeConfig;
         if (beforeScale) {
             const check = beforeScale({ target, origin, scaleX, scaleY });
             if (typeof check === 'object')
@@ -1610,29 +1565,30 @@ class Editor extends Group {
                 return;
         }
         const worldOrigin = this.getWorldOrigin(origin);
-        const transform = this.multiple && this.getChangedTransform(() => target.safeChange(() => target.scaleOf(origin, scaleX, scaleY)));
-        const data = { target, editor: this, worldOrigin, scaleX, scaleY, transform };
+        const transform = !single && this.getChangedTransform(() => target.safeChange(() => target.scaleOf(origin, scaleX, scaleY)));
+        const data = { target, editor, worldOrigin, scaleX, scaleY, transform };
         this.emitEvent(new EditorScaleEvent(EditorScaleEvent.BEFORE_SCALE, data));
         const event = new EditorScaleEvent(EditorScaleEvent.SCALE, data);
-        this.editTool.onScale(event);
+        this.doScale(event);
         this.emitEvent(event);
     }
     flip(axis) {
         if (!this.checkTransform('resizeable'))
             return;
-        const { element } = this;
+        const { target, single, editor } = this.editBox;
         const worldOrigin = this.getWorldOrigin('center');
-        const transform = this.multiple ? this.getChangedTransform(() => element.safeChange(() => element.flip(axis))) : new Matrix(LeafHelper.getFlipTransform(element, axis));
-        const data = { target: element, editor: this, worldOrigin, scaleX: axis === 'x' ? -1 : 1, scaleY: axis === 'y' ? -1 : 1, transform };
+        const transform = !single ? this.getChangedTransform(() => target.safeChange(() => target.flip(axis))) : new Matrix(LeafHelper.getFlipTransform(target, axis));
+        const data = { target, editor, worldOrigin, scaleX: axis === 'x' ? -1 : 1, scaleY: axis === 'y' ? -1 : 1, transform };
         this.emitEvent(new EditorScaleEvent(EditorScaleEvent.BEFORE_SCALE, data));
         const event = new EditorScaleEvent(EditorScaleEvent.SCALE, data);
-        this.editTool.onScale(event);
+        this.doScale(event);
         this.emitEvent(event);
     }
     rotateOf(origin, rotation) {
         if (!this.checkTransform('rotateable'))
             return;
-        const { element: target } = this, { beforeRotate } = this.mergeConfig;
+        const { target, mergeConfig, single, editor } = this.editBox;
+        const { beforeRotate } = mergeConfig;
         if (beforeRotate) {
             const check = beforeRotate({ target, origin, rotation });
             if (typeof check === 'number')
@@ -1641,17 +1597,18 @@ class Editor extends Group {
                 return;
         }
         const worldOrigin = this.getWorldOrigin(origin);
-        const transform = this.multiple && this.getChangedTransform(() => target.safeChange(() => target.rotateOf(origin, rotation)));
-        const data = { target, editor: this, worldOrigin, rotation, transform };
+        const transform = !single && this.getChangedTransform(() => target.safeChange(() => target.rotateOf(origin, rotation)));
+        const data = { target, editor, worldOrigin, rotation, transform };
         this.emitEvent(new EditorRotateEvent(EditorRotateEvent.BEFORE_ROTATE, data));
         const event = new EditorRotateEvent(EditorRotateEvent.ROTATE, data);
-        this.editTool.onRotate(event);
+        this.doRotate(event);
         this.emitEvent(event);
     }
     skewOf(origin, skewX, skewY = 0, _resize) {
         if (!this.checkTransform('skewable'))
             return;
-        const { element: target } = this, { beforeSkew } = this.mergeConfig;
+        const { target, mergeConfig, single, editor } = this.editBox;
+        const { beforeSkew } = mergeConfig;
         if (beforeSkew) {
             const check = beforeSkew({ target, origin, skewX, skewY });
             if (typeof check === 'object')
@@ -1660,25 +1617,142 @@ class Editor extends Group {
                 return;
         }
         const worldOrigin = this.getWorldOrigin(origin);
-        const transform = this.multiple && this.getChangedTransform(() => target.safeChange(() => target.skewOf(origin, skewX, skewY)));
-        const data = { target, editor: this, worldOrigin, skewX, skewY, transform };
+        const transform = !single && this.getChangedTransform(() => target.safeChange(() => target.skewOf(origin, skewX, skewY)));
+        const data = { target, editor, worldOrigin, skewX, skewY, transform };
         this.emitEvent(new EditorSkewEvent(EditorSkewEvent.BEFORE_SKEW, data));
         const event = new EditorSkewEvent(EditorSkewEvent.SKEW, data);
-        this.editTool.onSkew(event);
+        this.doSkew(event);
         this.emitEvent(event);
     }
-    checkTransform(type) { return this.element && !this.element.locked && this.mergeConfig[type]; }
+    doMove(event) {
+        this.editTool.onMove(event);
+    }
+    doScale(event) {
+        this.editTool.onScale(event);
+    }
+    doRotate(event) {
+        this.editTool.onRotate(event);
+    }
+    doSkew(event) {
+        this.editTool.onSkew(event);
+    }
+    checkTransform(type) {
+        const { target, mergeConfig } = this.editBox;
+        return target && !target.locked && mergeConfig[type];
+    }
     getWorldOrigin(origin) {
-        return this.element.getWorldPoint(LeafHelper.getInnerOrigin(this.element, origin));
+        const { target } = this.editBox;
+        return target.getWorldPoint(LeafHelper.getInnerOrigin(target, origin));
     }
     getChangedTransform(func) {
-        const { element } = this;
-        if (this.multiple && !element.canChange)
-            return element.changedTransform;
-        const oldMatrix = new Matrix(element.worldTransform);
+        const { target, single } = this.editBox;
+        if (!single && !target.canChange)
+            return target.changedTransform;
+        const oldMatrix = new Matrix(target.worldTransform);
         func();
-        return new Matrix(element.worldTransform).divide(oldMatrix);
+        return new Matrix(target.worldTransform).divide(oldMatrix);
+    }
+    emitEvent(event, capture) {
+        this.editBox.editor.emitEvent(event, capture);
+    }
+}
+
+let Editor = class Editor extends Group {
+    get list() { return this.leafList.list; }
+    get dragHoverExclude() { return [this.editBox.rect]; }
+    get editing() { return !!this.list.length; }
+    get groupOpening() { return !!this.openedGroupList.length; }
+    get multiple() { return this.list.length > 1; }
+    get single() { return this.list.length === 1; }
+    get dragging() { return this.editBox.dragging; }
+    get moving() { return this.editBox.moving; }
+    get dragPoint() { return this.editBox.dragPoint; }
+    get element() { return this.multiple ? this.simulateTarget : this.list[0]; }
+    get buttons() { return this.editBox.buttons; }
+    constructor(userConfig, data) {
+        super(data);
+        this.leafList = new LeafList();
+        this.openedGroupList = new LeafList();
+        this.simulateTarget = new SimulateElement(this);
+        this.editBox = new EditBox(this);
+        this.editToolList = {};
+        this.selector = new EditSelect(this);
+        this.editMask = new EditMask(this);
+        this.targetEventIds = [];
+        let mergedConfig = DataHelper.clone(config);
+        if (userConfig)
+            mergedConfig = DataHelper.default(userConfig, mergedConfig);
+        this.mergedConfig = this.config = mergedConfig;
+        this.addMany(this.editMask, this.selector, this.editBox);
+        if (!Plugin.has('resize'))
+            this.config.editSize = 'scale';
+    }
+    select(target) {
+        this.target = target;
+    }
+    cancel() {
+        this.target = null;
+    }
+    hasItem(item) {
+        return this.leafList.has(item);
+    }
+    addItem(item) {
+        if (!this.hasItem(item) && !item.locked)
+            this.leafList.add(item), this.target = this.leafList.list;
+    }
+    removeItem(item) {
+        if (this.hasItem(item))
+            this.leafList.remove(item), this.target = this.leafList.list;
+    }
+    shiftItem(item) {
+        this.hasItem(item) ? this.removeItem(item) : this.addItem(item);
     }
+    update() {
+        if (this.editing) {
+            if (!this.element.parent)
+                return this.cancel();
+            if (this.innerEditing)
+                this.innerEditor.update();
+            this.editTool.update();
+            this.selector.update();
+        }
+    }
+    updateEditBox() {
+        if (this.multiple)
+            simulate(this);
+        this.update();
+    }
+    updateEditTool() {
+        let tool = this.editTool;
+        if (tool) {
+            this.editBox.unload();
+            tool.unload();
+            this.editTool = null;
+        }
+        if (this.editing) {
+            const tag = this.element.editOuter || 'EditTool';
+            tool = this.editTool = this.editToolList[tag] = this.editToolList[tag] || EditToolCreator.get(tag, this);
+            this.editBox.load();
+            tool.load();
+            this.update();
+        }
+    }
+    getEditSize(_ui) {
+        return this.mergeConfig.editSize;
+    }
+    onMove(_e) { }
+    onScale(_e) { }
+    onRotate(_e) { }
+    onSkew(_e) { }
+    move(_x, _y = 0) { }
+    scaleWithDrag(_data) { }
+    scaleOf(_origin, scaleX, _scaleY = scaleX, _resize) { }
+    flip(_axis) { }
+    rotateOf(_origin, _rotation) { }
+    skewOf(_origin, _skewX, _skewY = 0, _resize) { }
+    checkTransform(_type) { return undefined; }
+    getWorldOrigin(_origin) { return undefined; }
+    getChangedTransform(_func) { return undefined; }
     group(userGroup) {
         if (this.multiple) {
             this.emitGroupEvent(EditorGroupEvent.BEFORE_GROUP);
@@ -1796,12 +1870,9 @@ class Editor extends Group {
         if (this.targetChanged)
             this.update();
     }
-    onKey(e) {
-        updateCursor(this, e);
-    }
     listenTargetEvents() {
         if (!this.targetEventIds.length) {
-            const { app, leafer, editBox, editMask } = this;
+            const { app, leafer, editMask } = this;
             this.targetEventIds = [
                 leafer.on_(RenderEvent.START, this.onRenderStart, this),
                 app.on_([
@@ -1809,8 +1880,6 @@ class Editor extends Group {
                     [MoveEvent.BEFORE_MOVE, this.onMove, this, true],
                     [ZoomEvent.BEFORE_ZOOM, this.onScale, this, true],
                     [RotateEvent.BEFORE_ROTATE, this.onRotate, this, true],
-                    [[KeyEvent.HOLD, KeyEvent.UP], this.onKey, this],
-                    [KeyEvent.DOWN, editBox.onArrow, editBox]
                 ])
             ];
             if (editMask.visible)
@@ -1835,7 +1904,7 @@ class Editor extends Group {
             super.destroy();
         }
     }
-}
+};
 __decorate([
     mergeConfigAttr()
 ], Editor.prototype, "mergeConfig", void 0);
@@ -1845,14 +1914,19 @@ __decorate([
 __decorate([
     targetAttr(onTarget)
 ], Editor.prototype, "target", void 0);
+Editor = __decorate([
+    useModule(TransformTool, ['editBox', 'editTool', 'emitEvent'])
+], Editor);
 
 class InnerEditor {
     static registerInnerEditor() {
         EditToolCreator.register(this);
     }
     get tag() { return 'InnerEditor'; }
+    get mode() { return 'focus'; }
     get editBox() { return this.editor.editBox; }
     constructor(editor) {
+        this.eventIds = [];
         this.editor = editor;
         this.create();
     }
@@ -1865,7 +1939,7 @@ class InnerEditor {
     load() {
         const { editor } = this;
         if (editor) {
-            if (editor.app)
+            if (editor.app && this.mode === 'focus')
                 editor.selector.hittable = editor.app.tree.hitChildren = false;
             this.onLoad();
         }
@@ -1876,7 +1950,7 @@ class InnerEditor {
     unload() {
         const { editor } = this;
         if (editor) {
-            if (editor.app)
+            if (editor.app && this.mode === 'focus')
                 editor.selector.hittable = editor.app.tree.hitChildren = true;
             this.onUnload();
         }
@@ -1950,10 +2024,7 @@ let EditTool = class EditTool extends InnerEditor {
         this.onLoad();
     }
     update() {
-        const { editor, editBox } = this;
-        const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = editor.element.getLayoutBounds('box', editor, true);
-        editBox.set({ x, y, scaleX, scaleY, rotation, skewX, skewY });
-        editBox.update({ x: 0, y: 0, width, height });
+        this.editBox.update();
         this.onUpdate();
     }
     unload() {
@@ -2088,4 +2159,4 @@ UI.setEditConfig = function (config) { this.changeAttr('editConfig', config); };
 UI.setEditOuter = function (toolName) { this.changeAttr('editOuter', toolName); };
 UI.setEditInner = function (editorName) { this.changeAttr('editInner', editorName); };
 
-export { EditBox, EditDataHelper, EditPoint, EditSelect, EditSelectHelper, EditTool, EditToolCreator, Editor, EditorEvent, EditorGroupEvent, EditorHelper, EditorMoveEvent, EditorRotateEvent, EditorScaleEvent, EditorSkewEvent, InnerEditor, InnerEditorEvent, LineEditTool, SelectArea, Stroker, registerEditTool, registerInnerEditor };
+export { EditBox, EditDataHelper, EditPoint, EditSelect, EditSelectHelper, EditTool, EditToolCreator, Editor, EditorEvent, EditorGroupEvent, EditorHelper, EditorMoveEvent, EditorRotateEvent, EditorScaleEvent, EditorSkewEvent, InnerEditor, InnerEditorEvent, LineEditTool, SelectArea, Stroker, TransformTool, registerEditTool, registerInnerEditor };