@leafer-ui/interface 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/interface",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "@leafer-ui/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -13,15 +13,15 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/leaferjs/ui.git"
+    "url": "https://github.com/leaferjs/leafer-ui.git"
   },
-  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/interface",
-  "bugs": "https://github.com/leaferjs/ui/issues",
+  "homepage": "https://github.com/leaferjs/leafer-ui/tree/main/packages/interface",
+  "bugs": "https://github.com/leaferjs/leafer-ui/issues",
   "keywords": [
     "leafer-ui",
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/interface": "1.0.4"
+    "@leafer/interface": "1.0.6"
   }
 }

package/src/ICommonAttr.ts

@@ -99,6 +99,7 @@ export interface ITextStyleAttrData {
 
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
+    autoSizeAlign?: IBoolean
 
     textWrap?: ITextWrap
     textOverflow?: IOverflow | string
@@ -118,6 +119,7 @@ export interface ITextStyleInputData {
 
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
+    autoSizeAlign?: IBoolean
 
     textWrap?: ITextWrap
     textOverflow?: IOverflow | string
@@ -137,6 +139,7 @@ export interface ITextStyleComputedData {
 
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
+    autoSizeAlign?: boolean // 自动宽高的文本，是否仍进行整体对齐操作
 
     textWrap?: ITextWrap
     textOverflow?: IOverflow | string

package/src/IUI.ts

@@ -20,7 +20,7 @@ export interface ILine extends ILineAttrData, IUI {
 
 interface ILineAttrData {
     toPoint?: IPointData
-    points?: number[]
+    points?: number[] | IPointData[]
     curve?: boolean | number
 }
 export interface ILineData extends ILineAttrData, IUIData { }
@@ -159,7 +159,7 @@ export interface IPolygon extends IPolygonAttrData, IUI {
 }
 interface IPolygonAttrData {
     sides?: number
-    points?: number[]
+    points?: number[] | IPointData[]
     curve?: boolean | number
 }
 export interface IPolygonData extends IPolygonAttrData, IUIData { }
@@ -262,6 +262,7 @@ export interface ITextDrawData {
     rows: ITextRowData[]
     paraNumber: number
     font: string
+    maxWidth?: number // 获取最大的行宽，自动宽度 且非 autoSizeAlign 时才有值
     decorationY?: number
     decorationHeight?: number
     overflow?: number // overflowed row number, not index
@@ -334,6 +335,7 @@ export interface IBox extends IBoxAttrData, IGroup {
 interface IBoxAttrData {
     overflow?: IOverflow
     resizeChildren?: IBoolean
+    textBox?: IBoolean // 编辑器中，textBox双击会直接进入编辑文本状态，如便利贴文本
 }
 export interface IBoxData extends IBoxAttrData, IGroupData { }
 export interface IBoxInputData extends IBoxAttrData, IGroupInputData { }
@@ -344,12 +346,12 @@ export interface IGroup extends IUI {
     __: IGroupData
     children: IUI[]
     pick(hitPoint: IPointData, options?: IPickOptions): IPickResult
-    add(child: IUI, index?: number): void
-    addAt(child: IUI, index: number): void
-    addAfter(child: IUI, after: IUI): void
-    addBefore(child: IUI, before: IUI): void
-    addMany(...children: ILeaf[]): void
-    remove(child?: IUI): void
+    add(child: IUI | IUI[] | IUIInputData | IUIInputData[], index?: number): void
+    addAt(child: IUI | IUI[] | IUIInputData | IUIInputData[], index: number): void
+    addAfter(child: IUI | IUI[] | IUIInputData | IUIInputData[], after: IUI): void
+    addBefore(child: IUI | IUI[] | IUIInputData | IUIInputData[], before: IUI): void
+    addMany(...children: ILeaf[] | IUIInputData[]): void
+    remove(child?: IUI | number | string | IFindCondition | IFindUIMethod): void
     removeAll(): void
     clear(): void
 }
@@ -365,6 +367,7 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     parent?: IGroup
     zoomLayer?: IGroup
     readonly isFrame?: boolean
+    isOverflow?: boolean
 
     proxyData?: IUIInputData
     __proxyData?: IUIInputData
@@ -403,6 +406,7 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void
     __drawPathByBox(drawer: IPathDrawer): void
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation, options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate
     killAnimate(type?: IAnimateType): void
@@ -455,6 +459,8 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __isStrokes?: boolean
 
     readonly __strokeWidth: number
+    readonly __hasStroke: boolean
+
 
     __pixelFill?: boolean // png / svg / webp
     __pixelStroke?: boolean
@@ -466,16 +472,18 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __opacityStroke?: boolean
 
     __drawAfterFill?: boolean
+    readonly __clipAfterFill?: boolean
+
     __isOverflow?: boolean
     __blendLayer?: boolean
 
-    __boxStroke?: boolean
+    __boxStroke?: boolean // box闭合描边，可不用计算miterLimit造成的渲染包围盒变化
 
     // text
     __font?: string
     __textDrawData?: ITextDrawData
 
-    __needComputePaint: boolean
+    __needComputePaint?: boolean
     __computePaint(): void
 }
 export interface IUIComputedData extends IUIAttrData, IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {

package/src/editor/IEditor.ts

@@ -20,6 +20,7 @@ export interface IEditorBase extends IGroup, ISelectorProxy {
     readonly single: boolean
 
     readonly dragging: boolean
+    readonly moving: boolean
 
     element?: IUI
     buttons: IGroup
@@ -53,7 +54,7 @@ export interface IEditorBase extends IGroup, ISelectorProxy {
     openGroup(group: IGroup): void
     closeGroup(group: IGroup): void
 
-    openInnerEditor(target?: IUI): void
+    openInnerEditor(target?: IUI, select?: boolean): void
     closeInnerEditor(): void
 
     lock(): void

package/src/module/IUIRender.ts

@@ -6,6 +6,7 @@ export type IUIRenderModule = IUIRender & ThisType<IUI>
 
 export interface IUIRender extends ILeafRender {
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void
 }
 
 export type IRectRenderModule = IRectRender & ThisType<IRect>

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, ISizeData, IPathCommandData, IWindingRule, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IObject, IEventer, IEventMap, IPercentData, IBoundsData as IBoundsData$1, IPathCreator, ILeaferCanvas, ICanvasContext2D, ICanvasContext2DSettings, IRenderOptions, IPickOptions, IPickResult, ILeaf as ILeaf$1, IJSONOptions, IValue, IFindCondition, IPathString, IPathDrawer, IExportOptions, IExportResult, IAnswer, ILeafData, ILeafComputedData, ILeafInputData, ILeaferAttrData, IControl, ILeaferConfig, ILeaferType, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap, IAround } from '@leafer/interface';
+import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, ISizeData, IPathCommandData, IWindingRule, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IObject, IEventer, IEventMap, IPercentData, IBoundsData as IBoundsData$1, IPathCreator, ILeaferCanvas, ICanvasContext2D, ICanvasContext2DSettings, IRenderOptions, IPickOptions, IPickResult, ILeaf as ILeaf$1, IFindCondition, IJSONOptions, IValue, IPathString, IPathDrawer, IExportOptions, IExportResult, IAnswer, ILeafData, ILeafComputedData, ILeafInputData, ILeaferAttrData, IControl, ILeaferConfig, ILeaferType, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap, IAround } from '@leafer/interface';
 export * from '@leafer/interface';
 import { IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, ILeafList, IObject as IObject$1, 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, IColorString as IColorString$1, IDirection4, ICursorType, IImageCursor, IAlign as IAlign$1, IUnitPointData as IUnitPointData$1, IUIInputData as IUIInputData$1, IBox as IBox$1, IRect as IRect$1, IBoundsData, IKeyEvent, IStateName as IStateName$1, IString as IString$1, IBoolean as IBoolean$1, IStateStyle as IStateStyle$1 } from '@leafer-ui/interface';
 
@@ -246,6 +246,7 @@ interface ITextStyleAttrData {
     paraSpacing?: INumber;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
+    autoSizeAlign?: IBoolean;
     textWrap?: ITextWrap;
     textOverflow?: IOverflow | string;
 }
@@ -262,6 +263,7 @@ interface ITextStyleInputData {
     paraSpacing?: INumber;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
+    autoSizeAlign?: IBoolean;
     textWrap?: ITextWrap;
     textOverflow?: IOverflow | string;
 }
@@ -278,6 +280,7 @@ interface ITextStyleComputedData {
     paraSpacing?: number;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
+    autoSizeAlign?: boolean;
     textWrap?: ITextWrap;
     textOverflow?: IOverflow | string;
 }
@@ -417,6 +420,7 @@ interface IEditorBase extends IGroup$1, ISelectorProxy {
     readonly multiple: boolean;
     readonly single: boolean;
     readonly dragging: boolean;
+    readonly moving: boolean;
     element?: IUI$1;
     buttons: IGroup$1;
     selector: IGroup$1;
@@ -441,7 +445,7 @@ interface IEditorBase extends IGroup$1, ISelectorProxy {
     ungroup(): IUI$1[];
     openGroup(group: IGroup$1): void;
     closeGroup(group: IGroup$1): void;
-    openInnerEditor(target?: IUI$1): void;
+    openInnerEditor(target?: IUI$1, select?: boolean): void;
     closeInnerEditor(): void;
     lock(): void;
     unlock(): void;
@@ -536,7 +540,7 @@ interface ILine extends ILineAttrData, IUI {
 }
 interface ILineAttrData {
     toPoint?: IPointData;
-    points?: number[];
+    points?: number[] | IPointData[];
     curve?: boolean | number;
 }
 interface ILineData extends ILineAttrData, IUIData {
@@ -649,7 +653,7 @@ interface IPolygon extends IPolygonAttrData, IUI {
 }
 interface IPolygonAttrData {
     sides?: number;
-    points?: number[];
+    points?: number[] | IPointData[];
     curve?: boolean | number;
 }
 interface IPolygonData extends IPolygonAttrData, IUIData {
@@ -737,6 +741,7 @@ interface ITextDrawData {
     rows: ITextRowData[];
     paraNumber: number;
     font: string;
+    maxWidth?: number;
     decorationY?: number;
     decorationHeight?: number;
     overflow?: number;
@@ -792,6 +797,7 @@ interface IBox extends IBoxAttrData, IGroup {
 interface IBoxAttrData {
     overflow?: IOverflow;
     resizeChildren?: IBoolean;
+    textBox?: IBoolean;
 }
 interface IBoxData extends IBoxAttrData, IGroupData {
 }
@@ -801,12 +807,12 @@ interface IGroup extends IUI {
     __: IGroupData;
     children: IUI[];
     pick(hitPoint: IPointData, options?: IPickOptions): IPickResult;
-    add(child: IUI, index?: number): void;
-    addAt(child: IUI, index: number): void;
-    addAfter(child: IUI, after: IUI): void;
-    addBefore(child: IUI, before: IUI): void;
-    addMany(...children: ILeaf$1[]): void;
-    remove(child?: IUI): void;
+    add(child: IUI | IUI[] | IUIInputData | IUIInputData[], index?: number): void;
+    addAt(child: IUI | IUI[] | IUIInputData | IUIInputData[], index: number): void;
+    addAfter(child: IUI | IUI[] | IUIInputData | IUIInputData[], after: IUI): void;
+    addBefore(child: IUI | IUI[] | IUIInputData | IUIInputData[], before: IUI): void;
+    addMany(...children: ILeaf$1[] | IUIInputData[]): void;
+    remove(child?: IUI | number | string | IFindCondition | IFindUIMethod): void;
     removeAll(): void;
     clear(): void;
 }
@@ -821,6 +827,7 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     parent?: IGroup;
     zoomLayer?: IGroup;
     readonly isFrame?: boolean;
+    isOverflow?: boolean;
     proxyData?: IUIInputData;
     __proxyData?: IUIInputData;
     animation?: IAnimation;
@@ -846,6 +853,7 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void;
     __drawPathByBox(drawer: IPathDrawer): void;
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void;
+    __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void;
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation, options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate;
     killAnimate(type?: IAnimateType): void;
     export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
@@ -878,6 +886,7 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __isFills?: boolean;
     __isStrokes?: boolean;
     readonly __strokeWidth: number;
+    readonly __hasStroke: boolean;
     __pixelFill?: boolean;
     __pixelStroke?: boolean;
     __isHitPixel?: boolean;
@@ -885,12 +894,13 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __opacityFill?: boolean;
     __opacityStroke?: boolean;
     __drawAfterFill?: boolean;
+    readonly __clipAfterFill?: boolean;
     __isOverflow?: boolean;
     __blendLayer?: boolean;
     __boxStroke?: boolean;
     __font?: string;
     __textDrawData?: ITextDrawData;
-    __needComputePaint: boolean;
+    __needComputePaint?: boolean;
     __computePaint(): void;
 }
 interface IUIComputedData extends IUIAttrData, IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {
@@ -935,6 +945,7 @@ interface IAppConfig extends ILeaferConfig {
 type IUIRenderModule = IUIRender & ThisType<IUI>;
 interface IUIRender extends ILeafRender {
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void;
+    __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void;
 }
 type IRectRenderModule = IRectRender & ThisType<IRect>;
 interface IRectRender extends IUIRender {