@leafer-ui/interface 1.0.0-rc.19 → 1.0.0-rc.20

package/package.json

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

package/src/IUI.ts

@@ -1,4 +1,4 @@
-import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPathDrawer, IPointData, IPathCommandData, ILeaferImageConfig, IBoundsData, IObject, IPathString, ILeaferImage, IPathCreator, IAnswer, IPickOptions, IPickResult, IValue } from '@leafer/interface'
+import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPathDrawer, IPointData, IPathCommandData, ILeaferImageConfig, IBoundsData, IObject, IPathString, ILeaferImage, IPathCreator, IAnswer, IPickOptions, IPickResult, IValue, ICanvasContext2DSettings } from '@leafer/interface'
 
 import {
     IFillAttrData, IFillInputData, IFillComputedData,
@@ -10,6 +10,7 @@ import {
 } from './ICommonAttr'
 import { IOverflow } from './type/IType'
 import { ILeafer } from './app/ILeafer'
+import { IEditorConfig } from './editor/IEditor'
 
 // Line
 export interface ILine extends IUI {
@@ -111,7 +112,6 @@ export interface IPen extends IGroup, IPathCreator {
     pathStyle: IPathInputData
     path: IPathCommandData
     paint(): void
-    clear(): void
 }
 
 export interface IPenData extends IGroupData { }
@@ -201,11 +201,13 @@ export interface IImageInputData extends IImageAttrData, IUIBaseInputData { }
 export interface ICanvas extends IRect {
     __: ICanvasData
     smooth: boolean
+    contextSettings: ICanvasContext2DSettings
     canvas: ILeaferCanvas
     __updateSize(): void
 }
 interface ICanvasAttrData {
     smooth?: boolean
+    contextSettings?: ICanvasContext2DSettings
 }
 export interface ICanvasData extends ICanvasAttrData, IRectData { }
 export interface ICanvasInputData extends ICanvasAttrData, IUIBaseInputData { }
@@ -291,6 +293,8 @@ export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrDa
     selectedStyle: IUIInputData
     disabledStyle: IUIInputData
 
+    editorStyle: IEditorConfig
+
     children?: IUI[]
 
     reset(data?: IUIInputData): void
@@ -330,6 +334,8 @@ export interface IUIData extends IUIComputedData, ILeafData {
     selectedStyle?: IUIInputData
     disabledStyle?: IUIInputData
 
+    editorStyle?: IEditorConfig
+
     // 非数据属性, 自动计算的缓存数据
     __isFills?: boolean
     __isStrokes?: boolean
@@ -339,6 +345,8 @@ export interface IUIData extends IUIComputedData, ILeafData {
     __pixelFill?: boolean // png / svg / webp
     __pixelStroke?: boolean
 
+    __isHitPixel?: boolean
+
     __opacityFill?: boolean  // 半透明的
     __opacityStroke?: boolean
 
@@ -375,6 +383,8 @@ export interface IUIBaseInputData extends IFillInputData, IStrokeInputData, ITex
     selectedStyle?: IUIInputData
     disabledStyle?: IUIInputData
 
+    editorStyle?: IEditorConfig
+
     children?: IUIInputData[]
 }
 

package/src/app/ILeafer.ts

@@ -18,4 +18,5 @@ export interface ILeafer extends IGroup, ILeaferAttrData, IControl {
 
     onInit(): void
     initType(type: ILeaferType): void
+    destroy(sync?: boolean): void
 }

package/src/editor/IEditor.ts

@@ -70,6 +70,7 @@ export interface IEditorConfig {
     buttonsMargin?: number
 
     hideOnMove?: boolean
+    hideOnSmall?: boolean | number
 
     moveCursor?: ICursorType
     resizeCursor?: IImageCursor
@@ -77,12 +78,15 @@ export interface IEditorConfig {
     skewCursor?: IImageCursor
 
     around?: IAround
-    lockRatio?: boolean
+    lockRatio?: boolean | 'corner'
+    lockMove?: boolean | 'x' | 'y'
     rotateGap?: number
 
     selector?: boolean
     hover?: boolean
+    select?: 'press' | 'tap'
     boxSelect?: boolean
+    continuousSelect?: boolean // 点击可以连续选择
 
     moveable?: boolean
     rotateable?: boolean

package/src/type/IType.ts

@@ -1,4 +1,4 @@
-import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, ISizeData } from '@leafer/interface'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, ISizeData, IFourNumber } from '@leafer/interface'
 import { IColorString, IPaintString } from './IStringType'
 
 export interface IUnitData {
@@ -71,6 +71,7 @@ export interface IImagePaint extends IPaintBase {
 
     filters?: IImageFilters
 
+    padding?: IFourNumber
     offset?: IPointData
     size?: number | ISizeData
     scale?: number | IPointData

package/types/index.d.ts

@@ -1,6 +1,6 @@
-import { IPointData, IExportFileType, ISizeData, IPathCommandData, IWindingRule, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, INumber, IBoolean, IString, IPathCreator, IBoundsData, ILeaferImageConfig, ILeaferCanvas, IRenderOptions, IPickOptions, IPickResult, ILeaf, IValue, IPathString, IPathDrawer, IExportOptions, IExportResult, IAnswer, ILeafData, ILeafComputedData, ILeafInputData, IObject, ILeaferAttrData, IControl, ILeaferConfig, ILeaferType, ILeafRender, ILeafBounds, ILeafHit, IStateStyleType, ICachedLeaf, IBooleanMap } from '@leafer/interface';
+import { IPointData, IExportFileType, IFourNumber, ISizeData, IPathCommandData, IWindingRule, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, INumber, IBoolean, IString, IPathCreator, IBoundsData, ILeaferImageConfig, ICanvasContext2DSettings, ILeaferCanvas, IRenderOptions, IPickOptions, IPickResult, ILeaf as ILeaf$1, IValue, IPathString, IPathDrawer, IExportOptions, IExportResult, IAnswer, ILeafData, ILeafComputedData, ILeafInputData, IObject as IObject$1, ILeaferAttrData, IControl, ILeaferConfig, ILeaferType, ILeafRender, ILeafBounds, ILeafHit, IStateStyleType, ICachedLeaf, IBooleanMap } from '@leafer/interface';
 export * from '@leafer/interface';
-import { IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, IObject as IObject$1, ILeaf as ILeaf$1, IEditSize, IDragEvent, IRotateEvent, IGroupInputData as IGroupInputData$1, IStroke as IStroke$1, IFill as IFill$1, IBoxInputData as IBoxInputData$1, IRectInputData as IRectInputData$1, ICursorType, IImageCursor, IAround } from '@leafer-ui/interface';
+import { IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, IObject, ILeaf, IEditSize, IDragEvent, IRotateEvent, IGroupInputData as IGroupInputData$1, IStroke as IStroke$1, IFill as IFill$1, IBoxInputData as IBoxInputData$1, IRectInputData as IRectInputData$1, ICursorType, IImageCursor, IAround } from '@leafer-ui/interface';
 
 type IPercent = string;
 type IColorString = string;
@@ -60,6 +60,7 @@ interface IImagePaint extends IPaintBase {
     mode?: IImagePaintMode;
     format?: IExportFileType;
     filters?: IImageFilters;
+    padding?: IFourNumber;
     offset?: IPointData;
     size?: number | ISizeData;
     scale?: number | IPointData;
@@ -303,6 +304,76 @@ interface IEffectComputedData {
     grayscale?: number;
 }
 
+interface IEditorBase extends IGroup$1, ISelectorProxy {
+    config: IEditorConfig;
+    hoverTarget: IUI$1;
+    target: IUI$1 | IUI$1[];
+    readonly list: IUI$1[];
+    readonly hasTarget: boolean;
+    readonly multiple: boolean;
+    readonly single: boolean;
+    readonly dragging: boolean;
+    element: IUI$1;
+    buttons: IGroup$1;
+    selector: IGroup$1;
+    editBox: IGroup$1;
+    editTool: IObject;
+    hasItem(item: IUI$1): boolean;
+    shiftItem(item: IUI$1): void;
+    addItem(item: IUI$1): void;
+    removeItem(item: IUI$1): void;
+    update(): void;
+    updateEditTool(): void;
+    getEditSize(ui: ILeaf): IEditSize;
+    onMove(e: IDragEvent): void;
+    onScale(e: IDragEvent): void;
+    onRotate(e: IDragEvent | IRotateEvent): void;
+    onSkew(e: IDragEvent): void;
+    group(group?: IGroup$1 | IGroupInputData$1): IGroup$1;
+    ungroup(): IUI$1[];
+    lock(): void;
+    unlock(): void;
+    toTop(): void;
+    toBottom(): void;
+}
+interface IEditorConfig {
+    editSize?: 'auto' | IEditSize;
+    dualEvent?: boolean;
+    keyEvent?: boolean;
+    stroke?: IStroke$1;
+    strokeWidth?: number;
+    pointFill?: IFill$1;
+    pointSize?: number;
+    pointRadius?: number;
+    point?: IBoxInputData$1 | IBoxInputData$1[];
+    middlePoint?: IBoxInputData$1 | IBoxInputData$1[];
+    rotatePoint?: IBoxInputData$1;
+    rect?: IBoxInputData$1;
+    area?: IRectInputData$1;
+    buttonsDirection?: 'top' | 'right' | 'bottom' | 'left';
+    buttonsFixed?: boolean;
+    buttonsMargin?: number;
+    hideOnMove?: boolean;
+    hideOnSmall?: boolean | number;
+    moveCursor?: ICursorType;
+    resizeCursor?: IImageCursor;
+    rotateCursor?: IImageCursor;
+    skewCursor?: IImageCursor;
+    around?: IAround;
+    lockRatio?: boolean | 'corner';
+    lockMove?: boolean | 'x' | 'y';
+    rotateGap?: number;
+    selector?: boolean;
+    hover?: boolean;
+    select?: 'press' | 'tap';
+    boxSelect?: boolean;
+    continuousSelect?: boolean;
+    moveable?: boolean;
+    rotateable?: boolean;
+    resizeable?: boolean;
+    skewable?: boolean;
+}
+
 interface ILine extends IUI {
     __: ILineData;
     toPoint: IPointData;
@@ -390,7 +461,6 @@ interface IPen extends IGroup, IPathCreator {
     pathStyle: IPathInputData;
     path: IPathCommandData;
     paint(): void;
-    clear(): void;
 }
 interface IPenData extends IGroupData {
 }
@@ -468,11 +538,13 @@ interface IImageInputData extends IImageAttrData, IUIBaseInputData {
 interface ICanvas extends IRect {
     __: ICanvasData;
     smooth: boolean;
+    contextSettings: ICanvasContext2DSettings;
     canvas: ILeaferCanvas;
     __updateSize(): void;
 }
 interface ICanvasAttrData {
     smooth?: boolean;
+    contextSettings?: ICanvasContext2DSettings;
 }
 interface ICanvasData extends ICanvasAttrData, IRectData {
 }
@@ -513,7 +585,7 @@ interface IGroup extends IUI {
     addAt(child: IUI, index: number): void;
     addAfter(child: IUI, after: IUI): void;
     addBefore(child: IUI, before: IUI): void;
-    addMany(...children: ILeaf[]): void;
+    addMany(...children: ILeaf$1[]): void;
     remove(child?: IUI): void;
     removeAll(): void;
     clear(): void;
@@ -522,7 +594,7 @@ interface IGroupData extends IUIData {
 }
 interface IGroupInputData extends IUIBaseInputData {
 }
-interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEffectAttrData, ILeaf {
+interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEffectAttrData, ILeaf$1 {
     __: IUIData;
     readonly app: ILeafer;
     leafer?: ILeafer;
@@ -537,6 +609,7 @@ interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEf
     focusStyle: IUIInputData;
     selectedStyle: IUIInputData;
     disabledStyle: IUIInputData;
+    editorStyle: IEditorConfig;
     children?: IUI[];
     reset(data?: IUIInputData): void;
     set(data: IUIInputData): void;
@@ -564,11 +637,13 @@ interface IUIData extends IUIComputedData, ILeafData {
     focusStyle?: IUIInputData;
     selectedStyle?: IUIInputData;
     disabledStyle?: IUIInputData;
+    editorStyle?: IEditorConfig;
     __isFills?: boolean;
     __isStrokes?: boolean;
     readonly __strokeWidth: number;
     __pixelFill?: boolean;
     __pixelStroke?: boolean;
+    __isHitPixel?: boolean;
     __opacityFill?: boolean;
     __opacityStroke?: boolean;
     __drawAfterFill?: boolean;
@@ -595,79 +670,14 @@ interface IUIBaseInputData extends IFillInputData, IStrokeInputData, ITextStyleI
     focusStyle?: IUIInputData;
     selectedStyle?: IUIInputData;
     disabledStyle?: IUIInputData;
+    editorStyle?: IEditorConfig;
     children?: IUIInputData[];
 }
 type IUITag = 'App' | 'Leafer' | 'Rect' | 'Ellipse' | 'Polygon' | 'Star' | 'Line' | 'Path' | 'Pen' | 'Text' | 'Image' | 'Canvas' | 'Group' | 'Frame' | 'Box';
-interface IUIInputData extends IRectInputData, IEllipseInputData, IPolygonInputData, IStarInputData, ILineInputData, IPathInputData, ITextInputData, IImageInputData, IGroupInputData, IFrameInputData, IUIBaseInputData, IObject {
+interface IUIInputData extends IRectInputData, IEllipseInputData, IPolygonInputData, IStarInputData, ILineInputData, IPathInputData, ITextInputData, IImageInputData, IGroupInputData, IFrameInputData, IUIBaseInputData, IObject$1 {
     children?: IUIInputData[];
 }
 
-interface IEditorBase extends IGroup$1, ISelectorProxy {
-    config: IEditorConfig;
-    hoverTarget: IUI$1;
-    target: IUI$1 | IUI$1[];
-    readonly list: IUI$1[];
-    readonly hasTarget: boolean;
-    readonly multiple: boolean;
-    readonly single: boolean;
-    readonly dragging: boolean;
-    element: IUI$1;
-    buttons: IGroup$1;
-    selector: IGroup$1;
-    editBox: IGroup$1;
-    editTool: IObject$1;
-    hasItem(item: IUI$1): boolean;
-    shiftItem(item: IUI$1): void;
-    addItem(item: IUI$1): void;
-    removeItem(item: IUI$1): void;
-    update(): void;
-    updateEditTool(): void;
-    getEditSize(ui: ILeaf$1): IEditSize;
-    onMove(e: IDragEvent): void;
-    onScale(e: IDragEvent): void;
-    onRotate(e: IDragEvent | IRotateEvent): void;
-    onSkew(e: IDragEvent): void;
-    group(group?: IGroup$1 | IGroupInputData$1): IGroup$1;
-    ungroup(): IUI$1[];
-    lock(): void;
-    unlock(): void;
-    toTop(): void;
-    toBottom(): void;
-}
-interface IEditorConfig {
-    editSize?: 'auto' | IEditSize;
-    dualEvent?: boolean;
-    keyEvent?: boolean;
-    stroke?: IStroke$1;
-    strokeWidth?: number;
-    pointFill?: IFill$1;
-    pointSize?: number;
-    pointRadius?: number;
-    point?: IBoxInputData$1 | IBoxInputData$1[];
-    middlePoint?: IBoxInputData$1 | IBoxInputData$1[];
-    rotatePoint?: IBoxInputData$1;
-    rect?: IBoxInputData$1;
-    area?: IRectInputData$1;
-    buttonsDirection?: 'top' | 'right' | 'bottom' | 'left';
-    buttonsFixed?: boolean;
-    buttonsMargin?: number;
-    hideOnMove?: boolean;
-    moveCursor?: ICursorType;
-    resizeCursor?: IImageCursor;
-    rotateCursor?: IImageCursor;
-    skewCursor?: IImageCursor;
-    around?: IAround;
-    lockRatio?: boolean;
-    rotateGap?: number;
-    selector?: boolean;
-    hover?: boolean;
-    boxSelect?: boolean;
-    moveable?: boolean;
-    rotateable?: boolean;
-    resizeable?: boolean;
-    skewable?: boolean;
-}
-
 interface ILeafer extends IGroup, ILeaferAttrData, IControl {
     readonly isApp: boolean;
     readonly app: ILeafer;
@@ -680,6 +690,7 @@ interface ILeafer extends IGroup, ILeaferAttrData, IControl {
     userConfig?: ILeaferConfig;
     onInit(): void;
     initType(type: ILeaferType): void;
+    destroy(sync?: boolean): void;
 }
 
 interface IApp extends ILeafer {
@@ -734,16 +745,16 @@ interface IColorConvertModule {
 
 interface IExportModule {
     running?: boolean;
-    export(leaf: ILeaf, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
+    export(leaf: ILeaf$1, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
 }
 
 interface IStateModule {
-    isHover(leaf: ILeaf): boolean;
-    isPress(leaf: ILeaf): boolean;
-    isFocus(leaf: ILeaf): boolean;
-    isDrag(leaf: ILeaf): boolean;
-    setStyle(leaf: ILeaf, stateType: IStateStyleType, value: boolean): void;
-    updateEventStyle(leaf: ILeaf, eventType: string): void;
+    isHover(leaf: ILeaf$1): boolean;
+    isPress(leaf: ILeaf$1): boolean;
+    isFocus(leaf: ILeaf$1): boolean;
+    isDrag(leaf: ILeaf$1): boolean;
+    setStyle(leaf: ILeaf$1, stateType: IStateStyleType, value: boolean): void;
+    updateEventStyle(leaf: ILeaf$1, eventType: string): void;
 }
 
 interface ICachedShape extends ICachedLeaf {