@leafer-in/interface 1.0.0-rc.9 → 1.0.1

package/package.json

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

package/src/editor/IEditBox.ts

@@ -1,29 +1,7 @@
-import { IGroup, IRect, IBoundsData, IKeyEvent } from '@leafer-ui/interface'
-import { IEditor } from '@leafer-in/interface'
-import { IEditPoint } from './IEditPoint'
-
-export interface IEditBox extends IGroup {
+import { IEditBoxBase } from '@leafer-ui/interface'
+import { IEditor } from './IEditor'
+export interface IEditBox extends IEditBoxBase {
 
     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/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,62 @@
-import { IUI, IPointData, IAround, IDragEvent, IEvent, IEventListenerId, ILeafList, IMatrixData, IEditorBase } from '@leafer-ui/interface'
+import { IUI, IPointData, IAround, IDragEvent, IEvent, IEventListenerId, IMatrixData, IEditorBase, IGroup, IObject, ILayoutBoundsData } 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
+    editTool?: IEditTool
+    innerEditor?: IInnerEditor
 
+    dragStartPoint: IPointData
+    dragStartBounds: ILayoutBoundsData
     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
+    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 {
@@ -45,10 +65,23 @@ export interface IEditorEvent extends IEvent {
 
     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
@@ -60,8 +93,8 @@ export interface IEditorScaleEvent extends IEditorEvent {
     readonly scaleY?: number
     transform?: IMatrixData
 
-    readonly direction?: IDirection8
-    readonly lockRatio?: boolean
+    readonly direction?: number
+    readonly lockRatio?: boolean | 'corner'
     readonly around?: IAround
 
     drag?: IDragEvent
@@ -69,6 +102,7 @@ export interface IEditorScaleEvent extends IEditorEvent {
 
 export interface IEditorRotateEvent extends IEditorEvent {
     // rotateOf(origin, rotation)
+    transform?: IMatrixData
     readonly rotation?: number
 }
 

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/index.ts

@@ -1,13 +1,20 @@
 export * from '@leafer-ui/interface'
 
 // editor
-export { IEditor, IEditTool, IDirection8, IEditorScaleEvent, IEditorRotateEvent, IEditorSkewEvent, IEditorEvent, IEditorMoveEvent } from './editor/IEditor'
+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'
-export { IEditPoint, IEditPointType } from './editor/IEditPoint'
 
 // html
 
-export { IHTMLTextData, IHTMLTextInputData } from './html/IHTMLTextData'
+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,29 +1,8 @@
-import { IBox, IGroup, IRect, IBoundsData, IKeyEvent, IUI, IRectInputData, IBounds, IEditorBase, ILeafList, IEventListenerId, IEvent, IPointData, IMatrixData, IAround, IDragEvent, IImageData, IImageInputData } from '@leafer-ui/interface';
+import { IEditBoxBase, IUI, IRectInputData, IGroup, IBoundsData, IBounds, IPointerEvent, IEditorBase, IPointData, ILayoutBoundsData, IEventListenerId, IObject, IEvent, IMatrixData, IAround, IDragEvent, IImageData, IImageInputData, IFourNumber, IBoxInputData, IAxisAlign, IFlowWrap, IGap, IFlowAlign } from '@leafer-ui/interface';
 export * from '@leafer-ui/interface';
-import { IEditor as IEditor$1 } from '@leafer-in/interface';
 
-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 IEditBox extends IEditBoxBase {
+    editor: IEditor;
 }
 
 interface IStroker extends IUI {
@@ -44,46 +23,67 @@ 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;
+    editTool?: IEditTool;
+    innerEditor?: IInnerEditor;
+    dragStartPoint: IPointData;
+    dragStartBounds: ILayoutBoundsData;
     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;
+    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 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;
@@ -92,12 +92,13 @@ interface IEditorScaleEvent extends IEditorEvent {
     readonly scaleX?: number;
     readonly scaleY?: number;
     transform?: IMatrixData;
-    readonly direction?: IDirection8;
-    readonly lockRatio?: boolean;
+    readonly direction?: number;
+    readonly lockRatio?: boolean | 'corner';
     readonly around?: IAround;
     drag?: IDragEvent;
 }
 interface IEditorRotateEvent extends IEditorEvent {
+    transform?: IMatrixData;
     readonly rotation?: number;
 }
 interface IEditorSkewEvent extends IEditorEvent {
@@ -115,4 +116,45 @@ interface IHTMLTextData extends IHTMLTextAttrData, IImageData {
 interface IHTMLTextInputData extends IHTMLTextAttrData, IImageInputData {
 }
 
-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 };
+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 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/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'