@leafer-ui/display 1.1.0 → 1.1.2

package/package.json

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

package/src/Leafer.ts

@@ -28,6 +28,7 @@ export class Leafer extends Group implements ILeafer {
 
     public get isLeafer(): boolean { return true }
 
+    public parentApp?: IApp
     declare public parent?: IApp
 
     public running: boolean
@@ -60,20 +61,10 @@ export class Leafer extends Group implements ILeafer {
 
     public userConfig: ILeaferConfig
     public config: ILeaferConfig = {
-        type: 'design',
         start: true,
         hittable: true,
         smooth: true,
-        lazySpeard: 100,
-        zoom: {
-            min: 0.01,
-            max: 256
-        },
-        move: {
-            holdSpaceKey: true,
-            holdMiddleKey: true,
-            autoDistance: 2
-        }
+        lazySpeard: 100
     }
 
     public autoLayout?: IAutoBounds
@@ -104,13 +95,23 @@ export class Leafer extends Group implements ILeafer {
     public init(userConfig?: ILeaferConfig, parentApp?: IApp): void {
         if (this.canvas) return
 
-        this.__setLeafer(this)
-        if (userConfig) DataHelper.assign(this.config, userConfig)
-
         let start: boolean
         const { config } = this
 
-        this.initType(config.type) // LeaferType
+        this.__setLeafer(this)
+
+        if (parentApp) {
+            this.parentApp = parentApp
+            this.__bindApp(parentApp)
+            start = parentApp.running
+        }
+
+        if (userConfig) {
+            this.parent = parentApp
+            this.initType(userConfig.type) // LeaferType
+            this.parent = undefined
+            DataHelper.assign(config, userConfig)
+        }
 
         // render / layout
         const canvas = this.canvas = Creator.canvas(config)
@@ -125,10 +126,7 @@ export class Leafer extends Group implements ILeafer {
         this.view = canvas.view
 
         // interaction / manager
-        if (parentApp) {
-            this.__bindApp(parentApp)
-            start = parentApp.running
-        } else {
+        if (!parentApp) {
             this.selector = Creator.selector(this)
             this.interaction = Creator.interaction(this, canvas, this.selector, config)
 
@@ -157,7 +155,7 @@ export class Leafer extends Group implements ILeafer {
 
     public onInit(): void { }
 
-    public initType(_type: ILeaferType): void { } // rewrite in @leafer-ui/type
+    public initType(_type: ILeaferType): void { } // rewrite in @leafer-ui/viewport
 
     public set(data: IUIInputData, transition?: ITransition | 'temp'): void {
         this.waitInit(() => { super.set(data, transition) })
@@ -199,7 +197,11 @@ export class Leafer extends Group implements ILeafer {
 
     override forceRender(bounds?: IBoundsData): void {
         this.renderer.addBlock(bounds ? new Bounds(bounds) : this.canvas.bounds)
-        if (this.viewReady) this.renderer.update()
+        if (this.viewReady) this.renderer.render()
+    }
+
+    public requestRender(change = false): void {
+        if (this.renderer) this.renderer.update(change)
     }
 
     public updateCursor(cursor?: ICursorType): void {
@@ -309,7 +311,10 @@ export class Leafer extends Group implements ILeafer {
 
             const { imageReady } = this
             if (imageReady && !this.viewCompleted) this.__checkViewCompleted()
-            if (!imageReady) this.viewCompleted = false
+            if (!imageReady) {
+                this.viewCompleted = false
+                this.requestRender()
+            }
         }
     }
 
@@ -360,6 +365,7 @@ export class Leafer extends Group implements ILeafer {
                 if (list[i] === item) { list.splice(i, 1); break }
             }
         } else list.push(item)
+        this.requestRender()
     }
 
     // need view plugin
@@ -436,7 +442,7 @@ export class Leafer extends Group implements ILeafer {
 
                     this.canvas.destroy()
 
-                    this.config.view = this.view = null
+                    this.config.view = this.view = this.parentApp = null
                     if (this.userConfig) this.userConfig.view = null
 
                     super.destroy()

package/types/index.d.ts

@@ -173,6 +173,7 @@ declare class Leafer extends Group implements ILeafer {
     get isApp(): boolean;
     get app(): ILeafer;
     get isLeafer(): boolean;
+    parentApp?: IApp;
     parent?: IApp;
     running: boolean;
     created: boolean;
@@ -219,6 +220,7 @@ declare class Leafer extends Group implements ILeafer {
     lockLayout(): void;
     resize(size: IScreenSizeData): void;
     forceRender(bounds?: IBoundsData): void;
+    requestRender(change?: boolean): void;
     updateCursor(cursor?: ICursorType): void;
     updateLazyBounds(): void;
     protected __doResize(size: IScreenSizeData): void;