@leafer-in/interface 1.0.0-rc.5 → 1.0.0-rc.7

package/package.json

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

package/src/editor/IEditBox.ts

@@ -0,0 +1,29 @@
+import { IGroup, IRect, IBoundsData, IKeyEvent } from '@leafer-ui/interface'
+import { IEditor } from '@leafer-in/interface'
+import { IEditPoint } from './IEditPoint'
+
+export interface IEditBox extends IGroup {
+
+    editor: IEditor
+    dragging?: 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/IEditPoint.ts

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

package/src/editor/IEditSelect.ts

@@ -0,0 +1,20 @@
+import { IGroup, IBounds } from '@leafer-ui/interface'
+
+import { IStroker } from './IStroker'
+import { ISelectArea } from './ISelectArea'
+import { IEditor } from './IEditor'
+
+export interface IEditSelect extends IGroup {
+    editor: IEditor
+
+    dragging: boolean
+    running: boolean
+
+    hoverStroker: IStroker
+    targetStroker: IStroker
+
+    selectArea: ISelectArea
+    bounds: IBounds
+
+    update(): void
+}

package/src/editor/IEditor.ts

@@ -0,0 +1,77 @@
+import { IUI, IPointData, IAround, IDragEvent, IEvent, IEventListenerId, ILeafList, IMatrixData, IEditorBase } 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
+
+    targetEventIds: IEventListenerId[]
+
+    listenTargetEvents(): void
+    removeTargetEvents(): void
+}
+
+export interface IEditTool {
+    tag: string
+    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 IEditorEvent extends IEvent {
+    readonly target?: IUI
+    readonly editor?: IEditor
+    readonly worldOrigin?: IPointData
+    readonly origin?: IPointData
+}
+export interface IEditorMoveEvent extends IEditorEvent {
+    readonly moveX: number
+    readonly moveY: number
+}
+
+export interface IEditorScaleEvent extends IEditorEvent {
+    // scaleOf(origin, scaleX, scaleY, resize) / transform(transform, resize)
+    readonly scaleX?: number
+    readonly scaleY?: number
+    transform?: IMatrixData
+
+    readonly direction?: IDirection8
+    readonly lockRatio?: boolean
+    readonly around?: IAround
+
+    drag?: IDragEvent
+}
+
+export interface IEditorRotateEvent extends IEditorEvent {
+    // rotateOf(origin, rotation)
+    readonly rotation?: number
+}
+
+export interface IEditorSkewEvent extends IEditorEvent {
+    // skewOf(origin, skewX, skewY)
+    transform?: IMatrixData
+    readonly skewX?: number
+    readonly skewY?: number
+}
+

package/src/editor/ISelectArea.ts

@@ -0,0 +1,6 @@
+import { IGroup, IRectInputData, IBoundsData } from '@leafer-ui/interface'
+
+export interface ISelectArea extends IGroup {
+    setStyle(style: IRectInputData, userStyle?: IRectInputData): void
+    setBounds(bounds: IBoundsData): void
+}

package/src/editor/IStroker.ts

@@ -0,0 +1,6 @@
+import { IUI, IRectInputData } from '@leafer-ui/interface'
+
+export interface IStroker extends IUI {
+    target: IUI | IUI[]
+    setTarget(target: IUI | IUI[], style: IRectInputData): void
+}

package/src/html/IHTMLTextData.ts

@@ -0,0 +1,9 @@
+import { IImageInputData, IImageData } from '@leafer-ui/interface'
+
+interface IHTMLTextAttrData {
+    text?: string
+    __htmlChanged?: boolean
+}
+
+export interface IHTMLTextData extends IHTMLTextAttrData, IImageData { }
+export interface IHTMLTextInputData extends IHTMLTextAttrData, IImageInputData { }

package/src/index.ts

@@ -1,3 +1,13 @@
 export * from '@leafer-ui/interface'
 
-export { IEditor, IEditorTool, IEditorConfig, IDirection8, IEditorResizeEvent, IEditorRotateEvent } from './IEditor'
+// editor
+export { IEditor, IEditTool, IDirection8, 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
+
+export { IHTMLTextData, IHTMLTextInputData } from './html/IHTMLTextData'

package/types/index.d.ts

@@ -1,46 +1,70 @@
-import { IGroup, IUI, IPolygon, IPointData, IResizeType, IAround, IRectInputData, ICursorType, IEvent, IDragEvent, IBoundsData } from '@leafer-ui/interface';
+import { IBox, IGroup, IRect, IBoundsData, IKeyEvent, IUI, IRectInputData, IBounds, IEditorBase, ILeafList, IEventListenerId, IEvent, IPointData, IMatrixData, IAround, IDragEvent, IImageData, IImageInputData } from '@leafer-ui/interface';
 export * from '@leafer-ui/interface';
+import { IEditor as IEditor$1 } from '@leafer-in/interface';
 
-interface IEditor extends IGroup {
-    config: IEditorConfig;
-    resizePoints: IUI[];
-    rotatePoints: IUI[];
-    resizeLines: IUI[];
-    circle: IUI;
-    targetRect: IUI;
-    rect: IPolygon;
-    target: IUI;
-    tool: IEditorTool;
-    enterPoint: IUI;
-    getTool(value: IUI): IEditorTool;
+interface IEditPoint extends IBox {
+    direction: IDirection8;
+    pointType: IEditPointType;
+}
+type IEditPointType = 'rotate' | 'resize';
+
+interface IEditBox extends IGroup {
+    editor: IEditor$1;
+    dragging?: 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 {
+    target: IUI | IUI[];
+    setTarget(target: IUI | IUI[], style: IRectInputData): void;
+}
+
+interface ISelectArea extends IGroup {
+    setStyle(style: IRectInputData, userStyle?: IRectInputData): void;
+    setBounds(bounds: IBoundsData): void;
+}
+
+interface IEditSelect extends IGroup {
+    editor: IEditor;
+    dragging: boolean;
+    running: boolean;
+    hoverStroker: IStroker;
+    targetStroker: IStroker;
+    selectArea: ISelectArea;
+    bounds: IBounds;
     update(): void;
 }
-interface IEditorTool {
-    name: string;
-    getMirrorData(editor: IEditor): IPointData;
-    resize(e: IEditorResizeEvent): void;
-    rotate(e: IEditorRotateEvent): void;
-    update(editor: IEditor): void;
+
+interface IEditor extends IEditorBase {
+    leafList: ILeafList;
+    simulateTarget: IUI;
+    selector: IEditSelect;
+    editBox: IEditBox;
+    editTool: IEditTool;
+    targetEventIds: IEventListenerId[];
+    listenTargetEvents(): void;
+    removeTargetEvents(): void;
 }
-interface IEditorConfig {
-    type?: 'pc' | 'mobile';
-    resizeType?: 'auto' | IResizeType;
-    around?: IAround;
-    lockRatio?: boolean;
-    rotateGap?: number;
-    stroke?: string;
-    pointFill?: string;
-    pointSize?: number;
-    pointRadius?: number;
-    point?: IRectInputData | IRectInputData[];
-    rotatePoint?: IRectInputData;
-    rect?: IRectInputData;
-    hideOnMove?: boolean;
-    moveCursor?: ICursorType;
-    resizeCursor?: ICursorType[];
-    rotateCursor?: ICursorType[];
-    rotateable?: boolean;
-    resizeable?: boolean;
+interface IEditTool {
+    tag: string;
+    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,
@@ -52,25 +76,41 @@ declare enum IDirection8 {
     bottomLeft = 6,
     left = 7
 }
-interface IEditorResizeEvent extends IEvent {
+interface IEditorEvent extends IEvent {
     readonly target?: IUI;
     readonly editor?: IEditor;
-    readonly resizeType?: IResizeType;
-    readonly lockRatio?: boolean;
-    readonly around?: IAround;
-    readonly dragEvent?: IDragEvent;
-    readonly direction?: IDirection8;
-    readonly bounds?: IBoundsData;
-    readonly old?: IBoundsData;
+    readonly worldOrigin?: IPointData;
     readonly origin?: IPointData;
+}
+interface IEditorMoveEvent extends IEditorEvent {
+    readonly moveX: number;
+    readonly moveY: number;
+}
+interface IEditorScaleEvent extends IEditorEvent {
     readonly scaleX?: number;
     readonly scaleY?: number;
+    transform?: IMatrixData;
+    readonly direction?: IDirection8;
+    readonly lockRatio?: boolean;
+    readonly around?: IAround;
+    drag?: IDragEvent;
 }
-interface IEditorRotateEvent extends IEvent {
-    readonly target?: IUI;
-    readonly editor?: IEditor;
-    readonly origin?: IPointData;
+interface IEditorRotateEvent extends IEditorEvent {
     readonly rotation?: number;
 }
+interface IEditorSkewEvent extends IEditorEvent {
+    transform?: IMatrixData;
+    readonly skewX?: number;
+    readonly skewY?: number;
+}
+
+interface IHTMLTextAttrData {
+    text?: string;
+    __htmlChanged?: boolean;
+}
+interface IHTMLTextData extends IHTMLTextAttrData, IImageData {
+}
+interface IHTMLTextInputData extends IHTMLTextAttrData, IImageInputData {
+}
 
-export { IDirection8, type IEditor, type IEditorConfig, type IEditorResizeEvent, type IEditorRotateEvent, type IEditorTool };
+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 ISelectArea, type IStroker };

package/src/IEditor.ts

@@ -1,98 +0,0 @@
-import { IGroup, IUI, IRectInputData, IResizeType, IPolygon, ICursorType, IBoundsData, IPointData, IAround, IDragEvent, IEvent } from '@leafer-ui/interface'
-
-export interface IEditor extends IGroup {
-    config: IEditorConfig
-
-    resizePoints: IUI[]
-    rotatePoints: IUI[]
-    resizeLines: IUI[]
-
-    circle: IUI
-    targetRect: IUI
-    rect: IPolygon
-
-    target: IUI
-
-    tool: IEditorTool
-
-    enterPoint: IUI
-
-    getTool(value: IUI): IEditorTool
-    update(): void
-}
-
-export interface IEditorTool {
-    name: string
-    getMirrorData(editor: IEditor): IPointData
-    resize(e: IEditorResizeEvent): void
-    rotate(e: IEditorRotateEvent): void
-    update(editor: IEditor): void
-}
-
-export interface IEditorConfig {
-    type?: 'pc' | 'mobile'
-    resizeType?: 'auto' | IResizeType
-
-    around?: IAround
-    lockRatio?: boolean
-    rotateGap?: number
-
-    stroke?: string
-    pointFill?: string
-    pointSize?: number
-    pointRadius?: number
-
-    point?: IRectInputData | IRectInputData[]
-    rotatePoint?: IRectInputData
-    rect?: IRectInputData
-
-    hideOnMove?: boolean
-
-    moveCursor?: ICursorType
-    resizeCursor?: ICursorType[]
-    rotateCursor?: ICursorType[]
-
-    rotateable?: boolean
-    resizeable?: boolean
-}
-
-export enum IDirection8 {
-    topLeft,
-    top,
-    topRight,
-    right,
-    bottomRight,
-    bottom,
-    bottomLeft,
-    left
-}
-
-export interface IEditorResizeEvent extends IEvent {
-    readonly target?: IUI
-    readonly editor?: IEditor
-
-    readonly resizeType?: IResizeType
-    readonly lockRatio?: boolean
-    readonly around?: IAround
-
-    readonly dragEvent?: IDragEvent
-    readonly direction?: IDirection8
-
-    // from old to bounds
-    readonly bounds?: IBoundsData
-    readonly old?: IBoundsData
-
-    // scaleOf(origin, scaleX, scaleY)
-    readonly origin?: IPointData
-    readonly scaleX?: number
-    readonly scaleY?: number
-}
-
-export interface IEditorRotateEvent extends IEvent {
-    readonly target?: IUI
-    readonly editor?: IEditor
-
-    // rotateOf(origin, rotation)
-    readonly origin?: IPointData
-    readonly rotation?: number
-}