@leafer-ui/display 1.3.1 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/display",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "@leafer-ui/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,14 +22,14 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.3.1",
-    "@leafer-ui/data": "1.3.1",
-    "@leafer-ui/display-module": "1.3.1",
-    "@leafer-ui/decorator": "1.3.1",
-    "@leafer-ui/external": "1.3.1"
+    "@leafer/core": "1.3.2",
+    "@leafer-ui/data": "1.3.2",
+    "@leafer-ui/display-module": "1.3.2",
+    "@leafer-ui/decorator": "1.3.2",
+    "@leafer-ui/external": "1.3.2"
   },
   "devDependencies": {
-    "@leafer/interface": "1.3.1",
-    "@leafer-ui/interface": "1.3.1"
+    "@leafer/interface": "1.3.2",
+    "@leafer-ui/interface": "1.3.2"
   }
 }

package/src/Leafer.ts

@@ -293,7 +293,6 @@ export class Leafer extends Group implements ILeafer {
     }
 
     protected __onReady(): void {
-        if (this.ready) return
         this.ready = true
         this.emitLeafer(LeaferEvent.BEFORE_READY)
         this.emitLeafer(LeaferEvent.READY)
@@ -308,6 +307,19 @@ export class Leafer extends Group implements ILeafer {
         WaitHelper.run(this.__viewReadyWait)
     }
 
+    protected __onLayoutEnd(): void {
+        const { grow, growWidth, growHeight } = this.config
+        if (grow) {
+            let { width, height, pixelRatio } = this
+            const bounds = grow === 'box' ? this.worldBoxBounds : this.__world
+            if (growWidth !== false) width = Math.max(1, bounds.x + bounds.width)
+            if (growHeight !== false) height = Math.max(1, bounds.y + bounds.height)
+            this.__doResize({ width, height, pixelRatio })
+        }
+
+        if (!this.ready) this.__onReady()
+    }
+
     protected __onNextRender(): void {
         if (this.viewReady) {
             WaitHelper.run(this.__nextRenderWait)
@@ -405,11 +417,11 @@ export class Leafer extends Group implements ILeafer {
         const runId = Run.start('FirstCreate ' + this.innerName)
         this.once(LeaferEvent.START, () => Run.end(runId))
         this.once(LayoutEvent.START, () => this.updateLazyBounds())
-        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_(LayoutEvent.END, this.__onLayoutEnd, this),
             this.on_(RenderEvent.NEXT, this.__onNextRender, this),
         )
     }

package/src/UI.ts

@@ -471,7 +471,7 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
         return Plugin.need('animate')
     }
 
-    public killAnimate(_type?: IAnimateType, _killStyle?: IUIInputData): void { }
+    public killAnimate(_type?: IAnimateType, _nextStyle?: IUIInputData): void { }
 
 
     // create

package/types/index.d.ts

@@ -132,7 +132,7 @@ declare class UI extends Leaf implements IUI {
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void;
     __drawPathByBox(drawer: IPathDrawer): void;
     animate(_keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], _options?: ITransition, _type?: IAnimateType, _isTemp?: boolean): IAnimate;
-    killAnimate(_type?: IAnimateType, _killStyle?: IUIInputData): void;
+    killAnimate(_type?: IAnimateType, _nextStyle?: IUIInputData): void;
     export(_filename: IExportFileType | string, _options?: IExportOptions | number | boolean): Promise<IExportResult>;
     clone(data?: IUIInputData): IUI;
     static one(data: IUIInputData, x?: number, y?: number, width?: number, height?: number): IUI;
@@ -236,6 +236,7 @@ declare class Leafer extends Group implements ILeafer {
     protected __onCreated(): void;
     protected __onReady(): void;
     protected __onViewReady(): void;
+    protected __onLayoutEnd(): void;
     protected __onNextRender(): void;
     protected __checkViewCompleted(emit?: boolean): void;
     protected __onWatchData(): void;