@leafer-in/editor 1.6.1 → 1.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-in/editor",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "@leafer-in/editor",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -34,9 +34,9 @@
     "leaferjs"
   ],
   "peerDependencies": {
-    "@leafer-ui/core": "^1.6.1",
-    "@leafer-in/resize": "^1.6.1",
-    "@leafer-ui/interface": "^1.6.1",
-    "@leafer-in/interface": "^1.6.1"
+    "@leafer-ui/core": "^1.6.3",
+    "@leafer-in/resize": "^1.6.3",
+    "@leafer-ui/interface": "^1.6.3",
+    "@leafer-in/interface": "^1.6.3"
   }
 }

package/src/Editor.ts

@@ -536,12 +536,17 @@ export class Editor extends Group implements IEditor {
             const { app, leafer, editBox, editMask } = this
             this.targetEventIds = [
                 leafer.on_(RenderEvent.START, this.onRenderStart, this),
-                app.on_(RenderEvent.CHILD_START, this.onAppRenderStart, this),
-                app.on_(MoveEvent.BEFORE_MOVE, this.onMove, this, true),
-                app.on_(ZoomEvent.BEFORE_ZOOM, this.onScale, this, true),
-                app.on_(RotateEvent.BEFORE_ROTATE, this.onRotate, this, true),
-                app.on_([KeyEvent.HOLD, KeyEvent.UP], this.onKey, this),
-                app.on_(KeyEvent.DOWN, editBox.onArrow, editBox)
+
+                app.on_([
+                    [RenderEvent.CHILD_START, this.onAppRenderStart, this],
+
+                    [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) editMask.forceRender()
         }
@@ -551,7 +556,6 @@ export class Editor extends Group implements IEditor {
         const { targetEventIds, editMask } = this
         if (targetEventIds.length) {
             this.off_(targetEventIds)
-            targetEventIds.length = 0
             if (editMask.visible) editMask.forceRender()
         }
     }

package/src/display/EditBox.ts

@@ -1,4 +1,4 @@
-import { IRect, IEventListenerId, IBoundsData, IPointData, IKeyEvent, IGroup, IBox, IBoxInputData, IAlign, IUI, IEditorConfig, IEditorDragStartData } from '@leafer-ui/interface'
+import { IRect, IEventListenerId, IBoundsData, IPointData, IKeyEvent, IGroup, IBox, IBoxInputData, IAlign, IUI, IEditorConfig, IEditorDragStartData, IEventParams } from '@leafer-ui/interface'
 import { Group, Box, Text, AroundHelper, Direction9, ResizeEvent } from '@leafer-ui/draw'
 import { DragEvent, PointerEvent } from '@leafer-ui/core'
 
@@ -330,31 +330,36 @@ export class EditBox extends Group implements IEditBox {
         const { editor } = this
         point.direction = direction
         point.pointType = type
-        point.on_(DragEvent.START, this.onDragStart, this)
-        point.on_(DragEvent.DRAG, this.onDrag, this)
-        point.on_(DragEvent.END, this.onDragEnd, this)
-        point.on_(PointerEvent.LEAVE, () => this.enterPoint = null)
-        if (point.name !== 'circle') point.on_(PointerEvent.ENTER, (e) => { this.enterPoint = point, updateCursor(editor, e) })
+
+        const events: IEventParams[] = [
+            [DragEvent.START, this.onDragStart, this],
+            [DragEvent.DRAG, this.onDrag, this],
+            [DragEvent.END, this.onDragEnd, this],
+            [PointerEvent.LEAVE, () => { this.enterPoint = null }],
+        ]
+        if (point.name !== 'circle') events.push([PointerEvent.ENTER, (e: PointerEvent) => { this.enterPoint = point, updateCursor(editor, e) }])
+        this.__eventIds.push(point.on_(events))
     }
 
     protected __listenEvents(): void {
         const { rect, editor } = this
-        this.__eventIds = [
+        this.__eventIds.push(
             editor.on_(EditorEvent.SELECT, this.onSelect, this),
 
-            rect.on_(DragEvent.START, this.onDragStart, this),
-            rect.on_(DragEvent.DRAG, editor.onMove, editor),
-            rect.on_(DragEvent.END, this.onDragEnd, this),
+            rect.on_([
+                [DragEvent.START, this.onDragStart, this],
+                [DragEvent.DRAG, editor.onMove, editor],
+                [DragEvent.END, this.onDragEnd, this],
 
-            rect.on_(PointerEvent.ENTER, () => updateMoveCursor(editor)),
-            rect.on_(PointerEvent.DOUBLE_TAP, this.onDoubleTap, this),
-            rect.on_(PointerEvent.LONG_PRESS, this.onLongPress, this)
-        ]
+                [PointerEvent.ENTER, () => updateMoveCursor(editor)],
+                [PointerEvent.DOUBLE_TAP, this.onDoubleTap, this],
+                [PointerEvent.LONG_PRESS, this.onLongPress, this]
+            ])
+        )
     }
 
     protected __removeListenEvents(): void {
         this.off_(this.__eventIds)
-        this.__eventIds.length = 0
     }
 
     public destroy(): void {

package/src/display/EditPoint.ts

@@ -1,9 +1,16 @@
 import { Box, Direction9 } from '@leafer-ui/draw'
 
-import { IEditPoint, IEditPointType } from '@leafer-in/interface'
+import { IEditPoint, IEditPointInputData, IEditPointType } from '@leafer-in/interface'
 
 
 export class EditPoint extends Box implements IEditPoint {
+
     public direction: Direction9
     public pointType: IEditPointType
+
+    constructor(data: IEditPointInputData) {
+        super(data)
+        this.useFastShadow = true
+    }
+
 }

package/src/display/EditSelect.ts

@@ -241,29 +241,30 @@ export class EditSelect extends Group implements IEditSelect {
             app.selector.proxy = editor
 
             this.__eventIds = [
-                editor.on_(EditorEvent.HOVER, this.onHover, this),
-                editor.on_(EditorEvent.SELECT, this.onSelect, this),
-
-                app.on_(PointerEvent.MOVE, this.onPointerMove, this),
-                app.on_(PointerEvent.BEFORE_DOWN, this.onBeforeDown, this),
-                app.on_(PointerEvent.TAP, this.onTap, this),
-
-                app.on_(DragEvent.START, this.onDragStart, this, true), // 采用捕获事件，需要比EditBox中的dragStart早触发
-                app.on_(DragEvent.DRAG, this.onDrag, this),
-                app.on_(DragEvent.END, this.onDragEnd, this),
-
-                app.on_(MoveEvent.MOVE, this.onAutoMove, this),
-                app.on_([ZoomEvent.ZOOM, MoveEvent.MOVE], () => { this.editor.hoverTarget = null }),
+                editor.on_([
+                    [EditorEvent.HOVER, this.onHover, this],
+                    [EditorEvent.SELECT, this.onSelect, this]
+                ]),
+
+                app.on_([
+                    [PointerEvent.MOVE, this.onPointerMove, this],
+                    [PointerEvent.BEFORE_DOWN, this.onBeforeDown, this],
+                    [PointerEvent.TAP, this.onTap, this],
+
+                    [DragEvent.START, this.onDragStart, this, true], // 采用捕获事件，需要比EditBox中的dragStart早触发
+                    [DragEvent.DRAG, this.onDrag, this],
+                    [DragEvent.END, this.onDragEnd, this],
+
+                    [MoveEvent.MOVE, this.onAutoMove, this],
+                    [[ZoomEvent.ZOOM, MoveEvent.MOVE], () => { this.editor.hoverTarget = null }],
+                ])
             ]
 
         })
     }
 
     protected __removeListenEvents(): void {
-        if (this.__eventIds) {
-            this.off_(this.__eventIds)
-            this.__eventIds.length = 0
-        }
+        this.off_(this.__eventIds)
     }
 
     public destroy(): void {

package/src/helper/EditDataHelper.ts

@@ -78,8 +78,9 @@ export const EditDataHelper = {
         }
 
         if (lockRatio) {
-            const unlockSide = lockRatio === 'corner' && direction % 2
-            if (!unlockSide) {
+            if (lockRatio === 'corner' && direction % 2) {
+                lockRatio = false
+            } else {
                 let scale: number
                 switch (direction) {
                     case top:
@@ -92,7 +93,6 @@ export const EditDataHelper = {
                         break
                     default:
                         scale = Math.sqrt(Math.abs(scaleX * scaleY))
-
                 }
                 scaleX = scaleX < 0 ? -scale : scale
                 scaleY = scaleY < 0 ? -scale : scale

package/src/index.ts

@@ -25,7 +25,7 @@ export { EditDataHelper } from './helper/EditDataHelper'
 export { EditSelectHelper } from './helper/EditSelectHelper'
 
 
-import { IEditor, IEditorConfig, IEditToolFunction, IEditorConfigFunction } from '@leafer-in/interface'
+import { IEditor, IEditorConfig, IEditToolFunction, IEditorConfigFunction, IApp } from '@leafer-in/interface'
 import { Creator, UI, Group, Text, Box, dataType, Plugin } from '@leafer-ui/draw'
 
 import '@leafer-in/resize'
@@ -36,7 +36,11 @@ import { Editor } from './Editor'
 Plugin.add('editor', 'resize')
 
 
-Creator.editor = function (options?: IEditorConfig): IEditor { return new Editor(options) }
+Creator.editor = function (options?: IEditorConfig, app?: IApp): IEditor {
+    const editor = new Editor(options)
+    if (app) app.sky.add(app.editor = editor)
+    return editor
+}
 
 Box.addAttr('textBox', false, dataType)
 

package/types/index.d.ts

@@ -1,7 +1,7 @@
 import { IBounds, ILeafList, IUI, IFunction, IEventListenerId, ILeaf, IPointerEvent, ILeaferCanvas, IRenderOptions, IGroup, IObject, IGroupInputData, IEditSize, IPointData, IAlign, IAxis, IMatrix, IApp, IBox, IEditorDragStartData, IBoundsData, IEditorConfig as IEditorConfig$1, IBoxInputData, IKeyEvent, IRect, IRectInputData, IMatrixData, IDragEvent, IAround, ILayoutBoundsData } from '@leafer-ui/interface';
 import { Group, UI, Direction9, Event, Box } from '@leafer-ui/draw';
 import { PointerEvent, DragEvent, MoveEvent, ZoomEvent, RotateEvent, KeyEvent } from '@leafer-ui/core';
-import { IEditSelect, IEditor, IStroker, ISelectArea, IEditorConfig, IEditPoint, ISimulateElement, IEditBox, IEditTool, IInnerEditor, IEditorScaleEvent, IEditorEvent, IEditPointType, IEditorMoveEvent, IEditorRotateEvent, IEditorSkewEvent, IEditorGroupEvent, IInnerEditorEvent, IUI as IUI$1, IDragEvent as IDragEvent$1, IPointData as IPointData$1, IPathCommandData, IFromToData, IAround as IAround$1 } from '@leafer-in/interface';
+import { IEditSelect, IEditor, IStroker, ISelectArea, IEditorConfig, IEditPoint, ISimulateElement, IEditBox, IEditTool, IInnerEditor, IEditorScaleEvent, IEditorEvent, IEditPointType, IEditPointInputData, IEditorMoveEvent, IEditorRotateEvent, IEditorSkewEvent, IEditorGroupEvent, IInnerEditorEvent, IUI as IUI$1, IDragEvent as IDragEvent$1, IPointData as IPointData$1, IPathCommandData, IFromToData, IAround as IAround$1 } from '@leafer-in/interface';
 
 declare class EditSelect extends Group implements IEditSelect {
     editor: IEditor;
@@ -186,6 +186,7 @@ declare class EditBox extends Group implements IEditBox {
 declare class EditPoint extends Box implements IEditPoint {
     direction: Direction9;
     pointType: IEditPointType;
+    constructor(data: IEditPointInputData);
 }
 
 declare class SelectArea extends Group implements ISelectArea {