@leafer-in/interface 1.0.0-rc.3 → 1.0.0-rc.30

package/package.json

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

package/src/editor/IEditBox.ts

@@ -0,0 +1,7 @@
+import { IEditBoxBase } from '@leafer-ui/interface'
+import { IEditor } from './IEditor'
+export interface IEditBox extends IEditBoxBase {
+
+    editor: IEditor
+
+}

package/src/editor/IEditSelect.ts

@@ -0,0 +1,22 @@
+import { IGroup, IUI, IBounds, IPointerEvent } 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
+
+    findUI(e: IPointerEvent): IUI
+    findDeepOne(e: IPointerEvent): IUI
+    update(): void
+}

package/src/editor/IEditor.ts

@@ -0,0 +1,114 @@
+import { IUI, IPointData, IAround, IDragEvent, IEvent, IEventListenerId, IMatrixData, IEditorBase, IGroup, IObject } from '@leafer-ui/interface'
+
+import { IEditBox } from './IEditBox'
+import { IEditSelect } from './IEditSelect'
+
+
+export interface IEditor extends IEditorBase {
+    simulateTarget: IUI
+
+    selector: IEditSelect
+    editBox: IEditBox
+    editTool?: IEditTool
+    innerEditor?: IInnerEditor
+
+    dragStartPoint: IPointData
+    targetEventIds: IEventListenerId[]
+
+    checkOpenedGroups(): void
+
+    listenTargetEvents(): void
+    removeTargetEvents(): void
+}
+
+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
+}
+
+export interface IInnerEditor {
+    tag: string
+    editTarget: IUI
+    config: IObject
+
+    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 {
+    readonly target?: IUI
+    readonly editor?: IEditor
+
+    readonly value?: IUI | IUI[]
+    readonly oldValue?: IUI | IUI[]
+    readonly list?: IUI[]
+    readonly oldList?: IUI[]
+
+    readonly worldOrigin?: IPointData
+    readonly origin?: IPointData
+}
+
+export interface IInnerEditorEvent extends IEditorEvent {
+    editTarget: IUI
+    innerEditor: IInnerEditor
+}
+
+export interface IEditorGroupEvent extends IEditorEvent {
+    editTarget: IGroup
+}
+
+
+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?: number
+    readonly lockRatio?: boolean | 'corner'
+    readonly around?: IAround
+
+    drag?: IDragEvent
+}
+
+export interface IEditorRotateEvent extends IEditorEvent {
+    // rotateOf(origin, rotation)
+    transform?: IMatrixData
+    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/flow/index.ts

@@ -0,0 +1,36 @@
+import { IBoundsData, IGap, IFlowAlign, IAxisAlign, IFlowWrap } from '@leafer-ui/interface'
+
+export interface IFlowWrapDrawData extends IGapBoundsData {
+    list: IFlowDrawData[]
+}
+
+export interface IFlowDrawData extends IGapBoundsData {
+    start: number
+    grow: number
+    hasRangeSize?: boolean
+}
+
+export interface IGapBoundsData extends IBoundsData {
+    count: number
+    gap: number
+}
+
+export interface IFlowAlignToAxisAlignMap {
+    [name: string]: IAxisAlign
+}
+
+export interface IFlowParseData {
+    complex: boolean
+    wrap: IFlowWrap
+
+    xGap: IGap
+    yGap: IGap
+    isAutoXGap: boolean
+    isAutoYGap: boolean
+    isFitXGap: boolean
+    isFitYGap: boolean
+
+    contentAlign: IFlowAlign
+    rowXAlign: IAxisAlign
+    rowYAlign: IAxisAlign
+}

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,20 @@
 export * from '@leafer-ui/interface'
 
-export { IEditor, IEditorTool, IEditorConfig, IDirection8, IEditorResizeEvent, IEditorRotateEvent } from './IEditor'
+// editor
+export { IEditor, IEditTool, IInnerEditor, IEditorEvent, IInnerEditorEvent, IEditorGroupEvent, IEditorMoveEvent, IEditorScaleEvent, IEditorRotateEvent, IEditorSkewEvent } from './editor/IEditor'
+export { IStroker } from './editor/IStroker'
+export { IEditBox } from './editor/IEditBox'
+export { ISelectArea } from './editor/ISelectArea'
+export { IEditSelect } from './editor/IEditSelect'
+
+// html
+
+export { IHTMLTextData, IHTMLTextInputData } from './html/IHTMLTextData'
+
+// scroll
+
+export { IScrollBar, IScrollBarConfig, IScrollBarTheme } from './scroll/IScrollBar'
+
+// flow
+
+export { IFlowWrapDrawData, IFlowDrawData, IGapBoundsData, IFlowAlignToAxisAlignMap, IFlowParseData } from './flow'

package/src/scroll/IScrollBar.ts

@@ -0,0 +1,15 @@
+import { IBoxInputData, IFourNumber, IGroup } from '@leafer-ui/interface'
+
+export interface IScrollBarConfig {
+    theme?: IScrollBarTheme
+    padding?: IFourNumber
+    minSize?: number
+}
+
+export type IScrollBarTheme = 'light' | 'dark' | IBoxInputData
+
+export interface IScrollBar extends IGroup {
+    config: IScrollBarConfig
+    changeTheme(theme: IScrollBarTheme): void
+    update(check: boolean): void
+}

package/types/index.d.ts

@@ -1,76 +1,159 @@
-import { IGroup, IUI, IPolygon, IPointData, IResizeType, IAround, IRectInputData, ICursorType, IEvent, IDragEvent, IBoundsData } from '@leafer-ui/interface';
+import { IEditBoxBase, IUI, IRectInputData, IGroup, IBoundsData, IBounds, IPointerEvent, IEditorBase, IPointData, IEventListenerId, IObject, IEvent, IMatrixData, IAround, IDragEvent, IImageData, IImageInputData, IFourNumber, IBoxInputData, IAxisAlign, IFlowWrap, IGap, IFlowAlign } from '@leafer-ui/interface';
 export * from '@leafer-ui/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 IEditBox extends IEditBoxBase {
+    editor: IEditor;
+}
+
+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;
+    findUI(e: IPointerEvent): IUI;
+    findDeepOne(e: IPointerEvent): IUI;
     update(): void;
 }
-interface IEditorTool {
-    name: string;
-    getMirrorData(editor: IEditor): IPointData;
-    resize(e: IEditorResizeEvent): void;
-    rotate(e: IEditorRotateEvent): void;
-    update(editor: IEditor): 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;
-}
-declare enum IDirection8 {
-    topLeft = 0,
-    top = 1,
-    topRight = 2,
-    right = 3,
-    bottomRight = 4,
-    bottom = 5,
-    bottomLeft = 6,
-    left = 7
-}
-interface IEditorResizeEvent extends IEvent {
+
+interface IEditor extends IEditorBase {
+    simulateTarget: IUI;
+    selector: IEditSelect;
+    editBox: IEditBox;
+    editTool?: IEditTool;
+    innerEditor?: IInnerEditor;
+    dragStartPoint: IPointData;
+    targetEventIds: IEventListenerId[];
+    checkOpenedGroups(): void;
+    listenTargetEvents(): void;
+    removeTargetEvents(): void;
+}
+interface IEditTool extends IInnerEditor {
+    onMove(e: IEditorMoveEvent): void;
+    onScale(e: IEditorScaleEvent): void;
+    onScaleWithDrag?(e: IEditorScaleEvent): void;
+    onRotate(e: IEditorRotateEvent): void;
+    onSkew(e: IEditorSkewEvent): void;
+}
+interface IInnerEditor {
+    tag: string;
+    editTarget: IUI;
+    config: IObject;
+    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;
     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 value?: IUI | IUI[];
+    readonly oldValue?: IUI | IUI[];
+    readonly list?: IUI[];
+    readonly oldList?: IUI[];
+    readonly worldOrigin?: IPointData;
     readonly origin?: IPointData;
+}
+interface IInnerEditorEvent extends IEditorEvent {
+    editTarget: IUI;
+    innerEditor: IInnerEditor;
+}
+interface IEditorGroupEvent extends IEditorEvent {
+    editTarget: IGroup;
+}
+interface IEditorMoveEvent extends IEditorEvent {
+    readonly moveX: number;
+    readonly moveY: number;
+}
+interface IEditorScaleEvent extends IEditorEvent {
     readonly scaleX?: number;
     readonly scaleY?: number;
+    transform?: IMatrixData;
+    readonly direction?: number;
+    readonly lockRatio?: boolean | 'corner';
+    readonly around?: IAround;
+    drag?: IDragEvent;
 }
-interface IEditorRotateEvent extends IEvent {
-    readonly target?: IUI;
-    readonly editor?: IEditor;
-    readonly origin?: IPointData;
+interface IEditorRotateEvent extends IEditorEvent {
+    transform?: IMatrixData;
     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 {
+}
+
+interface IScrollBarConfig {
+    theme?: IScrollBarTheme;
+    padding?: IFourNumber;
+    minSize?: number;
+}
+type IScrollBarTheme = 'light' | 'dark' | IBoxInputData;
+interface IScrollBar extends IGroup {
+    config: IScrollBarConfig;
+    changeTheme(theme: IScrollBarTheme): void;
+    update(check: boolean): void;
+}
+
+interface IFlowWrapDrawData extends IGapBoundsData {
+    list: IFlowDrawData[];
+}
+interface IFlowDrawData extends IGapBoundsData {
+    start: number;
+    grow: number;
+    hasRangeSize?: boolean;
+}
+interface IGapBoundsData extends IBoundsData {
+    count: number;
+    gap: number;
+}
+interface IFlowAlignToAxisAlignMap {
+    [name: string]: IAxisAlign;
+}
+interface IFlowParseData {
+    complex: boolean;
+    wrap: IFlowWrap;
+    xGap: IGap;
+    yGap: IGap;
+    isAutoXGap: boolean;
+    isAutoYGap: boolean;
+    isFitXGap: boolean;
+    isFitYGap: boolean;
+    contentAlign: IFlowAlign;
+    rowXAlign: IAxisAlign;
+    rowYAlign: IAxisAlign;
+}
 
-export { IDirection8, type IEditor, type IEditorConfig, type IEditorResizeEvent, type IEditorRotateEvent, type IEditorTool };
+export type { IEditBox, IEditSelect, IEditTool, IEditor, IEditorEvent, IEditorGroupEvent, IEditorMoveEvent, IEditorRotateEvent, IEditorScaleEvent, IEditorSkewEvent, IFlowAlignToAxisAlignMap, IFlowDrawData, IFlowParseData, IFlowWrapDrawData, IGapBoundsData, IHTMLTextData, IHTMLTextInputData, IInnerEditor, IInnerEditorEvent, IScrollBar, IScrollBarConfig, IScrollBarTheme, ISelectArea, 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
-}