@leafer-ui/app 1.0.0-rc.4 → 1.0.0-rc.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/app",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.6",
   "description": "@leafer-ui/app",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,13 +22,13 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.4",
-    "@leafer-ui/display": "1.0.0-rc.4",
-    "@leafer-ui/type": "1.0.0-rc.4",
-    "@leafer-ui/data": "1.0.0-rc.4"
+    "@leafer/core": "1.0.0-rc.6",
+    "@leafer-ui/display": "1.0.0-rc.6",
+    "@leafer-ui/type": "1.0.0-rc.6",
+    "@leafer-ui/data": "1.0.0-rc.6"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.4",
-    "@leafer-ui/interface": "1.0.0-rc.4"
+    "@leafer/interface": "1.0.0-rc.6",
+    "@leafer-ui/interface": "1.0.0-rc.6"
   }
 }

package/src/Leafer.ts

@@ -1,4 +1,4 @@
-import { IApp, ILeafer, ILeaferCanvas, IRenderer, ILayouter, ISelector, IWatcher, IInteraction, ILeaferConfig, ICanvasManager, IHitCanvasManager, IAutoBounds, IScreenSizeData, IResizeEvent, ILeaf, IEventListenerId, ITransformEventData, ITimer, __Value, IObject, IControl } from '@leafer/interface'
+import { IApp, ILeafer, ILeaferCanvas, IRenderer, ILayouter, ISelector, IWatcher, IInteraction, ILeaferConfig, ICanvasManager, IHitCanvasManager, IAutoBounds, IScreenSizeData, IResizeEvent, ILeaf, IEventListenerId, ITimer, __Value, IObject, IControl, IPointData } from '@leafer/interface'
 import { AutoBounds, LayoutEvent, ResizeEvent, LeaferEvent, CanvasManager, HitCanvasManager, ImageManager, DataHelper, Creator, Run, Debug, RenderEvent, registerUI, boundsType, canvasSizeAttrs, dataProcessor, PluginManager, WaitHelper, WatchEvent } from '@leafer/core'
 
 import { ILeaferInputData, ILeaferData, IFunction, IUIInputData } from '@leafer-ui/interface'
@@ -49,8 +49,6 @@ export class Leafer extends Group implements ILeafer {
     public hitCanvasManager?: IHitCanvasManager
 
     public zoomLayer: ILeaf = this
-    public moveLayer: ILeaf = this
-    public transformData?: ITransformEventData
 
     public userConfig: ILeaferConfig
     public config: ILeaferConfig = {
@@ -71,6 +69,9 @@ export class Leafer extends Group implements ILeafer {
 
     public autoLayout?: IAutoBounds
 
+    public get cursorPoint(): IPointData { return (this.interaction && this.interaction.hoverData) || { x: this.width / 2, y: this.height / 2 } }
+    public leafs = 0
+
     public __eventIds: IEventListenerId[] = []
     protected __startTimer: ITimer
     protected __controllers: IControl[] = []
@@ -209,9 +210,8 @@ export class Leafer extends Group implements ILeafer {
         this.__level = 1
     }
 
-    public setZoomLayer(zoomLayer: ILeaf, moveLayer?: ILeaf): void {
+    public setZoomLayer(zoomLayer: ILeaf): void {
         this.zoomLayer = zoomLayer
-        this.moveLayer = moveLayer || zoomLayer
     }
 
     protected __checkAutoLayout(config: ILeaferConfig): void {

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IApp, ILeaferConfig, ILeaferCanvas, IRenderOptions, IResizeEvent, ILeafer, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaf, ITransformEventData, IAutoBounds, IEventListenerId, ITimer, IControl, IScreenSizeData, __Value } from '@leafer/interface';
+import { IApp, ILeaferConfig, ILeaferCanvas, IRenderOptions, IResizeEvent, ILeafer, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaf, IAutoBounds, IPointData, IEventListenerId, ITimer, IControl, IScreenSizeData, __Value } from '@leafer/interface';
 import { RenderEvent } from '@leafer/core';
 import { ILeaferData, IFunction, ILeaferInputData, IUIInputData } from '@leafer-ui/interface';
 import { Group } from '@leafer-ui/display';
@@ -48,11 +48,11 @@ declare class Leafer extends Group implements ILeafer {
     canvasManager: ICanvasManager;
     hitCanvasManager?: IHitCanvasManager;
     zoomLayer: ILeaf;
-    moveLayer: ILeaf;
-    transformData?: ITransformEventData;
     userConfig: ILeaferConfig;
     config: ILeaferConfig;
     autoLayout?: IAutoBounds;
+    get cursorPoint(): IPointData;
+    leafs: number;
     __eventIds: IEventListenerId[];
     protected __startTimer: ITimer;
     protected __controllers: IControl[];
@@ -74,7 +74,7 @@ declare class Leafer extends Group implements ILeafer {
     protected __setApp(): void;
     protected __bindApp(app: IApp): void;
     __setLeafer(leafer: ILeafer): void;
-    setZoomLayer(zoomLayer: ILeaf, moveLayer?: ILeaf): void;
+    setZoomLayer(zoomLayer: ILeaf): void;
     protected __checkAutoLayout(config: ILeaferConfig): void;
     __setAttr(attrName: string, newValue: __Value): void;
     __getAttr(attrName: string): __Value;