@leafer-ui/app 1.6.1 → 1.6.3

package/package.json

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

package/src/App.ts

@@ -1,7 +1,7 @@
 import { ILeaferConfig, IResizeEvent, ILeaferCanvas, IRenderOptions, ILeaferBase, IBoundsData } from '@leafer/interface'
 import { Creator, DataHelper, LayoutEvent, RenderEvent, canvasSizeAttrs, registerUI } from '@leafer/core'
 
-import { IApp, IAppConfig, IAppForEachFn, IAppInputData, IEditorBase, ILeafer } from '@leafer-ui/interface'
+import { IApp, IAppConfig, IAppForEachFunction, IAppInputData, ILeafer } from '@leafer-ui/interface'
 
 import { Leafer } from '@leafer-ui/draw'
 
@@ -32,7 +32,7 @@ export class App extends Leafer implements IApp {
             if (ground) this.ground = this.addLeafer(ground)
             if (tree || editor) this.tree = this.addLeafer(tree || { type: userConfig.type || 'design' })
             if (sky || editor) this.sky = this.addLeafer(sky)
-            if (editor) this.sky.add(this.editor = Creator.editor(editor) as IEditorBase)
+            if (editor) Creator.editor(editor, this)
         }
     }
 
@@ -47,6 +47,11 @@ export class App extends Leafer implements IApp {
         this.layouter.disable()
     }
 
+    override __updateLocalBounds(): void {
+        this.forEach(leafer => leafer.updateLayout())
+        super.__updateLocalBounds()
+    }
+
     override start(): void {
         super.start()
         this.forEach(leafer => leafer.start())
@@ -91,7 +96,7 @@ export class App extends Leafer implements IApp {
         this.__listenChildEvents(leafer)
     }
 
-    public forEach(fn: IAppForEachFn): void {
+    public forEach(fn: IAppForEachFunction): void {
         this.children.forEach(fn)
     }
 
@@ -113,11 +118,7 @@ export class App extends Leafer implements IApp {
     }
 
     override __render(canvas: ILeaferCanvas, options: IRenderOptions): void {
-        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.forEach(leafer => canvas.copyWorld(leafer.canvas))
-        }
+        if (canvas.context) this.forEach(leafer => options.matrix ? leafer.__render(canvas, options) : canvas.copyWorld(leafer.canvas, options && options.bounds))
     }
 
     public __onResize(event: IResizeEvent): void {
@@ -142,9 +143,11 @@ export class App extends Leafer implements IApp {
     }
 
     protected __listenChildEvents(leafer: ILeaferBase): void {
-        leafer.once(LayoutEvent.END, () => this.__onReady())
-        leafer.once(RenderEvent.START, () => this.__onCreated())
-        leafer.once(RenderEvent.END, () => this.__onViewReady())
+        leafer.once([
+            [LayoutEvent.END, this.__onReady, this],
+            [RenderEvent.START, this.__onCreated, this],
+            [RenderEvent.END, this.__onViewReady, this]
+        ])
         if (this.realCanvas) this.__eventIds.push(leafer.on_(RenderEvent.END, this.__onChildRenderEnd, this))
     }
 

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, IAppForEachFn } from '@leafer-ui/interface';
+import { IApp, ILeafer, IAppConfig, IAppInputData, IAppForEachFunction } from '@leafer-ui/interface';
 import { Leafer } from '@leafer-ui/draw';
 
 declare class App extends Leafer implements IApp {
@@ -14,6 +14,7 @@ declare class App extends Leafer implements IApp {
     constructor(userConfig?: IAppConfig, data?: IAppInputData);
     init(userConfig?: IAppConfig, parentApp?: IApp): void;
     protected __setApp(): void;
+    __updateLocalBounds(): void;
     start(): void;
     stop(): void;
     unlockLayout(): void;
@@ -21,7 +22,7 @@ declare class App extends Leafer implements IApp {
     forceRender(bounds?: IBoundsData, sync?: boolean): void;
     addLeafer(merge?: ILeaferConfig): Leafer;
     add(leafer: ILeafer, index?: number): void;
-    forEach(fn: IAppForEachFn): void;
+    forEach(fn: IAppForEachFunction): void;
     protected __onCreated(): void;
     protected __onReady(): void;
     protected __onViewReady(): void;