@leafer-in/interface 1.0.0-rc.20 → 1.0.0-rc.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-in/interface",
-  "version": "1.0.0-rc.20",
+  "version": "1.0.0-rc.22",
   "description": "@leafer-in/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer-ui/interface": "1.0.0-rc.20",
-    "@leafer/interface": "1.0.0-rc.20"
+    "@leafer-ui/interface": "1.0.0-rc.22",
+    "@leafer/interface": "1.0.0-rc.22"
   }
 }

package/src/editor/IEditBox.ts

@@ -1,30 +1,7 @@
-import { IGroup, IRect, IBoundsData, IKeyEvent } from '@leafer-ui/interface'
+import { IEditBoxBase } from '@leafer-ui/interface'
 import { IEditor } from './IEditor'
-import { IEditPoint } from './IEditPoint'
-
-export interface IEditBox extends IGroup {
+export interface IEditBox extends IEditBoxBase {
 
     editor: IEditor
-    dragging: boolean
-    moving: boolean
-
-    circle: IEditPoint
-    rect: IRect
-
-    buttons: IGroup
-
-    resizePoints: IEditPoint[]
-    rotatePoints: IEditPoint[]
-    resizeLines: IEditPoint[]
-
-    readonly flipped: boolean
-    readonly flippedX: boolean
-    readonly flippedY: boolean
-    readonly flippedOne: boolean
-
-    enterPoint: IEditPoint
-
-    update(bounds: IBoundsData): void
-    onArrow(e: IKeyEvent): void
 
 }

package/src/editor/IEditSelect.ts

@@ -1,4 +1,4 @@
-import { IGroup, IBounds } from '@leafer-ui/interface'
+import { IGroup, IUI, IBounds, IPointerEvent } from '@leafer-ui/interface'
 
 import { IStroker } from './IStroker'
 import { ISelectArea } from './ISelectArea'
@@ -16,5 +16,7 @@ export interface IEditSelect extends IGroup {
     selectArea: ISelectArea
     bounds: IBounds
 
+    findUI(e: IPointerEvent): IUI
+    findDeepOne(e: IPointerEvent): IUI
     update(): void
 }

package/src/editor/IEditor.ts

@@ -1,42 +1,59 @@
-import { IUI, IPointData, IAround, IDragEvent, IEvent, IEventListenerId, ILeafList, IMatrixData, IEditorBase } from '@leafer-ui/interface'
+import { IUI, IPointData, IAround, IDragEvent, IEvent, IEventListenerId, IMatrixData, IEditorBase, IGroup } from '@leafer-ui/interface'
+
 import { IEditBox } from './IEditBox'
 import { IEditSelect } from './IEditSelect'
 
 
 export interface IEditor extends IEditorBase {
-    leafList: ILeafList
-
     simulateTarget: IUI
 
     selector: IEditSelect
     editBox: IEditBox
     editTool: IEditTool
+    innerEditor: IInnerEditor
 
+    dragStartPoint: IPointData
     targetEventIds: IEventListenerId[]
 
+    checkOpenedGroups(): void
+
     listenTargetEvents(): void
     removeTargetEvents(): void
 }
 
-export interface IEditTool {
-    tag: string
+export interface IEditTool extends IInnerEditor {
+    // 操作
     onMove(e: IEditorMoveEvent): void
     onScale(e: IEditorScaleEvent): void
     onScaleWithDrag?(e: IEditorScaleEvent): void
     onRotate(e: IEditorRotateEvent): void
     onSkew(e: IEditorSkewEvent): void
-    update(editor: IEditor): void
 }
 
-export enum IDirection8 {
-    topLeft,
-    top,
-    topRight,
-    right,
-    bottomRight,
-    bottom,
-    bottomLeft,
-    left
+export interface IInnerEditor {
+    tag: string
+
+    editor: IEditor
+    editBox: IEditBox
+    view: IGroup
+
+    eventIds: IEventListenerId[]
+
+    onCreate(): void
+    create(): void
+
+    // 状态
+    onLoad(): void
+    load(): void
+
+    onLoad(): void
+    unload(): void
+
+    onUpdate(): void
+    update(): void
+
+    onDestroy(): void
+    destroy(): void
 }
 
 export interface IEditorEvent extends IEvent {
@@ -62,7 +79,7 @@ export interface IEditorScaleEvent extends IEditorEvent {
     readonly scaleY?: number
     transform?: IMatrixData
 
-    readonly direction?: IDirection8
+    readonly direction?: number
     readonly lockRatio?: boolean | 'corner'
     readonly around?: IAround
 

package/src/index.ts

@@ -1,12 +1,11 @@
 export * from '@leafer-ui/interface'
 
 // editor
-export { IEditor, IEditTool, IDirection8, IEditorScaleEvent, IEditorRotateEvent, IEditorSkewEvent, IEditorEvent, IEditorMoveEvent } from './editor/IEditor'
+export { IEditor, IEditTool, IInnerEditor, IEditorScaleEvent, IEditorRotateEvent, IEditorSkewEvent, IEditorEvent, IEditorMoveEvent } from './editor/IEditor'
 export { IStroker } from './editor/IStroker'
 export { IEditBox } from './editor/IEditBox'
 export { ISelectArea } from './editor/ISelectArea'
 export { IEditSelect } from './editor/IEditSelect'
-export { IEditPoint, IEditPointType } from './editor/IEditPoint'
 
 // html
 

package/types/index.d.ts

@@ -1,29 +1,8 @@
-import { IBox, IGroup, IRect, IBoundsData, IKeyEvent, IUI, IRectInputData, IBounds, IEditorBase, ILeafList, IEventListenerId, IEvent, IPointData, IMatrixData, IAround, IDragEvent, IImageData, IImageInputData, IFourNumber, IBoxInputData } from '@leafer-ui/interface';
+import { IEditBoxBase, IUI, IRectInputData, IGroup, IBoundsData, IBounds, IPointerEvent, IEditorBase, IPointData, IEventListenerId, IEvent, IMatrixData, IAround, IDragEvent, IImageData, IImageInputData, IFourNumber, IBoxInputData } from '@leafer-ui/interface';
 export * from '@leafer-ui/interface';
 
-interface IEditPoint extends IBox {
-    direction: IDirection8;
-    pointType: IEditPointType;
-}
-type IEditPointType = 'rotate' | 'resize';
-
-interface IEditBox extends IGroup {
+interface IEditBox extends IEditBoxBase {
     editor: IEditor;
-    dragging: boolean;
-    moving: boolean;
-    circle: IEditPoint;
-    rect: IRect;
-    buttons: IGroup;
-    resizePoints: IEditPoint[];
-    rotatePoints: IEditPoint[];
-    resizeLines: IEditPoint[];
-    readonly flipped: boolean;
-    readonly flippedX: boolean;
-    readonly flippedY: boolean;
-    readonly flippedOne: boolean;
-    enterPoint: IEditPoint;
-    update(bounds: IBoundsData): void;
-    onArrow(e: IKeyEvent): void;
 }
 
 interface IStroker extends IUI {
@@ -44,37 +23,46 @@ interface IEditSelect extends IGroup {
     targetStroker: IStroker;
     selectArea: ISelectArea;
     bounds: IBounds;
+    findUI(e: IPointerEvent): IUI;
+    findDeepOne(e: IPointerEvent): IUI;
     update(): void;
 }
 
 interface IEditor extends IEditorBase {
-    leafList: ILeafList;
     simulateTarget: IUI;
     selector: IEditSelect;
     editBox: IEditBox;
     editTool: IEditTool;
+    innerEditor: IInnerEditor;
+    dragStartPoint: IPointData;
     targetEventIds: IEventListenerId[];
+    checkOpenedGroups(): void;
     listenTargetEvents(): void;
     removeTargetEvents(): void;
 }
-interface IEditTool {
-    tag: string;
+interface IEditTool extends IInnerEditor {
     onMove(e: IEditorMoveEvent): void;
     onScale(e: IEditorScaleEvent): void;
     onScaleWithDrag?(e: IEditorScaleEvent): void;
     onRotate(e: IEditorRotateEvent): void;
     onSkew(e: IEditorSkewEvent): void;
-    update(editor: IEditor): void;
-}
-declare enum IDirection8 {
-    topLeft = 0,
-    top = 1,
-    topRight = 2,
-    right = 3,
-    bottomRight = 4,
-    bottom = 5,
-    bottomLeft = 6,
-    left = 7
+}
+interface IInnerEditor {
+    tag: string;
+    editor: IEditor;
+    editBox: IEditBox;
+    view: IGroup;
+    eventIds: IEventListenerId[];
+    onCreate(): void;
+    create(): void;
+    onLoad(): void;
+    load(): void;
+    onLoad(): void;
+    unload(): void;
+    onUpdate(): void;
+    update(): void;
+    onDestroy(): void;
+    destroy(): void;
 }
 interface IEditorEvent extends IEvent {
     readonly target?: IUI;
@@ -94,7 +82,7 @@ interface IEditorScaleEvent extends IEditorEvent {
     readonly scaleX?: number;
     readonly scaleY?: number;
     transform?: IMatrixData;
-    readonly direction?: IDirection8;
+    readonly direction?: number;
     readonly lockRatio?: boolean | 'corner';
     readonly around?: IAround;
     drag?: IDragEvent;
@@ -130,4 +118,4 @@ interface IScrollBar extends IGroup {
     update(check: boolean): void;
 }
 
-export { IDirection8, type IEditBox, type IEditPoint, type IEditPointType, type IEditSelect, type IEditTool, type IEditor, type IEditorEvent, type IEditorMoveEvent, type IEditorRotateEvent, type IEditorScaleEvent, type IEditorSkewEvent, type IHTMLTextData, type IHTMLTextInputData, type IScrollBar, type IScrollBarConfig, type IScrollBarTheme, type ISelectArea, type IStroker };
+export type { IEditBox, IEditSelect, IEditTool, IEditor, IEditorEvent, IEditorMoveEvent, IEditorRotateEvent, IEditorScaleEvent, IEditorSkewEvent, IHTMLTextData, IHTMLTextInputData, IInnerEditor, IScrollBar, IScrollBarConfig, IScrollBarTheme, ISelectArea, IStroker };

package/src/editor/IEditPoint.ts

@@ -1,9 +0,0 @@
-import { IBox } from '@leafer-ui/interface'
-import { IDirection8 } from './IEditor'
-
-export interface IEditPoint extends IBox {
-    direction: IDirection8
-    pointType: IEditPointType
-}
-
-export type IEditPointType = 'rotate' | 'resize'