@leafer-ui/app 1.0.0-alpha.10 → 1.0.0-alpha.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/app",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.21",
   "description": "@leafer-ui/app",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,11 +19,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-alpha.10",
-    "@leafer-ui/display": "1.0.0-alpha.10"
+    "@leafer/core": "1.0.0-alpha.21",
+    "@leafer-ui/display": "1.0.0-alpha.21"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-alpha.10",
-    "@leafer-ui/interface": "1.0.0-alpha.10"
+    "@leafer/interface": "1.0.0-alpha.21",
+    "@leafer-ui/interface": "1.0.0-alpha.21"
   }
 }

package/src/App.ts

@@ -1,12 +1,10 @@
-import { ILeaferConfig, IResizeEvent, ILeaferCanvas, IRenderOptions } from '@leafer/interface'
+import { ILeaferConfig, IResizeEvent, ILeaferCanvas, IRenderOptions, IApp } from '@leafer/interface'
 import { DataHelper, LayoutEvent, RenderEvent } from '@leafer/core'
 
-import { IGroup } from '@leafer-ui/interface'
-
 import { Leafer } from './Leafer'
 
 
-export class App extends Leafer implements IGroup {
+export class App extends Leafer implements IApp {
 
     public get isApp(): boolean { return true }
 
@@ -53,7 +51,7 @@ export class App extends Leafer implements IGroup {
     }
 
     public __render(canvas: ILeaferCanvas, _options: IRenderOptions): void {
-        this.children.forEach(leafer => { canvas.copy(leafer.canvas) })
+        this.children.forEach(leafer => { canvas.copyWorld(leafer.canvas) })
     }
 
     public __onResize(event: IResizeEvent): void {

package/src/Leafer.ts

@@ -26,9 +26,10 @@ export class Leafer extends Group implements ILeafer {
     public pixelRatio: number
 
     public config: ILeaferConfig = {
-        zoom: true,
-        move: true,
-        start: true,
+        useZoom: true,
+        useMove: true,
+        autoStart: true,
+        hittable: true,
         pixelRatio: devicePixelRatio
     }
 
@@ -63,6 +64,7 @@ export class Leafer extends Group implements ILeafer {
 
         const { config } = this
         this.creator = Creator
+        this.hittable = config.hittable
 
         // render
         this.canvas = Creator.canvas(config)
@@ -84,7 +86,7 @@ export class Leafer extends Group implements ILeafer {
             app.selector?.defaultPath.unshift(this)
 
             this.selector = app.selector
-            this.interaction = app.interaction
+            if (config.hittable) this.interaction = app.interaction
 
             this.canvasManager = app.canvasManager
             this.hitCanvasManager = app.hitCanvasManager
@@ -95,13 +97,13 @@ export class Leafer extends Group implements ILeafer {
         } else {
 
             this.selector = Creator.selector(this)
-            this.interaction = Creator.interaction(this, this.canvas, this.selector, config)
+            if (config.hittable) this.interaction = Creator.interaction(this, this.canvas, this.selector, config)
 
             this.canvasManager = new CanvasManager(this)
             this.hitCanvasManager = new HitCanvasManager(this)
             this.imageManager = new ImageManager(this, config)
             Run.start('FullCreate')
-            if (config.start) setTimeout(this.start.bind(this))
+            if (config.autoStart) setTimeout(this.start.bind(this))
 
         }
 
@@ -125,15 +127,17 @@ export class Leafer extends Group implements ILeafer {
     protected __checkAutoLayout(config: ILeaferConfig): void {
         if (!config.width || !config.height) {
             this.autoLayout = new AutoBounds(config)
-            this.canvas.autoLayout(this.autoLayout, this.__onResize.bind(this))
+            this.canvas.startAutoLayout(this.autoLayout, this.__onResize.bind(this))
         }
     }
 
     public start(): void {
         if (!this.running) {
             Run.endOfName('FullCreate')
-            this.__interactiveWindow()
-            this.interaction?.start()
+            if (this.interaction) {
+                this.__interactiveWindow()
+                this.interaction.start()
+            }
             this.renderer.start()
             this.layouter.start()
             this.watcher.start()
@@ -143,7 +147,7 @@ export class Leafer extends Group implements ILeafer {
 
     public stop(): void {
         if (this.running) {
-            this.interaction?.stop()
+            if (this.interaction) this.interaction.stop()
             this.watcher.stop()
             this.layouter.stop()
             this.renderer.stop()
@@ -152,12 +156,12 @@ export class Leafer extends Group implements ILeafer {
     }
 
     protected __interactiveWindow(): void {
-        const { zoom, move } = this.config
-        if (move) {
+        const { useZoom, useMove } = this.config
+        if (useMove) {
             const { MOVE } = MoveEvent
             const { ZOOM } = ZoomEvent
             if (!this.hasEvent(MOVE)) this.__eventIds.push(this.on__(MOVE, (e: MoveEvent) => { LeafHelper.moveOfWorld(this, e.moveX, e.moveY) }))
-            if (zoom && !this.hasEvent(ZOOM)) this.__eventIds.push(this.on__(ZOOM, (e: ZoomEvent) => { LeafHelper.zoomOfWorld(this, e.scale, e) }))
+            if (useZoom && !this.hasEvent(ZOOM)) this.__eventIds.push(this.on__(ZOOM, (e: ZoomEvent) => { LeafHelper.zoomOfWorld(this, e.scale, e) }))
         }
     }