@leafer-in/editor 1.4.1 → 1.5.0

package/dist/editor.esm.js

@@ -1,4 +1,4 @@
-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 { Event, defineKey, MatrixHelper, BoundsHelper, LeafBoundsHelper, getMatrixData, getBoundsData, UI, Paint, Group, Rect, Bounds, LeafList, Direction9, AroundHelper, MathHelper, PointHelper, Box, Text, Matrix, Debug, LeafHelper, PropertyEvent, isNull, 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';
 
@@ -51,6 +51,7 @@ class EditorMoveEvent extends EditorEvent {
         super(type, data);
     }
 }
+EditorMoveEvent.BEFORE_MOVE = 'editor.before_move';
 EditorMoveEvent.MOVE = 'editor.move';
 
 class EditorScaleEvent extends EditorEvent {
@@ -58,6 +59,7 @@ class EditorScaleEvent extends EditorEvent {
         super(type, data);
     }
 }
+EditorScaleEvent.BEFORE_SCALE = 'editor.before_scale';
 EditorScaleEvent.SCALE = 'editor.scale';
 
 class EditorRotateEvent extends EditorEvent {
@@ -65,6 +67,7 @@ class EditorRotateEvent extends EditorEvent {
         super(type, data);
     }
 }
+EditorRotateEvent.BEFORE_ROTATE = 'editor.before_rotate';
 EditorRotateEvent.ROTATE = 'editor.rotate';
 
 class EditorSkewEvent extends EditorEvent {
@@ -72,6 +75,7 @@ class EditorSkewEvent extends EditorEvent {
         super(type, data);
     }
 }
+EditorSkewEvent.BEFORE_SKEW = 'editor.before_skew';
 EditorSkewEvent.SKEW = 'editor.skew';
 
 function targetAttr(fn) {
@@ -124,7 +128,7 @@ class Stroker extends UI {
             for (let i = 0; i < list.length; i++) {
                 leaf = list[i];
                 const { worldTransform, worldRenderBounds } = leaf;
-                if (!bounds || bounds.hit(worldRenderBounds, options.matrix)) {
+                if (worldRenderBounds.width && worldRenderBounds.height && (!bounds || bounds.hit(worldRenderBounds, options.matrix))) {
                     const aScaleX = abs(worldTransform.scaleX), aScaleY = abs(worldTransform.scaleY);
                     if (aScaleX !== aScaleY) {
                         copy$1(matrix, worldTransform);
@@ -250,9 +254,9 @@ class EditSelect extends Group {
     }
     onSelect() {
         if (this.running) {
-            const { mergeConfig: config, list } = this.editor;
-            const { stroke, strokeWidth } = config;
-            this.targetStroker.setTarget(list, { stroke, strokeWidth: Math.max(1, strokeWidth / 2) });
+            const { mergeConfig, list } = this.editor;
+            const { stroke, strokeWidth, selectedStyle } = mergeConfig;
+            this.targetStroker.setTarget(list, Object.assign({ stroke, strokeWidth: Math.max(1, strokeWidth / 2) }, (selectedStyle || {})));
             this.hoverStroker.target = null;
         }
     }
@@ -439,7 +443,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, dragBounds } = element;
+        const { boxBounds, widthRange, heightRange, dragBounds, worldBoxBounds } = element;
         const { width, height } = startBounds;
         if (around) {
             totalMove.x *= 2;
@@ -453,10 +457,6 @@ const EditDataHelper = {
         const changedScaleY = scaleMode ? originChangedScaleY : signY * boxBounds.height / height;
         totalMove.x *= scaleMode ? originChangedScaleX : signX;
         totalMove.y *= scaleMode ? originChangedScaleY : signY;
-        if (Math.abs(totalMove.x) === width)
-            totalMove.x += 0.1;
-        if (Math.abs(totalMove.y) === height)
-            totalMove.y += 0.1;
         const topScale = (-totalMove.y + height) / height;
         const rightScale = (totalMove.x + width) / width;
         const bottomScale = (totalMove.y + height) / height;
@@ -546,6 +546,10 @@ const EditDataHelper = {
             const nowHeight = boxBounds.height * element.scaleY;
             scaleY = within(nowHeight * scaleY, heightRange) / nowHeight;
         }
+        if (Math.abs(scaleX * worldBoxBounds.width) < 1)
+            scaleX = (scaleX < 0 ? -1 : 1) / worldBoxBounds.width;
+        if (Math.abs(scaleY * worldBoxBounds.height) < 1)
+            scaleY = (scaleY < 0 ? -1 : 1) / worldBoxBounds.height;
         return { origin, scaleX, scaleY, direction, lockRatio, around };
     },
     getRotateData(bounds, direction, current, last, around) {
@@ -674,7 +678,7 @@ function updateCursor(editor, e) {
     let { rotation } = editBox;
     const { resizeCursor, rotateCursor, skewCursor, resizeable, rotateable, skewable } = editor.mergeConfig;
     const { pointType } = point, { flippedX, flippedY } = editBox;
-    let showResize = pointType === 'resize';
+    let showResize = pointType.includes('resize');
     if (showResize && rotateable && (e.metaKey || e.ctrlKey || !resizeable))
         showResize = false;
     const showSkew = skewable && !showResize && point.name === 'resize-line';
@@ -701,7 +705,7 @@ function toDataURL(svg, rotation) {
 class EditPoint extends Box {
 }
 
-const fourDirection = ['top', 'right', 'bottom', 'left'];
+const fourDirection = ['top', 'right', 'bottom', 'left'], editConfig = undefined;
 class EditBox extends Group {
     get flipped() { return this.flippedX || this.flippedY; }
     get flippedX() { return this.scaleX < 0; }
@@ -716,6 +720,7 @@ class EditBox extends Group {
         this.resizePoints = [];
         this.rotatePoints = [];
         this.resizeLines = [];
+        this.dragStartData = {};
         this.__eventIds = [];
         this.editor = editor;
         this.visible = false;
@@ -757,7 +762,7 @@ class EditBox extends Group {
                 resizeP.rotation = (i / 2) * 90;
         }
         circle.set(this.getPointStyle(mergeConfig.circle || mergeConfig.rotatePoint || pointsStyle[0]));
-        rect.set(Object.assign({ stroke, strokeWidth }, (mergeConfig.rect || {})));
+        rect.set(Object.assign({ stroke, strokeWidth, editConfig }, (mergeConfig.rect || {})));
         rect.hittable = !single;
         rect.syncEventer = single && this.editor;
         if (single) {
@@ -766,14 +771,14 @@ class EditBox extends Group {
         }
     }
     update(bounds) {
-        this.visible = !this.editor.element.locked;
+        const { mergeConfig, element, multiple } = this.editor;
+        const { middlePoint, resizeable, rotateable, hideOnSmall, editBox } = mergeConfig;
+        this.visible = !element.locked;
         if (this.view.worldOpacity) {
-            const { mergeConfig } = this.editor;
             const { width, height } = bounds;
             const { rect, circle, buttons, resizePoints, rotatePoints, resizeLines } = this;
-            const { middlePoint, resizeable, rotateable, hideOnSmall } = mergeConfig;
             const smallSize = typeof hideOnSmall === 'number' ? hideOnSmall : 10;
-            const showPoints = !(hideOnSmall && width < smallSize && height < smallSize);
+            const showPoints = editBox && !(hideOnSmall && width < smallSize && height < smallSize);
             let point = {}, rotateP, resizeP, resizeL;
             for (let i = 0; i < 8; i++) {
                 AroundHelper.toPoint(AroundHelper.directionData[i], bounds, point);
@@ -789,13 +794,13 @@ class EditBox extends Group {
                     resizeP.visible = rotateP.visible = showPoints && !!middlePoint;
                     if (((i + 1) / 2) % 2) {
                         resizeL.width = width;
-                        if (resizeP.width > width - 30)
+                        if (hideOnSmall && resizeP.width * 2 > width)
                             resizeP.visible = false;
                     }
                     else {
                         resizeL.height = height;
                         resizeP.rotation = 90;
-                        if (resizeP.width > height - 30)
+                        if (hideOnSmall && resizeP.width * 2 > height)
                             resizeP.visible = false;
                     }
                 }
@@ -805,7 +810,7 @@ class EditBox extends Group {
                 this.layoutCircle(mergeConfig);
             if (rect.path)
                 rect.path = null;
-            rect.set(Object.assign(Object.assign({}, bounds), { visible: true }));
+            rect.set(Object.assign(Object.assign({}, bounds), { visible: multiple ? true : editBox }));
             buttons.visible = showPoints && buttons.children.length > 0;
             if (buttons.visible)
                 this.layoutButtons(mergeConfig);
@@ -852,7 +857,7 @@ class EditBox extends Group {
     }
     getPointStyle(userStyle) {
         const { stroke, strokeWidth, pointFill, pointSize, pointRadius } = this.editor.mergeConfig;
-        const defaultStyle = { fill: pointFill, stroke, strokeWidth, around: 'center', strokeAlign: 'center', width: pointSize, height: pointSize, cornerRadius: pointRadius, offsetX: 0, offsetY: 0 };
+        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() {
@@ -872,34 +877,32 @@ class EditBox extends Group {
     }
     onDragStart(e) {
         this.dragging = true;
-        const { editor } = this;
-        if (e.current.name === 'rect') {
+        const point = this.dragPoint = e.current;
+        const { editor, dragStartData } = this, { element } = editor;
+        if (point.name === 'rect') {
             this.moving = true;
-            editor.dragStartPoint = { x: editor.element.x, y: editor.element.y };
             editor.opacity = editor.mergeConfig.hideOnMove ? 0 : 1;
         }
-        else if (e.current.pointType === 'resize') {
-            editor.dragStartBounds = Object.assign({}, editor.element.getLayoutBounds('box', 'local'));
-            editor.resizeDirection = e.current.direction;
-        }
+        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;
     }
     onDragEnd(e) {
         this.dragging = false;
+        this.dragPoint = null;
         this.moving = false;
         if (e.current.name === 'rect')
             this.editor.opacity = 1;
-        this.editor.resizeDirection = undefined;
     }
     onDrag(e) {
         const { editor } = this;
-        const point = this.enterPoint = e.current;
-        if (point.pointType === 'rotate' || e.metaKey || e.ctrlKey || !editor.mergeConfig.resizeable) {
-            if (editor.mergeConfig.rotateable)
-                editor.onRotate(e);
-        }
-        else if (point.pointType === 'resize') {
+        const { pointType } = this.enterPoint = e.current;
+        if (pointType.includes('rotate') || e.metaKey || e.ctrlKey || !editor.mergeConfig.resizeable)
+            editor.onRotate(e);
+        if (pointType.includes('resize'))
             editor.onScale(e);
-        }
         updateCursor(editor, e);
     }
     onArrow(e) {
@@ -1077,6 +1080,7 @@ const config = {
     rotateCursor: { url: rotateSVG, x: 12, y: 12 },
     skewCursor: { url: skewSVG, x: 12, y: 12 },
     selector: true,
+    editBox: true,
     hover: true,
     select: 'press',
     openInner: 'double',
@@ -1092,14 +1096,25 @@ 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);
 }
 
 function onTarget(editor, oldValue) {
     const { target } = editor;
     if (target) {
-        editor.leafList = target instanceof LeafList ? target : new LeafList(target instanceof Array ? target : target);
+        const { list } = editor.leafList = target instanceof LeafList ? target : new LeafList(target instanceof Array ? target : target);
+        if (!list.every(checkEditable)) {
+            editor.target = list.filter(checkEditable);
+            return;
+        }
         if (editor.multiple)
             simulate(editor);
     }
@@ -1126,6 +1141,9 @@ function onTarget(editor, oldValue) {
 function onHover(editor, oldValue) {
     editor.emitEvent(new EditorEvent(EditorEvent.HOVER, { editor, value: editor.hoverTarget, oldValue }));
 }
+function checkEditable(item) {
+    return item.editable && !item.locked;
+}
 
 const order = (a, b) => a.parent.children.indexOf(a) - b.parent.children.indexOf(b);
 const reverseOrder = (a, b) => b.parent.children.indexOf(b) - a.parent.children.indexOf(a);
@@ -1223,10 +1241,13 @@ class EditorGroupEvent extends EditorEvent {
         super(type, data);
     }
 }
+EditorGroupEvent.BEFORE_GROUP = 'editor.before_group';
 EditorGroupEvent.GROUP = 'editor.group';
 EditorGroupEvent.BEFORE_UNGROUP = 'editor.before_ungroup';
 EditorGroupEvent.UNGROUP = 'editor.ungroup';
+EditorGroupEvent.BEFORE_OPEN = 'editor.before_open_group';
 EditorGroupEvent.OPEN = 'editor.open_group';
+EditorGroupEvent.BEFORE_CLOSE = 'editor.before_close_group';
 EditorGroupEvent.CLOSE = 'editor.close_group';
 
 const { updateMatrix } = LeafHelper;
@@ -1289,8 +1310,20 @@ class SimulateElement extends Rect {
 
 class Editor extends Group {
     get mergeConfig() {
-        const { element, config } = this;
-        return this.single && element.editConfig ? Object.assign(Object.assign({}, config), element.editConfig) : config;
+        const { config, element, dragPoint } = this, mergeConfig = Object.assign({}, config);
+        if (element && element.editConfig)
+            Object.assign(mergeConfig, element.editConfig);
+        if (dragPoint) {
+            if (dragPoint.editConfig)
+                Object.assign(mergeConfig, dragPoint.editConfig);
+            if (mergeConfig.editSize === 'font-size')
+                mergeConfig.lockRatio = true;
+            if (dragPoint.pointType === 'resize-rotate') {
+                mergeConfig.around || (mergeConfig.around = 'center');
+                isNull(mergeConfig.lockRatio) && (mergeConfig.lockRatio = true);
+            }
+        }
+        return mergeConfig;
     }
     get list() { return this.leafList.list; }
     get dragHoverExclude() { return [this.editBox.rect]; }
@@ -1300,6 +1333,7 @@ class Editor extends Group {
     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) {
@@ -1390,7 +1424,7 @@ class Editor extends Group {
                 else
                     total.x = 0;
             }
-            this.move(DragEvent.getValidMove(this.element, this.dragStartPoint, total));
+            this.move(DragEvent.getValidMove(this.element, this.editBox.dragStartData.point, total));
         }
     }
     onScale(e) {
@@ -1404,7 +1438,7 @@ class Editor extends Group {
             const { direction } = e.current;
             if (e.shiftKey || element.lockRatio)
                 lockRatio = true;
-            const data = EditDataHelper.getScaleData(element, this.dragStartBounds, direction, e.getInnerTotal(element), lockRatio, EditDataHelper.getAround(around, e.altKey), flipable, this.multiple || editSize === 'scale');
+            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) {
                 data.drag = e;
                 this.scaleWithDrag(data);
@@ -1419,26 +1453,29 @@ class Editor extends Group {
         const { direction, name } = e.current;
         if (skewable && name === 'resize-line')
             return this.onSkew(e);
-        const { element } = this;
+        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);
             else
                 return;
+            if (element.scaleX * element.scaleY < 0)
+                rotation = -rotation;
         }
         else {
-            const last = { x: e.x - e.moveX, y: e.y - e.moveY };
-            const data = EditDataHelper.getRotateData(element.boxBounds, direction, e.getBoxPoint(element), element.getBoxPoint(last), e.shiftKey ? null : (element.around || element.origin || around || 'center'));
+            const data = EditDataHelper.getRotateData(element.boxBounds, direction, e.getBoxPoint(element), element.getBoxPoint(dragStartData), e.shiftKey ? null : (element.around || element.origin || around || 'center'));
             rotation = data.rotation;
             origin = data.origin;
         }
-        rotation = MathHelper.getGapRotation(rotation, rotateGap, element.rotation);
-        if (!rotation)
-            return;
         if (element.scaleX * element.scaleY < 0)
             rotation = -rotation;
-        this.rotateOf(origin, MathHelper.float(rotation, 2));
+        if (e instanceof DragEvent)
+            rotation = dragStartData.rotation + rotation - element.rotation;
+        rotation = MathHelper.float(MathHelper.getGapRotation(rotation, rotateGap, element.rotation), 2);
+        if (!rotation)
+            return;
+        this.rotateOf(origin, rotation);
     }
     onSkew(e) {
         const { element } = this;
@@ -1455,7 +1492,9 @@ class Editor extends Group {
         const world = element.getWorldPointByLocal(typeof x === 'object' ? Object.assign({}, x) : { x, y }, null, true);
         if (this.multiple)
             element.safeChange(() => element.move(x, y));
-        const event = new EditorMoveEvent(EditorMoveEvent.MOVE, { target: element, editor: this, moveX: world.x, moveY: world.y });
+        const data = { target: element, editor: this, 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.emitEvent(event);
     }
@@ -1463,7 +1502,9 @@ class Editor extends Group {
         if (!this.checkTransform('resizeable'))
             return;
         const { element } = this;
-        const event = new EditorScaleEvent(EditorScaleEvent.SCALE, Object.assign(Object.assign({}, data), { target: element, editor: this, worldOrigin: element.getWorldPoint(data.origin) }));
+        data = Object.assign(Object.assign({}, data), { target: element, editor: this, worldOrigin: element.getWorldPoint(data.origin) });
+        this.emitEvent(new EditorScaleEvent(EditorScaleEvent.BEFORE_SCALE, data));
+        const event = new EditorScaleEvent(EditorScaleEvent.SCALE, data);
         this.editTool.onScaleWithDrag(event);
         this.emitEvent(event);
     }
@@ -1473,7 +1514,9 @@ class Editor extends Group {
         const { element } = this;
         const worldOrigin = this.getWorldOrigin(origin);
         const transform = this.multiple && this.getChangedTransform(() => element.safeChange(() => element.scaleOf(origin, scaleX, scaleY)));
-        const event = new EditorScaleEvent(EditorScaleEvent.SCALE, { target: element, editor: this, worldOrigin, scaleX, scaleY, transform });
+        const data = { target: element, editor: this, worldOrigin, scaleX, scaleY, transform };
+        this.emitEvent(new EditorScaleEvent(EditorScaleEvent.BEFORE_SCALE, data));
+        const event = new EditorScaleEvent(EditorScaleEvent.SCALE, data);
         this.editTool.onScale(event);
         this.emitEvent(event);
     }
@@ -1483,7 +1526,9 @@ class Editor extends Group {
         const { element } = this;
         const worldOrigin = this.getWorldOrigin('center');
         const transform = this.multiple ? this.getChangedTransform(() => element.safeChange(() => element.flip(axis))) : new Matrix(LeafHelper.getFlipTransform(element, axis));
-        const event = new EditorScaleEvent(EditorScaleEvent.SCALE, { target: element, editor: this, worldOrigin, scaleX: axis === 'x' ? -1 : 1, scaleY: axis === 'y' ? -1 : 1, transform });
+        const data = { target: element, editor: this, 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.emitEvent(event);
     }
@@ -1493,7 +1538,9 @@ class Editor extends Group {
         const { element } = this;
         const worldOrigin = this.getWorldOrigin(origin);
         const transform = this.multiple && this.getChangedTransform(() => element.safeChange(() => element.rotateOf(origin, rotation)));
-        const event = new EditorRotateEvent(EditorRotateEvent.ROTATE, { target: element, editor: this, worldOrigin, rotation, transform });
+        const data = { target: element, editor: this, worldOrigin, rotation, transform };
+        this.emitEvent(new EditorRotateEvent(EditorRotateEvent.BEFORE_ROTATE, data));
+        const event = new EditorRotateEvent(EditorRotateEvent.ROTATE, data);
         this.editTool.onRotate(event);
         this.emitEvent(event);
     }
@@ -1503,7 +1550,9 @@ class Editor extends Group {
         const { element } = this;
         const worldOrigin = this.getWorldOrigin(origin);
         const transform = this.multiple && this.getChangedTransform(() => element.safeChange(() => element.skewOf(origin, skewX, skewY)));
-        const event = new EditorSkewEvent(EditorSkewEvent.SKEW, { target: element, editor: this, worldOrigin, skewX, skewY, transform });
+        const data = { target: element, editor: this, worldOrigin, skewX, skewY, transform };
+        this.emitEvent(new EditorSkewEvent(EditorSkewEvent.BEFORE_SKEW, data));
+        const event = new EditorSkewEvent(EditorSkewEvent.SKEW, data);
         this.editTool.onSkew(event);
         this.emitEvent(event);
     }
@@ -1521,6 +1570,7 @@ class Editor extends Group {
     }
     group(userGroup) {
         if (this.multiple) {
+            this.emitGroupEvent(EditorGroupEvent.BEFORE_GROUP);
             this.target = EditorHelper.group(this.list, this.element, userGroup);
             this.emitGroupEvent(EditorGroupEvent.GROUP, this.target);
         }
@@ -1536,11 +1586,13 @@ class Editor extends Group {
         return this.list;
     }
     openGroup(group) {
+        this.emitGroupEvent(EditorGroupEvent.BEFORE_OPEN, group);
         this.openedGroupList.add(group);
         group.hitChildren = true;
         this.emitGroupEvent(EditorGroupEvent.OPEN, group);
     }
     closeGroup(group) {
+        this.emitGroupEvent(EditorGroupEvent.BEFORE_CLOSE, group);
         this.openedGroupList.remove(group);
         group.hitChildren = false;
         this.emitGroupEvent(EditorGroupEvent.CLOSE, group);
@@ -1569,7 +1621,8 @@ class Editor extends Group {
     emitGroupEvent(type, group) {
         const event = new EditorGroupEvent(type, { editTarget: group });
         this.emitEvent(event);
-        group.emitEvent(event);
+        if (group)
+            group.emitEvent(event);
     }
     openInnerEditor(target, select) {
         if (target && select)
@@ -1899,34 +1952,15 @@ LineEditTool = __decorate([
 
 Plugin$1.add('editor', 'resize');
 Creator.editor = function (options) { return new Editor(options); };
-dataType(false)(Box.prototype, 'textBox');
-defineKey(UI.prototype, 'editOuter', {
-    get() { return this.__.__isLinePath ? 'LineEditTool' : 'EditTool'; }
-});
-defineKey(UI.prototype, 'editInner', {
-    get() { return 'PathEditor'; }
-});
-defineKey(Group.prototype, 'editInner', {
-    get() { return ''; }
-});
-defineKey(Text.prototype, 'editInner', {
-    get() { return 'TextEditor'; }
-});
-UI.setEditConfig = function (config) {
-    defineKey(this.prototype, 'editConfig', {
-        get() { return typeof config === 'function' ? config(this) : config; }
-    });
-};
-UI.setEditOuter = function (toolName) {
-    defineKey(this.prototype, 'editOuter', {
-        get() { return typeof toolName === 'string' ? toolName : toolName(this); }
-    });
-};
-UI.setEditInner = function (editorName) {
-    defineKey(this.prototype, 'editInner', {
-        get() { return typeof editorName === 'string' ? editorName : editorName(this); }
-    });
-};
+Box.addAttr('textBox', false, dataType);
+UI.addAttr('editConfig', undefined, dataType);
+UI.addAttr('editOuter', (ui) => ui.__.__isLinePath ? 'LineEditTool' : 'EditTool', dataType);
+UI.addAttr('editInner', 'PathEditor', dataType);
+Group.addAttr('editInner', '', dataType);
+Text.addAttr('editInner', 'TextEditor', dataType);
+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 };
 //# sourceMappingURL=editor.esm.js.map