@leafer/interface 1.0.0-alpha.1 → 1.0.0-alpha.10

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "@leafer/interface",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.10",
   "description": "@leafer/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
-  "files": ["src"],
+  "files": [
+    "src"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/leaferjs/leafer.git"
@@ -16,4 +18,4 @@
     "leafer",
     "leaferjs"
   ]
-}
+}

package/src/app/{ISupperLeafer.ts → IApp.ts}

@@ -1,5 +1,5 @@
 import { ILeafer } from './ILeafer'
 
-export interface ISupperLeafer extends ILeafer {
+export interface IApp extends ILeafer {
     children: ILeafer[]
 }

package/src/app/ILeafer.ts

@@ -11,7 +11,7 @@ import { IHitCanvasManager } from '../canvas/IHitCanvasManager'
 import { IImageManager } from '../image/IImageManager'
 import { IObject } from '../data/IData'
 import { IZoomView } from '../display/IView'
-import { ISupperLeafer } from './ISupperLeafer'
+import { IApp } from './IApp'
 import { ILeaferImage, ILeaferImageConfig } from '../image/ILeaferImage'
 import { IEvent } from '../event/IEvent'
 
@@ -26,8 +26,8 @@ export interface ILeafer extends IZoomView {
 
     creator: ICreator
 
-    readonly isSupperLeafer: boolean
-    parent?: ISupperLeafer
+    readonly isApp: boolean
+    parent?: IApp
 
     running: boolean
 

package/src/canvas/ICanvas.ts

@@ -1,24 +1,24 @@
 type GlobalCompositeOperation = 'color' | 'color-burn' | 'color-dodge' | 'copy' | 'darken' | 'destination-atop' | 'destination-in' | 'destination-out' | 'destination-over' | 'difference' | 'exclusion' | 'hard-light' | 'hue' | 'lighten' | 'lighter' | 'luminosity' | 'multiply' | 'overlay' | 'saturation' | 'screen' | 'soft-light' | 'source-atop' | 'source-in' | 'source-out' | 'source-over' | 'xor'
 type CanvasDirection = 'inherit' | 'ltr' | 'rtl'
-export type CanvasFillRule = 'evenodd' | 'nonzero'
-type CanvasFontKerning = 'auto' | 'none' | 'normal'
-type CanvasFontStretch = 'condensed' | 'expanded' | 'extra-condensed' | 'extra-expanded' | 'normal' | 'semi-condensed' | 'semi-expanded' | 'ultra-condensed' | 'ultra-expanded'
-type CanvasFontVariantCaps = 'all-petite-caps' | 'all-small-caps' | 'normal' | 'petite-caps' | 'small-caps' | 'titling-caps' | 'unicase'
+export type IWindingRule = 'evenodd' | 'nonzero'
+// type CanvasFontKerning = 'auto' | 'none' | 'normal'
+// type CanvasFontStretch = 'condensed' | 'expanded' | 'extra-condensed' | 'extra-expanded' | 'normal' | 'semi-condensed' | 'semi-expanded' | 'ultra-condensed' | 'ultra-expanded'
+// type CanvasFontVariantCaps = 'all-petite-caps' | 'all-small-caps' | 'normal' | 'petite-caps' | 'small-caps' | 'titling-caps' | 'unicase'
 type CanvasLineCap = 'butt' | 'round' | 'square'
 type CanvasLineJoin = 'bevel' | 'miter' | 'round'
 type CanvasTextAlign = 'center' | 'end' | 'left' | 'right' | 'start'
 type CanvasTextBaseline = 'alphabetic' | 'bottom' | 'hanging' | 'ideographic' | 'middle' | 'top'
-type CanvasTextRendering = 'auto' | 'geometricPrecision' | 'optimizeLegibility' | 'optimizeSpeed'
+//type CanvasTextRendering = 'auto' | 'geometricPrecision' | 'optimizeLegibility' | 'optimizeSpeed'
 
 /** This Canvas 2D API interface is used to declare a path that can then be used on a CanvasRenderingContext2D object. The path methods of the CanvasRenderingContext2D interface are also present on this interface, which gives you the convenience of being able to retain and replay your path whenever desired. */
-interface Path2D extends CanvasPath {
+export interface IPath2D extends CanvasPath {
     /** Adds to the path the path given by the argument. */
-    addPath(path: Path2D, transform?: DOMMatrix2DInit): void
+    addPath(path: IPath2D, transform?: DOMMatrix2DInit): void
 }
 
-export declare var Path2D: {
-    prototype: Path2D
-    new(path?: Path2D | string): Path2D
+declare var IPath2D: {
+    prototype: IPath2D
+    new(path?: IPath2D | string): IPath2D
 }
 
 interface CanvasCompositing {
@@ -35,16 +35,16 @@ interface CanvasDrawImage {
 
 interface CanvasDrawPath {
     beginPath(): void
-    clip(fillRule?: CanvasFillRule): void
-    clip(path: Path2D, fillRule?: CanvasFillRule): void
-    fill(fillRule?: CanvasFillRule): void
-    fill(path: Path2D, fillRule?: CanvasFillRule): void
-    isPointInPath(x: number, y: number, fillRule?: CanvasFillRule): boolean
-    isPointInPath(path: Path2D, x: number, y: number, fillRule?: CanvasFillRule): boolean
+    clip(fillRule?: IWindingRule): void
+    clip(path: IPath2D, fillRule?: IWindingRule): void
+    fill(fillRule?: IWindingRule): void
+    fill(path: IPath2D, fillRule?: IWindingRule): void
+    isPointInPath(x: number, y: number, fillRule?: IWindingRule): boolean
+    isPointInPath(path: IPath2D, x: number, y: number, fillRule?: IWindingRule): boolean
     isPointInStroke(x: number, y: number): boolean
-    isPointInStroke(path: Path2D, x: number, y: number): boolean
+    isPointInStroke(path: IPath2D, x: number, y: number): boolean
     stroke(): void
-    stroke(path: Path2D): void
+    stroke(path: IPath2D): void
 }
 
 interface CanvasFillStrokeStyles {
@@ -137,14 +137,14 @@ interface CanvasRenderingContext2DSettings {
 }
 
 /** The CanvasRenderingContext2D interface, part of the Canvas API, provides the 2D rendering context for the drawing surface of a <canvas> element. It is used for drawing shapes, text, images, and other objects. */
-export interface CanvasRenderingContext2D extends CanvasCompositing, CanvasDrawImage, CanvasDrawPath, CanvasFillStrokeStyles, CanvasFilters, CanvasImageData, CanvasImageSmoothing, CanvasPath, CanvasPathDrawingStyles, CanvasRect, CanvasShadowStyles, CanvasState, CanvasText, CanvasTextDrawingStyles, CanvasTransform, CanvasUserInterface {
+export interface ICanvasContext2D extends CanvasCompositing, CanvasDrawImage, CanvasDrawPath, CanvasFillStrokeStyles, CanvasFilters, CanvasImageData, CanvasImageSmoothing, CanvasPath, CanvasPathDrawingStyles, CanvasRect, CanvasShadowStyles, CanvasState, CanvasText, CanvasTextDrawingStyles, CanvasTransform, CanvasUserInterface {
     readonly canvas: HTMLCanvasElement
     getContextAttributes(): CanvasRenderingContext2DSettings
 }
 
-declare var CanvasRenderingContext2D: {
-    prototype: CanvasRenderingContext2D
-    new(): CanvasRenderingContext2D
+declare var ICanvasContext2D: {
+    prototype: ICanvasContext2D
+    new(): ICanvasContext2D
 }
 
 interface CanvasShadowStyles {
@@ -161,12 +161,12 @@ interface CanvasState {
 
 interface CanvasUserInterface {
     drawFocusIfNeeded(element: any): void
-    drawFocusIfNeeded(path: Path2D, element: any): void
+    drawFocusIfNeeded(path: IPath2D, element: any): void
 }
 
 
 /** The dimensions of a piece of text in the canvas, as created by the CanvasRenderingContext2D.measureText() method. */
-export interface TextMetrics {
+export interface ITextMetrics {
     /** Returns the measurement described below. */
     readonly actualBoundingBoxAscent: number
     /** Returns the measurement described below. */
@@ -184,13 +184,13 @@ export interface TextMetrics {
 }
 
 declare var TextMetrics: {
-    prototype: TextMetrics
-    new(): TextMetrics
+    prototype: ITextMetrics
+    new(): ITextMetrics
 }
 
 interface CanvasText {
     fillText(text: string, x: number, y: number, maxWidth?: number): void
-    measureText(text: string): TextMetrics
+    measureText(text: string): ITextMetrics
     strokeText(text: string, x: number, y: number, maxWidth?: number): void
 }
 

package/src/canvas/ILeaferCanvas.ts

@@ -1,15 +1,11 @@
 import { IObject } from '../data/IData'
 import { IBounds, IMatrixData, IBoundsData, IAutoBoundsData, IAutoBounds, IScreenSizeData, IMatrixWithBoundsData, IPointData } from '../math/IMath'
-import { CanvasRenderingContext2D, CanvasFillRule, Path2D, TextMetrics, CanvasGradient, CanvasPattern } from './ICanvas'
+import { ICanvasContext2D, IWindingRule, IPath2D, ITextMetrics, CanvasGradient, CanvasPattern } from './ICanvas'
 import { IResizeEventListener } from '../event/IEvent'
-import { ICanvasDrawPath } from './ICanvasPathDrawer'
+import { IPathDrawer } from '../path/IPathDrawer'
 import { InnerId } from '../event/IEventer'
 import { ICanvasManager } from './ICanvasManager'
 
-export interface ILeaferCanvasContext extends CanvasRenderingContext2D {
-
-}
-
 export interface ILeaferCanvasConfig extends IAutoBoundsData {
     view?: string | IObject
     fill?: string
@@ -67,9 +63,9 @@ interface ICanvasMethod {
     save(): void
     restore(): void
 
-    fill(path?: Path2D | CanvasFillRule, rule?: CanvasFillRule): void
-    stroke(path?: Path2D): void
-    clip(path?: Path2D | CanvasFillRule, rule?: CanvasFillRule): void
+    fill(path?: IPath2D | IWindingRule, rule?: IWindingRule): void
+    stroke(path?: IPath2D): void
+    clip(path?: IPath2D | IWindingRule, rule?: IWindingRule): void
 
     fillRect(x: number, y: number, width: number, height: number): void
     strokeRect(x: number, y: number, width: number, height: number): void
@@ -95,7 +91,7 @@ interface ICanvasMethod {
     // text
 
     fillText(text: string, x: number, y: number, maxWidth?: number): void
-    measureText(text: string): TextMetrics
+    measureText(text: string): ITextMetrics
     strokeText(text: string, x: number, y: number, maxWidth?: number): void
 
     // custom
@@ -121,7 +117,7 @@ interface ICanvasMethod {
     clear(): void
 }
 
-export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, ICanvasDrawPath {
+export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 
     manager: ICanvasManager
 
@@ -137,7 +133,7 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, ICanvasDrawPa
     bounds: IBounds
 
     view: unknown
-    context: ILeaferCanvasContext
+    context: ICanvasContext2D
 
     recycled?: boolean
 

package/src/display/ILeaf.ts

@@ -118,7 +118,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     __worldOpacity: number
     __renderTime: number // μs 1000微秒 = 1毫秒
-    __complex: boolean // 外观是否复杂， 将调用__drawComplex()
+    __complex: boolean // 外观是否复杂
 
     __level: number // 图层级别 root(1) -> hight
     __tempNumber?: number // 用于临时运算储存状态

package/src/event/IEventer.ts

@@ -1,5 +1,5 @@
 import { IEvent, IFunction, IObject } from '@leafer/interface'
-import { LeafEventer } from '../display/module/ILeafEventer'
+import { ILeafEventer } from '../display/module/ILeafEventer'
 
 export type IEventListener = IFunction
 
@@ -24,7 +24,7 @@ export interface IEventListenerId {
 
 export type InnerId = number
 
-export interface IEventer extends LeafEventer {
+export interface IEventer extends ILeafEventer {
 
     readonly innerId: InnerId
     __captureMap?: IEventListenerMap

package/src/image/ILeaferImage.ts

@@ -3,6 +3,8 @@ export interface ILeaferImageConfig {
     thumb?: string
 }
 
-export interface ILeaferImage {
 
+
+export interface ILeaferImage {
+    //load(url: string):Promise<>
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-export { ISupperLeafer } from './app/ISupperLeafer'
+export { IApp } from './app/IApp'
 export { ILeafer, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
 export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
@@ -29,9 +29,9 @@ export { IPlatform } from './platform/IPlatform'
 export { IPlugin } from './plugin/IPlugin'
 
 
-export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasContext, ILeaferCanvasConfig, IHitCanvasConfig } from './canvas/ILeaferCanvas'
-export { ICanvasDrawPath } from './canvas/ICanvasPathDrawer'
-export { CanvasFillRule, CanvasRenderingContext2D, TextMetrics, Path2D } from './canvas/ICanvas'
+export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasConfig, IHitCanvasConfig } from './canvas/ILeaferCanvas'
+export { IPathDrawer } from './path/IPathDrawer'
+export { IWindingRule, ICanvasContext2D, ITextMetrics, IPath2D } from './canvas/ICanvas'
 export { CanvasPathCommand, IPathCommandData, MCommandData, HCommandData, VCommandData, LCommandData, CCommandData, SCommandData, QCommandData, TCommandData, ZCommandData, ACommandData, RectCommandData, RoundRectCommandData, EllipseCommandData, ArcCommandData, ArcToCommandData } from './path/IPathCommand'
 
 export { ILeaferImage, ILeaferImageConfig } from './image/ILeaferImage'

package/src/interaction/IInteraction.ts

@@ -1,20 +1,33 @@
 import { INumberFunction, IPointDataFunction } from '../function/IFunction'
-import { IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent } from '../event/IUIEvent'
+import { IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent, IUIEvent } from '../event/IUIEvent'
 import { ILeaf } from '../display/ILeaf'
+import { ILeafList } from '../data/IList'
 import { IPointData } from '../math/IMath'
+import { ISelector } from '../selector/ISelector'
+import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
+import { IBounds } from '../math/IMath'
 
 export interface IInteraction {
     target: ILeaf
-    config: IInteractionConfig
+    canvas: ILeaferCanvas
+    selector: ISelector
+
     running: boolean
+    readonly dragging: boolean
+
+    config: IInteractionConfig
+
+    readonly hitRadius: number
+    shrinkCanvasBounds: IBounds
 
-    pointerMoveIgnore: boolean
+    downData: IPointerEvent
 
     start(): void
     stop(): void
 
     pointerDown(data: IPointerEvent): void
     pointerMove(data: IPointerEvent): void
+    pointerMoveReal(data: IPointerEvent): void
     pointerUp(data: IPointerEvent): void
     pointerCancel(): void
 
@@ -22,6 +35,8 @@ export interface IInteraction {
     zoom(data: IZoomEvent): void
     rotate(data: IRotateEvent): void
 
+    emit(type: string, data: IUIEvent, path?: ILeafList, excludePath?: ILeafList): void
+
     destroy(): void
 }
 
@@ -36,7 +51,7 @@ export interface IWheelConfig {
     zoomSpeed?: number // 取值范围 0 ～ 1, 默认0.5
     moveSpeed?: number
     rotateSpeed?: number // 取值范围 0 ～ 1, 默认0.5
-    delta?: IPointData
+    delta?: IPointData  // 以chrome为基准, 鼠标滚动一格的距离
     getScale?: INumberFunction
     getMove?: IPointDataFunction
 }
@@ -50,4 +65,5 @@ export interface IPointerConfig {
     dragDistance?: number
     swipeDistance?: number
     autoMoveDistance?: number
+    ignoreMove: boolean // 性能优化字段, 控制move事件触发次数
 }

package/src/layouter/ILayouter.ts

@@ -33,20 +33,27 @@ export interface ILayouterConfig {
 export interface ILayouter {
     target: ILeaf
     layoutedBlocks: ILayoutBlockData[]
+
     totalTimes: number
     times: number
-    config: ILayouterConfig
+
     running: boolean
+    changed: boolean
+
+    config: ILayouterConfig
 
     start(): void
     stop(): void
+    update(): void
+
+    layout(): void
+    layoutOnce(): void
+    partLayout(): void
+    fullLayout(): void
 
     createBlock(data: ILeafList | ILeaf[]): ILayoutBlockData
     getBlocks(list: ILeafList): ILayoutBlockData[]
     setBlocks(current: ILayoutBlockData[]): void
 
-    layout(): void
-    partLayout(): void
-    fullLayout(): void
     destroy(): void
 }

package/src/{canvas/ICanvasPathDrawer.ts → path/IPathDrawer.ts}

@@ -1,4 +1,4 @@
-export interface ICanvasDrawPath {
+export interface IPathDrawer {
     beginPath?(): void
 
     moveTo(x: number, y: number): void
@@ -12,5 +12,5 @@ export interface ICanvasDrawPath {
     ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, counterclockwise?: boolean): void
 
     rect(x: number, y: number, width: number, height: number): void
-    roundRect?(x: number, y: number, width: number, height: number, radius?: number | number[]): void
+    roundRect(x: number, y: number, width: number, height: number, radius?: number | number[]): void
 }

package/src/renderer/IRenderer.ts

@@ -2,7 +2,6 @@ import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
 import { ILeaf } from '../display/ILeaf'
 import { IBounds, IMatrix } from '../math/IMath'
 import { IFunction } from '../function/IFunction'
-import { ILayoutBlockData } from '../layouter/ILayouter'
 
 export interface IRenderOptions {
     bounds?: IBounds,
@@ -12,26 +11,38 @@ export interface IRenderOptions {
 }
 
 export interface IRendererConfig {
+    usePartRender?: boolean
     maxFPS?: number
 }
 
 export interface IRenderer {
-    canvas: ILeaferCanvas
     target: ILeaf
-    layoutedBlocks: ILayoutBlockData[]
-    running: boolean
+    canvas: ILeaferCanvas
+    updateBlocks: IBounds[]
+
+    FPS: number
     totalTimes: number
     times: number
-    config: IRendererConfig
 
-    FPS: number
+    running: boolean
+    changed: boolean
+
+    config: IRendererConfig
 
     start(): void
     stop(): void
+    update(): void
 
     requestLayout(): void
+
     render(callback?: IFunction): void
-    clipRender(bounds: IBounds): void
+    renderOnce(callback?: IFunction): void
+    partRender(): void
+    clipRender(bounds: IBounds, fullMode?: boolean): void
     fullRender(bounds?: IBounds): void
+
+    addBlock(block: IBounds): void
+    mergeBlocks(): void
+
     destroy(): void
 }

package/src/selector/ISelector.ts

@@ -15,8 +15,8 @@ export interface ISelectPathOptions {
 
 export interface ISelector {
     target: ILeaf
-
     defaultPath: ILeafList
+
     getHitPointPath(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult
 
     find(name: number | string, branch?: ILeaf): ILeaf | ILeaf[]

package/src/watcher/IWatcher.ts

@@ -12,11 +12,14 @@ export interface IWatcherConfig {
 export interface IWatcher {
     target: ILeaf
     updatedList: ILeafList
+
     totalTimes: number
-    config: IWatcherConfig
+
     running: boolean
     changed: boolean
 
+    config: IWatcherConfig
+
     start(): void
     stop(): void