@leafer/interface - npm Package Compare versions

Comparing version 1.0.0-rc.17 to 1.0.0-rc.18

package.json

 {
   "name": "@leafer/interface",
-  "version": "1.0.0-rc.17",
+  "version": "1.0.0-rc.18",
   "description": "@leafer/interface",
@@ -5,0 +5,0 @@ "author": "Chao (Leafer) Wan",

src/app/ILeafer.ts

@@ -12,3 +12,3 @@ import { ILeaf, ICursorType } from '../display/ILeaf'
 import { IEventListenerId } from '../event/IEventer'
-import { IObject } from '../data/IData'
+import { IFourNumber, IObject } from '../data/IData'
 import { IZoomView } from '../display/IView'
@@ -71,3 +71,2 @@ import { IAppBase } from './IApp'
 
-    setZoomLayer(zoomLayer: ILeaf): void
     forceFullRender(): void
@@ -78,7 +77,12 @@ forceRender(bounds?: IBoundsData): void
 
-    waitReady(item: IFunction): void
-    waitViewReady(item: IFunction): void
-    waitViewCompleted(item: IFunction): void
+    waitReady(item: IFunction, bind?: IObject): void
+    waitViewReady(item: IFunction, bind?: IObject): void
+    waitViewCompleted(item: IFunction, bind?: IObject): void
+
+    zoom(zoomType: IZoomType, padding?: IFourNumber, fixedScale?: boolean): IBoundsData
+    validScale(changeScale: number): number
 }
 
+export type IZoomType = 'in' | 'out' | 'fit' | 'fit-width' | 'fit-height' | number | ILeaf | ILeaf[] | IBoundsData
+
 export interface ILeaferBase extends IZoomView, IControl, ILeaferAttrData {
@@ -85,0 +89,0 @@ readonly isApp: boolean

src/data/IData.ts

@@ -9,2 +9,4 @@ export type INumber = number // number | string    will convert to number
 
+export type IFourNumber = number | number[]
+
 export interface IObject {
@@ -11,0 +13,0 @@ [name: string]: any

src/data/ILeafData.ts

@@ -15,3 +15,3 @@ import { ILeaf, ILeafComputedData } from '../display/ILeaf'
     __removeInput(name: string): void
-    __getInputData(): IObject
+    __getInputData(names?: string[] | IObject): IObject
 
@@ -18,0 +18,0 @@ __setMiddle(name: string, value: any): void

src/display/ILeaf.ts

@@ -39,2 +39,4 @@ import { ILeaferBase } from '../app/ILeafer'
     visible: IBoolean
+    selected: IBoolean
+    disabled: IBoolean
     locked: IBoolean
@@ -70,3 +72,3 @@ zIndex: INumber
     editable: IBoolean
-    editSize?: IEditSize
+    editSize: IEditSize
 
@@ -82,2 +84,9 @@ hittable: IBoolean
     cursor: ICursorType | ICursorType[]
+
+    normalStyle: ILeafInputData // restore hover / press / focus / selected / disabled style
+    hoverStyle: ILeafInputData
+    pressStyle: ILeafInputData
+    focusStyle: ILeafInputData
+    selectedStyle: ILeafInputData
+    disabledStyle: ILeafInputData
 }
@@ -184,2 +193,8 @@
 
+export type IStateStyleType =
+    | 'hoverStyle'
+    | 'pressStyle'
+    | 'focusStyle'
+    | 'selectedStyle'
+    | 'disabledStyle'
 
@@ -197,2 +212,4 @@ export interface ILeafInputData {
     visible?: IBoolean
+    selected?: IBoolean
+    disabled?: IBoolean
     locked?: IBoolean
@@ -240,2 +257,9 @@ zIndex?: INumber
 
+    normalStyle?: ILeafInputData
+    hoverStyle?: ILeafInputData
+    pressStyle?: ILeafInputData
+    focusStyle?: ILeafInputData
+    selectedStyle?: ILeafInputData
+    disabledStyle?: ILeafInputData
+
     children?: ILeafInputData[]
@@ -255,2 +279,4 @@
     visible?: boolean
+    selected?: boolean
+    disabled?: boolean
     locked?: boolean
@@ -297,2 +323,9 @@ zIndex?: number
 
+    normalStyle?: ILeafInputData
+    hoverStyle?: ILeafInputData
+    pressStyle?: ILeafInputData
+    focusStyle?: ILeafInputData
+    selectedStyle?: ILeafInputData
+    disabledStyle?: ILeafInputData
+
     // other
@@ -324,2 +357,3 @@ __childBranchNumber?: number // 存在子分支的个数
     parent?: ILeaf
+    zoomLayer?: ILeaf
 
@@ -384,5 +418,6 @@ readonly isApp?: boolean
 
-    waitParent(item: IFunction): void
-    waitLeafer(item: IFunction): void
-    nextRender(item: IFunction, off?: 'off'): void
+    waitParent(item: IFunction, bind?: IObject): void
+    waitLeafer(item: IFunction, bind?: IObject): void
+    nextRender(item: IFunction, bind?: IObject, off?: 'off'): void
+    removeNextRender(item: IFunction): void
 
@@ -392,3 +427,3 @@ __bindLeafer(leafer: ILeaferBase | null): void
     set(data: IObject): void
-    get(name?: string): ILeafInputData | IValue
+    get(name?: string | string[] | IObject): ILeafInputData | IValue
     toJSON(): IObject
@@ -409,2 +444,3 @@ toString(): string
 
+    focus(value?: boolean): void
     forceUpdate(attrName?: string): void
@@ -447,5 +483,9 @@
     getWorld(attrName: ILayoutAttr): number // will remove
+    getTransform(relative?: ILocationType | ILeaf): IMatrixData
+
     getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData
 
+    getWorldBounds(inner: IBoundsData, relative?: ILeaf, change?: boolean): IBoundsData
+
     worldToLocal(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
@@ -475,2 +515,8 @@ localToWorld(local: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
 
+    transformWorld(worldTransform?: IMatrixData, resize?: boolean): void
+    moveWorld(x: number, y?: number): void
+    scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void
+    rotateOfWorld(worldOrigin: IPointData, rotation: number): void
+    skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void
+
     scaleResize(scaleX: number, scaleY: number, noResize?: boolean): void
@@ -504,2 +550,4 @@ __scaleResize(scaleX: number, scaleY: number): void
 
+    // 
+
     // branch
@@ -506,0 +554,0 @@ children?: ILeaf[]

src/display/IView.ts

 import { IBranch } from './IBranch'
-import { ILeaf } from './ILeaf'
 
+
 export interface IZoomView extends IBranch {
-    zoomLayer?: ILeaf
-    setZoomLayer(zoomLayer: ILeaf): void
+
 }

src/file/IExport.ts

 import { IBlob, ILeaferCanvas } from '../canvas/ILeaferCanvas'
+import { ILeaf } from '../display/ILeaf'
 import { ILocationType } from '../layout/ILeafLayout'
@@ -15,3 +16,3 @@ import { IBoundsData } from '../math/IMath'
     screenshot?: IBoundsData | boolean
-    location?: ILocationType
+    relative?: ILocationType | ILeaf
     onCanvas?: IExportOnCanvasFunction
@@ -18,0 +19,0 @@ }

src/index.ts

 export { IAppBase } from './app/IApp'
-export { ILeaferBase, ILeaferAttrData, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
-export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IMaskType, IBlendMode, IEditSize, IImageCursor, ICursorType, IAround } from './display/ILeaf'
+export { ILeaferBase, ILeaferAttrData, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator, IZoomType } from './app/ILeafer'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IMaskType, IBlendMode, IEditSize, IImageCursor, ICursorType, IStateStyleType, IAround } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
@@ -53,5 +53,5 @@ export { IZoomView } from './display/IView'
 
-export { INumber, IBoolean, IString, IValue, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
+export { INumber, IBoolean, IString, IValue, IFourNumber, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
 export { ILeafList, ILeafArrayMap, ILeafMap, ILeafLevelList, ILeafListItemCallback } from './data/IList'
 export { IPoint, IPointData, IRadiusPointData, ISize, ISizeData, IScreenSizeData, IBounds, IBoundsData, IBoundsDataFn, IOffsetBoundsData, ITwoPointBoundsData, IAutoBounds, IAutoBoundsData, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithScaleData, IMatrixWithOptionScaleData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IScaleRotationData, IScaleData, ISkewData, ILayoutBoundsData, ILayoutData, ILayoutAttr } from './math/IMath'
 export { IFunction, IAttrDecorator } from './function/IFunction'

src/interaction/IInteraction.ts

@@ -34,2 +34,3 @@ import { INumberFunction, IPointDataFunction } from '../function/IFunction'
     downTime: number
+    focusData: ILeaf
 
@@ -54,4 +55,10 @@ receive(event: any): void
     findPath(data: IPointerEvent, options?: IPickOptions): ILeafList
+
     isDrag(leaf: ILeaf): boolean
+    isPress(leaf: ILeaf): boolean
+    isHover(leaf: ILeaf): boolean
+    isFocus(leaf: ILeaf): boolean
 
+    cancelHover(): void
+
     updateDownData(data?: IPointerEvent, options?: IPickOptions): void
@@ -88,3 +95,5 @@ updateHoverData(data: IPointerEvent): void
     holdRightKey?: boolean
+    scroll?: boolean
     drag?: boolean
+    dragAnimate?: boolean
     dragEmpty?: boolean
@@ -91,0 +100,0 @@ dragOut?: boolean

src/layout/ILeafLayout.ts

 import { IBoundsData, IMatrixData, ILayoutBoundsData, IPointData } from '../math/IMath'
 import { ILeaf } from '../display/ILeaf'
 
-export type ILocationType = 'world' | 'local' | 'inner'
+export type ILocationType = 'world' | 'page' | 'local' | 'inner'
 export type IBoundsType = 'content' | 'box' | 'stroke' | 'margin' | 'render'
@@ -6,0 +6,0 @@

src/math/IMath.ts

@@ -1,2 +0,2 @@
-import { IObject } from '../data/IData'
+import { IFourNumber, IObject } from '../data/IData'
 
@@ -73,3 +73,4 @@ export interface IPointData {
 
-    spread(spreadX: number, spreadY?: number): IBounds
+    spread(fourNumber: IFourNumber, spreadY?: number): IBounds
+    shrink(fourNumber: IFourNumber): IBounds
     ceil(): IBounds
@@ -76,0 +77,0 @@ unsign(): IBounds

src/path/IPathDrawer.ts

@@ -31,5 +31,5 @@ import { IPathCommandData } from './IPathCommand'
 
-    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): IPathCreator
+    arc(x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator
     arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): IPathCreator
-    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): IPathCreator
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator
 
@@ -36,0 +36,0 @@ rect(x: number, y: number, width: number, height: number): IPathCreator

src/renderer/IRenderer.ts

@@ -35,2 +35,3 @@ import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
     changed: boolean
+    ignore: boolean
 
@@ -37,0 +38,0 @@ config: IRendererConfig

No alert changes

Improved metrics

Total package byte prevSize

157635

2.88%

Lines of code

4109

2.39%

No dependency changes