@leafer/interface 1.1.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/interface",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "@leafer/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",

package/src/app/ILeafer.ts

@@ -17,7 +17,7 @@ import { IControl } from '../control/IControl'
 import { IFunction } from '../function/IFunction'
 
 
-export type ILeaferType = 'draw' | 'block' | 'editor' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart' | 'custom'
+export type ILeaferType = 'draw' | 'block' | 'viewport' | 'editor' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart' | 'custom'
 export interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IInteractionConfig, ILayouterConfig {
     start?: boolean
     type?: ILeaferType
@@ -55,6 +55,7 @@ export interface ILeaferAttrData {
     lazyBounds: IBounds
 
     config: ILeaferConfig
+    userConfig?: ILeaferConfig
 
     readonly cursorPoint: IPointData
     readonly clientBounds: IBoundsData
@@ -71,6 +72,8 @@ export interface ILeaferAttrData {
     unlockLayout(): void
     lockLayout(): void
 
+    requestRender(change: boolean): void
+
     updateCursor(cursor?: ICursorType): void
     resize(size: IScreenSizeData): void
 
@@ -94,6 +97,7 @@ export type IZoomType = 'in' | 'out' | 'fit' | 'fit-width' | 'fit-height' | numb
 export interface ILeaferBase extends IZoomView, IControl, ILeaferAttrData {
     readonly isApp: boolean
     readonly app: ILeaferBase
+    parentApp?: IAppBase
     parent?: IAppBase
 }
 

package/src/event/IEvent.ts

@@ -81,7 +81,7 @@ export interface IWatchEvent extends IEvent {
 export interface IMultiTouchData {
     move: IPointData,
     scale: number,
-    angle: number,
+    rotation: number,
     center: IPointData
 }
 

package/src/event/IUIEvent.ts

@@ -83,6 +83,11 @@ export interface IMoveEvent extends IDragEvent {
     moveType?: 'drag' | 'move'
 }
 
+export interface IWheelEvent extends IUIEvent {
+    deltaX: number
+    deltaY: number
+}
+
 export interface ISwipeEvent extends IDragEvent {
 
 }

package/src/index.ts

@@ -46,10 +46,10 @@ export { IExportOptions, IJSONOptions, IExportResult, IExportResultFunction, IEx
 
 export { InnerId, IEventer, IEventMap, IEventListener, IEventOption, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId } from './event/IEventer'
 export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IAnimateEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, IMultiTouchData, IKeepTouchData } from './event/IEvent'
-export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEvent, IMoveEvent, IZoomEvent, IRotateEvent, IKeyEvent, IImageEvent } from './event/IUIEvent'
+export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEvent, IMoveEvent, IZoomEvent, IRotateEvent, IWheelEvent, IKeyEvent, IImageEvent } from './event/IUIEvent'
 export { ICursorTypeMap, ICursorRotate, ICursorRotateMap } from './interaction/ICursor'
 export { IInteraction, IInteractionCanvas, IInteractionConfig, IMoveConfig, ICursorConfig, IZoomConfig, IWheelConfig, ITouchConfig, IMultiTouchConfig, IPointerConfig } from './interaction/IInteraction'
-
+export { ITransformer } from './interaction/ITransformer'
 
 export { INumber, IBoolean, IString, IValue, IFourNumber, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IFunctionMap, IPointDataMap, IDataTypeHandle } from './data/IData'
 export { ILeafList, ILeafArrayMap, ILeafMap, ILeafLevelList, ILeafListItemCallback } from './data/IList'

package/src/interaction/IInteraction.ts

@@ -30,6 +30,8 @@ export interface IInteraction extends IControl {
     readonly isHoldSpaceKey: boolean
 
     config: IInteractionConfig
+    readonly m: IMoveConfig
+    readonly p: IPointerConfig
 
     cursor: ICursorType | ICursorType[]
     readonly hitRadius: number
@@ -113,11 +115,11 @@ export interface IMoveConfig {
     holdSpaceKey?: boolean
     holdMiddleKey?: boolean
     holdRightKey?: boolean
-    scroll?: boolean | 'limit'
+    scroll?: boolean | 'x' | 'y' | 'limit' | 'x-limit' | 'y-limit'
     drag?: boolean | 'auto'
     dragAnimate?: boolean
     dragEmpty?: boolean
-    dragOut?: boolean
+    dragOut?: boolean | number
     autoDistance?: number
 }
 

package/src/interaction/ITransformer.ts

@@ -0,0 +1,10 @@
+import { IMoveEvent, IZoomEvent, IRotateEvent } from '../event/IUIEvent'
+
+export interface ITransformer {
+    readonly transforming: boolean
+    move(data: IMoveEvent): void
+    zoom(data: IZoomEvent): void
+    rotate(data: IRotateEvent): void
+    transformEnd(): void
+    destroy(): void
+}

package/src/renderer/IRenderer.ts

@@ -36,7 +36,7 @@ export interface IRenderer extends IControl {
 
     config: IRendererConfig
 
-    update(): void
+    update(change?: boolean): void
 
     requestLayout(): void
 

package/types/index.d.ts

@@ -403,7 +403,7 @@ interface IWatchEvent extends IEvent {
 interface IMultiTouchData {
     move: IPointData;
     scale: number;
-    angle: number;
+    rotation: number;
     center: IPointData;
 }
 interface IKeepTouchData {
@@ -1124,7 +1124,7 @@ interface IRenderer extends IControl {
     changed: boolean;
     ignore: boolean;
     config: IRendererConfig;
-    update(): void;
+    update(change?: boolean): void;
     requestLayout(): void;
     render(callback?: IFunction): void;
     renderAgain(): void;
@@ -1777,6 +1777,10 @@ interface IZoomEvent extends IUIEvent {
 interface IMoveEvent extends IDragEvent {
     moveType?: 'drag' | 'move';
 }
+interface IWheelEvent extends IUIEvent {
+    deltaX: number;
+    deltaY: number;
+}
 interface ISwipeEvent extends IDragEvent {
 }
 interface IKeyEvent extends IUIEvent {
@@ -1805,6 +1809,8 @@ interface IInteraction extends IControl {
     readonly isHoldRightKey: boolean;
     readonly isHoldSpaceKey: boolean;
     config: IInteractionConfig;
+    readonly m: IMoveConfig;
+    readonly p: IPointerConfig;
     cursor: ICursorType | ICursorType[];
     readonly hitRadius: number;
     bottomList?: IPickBottom[];
@@ -1866,11 +1872,11 @@ interface IMoveConfig {
     holdSpaceKey?: boolean;
     holdMiddleKey?: boolean;
     holdRightKey?: boolean;
-    scroll?: boolean | 'limit';
+    scroll?: boolean | 'x' | 'y' | 'limit' | 'x-limit' | 'y-limit';
     drag?: boolean | 'auto';
     dragAnimate?: boolean;
     dragEmpty?: boolean;
-    dragOut?: boolean;
+    dragOut?: boolean | number;
     autoDistance?: number;
 }
 interface IWheelConfig {
@@ -1919,7 +1925,7 @@ interface IHitCanvasManager extends ICanvasManager {
 interface IZoomView extends IBranch {
 }
 
-type ILeaferType = 'draw' | 'block' | 'editor' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart' | 'custom';
+type ILeaferType = 'draw' | 'block' | 'viewport' | 'editor' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart' | 'custom';
 interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IInteractionConfig, ILayouterConfig {
     start?: boolean;
     type?: ILeaferType;
@@ -1948,6 +1954,7 @@ interface ILeaferAttrData {
     autoLayout?: IAutoBounds;
     lazyBounds: IBounds;
     config: ILeaferConfig;
+    userConfig?: ILeaferConfig;
     readonly cursorPoint: IPointData;
     readonly clientBounds: IBoundsData;
     leafs: number;
@@ -1958,6 +1965,7 @@ interface ILeaferAttrData {
     stop(): void;
     unlockLayout(): void;
     lockLayout(): void;
+    requestRender(change: boolean): void;
     updateCursor(cursor?: ICursorType): void;
     resize(size: IScreenSizeData): void;
     waitReady(item: IFunction, bind?: IObject): void;
@@ -1975,6 +1983,7 @@ type IZoomType = 'in' | 'out' | 'fit' | 'fit-width' | 'fit-height' | number | IL
 interface ILeaferBase extends IZoomView, IControl, ILeaferAttrData {
     readonly isApp: boolean;
     readonly app: ILeaferBase;
+    parentApp?: IAppBase;
     parent?: IAppBase;
 }
 interface ILeaferTypeCreator {
@@ -2180,4 +2189,13 @@ interface ICursorRotateMap {
     [name: string]: ICursorRotate;
 }
 
-export type { ACommandData, ArcCommandData, ArcToCommandData, BezierCurveToCommandObject, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAlign, IAnimateEvent, IAnswer, IAppBase, IAround, IAttrDecorator, IAutoBounds, IAutoBoundsData, IAutoBoxData, IAutoSize, IAxis, IAxisAlign, IAxisReverse, IBaseLineAlign, IBlendMode, IBlob, IBlobFunction, IBoolean, IBooleanMap, IBounds, IBoundsData, IBoundsDataFn, IBoundsType, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasCacheOptions, ICanvasContext2D, ICanvasContext2DSettings, ICanvasManager, ICanvasPattern, ICanvasStrokeOptions, ICanvasType, IChildEvent, IClientPointData, IConstraint, IConstraintType, IControl, ICreator, ICursorConfig, ICursorRotate, ICursorRotateMap, ICursorType, ICursorTypeMap, IDataProcessor, IDataTypeHandle, IDirection, IDirection4, IDragEvent, IDropEvent, IEditSize, IEraserType, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventMap, IEventOption, IEventTarget, IEventer, IExportFileType, IExportImageType, IExportOnCanvasFunction, IExportOptions, IExportResult, IExportResultFunction, IFindCondition, IFindMethod, IFlowAlign, IFlowAxisAlign, IFlowBoxType, IFlowType, IFlowWrap, IFourNumber, IFromToData, IFunction, IFunctionMap, IGap, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageCursor, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IJSONOptions, IKeepTouchData, IKeyEvent, ILayoutAttr, ILayoutBlockData, ILayoutBoundsData, ILayoutChangedData, ILayoutData, ILayoutEvent, ILayouter, ILayouterConfig, ILeaf, ILeafArrayMap, ILeafAttrData, ILeafAttrDescriptor, ILeafAttrDescriptorFn, ILeafBounds, ILeafBoundsModule, ILeafComputedData, ILeafData, ILeafDataOptions, ILeafDataProxy, ILeafDataProxyModule, ILeafEventer, ILeafEventerModule, ILeafHit, ILeafHitModule, ILeafInputData, ILeafLayout, ILeafLevelList, ILeafList, ILeafListItemCallback, ILeafMap, ILeafMatrix, ILeafMatrixModule, ILeafRender, ILeafRenderModule, ILeaferAttrData, ILeaferBase, ILeaferCanvas, ILeaferCanvasConfig, ILeaferCanvasView, ILeaferConfig, ILeaferEvent, ILeaferImage, ILeaferImageCacheCanvas, ILeaferImageConfig, ILeaferImageOnError, ILeaferImageOnLoaded, ILeaferImagePatternPaint, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILocationType, IMaskType, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IMatrixWithOptionScaleData, IMatrixWithScaleData, IMiniapp, IMiniappSelect, IMiniappSizeView, IMotionPathData, IMoveConfig, IMoveEvent, IMultiTouchConfig, IMultiTouchData, INumber, INumberFunction, INumberMap, IObject, IObjectFunction, IOffsetBoundsData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCommandObject, IPathCreator, IPathDrawer, IPathString, IPercentData, IPickBottom, IPickOptions, IPickResult, IPlatform, IPlugin, IPoint, IPointData, IPointDataFunction, IPointDataMap, IPointGap, IPointerConfig, IPointerEvent, IPropertyEvent, IRadiusPointData, IRangeSize, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IRotateEvent, IRotationPointData, IScaleData, IScaleRotationData, IScreenSizeData, IScrollPointData, ISelector, ISelectorConfig, ISelectorProxy, ISide, ISize, ISizeData, ISkewData, ISkiaCanvas, ISkiaCanvasExportConfig, ISkiaNAPICanvas, IStateStyleType, IString, IStringFunction, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITouchConfig, ITwoPointBoundsData, IUICreator, IUIEvent, IUnitData, IUnitPointData, IUpdateEvent, IValue, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWindingRule, IZoomConfig, IZoomEvent, IZoomType, IZoomView, InnerId, LCommandData, LineToCommandObject, MCommandData, MoveToCommandObject, PointerType, QCommandData, QuadraticCurveToCommandObject, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, VCommandData, ZCommandData };
+interface ITransformer {
+    readonly transforming: boolean;
+    move(data: IMoveEvent): void;
+    zoom(data: IZoomEvent): void;
+    rotate(data: IRotateEvent): void;
+    transformEnd(): void;
+    destroy(): void;
+}
+
+export type { ACommandData, ArcCommandData, ArcToCommandData, BezierCurveToCommandObject, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAlign, IAnimateEvent, IAnswer, IAppBase, IAround, IAttrDecorator, IAutoBounds, IAutoBoundsData, IAutoBoxData, IAutoSize, IAxis, IAxisAlign, IAxisReverse, IBaseLineAlign, IBlendMode, IBlob, IBlobFunction, IBoolean, IBooleanMap, IBounds, IBoundsData, IBoundsDataFn, IBoundsType, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasCacheOptions, ICanvasContext2D, ICanvasContext2DSettings, ICanvasManager, ICanvasPattern, ICanvasStrokeOptions, ICanvasType, IChildEvent, IClientPointData, IConstraint, IConstraintType, IControl, ICreator, ICursorConfig, ICursorRotate, ICursorRotateMap, ICursorType, ICursorTypeMap, IDataProcessor, IDataTypeHandle, IDirection, IDirection4, IDragEvent, IDropEvent, IEditSize, IEraserType, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventMap, IEventOption, IEventTarget, IEventer, IExportFileType, IExportImageType, IExportOnCanvasFunction, IExportOptions, IExportResult, IExportResultFunction, IFindCondition, IFindMethod, IFlowAlign, IFlowAxisAlign, IFlowBoxType, IFlowType, IFlowWrap, IFourNumber, IFromToData, IFunction, IFunctionMap, IGap, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageCursor, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IJSONOptions, IKeepTouchData, IKeyEvent, ILayoutAttr, ILayoutBlockData, ILayoutBoundsData, ILayoutChangedData, ILayoutData, ILayoutEvent, ILayouter, ILayouterConfig, ILeaf, ILeafArrayMap, ILeafAttrData, ILeafAttrDescriptor, ILeafAttrDescriptorFn, ILeafBounds, ILeafBoundsModule, ILeafComputedData, ILeafData, ILeafDataOptions, ILeafDataProxy, ILeafDataProxyModule, ILeafEventer, ILeafEventerModule, ILeafHit, ILeafHitModule, ILeafInputData, ILeafLayout, ILeafLevelList, ILeafList, ILeafListItemCallback, ILeafMap, ILeafMatrix, ILeafMatrixModule, ILeafRender, ILeafRenderModule, ILeaferAttrData, ILeaferBase, ILeaferCanvas, ILeaferCanvasConfig, ILeaferCanvasView, ILeaferConfig, ILeaferEvent, ILeaferImage, ILeaferImageCacheCanvas, ILeaferImageConfig, ILeaferImageOnError, ILeaferImageOnLoaded, ILeaferImagePatternPaint, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILocationType, IMaskType, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IMatrixWithOptionScaleData, IMatrixWithScaleData, IMiniapp, IMiniappSelect, IMiniappSizeView, IMotionPathData, IMoveConfig, IMoveEvent, IMultiTouchConfig, IMultiTouchData, INumber, INumberFunction, INumberMap, IObject, IObjectFunction, IOffsetBoundsData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCommandObject, IPathCreator, IPathDrawer, IPathString, IPercentData, IPickBottom, IPickOptions, IPickResult, IPlatform, IPlugin, IPoint, IPointData, IPointDataFunction, IPointDataMap, IPointGap, IPointerConfig, IPointerEvent, IPropertyEvent, IRadiusPointData, IRangeSize, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IRotateEvent, IRotationPointData, IScaleData, IScaleRotationData, IScreenSizeData, IScrollPointData, ISelector, ISelectorConfig, ISelectorProxy, ISide, ISize, ISizeData, ISkewData, ISkiaCanvas, ISkiaCanvasExportConfig, ISkiaNAPICanvas, IStateStyleType, IString, IStringFunction, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITouchConfig, ITransformer, ITwoPointBoundsData, IUICreator, IUIEvent, IUnitData, IUnitPointData, IUpdateEvent, IValue, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWheelEvent, IWindingRule, IZoomConfig, IZoomEvent, IZoomType, IZoomView, InnerId, LCommandData, LineToCommandObject, MCommandData, MoveToCommandObject, PointerType, QCommandData, QuadraticCurveToCommandObject, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, VCommandData, ZCommandData };