@leafer-ui/interface 1.0.0-alpha.7 → 1.0.0-alpha.9

package/package.json

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

package/src/ICommonAttr.ts

@@ -1,14 +1,14 @@
 import { IPaint, IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect } from './type/IType'
 import { ILeafStrokePaint, ILeafShadowEffect, ILeafPaint } from './type/IComputedType'
-import { IPaintString, IDashPatternString, IPercent, IShadowString, IStringColor, IBorderWidthString, IBorderRadiusString } from './type/IStringType'
+import { IPaintString, IDashPatternString, IPercent, IShadowString, IStringColor, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
 
 // corner---
 export interface ICornerRadiusAttrData {
-    cornerRadius: number
+    cornerRadius: number | number[] | ICornerRadiusString
     cornerSmoothing: number
 }
 export interface ICornerRadiusInputData {
-    cornerRadius?: number
+    cornerRadius?: number | number[] | ICornerRadiusString
     cornerSmoothing?: number
 }
 export interface ICornerRadiusComputedData {
@@ -28,14 +28,6 @@ export interface IFillComputedData {
 }
 
 // border 
-export interface IBorderAttrData {
-    borderWidth: number | number[] | IBorderWidthString
-    borderRadius: number | number[] | IBorderRadiusString
-}
-export interface IBorderInputData {
-    borderWidth?: number | number[]
-    borderRadius?: number | number[]
-}
 export interface IBorderComputedData {
     borderWidth?: number | number[]
     borderRadius?: number | number[]
@@ -46,7 +38,7 @@ export interface IStrokeAttrData {
     stroke: IPaint | IPaint[] | IPaintString
 
     strokeAlign: IStrokeAlign
-    strokeWidth: number
+    strokeWidth: number | number[] | IStrokeWidthString
     strokeCap: IStrokeCap
     strokeJoin: IStrokeJoin
     dashPattern: number[] | IDashPatternString
@@ -57,7 +49,7 @@ export interface IStrokeInputData {
     stroke?: IPaint | IPaint[] | IPaintString
 
     strokeAlign?: IStrokeAlign
-    strokeWidth?: number
+    strokeWidth?: number | number[] | IStrokeWidthString
     strokeCap?: IStrokeCap
     strokeJoin?: IStrokeJoin
     dashPattern?: number[] | IDashPatternString

package/src/IUI.ts

@@ -1,16 +1,16 @@
-import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, ICanvasDrawPath, IPointData, IPath2D, IPathCommandData, IBranch, ILeaferImageConfig, IMatrixData, IBoundsData } from '@leafer/interface'
+import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IPathDrawer, IPointData, IPath2D, IPathCommandData, IWindingRule, IBranch, ILeaferImageConfig, IMatrixData, IBoundsData, __Number } from '@leafer/interface'
 
 import { IPathString, IVectorPathString } from './type/IStringType'
-import { IBlendMode, IWindingRule } from './type/IType'
+import { IBlendMode } from './type/IType'
 import { IVectorPath } from './type/IType'
 
 import {
     IFillAttrData, IFillInputData, IFillComputedData,
-    IBorderComputedData, IBorderInputData,
+    IBorderComputedData,
     ICornerRadiusAttrData, ICornerRadiusInputData, ICornerRadiusComputedData,
     IStrokeAttrData, IStrokeComputedData, IStrokeInputData,
     IEffectAttrData, IEffectInputData, IEffectComputedData,
-    ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData, IBorderAttrData
+    ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData
 } from './ICommonAttr'
 
 
@@ -165,7 +165,7 @@ export interface IGroupData extends IUIData { }
 export interface IGroupInputData extends IUIInputData { }
 
 // UI
-export interface IUI extends IFillAttrData, IBorderAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEffectAttrData, ILeaf {
+export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEffectAttrData, ILeaf {
     __: IUIData
     root?: IGroup
     parent?: IGroup
@@ -173,7 +173,7 @@ export interface IUI extends IFillAttrData, IBorderAttrData, IStrokeAttrData, IC
     readonly relativeTransform: IMatrixData
     readonly worldBoxBounds: IBoundsData
     readonly worldRenderBounds: IBoundsData
-    __drawPathByData(drawer: ICanvasDrawPath, data: IPathCommandData): void
+    __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void
 }
 
 export interface IUIData extends IUIComputedData, ILeafData {
@@ -190,8 +190,8 @@ export interface IUIData extends IUIComputedData, ILeafData {
     path?: IPathCommandData
     windingRule?: IWindingRule
 
-    __renderPath?: IPathCommandData
-    __renderPath2D?: IPath2D
+    __pathForRender?: IPathCommandData
+    __path2DForRender?: IPath2D
 
     __strokeOuterWidth?: number // boxBounds外面的笔触宽度
 }
@@ -201,7 +201,7 @@ export interface IUIComputedData extends IFillComputedData, IBorderComputedData,
     locked?: boolean
 }
 
-export interface IUIInputData extends IFillInputData, IBorderInputData, IStrokeInputData, ICornerRadiusInputData, IEffectInputData, ILeafInputData {
+export interface IUIInputData extends IFillInputData, IStrokeInputData, ICornerRadiusInputData, IEffectInputData, ILeafInputData {
     blendMode?: IBlendMode
     mask?: boolean
     locked?: boolean

package/src/index.ts

@@ -14,8 +14,8 @@ export {
     IGroup, IGroupInputData, IGroupData,
     IUI, IUIInputData, IUIData
 } from './IUI'
-export { IBlendMode, IVectorPath, IWindingRule, IShadowEffect, IBlurEffect, IGrayscaleEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IColor, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration } from './type/IType'
-export { IBorderRadiusString, IBorderWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IPathString, IVectorPathString, IStringColor } from './type/IStringType'
+export { IBlendMode, IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IColor, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration } from './type/IType'
+export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IPathString, IVectorPathString, IStringColor } from './type/IStringType'
 export { ILeafFill, ILeafPaint, ILeafPaintColor, ILeafStrokePaint, ILeafShadowEffect } from './type/IComputedType'
 
 export { IUIRenderModule, IRectRenderModule, IGroupRenderModule, IFrameRenderModule } from './module/IUIRender'

package/src/type/IStringType.ts

@@ -2,8 +2,8 @@ export type IPercent = string
 
 export type IStringColor = string
 
-export type IBorderRadiusString = string
-export type IBorderWidthString = string
+export type ICornerRadiusString = string
+export type IStrokeWidthString = string
 export type IDashPatternString = string
 export type IVectorPathString = string
 export type IPathString = string

package/src/type/IType.ts

@@ -1,4 +1,4 @@
-import { IMatrixData, IPointData, IPathCommandData } from '@leafer/interface'
+import { IMatrixData, IPointData, IPathCommandData, IWindingRule } from '@leafer/interface'
 import { IStringColor } from './IStringType'
 
 export type IBlendMode =
@@ -118,8 +118,6 @@ export interface IVectorPath {
     rule?: IWindingRule,
     data: string | IPathCommandData
 }
-export type IWindingRule = 'nonzero' | 'evenodd'
-
 
 // 特效
 export interface IShadowEffect {