@leafer-ui/interface 1.0.0-rc.4 → 1.0.0-rc.6

package/package.json

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

package/src/ICommonAttr.ts

@@ -1,4 +1,4 @@
-import { IPaint, IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, IUnitData } from './type/IType'
+import { IPaint, IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, IUnitData, ITextWrap } from './type/IType'
 import { ILeafStrokePaint, ILeafShadowEffect, ILeafPaint } from './type/IComputedType'
 import { IPaintString, IDashPatternString, IShadowString, IColorString, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
 
@@ -86,6 +86,7 @@ export interface ITextStyleAttrData {
     textAlign: ITextAlign
     verticalAlign: IVerticalAlign
 
+    textWrap: ITextWrap
     textOverflow: IOverflow | string
 }
 export interface ITextStyleInputData {
@@ -104,6 +105,7 @@ export interface ITextStyleInputData {
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
 
+    textWrap?: ITextWrap
     textOverflow?: IOverflow | string
 }
 export interface ITextStyleComputedData {
@@ -121,7 +123,9 @@ export interface ITextStyleComputedData {
 
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
-    textOverflow?: IOverflow
+
+    textWrap?: ITextWrap
+    textOverflow?: IOverflow | string
 }
 
 // effect---

package/src/IUI.ts

@@ -1,4 +1,4 @@
-import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IPathDrawer, IPointData, IPath2D, IPathCommandData, IWindingRule, ILeaferImageConfig, IBoundsData, IObject, __Number, IPathString, ILeaferImage, IBlob, IPathCreator } from '@leafer/interface'
+import { ILeaf, ILeafComputedData, ILeafData, ILeafDataOptions, ILeafInputData, ILeaferCanvas, IRenderOptions, IPathDrawer, IPointData, IPath2D, IPathCommandData, IWindingRule, ILeaferImageConfig, IBoundsData, IObject, __Number, IPathString, ILeaferImage, IBlob, IPathCreator, IFindMethod } from '@leafer/interface'
 
 import {
     IFillAttrData, IFillInputData, IFillComputedData,
@@ -124,6 +124,8 @@ export interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIDat
     __baseLine?: number
     __lineHeight?: number
     __letterSpacing?: number
+    __clipText?: boolean
+    __textBoxBounds?: IBoundsData
 }
 export interface ITextInputData extends ITextAttrData, ITextStyleInputData, IUIBaseInputData {
 
@@ -144,6 +146,7 @@ export interface ITextRowData {
     paraStart?: boolean // paragraph start
     paraEnd?: boolean // paragraph end
     isOverflow?: boolean
+    textMode?: boolean
 }
 
 export interface ITextWordData {
@@ -257,9 +260,19 @@ export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrDa
     __: IUIData
     parent?: IGroup
 
+    proxyData?: IUIInputData
+
+    reset(_data?: IUIInputData): void
+
     set(data: IUIInputData): void
     toJSON(): IUIInputData
 
+    get(options?: ILeafDataOptions): IUIInputData
+    getProxyData(): IUIInputData
+
+    find(condition: number | string | IFindMethod): IUI[]
+    findOne(condition: number | string | IFindMethod): IUI
+
     getPath(curve?: boolean): IPathCommandData
     getPathString(curve?: boolean): IPathString
 
@@ -279,13 +292,17 @@ export interface IUIData extends IUIComputedData, ILeafData {
     // 非数据属性, 自动计算的缓存数据
     __isFills?: boolean
     __isStrokes?: boolean
+
+    __pixelFill?: boolean // png / svg / webp
+    __pixelStroke?: boolean
+
+    __opacityFill?: boolean  // 半透明的
+    __opacityStroke?: boolean
+
     __drawAfterFill?: boolean
     __isOverflow?: boolean
     __blendLayer?: boolean
 
-    __isTranslucentFill?: boolean  // 半透明的
-    __isTranslucentStroke?: boolean
-
     __useEffect?: boolean
 
     // path

package/src/index.ts

@@ -18,7 +18,7 @@ export {
     IUI, IUIBaseInputData, IUIData,
     IUITag, IUIInputData
 } from './IUI'
-export { IUnitData, IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, IOverflow } from './type/IType'
+export { IUnitData, IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, IOverflow, ITextWrap } from './type/IType'
 export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IColorString as IStringColor } from './type/IStringType'
 export { ILeafFill, ILeafPaint, ILeafPaintPatternData, ILeafPaintColor, ILeafStrokePaint, ILeafShadowEffect } from './type/IComputedType'
 

package/src/type/IComputedType.ts

@@ -1,4 +1,4 @@
-import { IBlendMode, ILeaferImage, IMatrixData } from '@leafer/interface'
+import { IBlendMode, ILeaferImage, IMatrixData, ITaskItem } from '@leafer/interface'
 
 import { IColorString } from './IStringType'
 import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode } from './IType'
@@ -15,6 +15,7 @@ export interface ILeafPaint {
     image?: ILeaferImage
     loadId?: number
     patternId?: string
+    patternTask?: ITaskItem
     data?: ILeafPaintPatternData
 }
 

package/src/type/IType.ts

@@ -102,6 +102,7 @@ export type IFontWeightString =
     | 'extra-bold'
     | 'black'
 export type ITextDecoration = 'none' | 'under' | 'delete'
+export type ITextWrap = 'normal' | 'none' | 'break'
 
 // 路径
 export interface IVectorPath {

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IPointData, IExportFileType, IWindingRule, IPathCommandData, IBlendMode, IMatrixData, ILeaferImage, IBlob, ILeaf, IPathString, IPathCreator, IBoundsData, ILeaferImageConfig, ILeaferCanvas, IRenderOptions, IPathDrawer, ILeafData, IPath2D, ILeafComputedData, ILeafInputData, IObject, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap } from '@leafer/interface';
+import { IPointData, IExportFileType, IWindingRule, IPathCommandData, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, IBlob, ILeaf, IPathString, IPathCreator, IBoundsData, ILeaferImageConfig, ILeaferCanvas, IRenderOptions, ILeafDataOptions, IFindMethod, IPathDrawer, ILeafData, IPath2D, ILeafComputedData, ILeafInputData, IObject, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap } from '@leafer/interface';
 export * from '@leafer/interface';
 
 type IPercent = string;
@@ -80,6 +80,7 @@ type IFontWeight = IFontWeightNumer | IFontWeightString;
 type IFontWeightNumer = 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;
 type IFontWeightString = 'thin' | 'extra-light' | 'light' | 'normal' | 'medium' | 'semi-bold' | 'bold' | 'extra-bold' | 'black';
 type ITextDecoration = 'none' | 'under' | 'delete';
+type ITextWrap = 'normal' | 'none' | 'break';
 interface IVectorPath {
     rule?: IWindingRule;
     data: string | IPathCommandData;
@@ -114,6 +115,7 @@ interface ILeafPaint {
     image?: ILeaferImage;
     loadId?: number;
     patternId?: string;
+    patternTask?: ITaskItem;
     data?: ILeafPaintPatternData;
 }
 interface ILeafPaintPatternData {
@@ -213,6 +215,7 @@ interface ITextStyleAttrData {
     paraSpacing: number;
     textAlign: ITextAlign;
     verticalAlign: IVerticalAlign;
+    textWrap: ITextWrap;
     textOverflow: IOverflow | string;
 }
 interface ITextStyleInputData {
@@ -228,6 +231,7 @@ interface ITextStyleInputData {
     paraSpacing?: number;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
+    textWrap?: ITextWrap;
     textOverflow?: IOverflow | string;
 }
 interface ITextStyleComputedData {
@@ -243,7 +247,8 @@ interface ITextStyleComputedData {
     paraSpacing?: number;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
-    textOverflow?: IOverflow;
+    textWrap?: ITextWrap;
+    textOverflow?: IOverflow | string;
 }
 interface IEffectAttrData {
     shadow: IShadowEffect | IShadowEffect[] | IShadowString;
@@ -380,6 +385,8 @@ interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIData {
     __baseLine?: number;
     __lineHeight?: number;
     __letterSpacing?: number;
+    __clipText?: boolean;
+    __textBoxBounds?: IBoundsData;
 }
 interface ITextInputData extends ITextAttrData, ITextStyleInputData, IUIBaseInputData {
 }
@@ -396,6 +403,7 @@ interface ITextRowData {
     paraStart?: boolean;
     paraEnd?: boolean;
     isOverflow?: boolean;
+    textMode?: boolean;
 }
 interface ITextWordData {
     x?: number;
@@ -491,8 +499,14 @@ interface IGroupInputData extends IUIBaseInputData {
 interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEffectAttrData, ILeaf {
     __: IUIData;
     parent?: IGroup;
+    proxyData?: IUIInputData;
+    reset(_data?: IUIInputData): void;
     set(data: IUIInputData): void;
     toJSON(): IUIInputData;
+    get(options?: ILeafDataOptions): IUIInputData;
+    getProxyData(): IUIInputData;
+    find(condition: number | string | IFindMethod): IUI[];
+    findOne(condition: number | string | IFindMethod): IUI;
     getPath(curve?: boolean): IPathCommandData;
     getPathString(curve?: boolean): IPathString;
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void;
@@ -505,11 +519,13 @@ interface IUIData extends IUIComputedData, ILeafData {
     locked?: boolean;
     __isFills?: boolean;
     __isStrokes?: boolean;
+    __pixelFill?: boolean;
+    __pixelStroke?: boolean;
+    __opacityFill?: boolean;
+    __opacityStroke?: boolean;
     __drawAfterFill?: boolean;
     __isOverflow?: boolean;
     __blendLayer?: boolean;
-    __isTranslucentFill?: boolean;
-    __isTranslucentStroke?: boolean;
     __useEffect?: boolean;
     path?: IPathCommandData;
     windingRule?: IWindingRule;
@@ -594,4 +610,4 @@ interface IEffectModule {
     backgroundBlur?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, renderOptions: IRenderOptions): void;
 }
 
-export type { IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, ICornerRadiusString, IDashPatternString, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IExportOptions, IExportResult, IExportResultFunction, IFontWeight, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGradientPaint, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintModule, IPaintString, IPath, IPathData, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IShadowEffect, IShadowString, IStar, IStarData, IStarInputData, IColorString as IStringColor, IStrokeAlign, IStrokeCap, IStrokeJoin, IStrokeWidthString, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextWordData, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIRenderModule, IUITag, IUnitData, IVectorPath, IVerticalAlign };
+export type { IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, ICornerRadiusString, IDashPatternString, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IExportOptions, IExportResult, IExportResultFunction, IFontWeight, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGradientPaint, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintModule, IPaintString, IPath, IPathData, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IShadowEffect, IShadowString, IStar, IStarData, IStarInputData, IColorString as IStringColor, 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 };