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

package/package.json

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

package/src/canvas/IHitCanvasManager.ts

@@ -5,5 +5,5 @@ import { IHitCanvas, ILeaferCanvasConfig } from './ILeaferCanvas'
 export interface IHitCanvasManager extends ICanvasManager {
     maxTotal: number // 最多缓存多少张画布
     getPathType(leaf: ILeaf): IHitCanvas
-    getPixelType(leaf: ILeaf, config: ILeaferCanvasConfig): IHitCanvas
+    getPixelType(leaf: ILeaf, config?: ILeaferCanvasConfig): IHitCanvas
 }

package/src/display/ILeaf.ts

@@ -70,7 +70,7 @@ export interface ILeafAttrData {
 
     path: IPathCommandData | IPathString
     windingRule: IWindingRule
-    closed: boolean
+    closed: IBoolean
 
     // auto layout
     flow: IFlowType
@@ -83,6 +83,7 @@ export interface ILeafAttrData {
     inFlow: IBoolean
     autoWidth: IAutoSize
     autoHeight: IAutoSize
+    lockRatio: IBoolean
     autoBox: IAutoBoxData | IConstraint
 
     widthRange: IRangeSize
@@ -110,6 +111,9 @@ export interface ILeafAttrData {
     focusStyle: ILeafInputData
     selectedStyle: ILeafInputData
     disabledStyle: ILeafInputData
+
+    // 预留给用户使用的数据对象
+    data: IObject
 }
 
 
@@ -324,7 +328,7 @@ export interface ILeafInputData {
 
     path?: IPathCommandData | IPathString
     windingRule?: IWindingRule
-    closed?: boolean
+    closed?: IBoolean
 
     // auto layout
     flow?: IFlowType
@@ -337,6 +341,7 @@ export interface ILeafInputData {
     inFlow?: IBoolean
     autoWidth?: IAutoSize
     autoHeight?: IAutoSize
+    lockRatio?: IBoolean
     autoBox?: IAutoBoxData | IConstraint
 
     widthRange?: IRangeSize
@@ -365,6 +370,9 @@ export interface ILeafInputData {
     selectedStyle?: ILeafInputData
     disabledStyle?: ILeafInputData
 
+    // 预留给用户使用的数据对象
+    data?: IObject
+
     children?: ILeafInputData[]
 
     // other
@@ -424,6 +432,7 @@ export interface ILeafComputedData {
     inFlow?: boolean
     autoWidth?: IAutoSize
     autoHeight?: IAutoSize
+    lockRatio?: boolean
     autoBox?: IAutoBoxData | IConstraint
 
     widthRange?: IRangeSize
@@ -452,6 +461,10 @@ export interface ILeafComputedData {
     selectedStyle?: ILeafInputData
     disabledStyle?: ILeafInputData
 
+
+    // 预留给用户使用的数据对象
+    data?: IObject
+
     // other
     __childBranchNumber?: number // 存在子分支的个数
     __complex?: boolean // 外观是否复杂
@@ -563,10 +576,15 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     set(data: IObject): void
     get(name?: string | string[] | IObject): ILeafInputData | IValue
+    setAttr(name: string, value: any): void
+    getAttr(name: string): any
+    getComputedAttr(name: string): any
+
     toJSON(): IObject
     toString(): string
-    toSVG?(): string
-    toHTML?(): string
+    toSVG(): string
+    __SVG(data: IObject): void
+    toHTML(): string
 
     // ILeafData ->
     __setAttr(attrName: string, newValue: IValue, checkFiniteNumber?: boolean): boolean
@@ -577,8 +595,8 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     // find
     find(condition: number | string | IFindMethod, options?: any): ILeaf[]
     findTag(tag: string | string[]): ILeaf[]
-    findOne(condition: number | string | IFindMethod, options?: any): ILeaf
-    findId(id: number | string): ILeaf
+    findOne(condition: number | string | IFindMethod, options?: any): ILeaf | undefined
+    findId(id: number | string): ILeaf | undefined
 
     focus(value?: boolean): void
     forceUpdate(attrName?: string): void
@@ -648,9 +666,9 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     transform(transform?: IMatrixData, resize?: boolean): void
 
     move(x: number | IPointData, y?: number): void
-    scaleOf(origin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void
-    rotateOf(origin: IPointData, rotation: number): void
-    skewOf(origin: IPointData, skewX: number, skewY?: number, resize?: boolean): void
+    scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void
+    rotateOf(origin: IPointData | IAlign, rotation: number): void
+    skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean): void
 
     transformWorld(worldTransform?: IMatrixData, resize?: boolean): void
     moveWorld(x: number | IPointData, y?: number): void
@@ -661,6 +679,9 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     scaleResize(scaleX: number, scaleY: number, noResize?: boolean): void
     __scaleResize(scaleX: number, scaleY: number): void
 
+    resizeWidth(width: number): void
+    resizeHeight(height: number): void
+
     // ILeafHit ->
     __hitWorld(point: IRadiusPointData): boolean
     __hit(local: IRadiusPointData): boolean

package/src/event/IUIEvent.ts

@@ -3,7 +3,7 @@ import { ILeafList } from '../data/IList'
 import { IEvent } from './IEvent'
 import { ILeaferImage } from '../image/ILeaferImage'
 import { ILeaf } from '../display/ILeaf'
-import { IPointData } from '../math/IMath'
+import { IPointData, IBoundsData } from '../math/IMath'
 
 export interface IUIEvent extends IEvent {
     x: number
@@ -55,6 +55,8 @@ export interface IDragEvent extends IPointerEvent {
     getPageTotal?(): IPointData
     getInnerTotal?(relative?: ILeaf): IPointData
     getLocalTotal?(relative?: ILeaf): IPointData
+
+    getPageBounds?(): IBoundsData
 }
 
 export interface IDropEvent extends IPointerEvent {

package/src/interaction/IInteraction.ts

@@ -86,6 +86,7 @@ export interface IInteractionConfig {
     zoom?: IZoomConfig
     move?: IMoveConfig
     eventer?: IObject
+    keyEvent?: boolean
 }
 
 export interface IZoomConfig {

package/src/math/IMath.ts

@@ -103,6 +103,7 @@ export interface IBounds extends IBoundsData, ITwoPointBoundsData {
     addListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds
     setListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds
 
+    setPoint(point: IPointData): IBounds
     setPoints(points: IPointData[]): IBounds
     addPoint(point: IPointData): IBounds
     getPoints(): IPointData[] // topLeft, topRight, bottomRight, bottomLeft

package/src/platform/IPlatform.ts

@@ -9,6 +9,7 @@ import { ICanvasType } from '../canvas/ISkiaCanvas'
 export interface IPlatform {
     name?: 'web' | 'node' | 'miniapp'
     os?: 'Mac' | 'Windows' | 'Linux'
+    toURL(text: string, fileType?: 'text' | 'svg'): string
     requestRender?(render: IFunction): void
     canvas?: ILeaferCanvas
     canvasType?: ICanvasType
@@ -18,7 +19,7 @@ export interface IPlatform {
     intWheelDeltaY?: boolean // firefox / Windows need
     conicGradientSupport?: boolean
     conicGradientRotate90?: boolean // firefox need rotate
-    fullImageShadow?: boolean // safari need 
+    fullImageShadow?: boolean // safari need
     syncDomFont?: boolean // firefox need
     layout?(target: ILeaf): void
     origin?: {

package/types/index.d.ts

@@ -82,6 +82,7 @@ interface IBounds extends IBoundsData, ITwoPointBoundsData {
     setList(boundsList: IBoundsData[]): IBounds;
     addListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds;
     setListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds;
+    setPoint(point: IPointData): IBounds;
     setPoints(points: IPointData[]): IBounds;
     addPoint(point: IPointData): IBounds;
     getPoints(): IPointData[];
@@ -1255,7 +1256,7 @@ interface ILeafAttrData {
     pixelRatio: INumber;
     path: IPathCommandData | IPathString;
     windingRule: IWindingRule;
-    closed: boolean;
+    closed: IBoolean;
     flow: IFlowType;
     padding: IFourNumber;
     gap: IGap | IPointGap;
@@ -1265,6 +1266,7 @@ interface ILeafAttrData {
     inFlow: IBoolean;
     autoWidth: IAutoSize;
     autoHeight: IAutoSize;
+    lockRatio: IBoolean;
     autoBox: IAutoBoxData | IConstraint;
     widthRange: IRangeSize;
     heightRange: IRangeSize;
@@ -1285,6 +1287,7 @@ interface ILeafAttrData {
     focusStyle: ILeafInputData;
     selectedStyle: ILeafInputData;
     disabledStyle: ILeafInputData;
+    data: IObject;
 }
 type IAxis = 'x' | 'y';
 type IAxisReverse = 'x-reverse' | 'y-reverse';
@@ -1371,7 +1374,7 @@ interface ILeafInputData {
     pixelRatio?: INumber;
     path?: IPathCommandData | IPathString;
     windingRule?: IWindingRule;
-    closed?: boolean;
+    closed?: IBoolean;
     flow?: IFlowType;
     padding?: IFourNumber;
     gap?: IGap | IPointGap;
@@ -1381,6 +1384,7 @@ interface ILeafInputData {
     inFlow?: IBoolean;
     autoWidth?: IAutoSize;
     autoHeight?: IAutoSize;
+    lockRatio?: IBoolean;
     autoBox?: IAutoBoxData | IConstraint;
     widthRange?: IRangeSize;
     heightRange?: IRangeSize;
@@ -1401,6 +1405,7 @@ interface ILeafInputData {
     focusStyle?: ILeafInputData;
     selectedStyle?: ILeafInputData;
     disabledStyle?: ILeafInputData;
+    data?: IObject;
     children?: ILeafInputData[];
     noBounds?: boolean;
 }
@@ -1446,6 +1451,7 @@ interface ILeafComputedData {
     inFlow?: boolean;
     autoWidth?: IAutoSize;
     autoHeight?: IAutoSize;
+    lockRatio?: boolean;
     autoBox?: IAutoBoxData | IConstraint;
     widthRange?: IRangeSize;
     heightRange?: IRangeSize;
@@ -1466,6 +1472,7 @@ interface ILeafComputedData {
     focusStyle?: ILeafInputData;
     selectedStyle?: ILeafInputData;
     disabledStyle?: ILeafInputData;
+    data?: IObject;
     __childBranchNumber?: number;
     __complex?: boolean;
     __naturalWidth?: number;
@@ -1544,18 +1551,22 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     __bindLeafer(leafer: ILeaferBase | null): void;
     set(data: IObject): void;
     get(name?: string | string[] | IObject): ILeafInputData | IValue;
+    setAttr(name: string, value: any): void;
+    getAttr(name: string): any;
+    getComputedAttr(name: string): any;
     toJSON(): IObject;
     toString(): string;
-    toSVG?(): string;
-    toHTML?(): string;
+    toSVG(): string;
+    __SVG(data: IObject): void;
+    toHTML(): string;
     __setAttr(attrName: string, newValue: IValue, checkFiniteNumber?: boolean): boolean;
     __getAttr(attrName: string): IValue;
     setProxyAttr(name: string, newValue: IValue): void;
     getProxyAttr(name: string): IValue;
     find(condition: number | string | IFindMethod, options?: any): ILeaf[];
     findTag(tag: string | string[]): ILeaf[];
-    findOne(condition: number | string | IFindMethod, options?: any): ILeaf;
-    findId(id: number | string): ILeaf;
+    findOne(condition: number | string | IFindMethod, options?: any): ILeaf | undefined;
+    findId(id: number | string): ILeaf | undefined;
     focus(value?: boolean): void;
     forceUpdate(attrName?: string): void;
     updateLayout(): void;
@@ -1601,9 +1612,9 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     setTransform(transform?: IMatrixData, resize?: boolean): void;
     transform(transform?: IMatrixData, resize?: boolean): void;
     move(x: number | IPointData, y?: number): void;
-    scaleOf(origin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
-    rotateOf(origin: IPointData, rotation: number): void;
-    skewOf(origin: IPointData, skewX: number, skewY?: number, resize?: boolean): void;
+    scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void;
+    rotateOf(origin: IPointData | IAlign, rotation: number): void;
+    skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean): void;
     transformWorld(worldTransform?: IMatrixData, resize?: boolean): void;
     moveWorld(x: number | IPointData, y?: number): void;
     scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
@@ -1611,6 +1622,8 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void;
     scaleResize(scaleX: number, scaleY: number, noResize?: boolean): void;
     __scaleResize(scaleX: number, scaleY: number): void;
+    resizeWidth(width: number): void;
+    resizeHeight(height: number): void;
     __hitWorld(point: IRadiusPointData): boolean;
     __hit(local: IRadiusPointData): boolean;
     __hitFill(inner: IRadiusPointData): boolean;
@@ -1720,6 +1733,7 @@ interface IDragEvent extends IPointerEvent {
     getPageTotal?(): IPointData;
     getInnerTotal?(relative?: ILeaf): IPointData;
     getLocalTotal?(relative?: ILeaf): IPointData;
+    getPageBounds?(): IBoundsData;
 }
 interface IDropEvent extends IPointerEvent {
     list: ILeafList;
@@ -1801,6 +1815,7 @@ interface IInteractionConfig {
     zoom?: IZoomConfig;
     move?: IMoveConfig;
     eventer?: IObject;
+    keyEvent?: boolean;
 }
 interface IZoomConfig {
     disabled?: boolean;
@@ -1851,7 +1866,7 @@ interface ICursorConfig {
 interface IHitCanvasManager extends ICanvasManager {
     maxTotal: number;
     getPathType(leaf: ILeaf): IHitCanvas;
-    getPixelType(leaf: ILeaf, config: ILeaferCanvasConfig): IHitCanvas;
+    getPixelType(leaf: ILeaf, config?: ILeaferCanvasConfig): IHitCanvas;
 }
 
 interface IZoomView extends IBranch {
@@ -2040,6 +2055,7 @@ interface ISkiaNAPICanvas {
 interface IPlatform {
     name?: 'web' | 'node' | 'miniapp';
     os?: 'Mac' | 'Windows' | 'Linux';
+    toURL(text: string, fileType?: 'text' | 'svg'): string;
     requestRender?(render: IFunction): void;
     canvas?: ILeaferCanvas;
     canvasType?: ICanvasType;