@leafer-ui/app 1.5.2 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/app",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "@leafer-ui/app",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,12 +22,12 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.5.2",
-    "@leafer-ui/display": "1.5.2",
-    "@leafer-ui/data": "1.5.2"
+    "@leafer/core": "1.6.0",
+    "@leafer-ui/display": "1.6.0",
+    "@leafer-ui/data": "1.6.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.5.2",
-    "@leafer-ui/interface": "1.5.2"
+    "@leafer/interface": "1.6.0",
+    "@leafer-ui/interface": "1.6.0"
   }
 }

package/src/App.ts

@@ -1,7 +1,7 @@
 import { ILeaferConfig, IResizeEvent, ILeaferCanvas, IRenderOptions, ILeaferBase, IBoundsData } from '@leafer/interface'
-import { Creator, DataHelper, Debug, LayoutEvent, PropertyEvent, RenderEvent, canvasSizeAttrs, registerUI } from '@leafer/core'
+import { Creator, DataHelper, LayoutEvent, RenderEvent, canvasSizeAttrs, registerUI } from '@leafer/core'
 
-import { IApp, IAppConfig, IAppInputData, IEditorBase, ILeafer } from '@leafer-ui/interface'
+import { IApp, IAppConfig, IAppForEachFn, IAppInputData, IEditorBase, ILeafer } from '@leafer-ui/interface'
 
 import { Leafer } from '@leafer-ui/draw'
 
@@ -45,32 +45,30 @@ export class App extends Leafer implements IApp {
         this.leafer = this
         this.watcher.disable()
         this.layouter.disable()
-
-        this.__eventIds.push(this.on_(PropertyEvent.CHANGE, this.__onPropertyChange, this))
     }
 
     override start(): void {
         super.start()
-        this.children.forEach(leafer => leafer.start())
+        this.forEach(leafer => leafer.start())
     }
 
     override stop(): void {
-        this.children.forEach(leafer => leafer.stop())
+        this.forEach(leafer => leafer.stop())
         super.stop()
     }
 
     override unlockLayout(): void {
         super.unlockLayout()
-        this.children.forEach(leafer => leafer.unlockLayout())
+        this.forEach(leafer => leafer.unlockLayout())
     }
 
     override lockLayout(): void {
         super.lockLayout()
-        this.children.forEach(leafer => leafer.lockLayout())
+        this.forEach(leafer => leafer.lockLayout())
     }
 
     override forceRender(bounds?: IBoundsData, sync?: boolean): void {
-        this.children.forEach(leafer => leafer.forceRender(bounds, sync))
+        this.forEach(leafer => leafer.forceRender(bounds, sync))
     }
 
     public addLeafer(merge?: ILeaferConfig): Leafer {
@@ -93,8 +91,8 @@ export class App extends Leafer implements IApp {
         this.__listenChildEvents(leafer)
     }
 
-    protected __onPropertyChange(): void {
-        if (Debug.showHitView) this.children.forEach(leafer => leafer.forceUpdate('surface'))
+    public forEach(fn: IAppForEachFn): void {
+        this.children.forEach(fn)
     }
 
     protected __onCreated(): void {
@@ -118,21 +116,21 @@ export class App extends Leafer implements IApp {
         if (canvas.context) {
             const m = options.matrix
             if (m) canvas.setTransform(m.a, m.b, m.c, m.d, m.e, m.f) // screenshot
-            this.children.forEach(leafer => canvas.copyWorld(leafer.canvas))
+            this.forEach(leafer => canvas.copyWorld(leafer.canvas))
         }
     }
 
     public __onResize(event: IResizeEvent): void {
-        this.children.forEach(leafer => leafer.resize(event))
+        this.forEach(leafer => leafer.resize(event))
         super.__onResize(event)
     }
 
     public updateLayout(): void {
-        this.children.forEach(leafer => leafer.updateLayout())
+        this.forEach(leafer => leafer.updateLayout())
     }
 
     protected __getChildConfig(userConfig?: ILeaferConfig): ILeaferConfig {
-        let config = { ...this.config }
+        const config = { ...this.config }
         config.hittable = config.realCanvas = undefined
         if (userConfig) DataHelper.assign(config, userConfig)
 

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import { IBoundsData, ILeaferConfig, ILeaferCanvas, IRenderOptions, IResizeEvent, ILeaferBase } from '@leafer/interface';
 import { RenderEvent } from '@leafer/core';
-import { IApp, ILeafer, IAppConfig, IAppInputData } from '@leafer-ui/interface';
+import { IApp, ILeafer, IAppConfig, IAppInputData, IAppForEachFn } from '@leafer-ui/interface';
 import { Leafer } from '@leafer-ui/draw';
 
 declare class App extends Leafer implements IApp {
@@ -21,7 +21,7 @@ declare class App extends Leafer implements IApp {
     forceRender(bounds?: IBoundsData, sync?: boolean): void;
     addLeafer(merge?: ILeaferConfig): Leafer;
     add(leafer: ILeafer, index?: number): void;
-    protected __onPropertyChange(): void;
+    forEach(fn: IAppForEachFn): void;
     protected __onCreated(): void;
     protected __onReady(): void;
     protected __onViewReady(): void;