@leafer/interface 1.0.0-beta.6 → 1.0.0-beta.8

package/package.json

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

package/src/app/ILeafer.ts

@@ -63,6 +63,7 @@ export interface ILeafer extends IZoomView, IControl {
     forceFullRender(): void
     resize(size: IScreenSizeData): void
     waitViewLoaded(fun: IFunction): void
+    receiveEvent(event: IObject): void
 }
 
 export interface ILeaferTypeCreator {

package/src/canvas/ILeaferCanvas.ts

@@ -146,13 +146,14 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     hittable?: boolean
 
     bounds: IBounds
+    clientBounds: IBoundsData
 
     config: ILeaferCanvasConfig
 
     autoLayout: boolean
 
-    view: unknown
-    parentView: unknown
+    view: any
+    parentView: any
 
     unreal?: boolean
 
@@ -175,6 +176,7 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 
     resize(size: IScreenSizeData): void
     updateViewSize(): void
+    updateClientBounds(): void
 
     // other
     isSameSize(options: ILeaferCanvasConfig): boolean
@@ -187,7 +189,10 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 }
 
 
-export type IHitCanvas = ILeaferCanvas
+export interface IHitCanvas extends ILeaferCanvas {
+
+}
+
 
 export interface IBlobFunction {
     (blob: IBlob | null): void

package/src/canvas/ISkiaCanvas.ts

@@ -1,6 +1,6 @@
 import { IExportFileType, IExportImageType } from '../file/IFileType'
 
-export type ICanvasType = 'skia' | 'canvas'
+export type ICanvasType = 'skia' | 'canvas' | 'wx'
 
 export interface ISkiaCanvas {
     toBuffer(format: IExportFileType, config: ISkiaCanvasExportConfig): Promise<any>

package/src/display/IBranch.ts

@@ -5,4 +5,5 @@ import { ILeaf } from './ILeaf'
 export interface IBranch extends ILeaf {
     children: ILeaf[]
     __renderBranch?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    removeAll(): void
 }

package/src/display/ILeaf.ts

@@ -158,6 +158,8 @@ export interface ILeafComputedData {
     // other
     __childBranchNumber?: number // 存在子分支的个数
     __complex?: boolean // 外观是否复杂
+    __naturalWidth?: number
+    __naturalHeight?: number
 }
 
 export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDataProxy, ILeafInputData, IEventer {

package/src/event/IEvent.ts

@@ -2,7 +2,7 @@ import { IEventer } from './IEventer'
 import { IWatchEventData } from '../watcher/IWatcher'
 import { ILayoutBlockData } from '../layouter/ILayouter'
 import { ILeaf } from '../display/ILeaf'
-import { IScreenSizeData } from '../math/IMath'
+import { IScreenSizeData, IPointData } from '../math/IMath'
 
 export interface IEvent {
     type?: string
@@ -95,4 +95,17 @@ export interface ITransformEvent extends IEvent, ITransformEventData {
     readonly scaleY: number
     readonly rotation: number
 }
-export type TransformMode = 'move' | 'zoom' | 'rotate'
+export type TransformMode = 'move' | 'zoom' | 'rotate'
+
+
+export interface IMultiTouchData {
+    move: IPointData,
+    scale: number,
+    angle: number,
+    center: IPointData
+}
+
+export interface IKeepTouchData {
+    from: IPointData
+    to: IPointData
+}

package/src/event/IUIEvent.ts

@@ -2,6 +2,8 @@ import { IObject } from '../data/IData'
 import { ILeafList } from '../data/IList'
 import { IEvent } from './IEvent'
 import { ILeaferImage } from '../image/ILeaferImage'
+import { ILeaf } from '../display/ILeaf'
+import { IPointData } from '../math/IMath'
 
 export interface IUIEvent extends IEvent {
     x: number
@@ -22,6 +24,9 @@ export interface IUIEvent extends IEvent {
     throughPath?: ILeafList // 穿透path，不受层级影响，从上到下只要碰撞到区域就算，一般点击的时候
 
     origin?: IObject
+
+    getInner?(target?: ILeaf): IPointData
+    getLocal?(target?: ILeaf): IPointData
 }
 
 
@@ -42,6 +47,9 @@ export interface IDragEvent extends IPointerEvent {
     moveY: number
     totalX: number
     totalY: number
+
+    getInnerMove?(target?: ILeaf): IPointData
+    getLocalMove?(target?: ILeaf): IPointData
 }
 
 export interface IDropEvent extends IPointerEvent {

package/src/index.ts

@@ -30,7 +30,7 @@ export { ITaskProcessor, ITaskProcessorConfig } from './task/ITaskProcessor'
 
 
 export { IControl } from './control/IControl'
-export { IPlatform } from './platform/IPlatform'
+export { IPlatform, IMiniapp, IMiniappSelect, IMiniappSizeView } from './platform/IPlatform'
 export { IPlugin } from './plugin/IPlugin'
 
 
@@ -44,7 +44,7 @@ export { ILeaferImage, ILeaferImageConfig, ILeaferImageOnLoaded, ILeaferImageOnE
 export { IExportFileType, IExportImageType } from './file/IFileType'
 
 export { InnerId, IEventer, IEventListener, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId } from './event/IEventer'
-export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IAnimateEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, ITransformEvent, ITransformEventData, TransformMode } from './event/IEvent'
+export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IAnimateEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, ITransformEvent, ITransformEventData, TransformMode, IMultiTouchData, IKeepTouchData } from './event/IEvent'
 export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEvent, IMoveEvent, IZoomEvent, IRotateEvent, IKeyEvent, IImageEvent } from './event/IUIEvent'
 export { IInteraction, IInteractionCanvas, IInteractionConfig, IWheelConfig, IPointerConfig } from './interaction/IInteraction'
 

package/src/interaction/IInteraction.ts

@@ -6,6 +6,8 @@ import { IPointData } from '../math/IMath'
 import { ISelector } from '../selector/ISelector'
 import { IBounds } from '../math/IMath'
 import { IControl } from '../control/IControl'
+import { IKeepTouchData } from '../event/IEvent'
+import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
 
 export interface IInteraction extends IControl {
     target: ILeaf
@@ -23,12 +25,16 @@ export interface IInteraction extends IControl {
     downData: IPointerEvent
     downTime: number
 
+    receive(event: any): void
+
     pointerDown(data: IPointerEvent): void
     pointerMove(data: IPointerEvent): void
     pointerMoveReal(data: IPointerEvent): void
     pointerUp(data: IPointerEvent): void
     pointerCancel(): void
 
+    multiTouch(data: IUIEvent, list: IKeepTouchData[]): void
+
     move(data: IMoveEvent): void
     zoom(data: IZoomEvent): void
     rotate(data: IRotateEvent): void
@@ -36,9 +42,8 @@ export interface IInteraction extends IControl {
     emit(type: string, data: IUIEvent, path?: ILeafList, excludePath?: ILeafList): void
 }
 
-export interface IInteractionCanvas {
-    bounds: IBounds
-    view: unknown
+export interface IInteractionCanvas extends ILeaferCanvas {
+
 }
 
 export interface IInteractionConfig {

package/src/platform/IPlatform.ts

@@ -2,13 +2,17 @@ import { IFunction } from '../function/IFunction'
 import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
 import { ILeaf } from '../display/ILeaf'
 import { IExportFileType, IExportImageType } from '../file/IFileType'
+import { IBoundsData, ISizeData } from '../math/IMath'
+import { IObject } from '../data/IData'
 
 export interface IPlatform {
+    name?: 'web' | 'node' | 'miniapp'
+    os?: 'Mac' | 'Windows' | 'Linux'
     requestRender?(render: IFunction): void
     canvas?: ILeaferCanvas
     isWorker?: boolean
     devicePixelRatio?: number
-    intWheelDeltaY?: boolean // firxfox need
+    intWheelDeltaY?: boolean // firxfox / Windows need
     conicGradientSupport?: boolean
     conicGradientRotate90?: boolean // fixfox need rotate
     fullImageShadow?: boolean // safari need 
@@ -20,5 +24,22 @@ export interface IPlatform {
         canvasToBolb(canvas: any, type?: IExportFileType, quality?: number): Promise<any>
         canvasSaveAs(canvas: any, filename: string, quality?: number): Promise<void>
         loadImage(url: string): Promise<any>
-    }
+    },
+    miniapp?: IMiniapp
+}
+
+
+export interface IMiniappSelect extends IObject { }
+
+export interface IMiniappSizeView extends ISizeData {
+    view: any
+}
+
+export interface IMiniapp {
+    select(name: string): IMiniappSelect
+    getBounds(select: IMiniappSelect): Promise<IBoundsData>
+    getSizeView(select: IMiniappSelect): Promise<IMiniappSizeView>
+    onWindowResize(fun: IFunction): void
+    offWindowResize(fun: IFunction): void
+    saveToAlbum(path: string): Promise<any>
 }

package/src/plugin/IPlugin.ts

@@ -1,8 +1,10 @@
+import { ILeafer } from '../app/ILeafer'
 import { IObject } from '../data/IData'
 
 export interface IPlugin extends IObject {
     name?: string
     importVersion: string
     import: string[]
-    run(LeaferUI: IObject): void
+    run(LeaferUI: IObject, config: IObject): void
+    onLeafer?(leafer: ILeafer): void
 }

package/src/watcher/IWatcher.ts

@@ -12,16 +12,18 @@ export interface IWatcherConfig {
 
 export interface IWatcher extends IControl {
     target: ILeaf
-    updatedList: ILeafList
 
     totalTimes: number
 
     disabled: boolean
     running: boolean
     changed: boolean
+    hasRemoved: boolean
 
     config: IWatcherConfig
 
+    updatedList: ILeafList
+
     disable(): void
 
     update(): void