@leafer-ui/interface 1.0.0-rc.22 → 1.0.0-rc.24

package/package.json

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

package/src/ICommonAttr.ts

@@ -1,5 +1,5 @@
-import { INumber, IBoolean, IString, IFourNumber } from '@leafer/interface'
-import { IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, IUnitData, ITextWrap, IStroke, IFill, IArrowType } from './type/IType'
+import { INumber, IBoolean, IString, IFourNumber, IUnitData } from '@leafer/interface'
+import { IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IStroke, IFill, IArrowType } from './type/IType'
 import { ILeafStrokePaint, ILeafShadowEffect, ILeafPaint } from './type/IComputedType'
 import { IDashPatternString, IShadowString, IColorString, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
 

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, ICanvasContext2DSettings, IFourNumber } 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, IFourNumber, IFindCondition } from '@leafer/interface'
 
 import {
     IFillAttrData, IFillInputData, IFillComputedData,
@@ -40,6 +40,17 @@ interface IArrowAttrData {
 export interface IArrowData extends IArrowAttrData, ILineData { }
 export interface IArrowInputData extends IArrowAttrData, ILineInputData { }
 
+// Flow
+export interface IFlow extends IBox {
+    __: IFlowData
+}
+
+interface IFlowAttrData {
+
+}
+export interface IFlowData extends IFlowAttrData, IBoxData { }
+export interface IFlowInputData extends IFlowAttrData, IBoxInputData { }
+
 
 // Rect
 export interface IRect extends IUI {
@@ -301,6 +312,8 @@ export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrDa
 
     children?: IUI[]
 
+    readonly pen: IPathCreator
+
     reset(data?: IUIInputData): void
 
     set(data: IUIInputData): void
@@ -309,12 +322,16 @@ export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrDa
     get(name?: string | string[] | IUIInputData): IUIInputData | IValue
     createProxyData(): IUIInputData
 
-    find(condition: number | string | IFindUIMethod, options?: any): IUI[]
-    findOne(condition: number | string | IFindUIMethod, options?: any): IUI
+    find(condition: number | string | IFindCondition | IFindUIMethod, options?: any): IUI[]
+    findTag(tag: string | string[]): IUI[]
+    findOne(condition: number | string | IFindCondition | IFindUIMethod, options?: any): IUI
+    findId(id: number | string): IUI
 
     getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData
     getPathString(curve?: boolean, pathForRender?: boolean): IPathString
 
+    load(): void
+
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void
     __drawPathByBox(drawer: IPathDrawer): void
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
@@ -356,11 +373,6 @@ export interface IUIData extends IUIComputedData, ILeafData {
     __isOverflow?: boolean
     __blendLayer?: boolean
 
-    readonly __autoWidth: boolean
-    readonly __autoHeight: boolean
-    readonly __autoSide: boolean
-    readonly __autoSize: boolean
-
     __boxStroke?: boolean
 
     // text

package/src/editor/IEditor.ts

@@ -1,4 +1,4 @@
-import { IGroup, IUI, IBox, IRectInputData, ISelectorProxy, IEditSize, ICursorType, IAround, IDragEvent, IRotateEvent, IStroke, IFill, ILeaf, ILeafList, IObject, IBoxInputData, IGroupInputData, IImageCursor, IRect, IBoundsData, IKeyEvent, IUIInputData } from '@leafer-ui/interface'
+import { IGroup, IUI, IBox, IRectInputData, ISelectorProxy, IEditSize, ICursorType, IAlign, IUnitPointData, IDragEvent, IRotateEvent, IStroke, IFill, ILeaf, ILeafList, IObject, IBoxInputData, IGroupInputData, IImageCursor, IRect, IBoundsData, IKeyEvent, IUIInputData } from '@leafer-ui/interface'
 
 export interface IEditorBase extends IGroup, ISelectorProxy {
     config: IEditorConfig
@@ -28,6 +28,9 @@ export interface IEditorBase extends IGroup, ISelectorProxy {
     editTool: IObject
     innerEditor: IObject
 
+    select(target: IUI | IUI[]): void
+    cancel(): void
+
     hasItem(item: IUI): boolean
     shiftItem(item: IUI): void
     addItem(item: IUI): void
@@ -59,7 +62,7 @@ export interface IEditorBase extends IGroup, ISelectorProxy {
 }
 
 export interface IEditorConfig {
-    editSize?: 'auto' | IEditSize
+    editSize?: IEditSize
     dualEvent?: boolean
     keyEvent?: boolean
 
@@ -89,9 +92,8 @@ export interface IEditorConfig {
     rotateCursor?: IImageCursor
     skewCursor?: IImageCursor
 
-    around?: IAround
+    around?: IAlign | IUnitPointData
     lockRatio?: boolean | 'corner'
-    lockMove?: boolean | 'x' | 'y'
     rotateGap?: number
 
     selector?: boolean

package/src/index.ts

@@ -16,6 +16,7 @@ export {
     IImage, IImageInputData, IImageData,
     ICanvas, ICanvasInputData, ICanvasData,
     IFrame, IFrameInputData, IFrameData,
+    IFlow, IFlowInputData, IFlowData,
     IBox, IBoxInputData, IBoxData,
     IGroup, IGroupInputData, IGroupData,
     ILeaferInputData, ILeaferData,
@@ -24,7 +25,7 @@ export {
     IUITag, IUIInputData
 } from './IUI'
 
-export { IUnitData, IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IFill, IStroke, IPaintAttr, IStrokeAlign, IStrokeJoin, IStrokeCap, IArrowType, IPathDataArrow, IPathDataArrowMap, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IRepeat } from './type/IType'
+export { IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IFill, IStroke, IPaintAttr, IStrokeAlign, IStrokeJoin, IStrokeCap, IArrowType, IPathDataArrow, IPathDataArrowMap, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IRepeat } from './type/IType'
 export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IColorString } from './type/IStringType'
 export { ILeafFill, ILeafPaint, ILeafPaintPatternData, ILeafPaintColor, ILeafStrokePaint, ILeafShadowEffect } from './type/IComputedType'
 

package/src/type/IType.ts

@@ -1,11 +1,6 @@
-import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, ISizeData, IFourNumber, IDirection } from '@leafer/interface'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, ISizeData, IFourNumber, IAlign, IUnitPointData } from '@leafer/interface'
 import { IColorString, IPaintString } from './IStringType'
 
-export interface IUnitData {
-    type: 'percent' | 'px'
-    value: number
-}
-
 export type IPaint = ISolidPaint | IGradientPaint | IImagePaint
 
 export type IFill = IPaint | IPaint[] | IPaintString
@@ -52,10 +47,10 @@ export interface IRGBA extends IRGB {
 // ---
 export interface IGradientPaint extends IPaintBase {
     type: IGradientType
-    from?: IPointData
-    to?: IPointData
+    from?: IAlign | IUnitPointData
+    to?: IAlign | IUnitPointData
     stretch?: number
-    stops: IColorStop[]
+    stops: IColorStop[] | IColorString[]
 }
 export interface IColorStop {
     offset: number
@@ -73,7 +68,7 @@ export interface IImagePaint extends IPaintBase {
 
     padding?: IFourNumber
 
-    around?: IDirection
+    align?: IAlign
     offset?: IPointData
 
     size?: number | ISizeData

package/types/index.d.ts

@@ -1,6 +1,6 @@
-import { IPointData, IExportFileType, IFourNumber, IDirection, ISizeData, IPathCommandData, IWindingRule, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, INumber, IBoolean, IString, IPathCreator, IBoundsData as IBoundsData$1, 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, IAround as IAround$1 } from '@leafer/interface';
+import { IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, ISizeData, IPathCommandData, IWindingRule, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, INumber, IBoolean, IString, IUnitData, IPathCreator, IBoundsData as IBoundsData$1, ILeaferImageConfig, ICanvasContext2DSettings, ILeaferCanvas, IRenderOptions, IPickOptions, IPickResult, ILeaf as ILeaf$1, IValue, IFindCondition, IPathString, IPathDrawer, IExportOptions, IExportResult, IAnswer, ILeafData, ILeafComputedData, ILeafInputData, IObject as IObject$1, ILeaferAttrData, IControl, ILeaferConfig, ILeaferType, ILeafRender, ILeafBounds, ILeafHit, IStateStyleType, ICachedLeaf, IBooleanMap, IAround } from '@leafer/interface';
 export * from '@leafer/interface';
-import { IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, ILeafList, 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, IUIInputData as IUIInputData$1, IBox as IBox$1, IRect as IRect$1, IBoundsData, IKeyEvent } from '@leafer-ui/interface';
+import { IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, ILeafList, 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, IAlign as IAlign$1, IUnitPointData as IUnitPointData$1, IUIInputData as IUIInputData$1, IBox as IBox$1, IRect as IRect$1, IBoundsData, IKeyEvent } from '@leafer-ui/interface';
 
 type IPercent = string;
 type IColorString = string;
@@ -13,10 +13,6 @@ type IGradientPaintString = string;
 type IImagePaintString = string;
 type IShadowString = string;
 
-interface IUnitData {
-    type: 'percent' | 'px';
-    value: number;
-}
 type IPaint = ISolidPaint | IGradientPaint | IImagePaint;
 type IFill = IPaint | IPaint[] | IPaintString;
 type IStroke = IPaint | IPaint[] | IPaintString;
@@ -45,10 +41,10 @@ interface IRGBA extends IRGB {
 }
 interface IGradientPaint extends IPaintBase {
     type: IGradientType;
-    from?: IPointData;
-    to?: IPointData;
+    from?: IAlign | IUnitPointData;
+    to?: IAlign | IUnitPointData;
     stretch?: number;
-    stops: IColorStop[];
+    stops: IColorStop[] | IColorString[];
 }
 interface IColorStop {
     offset: number;
@@ -61,7 +57,7 @@ interface IImagePaint extends IPaintBase {
     format?: IExportFileType;
     filters?: IImageFilters;
     padding?: IFourNumber;
-    around?: IDirection;
+    align?: IAlign;
     offset?: IPointData;
     size?: number | ISizeData;
     scale?: number | IPointData;
@@ -325,6 +321,8 @@ interface IEditorBase extends IGroup$1, ISelectorProxy {
     editBox: IEditBoxBase;
     editTool: IObject;
     innerEditor: IObject;
+    select(target: IUI$1 | IUI$1[]): void;
+    cancel(): void;
     hasItem(item: IUI$1): boolean;
     shiftItem(item: IUI$1): void;
     addItem(item: IUI$1): void;
@@ -348,7 +346,7 @@ interface IEditorBase extends IGroup$1, ISelectorProxy {
     toBottom(): void;
 }
 interface IEditorConfig {
-    editSize?: 'auto' | IEditSize;
+    editSize?: IEditSize;
     dualEvent?: boolean;
     keyEvent?: boolean;
     stroke?: IStroke$1;
@@ -370,9 +368,8 @@ interface IEditorConfig {
     resizeCursor?: IImageCursor;
     rotateCursor?: IImageCursor;
     skewCursor?: IImageCursor;
-    around?: IAround;
+    around?: IAlign$1 | IUnitPointData$1;
     lockRatio?: boolean | 'corner';
-    lockMove?: boolean | 'x' | 'y';
     rotateGap?: number;
     selector?: boolean;
     hover?: boolean;
@@ -446,6 +443,15 @@ interface IArrowData extends IArrowAttrData, ILineData {
 }
 interface IArrowInputData extends IArrowAttrData, ILineInputData {
 }
+interface IFlow extends IBox {
+    __: IFlowData;
+}
+interface IFlowAttrData {
+}
+interface IFlowData extends IFlowAttrData, IBoxData {
+}
+interface IFlowInputData extends IFlowAttrData, IBoxInputData {
+}
 interface IRect extends IUI {
     __: IRectData;
 }
@@ -663,15 +669,19 @@ interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEf
     editOuter: string;
     editInner: string;
     children?: IUI[];
+    readonly pen: IPathCreator;
     reset(data?: IUIInputData): void;
     set(data: IUIInputData): void;
     toJSON(): IUIInputData;
     get(name?: string | string[] | IUIInputData): IUIInputData | IValue;
     createProxyData(): IUIInputData;
-    find(condition: number | string | IFindUIMethod, options?: any): IUI[];
-    findOne(condition: number | string | IFindUIMethod, options?: any): IUI;
+    find(condition: number | string | IFindCondition | IFindUIMethod, options?: any): IUI[];
+    findTag(tag: string | string[]): IUI[];
+    findOne(condition: number | string | IFindCondition | IFindUIMethod, options?: any): IUI;
+    findId(id: number | string): IUI;
     getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData;
     getPathString(curve?: boolean, pathForRender?: boolean): IPathString;
+    load(): void;
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void;
     __drawPathByBox(drawer: IPathDrawer): void;
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void;
@@ -700,10 +710,6 @@ interface IUIData extends IUIComputedData, ILeafData {
     __drawAfterFill?: boolean;
     __isOverflow?: boolean;
     __blendLayer?: boolean;
-    readonly __autoWidth: boolean;
-    readonly __autoHeight: boolean;
-    readonly __autoSide: boolean;
-    readonly __autoSize: boolean;
     __boxStroke?: boolean;
     __font?: string;
     __textDrawData?: ITextDrawData;
@@ -833,7 +839,7 @@ interface IPaintImageModule {
     createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData$1): void;
     fillOrFitMode(data: ILeafPaintPatternData, box: IBoundsData$1, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void;
     clipMode(data: ILeafPaintPatternData, box: IBoundsData$1, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void;
-    repeatMode(data: ILeafPaintPatternData, box: IBoundsData$1, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number, around: IAround$1): void;
+    repeatMode(data: ILeafPaintPatternData, box: IBoundsData$1, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number, around: IAround): void;
 }
 interface IPaintGradientModule {
     linearGradient(paint: IGradientPaint, box: IBoundsData$1): ILeafPaint;
@@ -848,4 +854,4 @@ interface IEffectModule {
     backgroundBlur(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void;
 }
 
-export type { IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointType, IEditToolFunction, IEditorBase, IEditorConfig, IEditorConfigFunction, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFindUIMethod, IFontWeight, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGradientPaint, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IShadowEffect, IShadowString, IStar, IStarData, IStarInputData, IStateModule, IStroke, IStrokeAlign, IStrokeCap, IStrokeJoin, IStrokeWidthString, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextWordData, ITextWrap, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIRenderModule, IUITag, IUnitData, IVectorPath, IVerticalAlign };
+export type { IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointType, IEditToolFunction, IEditorBase, IEditorConfig, IEditorConfigFunction, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGradientPaint, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IShadowEffect, IShadowString, IStar, IStarData, IStarInputData, IStateModule, IStroke, IStrokeAlign, IStrokeCap, IStrokeJoin, IStrokeWidthString, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextWordData, ITextWrap, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign };