@leafer-ui/app 1.0.0-rc.7 → 1.0.0-rc.8

package/package.json

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

package/src/App.ts

@@ -17,9 +17,9 @@ export class App extends Leafer implements IApp {
 
     public realCanvas: boolean
 
-    public ground?: ILeafer
-    public tree?: ILeafer
-    public sky?: ILeafer
+    public ground: ILeafer
+    public tree: ILeafer
+    public sky: ILeafer
 
     constructor(userConfig?: IAppConfig, data?: IAppInputData) {
         super(userConfig, data)
@@ -106,10 +106,6 @@ export class App extends Leafer implements IApp {
         if (this.children.every(child => child.viewReady)) super.__onViewReady()
     }
 
-    protected __checkViewCompleted(): boolean {
-        return this.children.every(item => item.viewCompleted)
-    }
-
     protected __onChildRenderEnd(e: RenderEvent): void {
         this.renderer.addBlock(e.renderBounds)
         if (this.viewReady) this.renderer.update()
@@ -143,7 +139,7 @@ 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, (e) => this.__onRenderEnd(e))
+        leafer.once(RenderEvent.END, () => this.__onViewReady())
         if (this.realCanvas) this.__eventIds.push(leafer.on_(RenderEvent.END, this.__onChildRenderEnd, this))
     }
 

package/src/Leafer.ts

@@ -1,5 +1,5 @@
 import { ILeaferCanvas, IRenderer, ILayouter, ISelector, IWatcher, IInteraction, ILeaferConfig, ICanvasManager, IHitCanvasManager, IAutoBounds, IScreenSizeData, IResizeEvent, ILeaf, IEventListenerId, ITimer, IValue, 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 { AutoBounds, LayoutEvent, ResizeEvent, LeaferEvent, CanvasManager, HitCanvasManager, ImageManager, DataHelper, Creator, Run, Debug, RenderEvent, AnimateEvent, registerUI, boundsType, canvasSizeAttrs, dataProcessor, PluginManager, WaitHelper, WatchEvent } from '@leafer/core'
 
 import { ILeaferInputData, ILeaferData, IFunction, IUIInputData, ILeafer, IGroup, IApp, IEditorBase } from '@leafer-ui/interface'
 import { LeaferTypeCreator } from '@leafer-ui/type'
@@ -30,6 +30,7 @@ export class Leafer extends Group implements ILeafer {
     public ready: boolean
     public viewReady: boolean
     public viewCompleted: boolean
+    public get imageReady(): boolean { return this.viewReady && ImageManager.isComplete }
     public get layoutLocked() { return !this.layouter.running }
 
     public view: unknown
@@ -283,23 +284,24 @@ export class Leafer extends Group implements ILeafer {
         WaitHelper.run(this.__viewReadyWait)
     }
 
-    protected __onRenderEnd(_e: RenderEvent): void {
-        if (!this.viewReady) this.__onViewReady()
-        const completed = this.__checkViewCompleted()
-        if (completed) this.__onViewCompleted()
-        this.viewCompleted = completed
-        WaitHelper.run(this.__nextRenderWait)
-    }
+    protected __onAnimateFrame(): void {
+        if (this.viewReady) {
+            if (this.__nextRenderWait.length) WaitHelper.run(this.__nextRenderWait)
 
-    protected __checkViewCompleted(): boolean {
-        return this.viewReady && !this.watcher.changed && ImageManager.isComplete
+            const { imageReady } = this
+            if (imageReady && !this.viewCompleted) this.__checkViewCompleted()
+            if (!imageReady) this.viewCompleted = false
+        }
     }
 
-    protected __onViewCompleted(): void {
-        if (!this.viewCompleted) {
-            this.emitLeafer(LeaferEvent.VIEW_COMPLETED)
-            WaitHelper.run(this.__viewCompletedWait)
-        }
+    protected __checkViewCompleted(emit: boolean = true): void {
+        this.nextRender(() => {
+            if (this.imageReady) {
+                if (emit) this.emitLeafer(LeaferEvent.VIEW_COMPLETED)
+                WaitHelper.run(this.__viewCompletedWait)
+                this.viewCompleted = true
+            }
+        })
     }
 
     protected __onWatchData(): void {
@@ -317,20 +319,16 @@ export class Leafer extends Group implements ILeafer {
     }
 
     public waitViewCompleted(item: IFunction): void {
+        this.__viewCompletedWait.push(item)
         if (this.viewCompleted) {
-            item()
+            this.__checkViewCompleted(false)
         } else {
-            this.__viewCompletedWait.push(item)
             if (!this.running) this.start()
         }
     }
 
     public nextRender(item: IFunction): void {
-        if (this.watcher && !this.watcher.changed) {
-            item()
-        } else {
-            this.__nextRenderWait.push(item)
-        }
+        this.__nextRenderWait.push(item)
     }
 
     protected __checkUpdateLayout(): void {
@@ -346,9 +344,10 @@ export class Leafer extends Group implements ILeafer {
         this.once(LeaferEvent.START, () => Run.end(runId))
         this.once(LayoutEvent.END, () => this.__onReady())
         this.once(RenderEvent.START, () => this.__onCreated())
+        this.once(RenderEvent.END, () => this.__onViewReady())
         this.__eventIds.push(
             this.on_(WatchEvent.DATA, this.__onWatchData, this),
-            this.on_(RenderEvent.END, this.__onRenderEnd, this),
+            this.on_(AnimateEvent.FRAME, this.__onAnimateFrame, this),
             this.on_(LayoutEvent.CHECK_UPDATE, this.__checkUpdateLayout, this)
         )
     }

package/types/index.d.ts

@@ -1,7 +1,7 @@
 import { ILeaferCanvas, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IPointData, IEventListenerId, ITimer, IControl, IScreenSizeData, IResizeEvent, ILeaf, IValue, IRenderOptions, ILeaferBase } from '@leafer/interface';
-import { RenderEvent } from '@leafer/core';
 import { ILeafer, ILeaferData, IApp, IEditorBase, IGroup, IFunction, ILeaferInputData, IUIInputData, IAppConfig, IAppInputData } from '@leafer-ui/interface';
 import { Group } from '@leafer-ui/display';
+import { RenderEvent } from '@leafer/core';
 
 declare class Leafer extends Group implements ILeafer {
     get __tag(): string;
@@ -15,6 +15,7 @@ declare class Leafer extends Group implements ILeafer {
     ready: boolean;
     viewReady: boolean;
     viewCompleted: boolean;
+    get imageReady(): boolean;
     get layoutLocked(): boolean;
     view: unknown;
     canvas: ILeaferCanvas;
@@ -63,9 +64,8 @@ declare class Leafer extends Group implements ILeafer {
     protected __onCreated(): void;
     protected __onReady(): void;
     protected __onViewReady(): void;
-    protected __onRenderEnd(_e: RenderEvent): void;
-    protected __checkViewCompleted(): boolean;
-    protected __onViewCompleted(): void;
+    protected __onAnimateFrame(): void;
+    protected __checkViewCompleted(emit?: boolean): void;
     protected __onWatchData(): void;
     waitReady(item: IFunction): void;
     waitViewReady(item: IFunction): void;
@@ -83,9 +83,9 @@ declare class App extends Leafer implements IApp {
     get isApp(): boolean;
     children: ILeafer[];
     realCanvas: boolean;
-    ground?: ILeafer;
-    tree?: ILeafer;
-    sky?: ILeafer;
+    ground: ILeafer;
+    tree: ILeafer;
+    sky: ILeafer;
     constructor(userConfig?: IAppConfig, data?: IAppInputData);
     protected __setApp(): void;
     start(): void;
@@ -98,7 +98,6 @@ declare class App extends Leafer implements IApp {
     protected __onCreated(): void;
     protected __onReady(): void;
     protected __onViewReady(): void;
-    protected __checkViewCompleted(): boolean;
     protected __onChildRenderEnd(e: RenderEvent): void;
     __render(canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __onResize(event: IResizeEvent): void;