@leafer-ui/interface 1.0.0-rc.25 → 1.0.0-rc.27

package/package.json

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

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, IFindCondition } 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, IBoolean } from '@leafer/interface'
 
 import {
     IFillAttrData, IFillInputData, IFillComputedData,
@@ -134,10 +134,12 @@ export interface IText extends ITextStyleAttrData, IUI {
     __: ITextData
     text: string
     padding: IFourNumber
+    resizeFontSize: IBoolean
 }
 interface ITextAttrData {
     text?: string
     padding?: IFourNumber
+    resizeFontSize?: boolean
 }
 
 export interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIData {
@@ -257,14 +259,17 @@ export interface IFrameInputData extends IBoxInputData {
 // Box
 export interface IBox extends IGroup {
     __: IBoxData
+    resizeChildren: IBoolean
     overflow: IOverflow
     __updateRectRenderBounds(): void
     __renderGroup(canvas: ILeaferCanvas, options: IRenderOptions): void
 }
 export interface IBoxData extends IGroupData {
+    resizeChildren?: boolean
     overflow?: IOverflow
 }
 export interface IBoxInputData extends IGroupInputData {
+    resizeChildren?: boolean
     overflow?: IOverflow
 }
 
@@ -324,8 +329,8 @@ export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrDa
 
     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
+    findOne(condition: number | string | IFindCondition | IFindUIMethod, options?: any): IUI | undefined
+    findId(id: number | string): IUI | undefined
 
     getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData
     getPathString(curve?: boolean, pathForRender?: boolean): IPathString
@@ -365,6 +370,7 @@ export interface IUIData extends IUIComputedData, ILeafData {
     __pixelStroke?: boolean
 
     __isHitPixel?: boolean
+    __isCanvas?: boolean // canvas 等需单独绘制的元素
 
     __opacityFill?: boolean  // 半透明的
     __opacityStroke?: boolean

package/src/editor/IEditor.ts

@@ -1,4 +1,4 @@
-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'
+import { IGroup, IUI, IBox, IRectInputData, ISelectorProxy, IEditSize, ICursorType, IAlign, IUnitPointData, IDragEvent, IRotateEvent, IStroke, IFill, ILeaf, ILeafList, IObject, IBoxInputData, IGroupInputData, IImageCursor, IRect, IBoundsData, IKeyEvent, IUIInputData, IZoomEvent } from '@leafer-ui/interface'
 
 export interface IEditorBase extends IGroup, ISelectorProxy {
     config: IEditorConfig
@@ -42,7 +42,7 @@ export interface IEditorBase extends IGroup, ISelectorProxy {
     getEditSize(ui: ILeaf): IEditSize
 
     onMove(e: IDragEvent): void
-    onScale(e: IDragEvent): void
+    onScale(e: IDragEvent | IZoomEvent): void
     onRotate(e: IDragEvent | IRotateEvent): void
     onSkew(e: IDragEvent): void
 
@@ -51,7 +51,7 @@ export interface IEditorBase extends IGroup, ISelectorProxy {
     openGroup(group: IGroup): void
     closeGroup(group: IGroup): void
 
-    openInnerEditor(): void
+    openInnerEditor(target?: IUI): void
     closeInnerEditor(): void
 
     lock(): void
@@ -105,8 +105,8 @@ export interface IEditorConfig {
     openInner?: 'double' | 'long' // 双击/长按打开内部
 
     moveable?: boolean
-    rotateable?: boolean
-    resizeable?: boolean
+    rotateable?: boolean | 'rotate'
+    resizeable?: boolean | 'zoom'
     skewable?: boolean
 }
 

package/src/index.ts

@@ -28,6 +28,7 @@ export {
 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'
+export { IStrokeAttrData, IStrokeInputData, IStrokeComputedData, ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData, IEffectAttrData, IEffectInputData, IEffectComputedData } from './ICommonAttr'
 
 export { IUIRenderModule, IRectRenderModule, IImageRenderModule, ITextRenderModule, IGroupRenderModule, IFrameRenderModule } from './module/IUIRender'
 export { IUIBoundsModule } from './module/IUIBounds'

package/src/module/IPaint.ts

@@ -1,10 +1,11 @@
-import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage, IAround } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage, IAround, IPointData, IMatrixData } from '@leafer/interface'
 
 import { ILeafPaint, ILeafPaintPatternData } from '../type/IComputedType'
 import { IUI, IUIData } from '../IUI'
 import { ICachedShape } from '../ICachedShape'
 import { IGradientPaint, IImagePaint, IPaintAttr } from '../type/IType'
 
+
 export interface IPaintModule {
     compute(attrName: IPaintAttr, ui: IUI): void
 
@@ -30,6 +31,7 @@ export interface IPaintImageModule {
     recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap
 
     createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void
+    getPatternData(paint: IImagePaint, box: IBoundsData, image: ILeaferImage): ILeafPaintPatternData
     fillOrFitMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void
     clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void
     repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number, around: IAround): void
@@ -39,4 +41,5 @@ export interface IPaintGradientModule {
     linearGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint
     radialGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint
     conicGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint
+    getTransform(box: IBoundsData, from: IPointData, to: IPointData, stretch: number, rotate90: boolean): IMatrixData
 }

package/types/index.d.ts

@@ -1,6 +1,6 @@
-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';
+import { IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, ISizeData, IPathCommandData, IWindingRule, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, 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, 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';
+import { IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, ILeafList, IObject, ILeaf, IEditSize, IDragEvent, IZoomEvent, 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;
@@ -331,14 +331,14 @@ interface IEditorBase extends IGroup$1, ISelectorProxy {
     updateEditTool(): void;
     getEditSize(ui: ILeaf): IEditSize;
     onMove(e: IDragEvent): void;
-    onScale(e: IDragEvent): void;
+    onScale(e: IDragEvent | IZoomEvent): void;
     onRotate(e: IDragEvent | IRotateEvent): void;
     onSkew(e: IDragEvent): void;
     group(group?: IGroup$1 | IGroupInputData$1): IGroup$1;
     ungroup(): IUI$1[];
     openGroup(group: IGroup$1): void;
     closeGroup(group: IGroup$1): void;
-    openInnerEditor(): void;
+    openInnerEditor(target?: IUI$1): void;
     closeInnerEditor(): void;
     lock(): void;
     unlock(): void;
@@ -379,8 +379,8 @@ interface IEditorConfig {
     continuousSelect?: boolean;
     openInner?: 'double' | 'long';
     moveable?: boolean;
-    rotateable?: boolean;
-    resizeable?: boolean;
+    rotateable?: boolean | 'rotate';
+    resizeable?: boolean | 'zoom';
     skewable?: boolean;
 }
 interface IEditPoint extends IBox$1 {
@@ -524,10 +524,12 @@ interface IText extends ITextStyleAttrData, IUI {
     __: ITextData;
     text: string;
     padding: IFourNumber;
+    resizeFontSize: IBoolean;
 }
 interface ITextAttrData {
     text?: string;
     padding?: IFourNumber;
+    resizeFontSize?: boolean;
 }
 interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIData {
     __baseLine?: number;
@@ -623,14 +625,17 @@ interface IFrameInputData extends IBoxInputData {
 }
 interface IBox extends IGroup {
     __: IBoxData;
+    resizeChildren: IBoolean;
     overflow: IOverflow;
     __updateRectRenderBounds(): void;
     __renderGroup(canvas: ILeaferCanvas, options: IRenderOptions): void;
 }
 interface IBoxData extends IGroupData {
+    resizeChildren?: boolean;
     overflow?: IOverflow;
 }
 interface IBoxInputData extends IGroupInputData {
+    resizeChildren?: boolean;
     overflow?: IOverflow;
 }
 interface IGroup extends IUI {
@@ -677,8 +682,8 @@ interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEf
     createProxyData(): IUIInputData;
     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;
+    findOne(condition: number | string | IFindCondition | IFindUIMethod, options?: any): IUI | undefined;
+    findId(id: number | string): IUI | undefined;
     getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData;
     getPathString(curve?: boolean, pathForRender?: boolean): IPathString;
     load(): void;
@@ -705,6 +710,7 @@ interface IUIData extends IUIComputedData, ILeafData {
     __pixelFill?: boolean;
     __pixelStroke?: boolean;
     __isHitPixel?: boolean;
+    __isCanvas?: boolean;
     __opacityFill?: boolean;
     __opacityStroke?: boolean;
     __drawAfterFill?: boolean;
@@ -837,6 +843,7 @@ interface IPaintImageModule {
     createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): boolean;
     recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap;
     createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData$1): void;
+    getPatternData(paint: IImagePaint, box: IBoundsData$1, image: ILeaferImage): ILeafPaintPatternData;
     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): void;
@@ -845,6 +852,7 @@ interface IPaintGradientModule {
     linearGradient(paint: IGradientPaint, box: IBoundsData$1): ILeafPaint;
     radialGradient(paint: IGradientPaint, box: IBoundsData$1): ILeafPaint;
     conicGradient(paint: IGradientPaint, box: IBoundsData$1): ILeafPaint;
+    getTransform(box: IBoundsData$1, from: IPointData, to: IPointData, stretch: number, rotate90: boolean): IMatrixData;
 }
 
 interface IEffectModule {
@@ -854,4 +862,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, 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 };
+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, IEffectAttrData, IEffectComputedData, IEffectInputData, 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, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign };