@leafer-ui/display 1.0.10 → 1.1.1

package/package.json

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

package/src/Group.ts

@@ -1,7 +1,7 @@
 import { IJSONOptions, IPickOptions, IPickResult, IPointData } from '@leafer/interface'
 import { Branch, useModule, dataProcessor, registerUI } from '@leafer/core'
 
-import { IGroup, IGroupData, IGroupInputData, IUI, IUIInputData, IUIJSONData, IFindCondition, IFindUIMethod } from '@leafer-ui/interface'
+import { IGroup, IGroupData, IGroupInputData, IUI, IUIInputData, IUIJSONData, ITransition, IFindCondition, IFindUIMethod } from '@leafer-ui/interface'
 import { GroupData } from '@leafer-ui/data'
 
 import { UI } from './UI'
@@ -36,19 +36,19 @@ export class Group extends UI implements IGroup {   // tip: rewrited Box
 
     // data
 
-    public set(data: IUIInputData, isTemp?: boolean): void {
+    public set(data: IUIInputData, transition?: ITransition | 'temp'): void {
         if (data.children) {
             const { children } = data
 
             delete data.children
             this.children ? this.clear() : this.__setBranch()
 
-            super.set(data, isTemp)
+            super.set(data, transition)
 
             children.forEach(child => this.add(child))
             data.children = children
 
-        } else super.set(data, isTemp)
+        } else super.set(data, transition)
     }
 
     public toJSON(options?: IJSONOptions): IUIJSONData {

package/src/Leafer.ts

@@ -1,7 +1,7 @@
 import { ILeaferCanvas, IRenderer, ILayouter, ISelector, IWatcher, IInteraction, ILeaferConfig, ICanvasManager, IHitCanvasManager, IAutoBounds, IScreenSizeData, IResizeEvent, IEventListenerId, ITimer, IValue, IObject, IControl, IPointData, ILeaferType, ICursorType, IBoundsData, INumber, IZoomType, IFourNumber, IBounds, IClientPointData } from '@leafer/interface'
 import { AutoBounds, LayoutEvent, ResizeEvent, LeaferEvent, CanvasManager, ImageManager, DataHelper, Creator, Run, Debug, RenderEvent, registerUI, boundsType, canvasSizeAttrs, dataProcessor, WaitHelper, WatchEvent, Bounds, LeafList, needPlugin } from '@leafer/core'
 
-import { ILeaferInputData, ILeaferData, IFunction, IUIInputData, ILeafer, IApp, IEditorBase } from '@leafer-ui/interface'
+import { ILeaferInputData, ILeaferData, IFunction, IUIInputData, ITransition, ILeafer, IApp, IEditorBase } from '@leafer-ui/interface'
 import { LeaferData } from '@leafer-ui/data'
 
 import { Group } from './Group'
@@ -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)
 
@@ -159,8 +157,8 @@ export class Leafer extends Group implements ILeafer {
 
     public initType(_type: ILeaferType): void { } // rewrite in @leafer-ui/type
 
-    public set(data: IUIInputData): void {
-        this.waitInit(() => { super.set(data) })
+    public set(data: IUIInputData, transition?: ITransition | 'temp'): void {
+        this.waitInit(() => { super.set(data, transition) })
     }
 
     public start(): void {
@@ -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/src/Text.ts

@@ -39,7 +39,7 @@ export class Text extends UI implements IText {
     declare public hitFill?: IHitType
 
     @boundsType('')
-    public text?: IString
+    public text?: IString | INumber
 
     @boundsType('L')
     public fontFamily?: IString

package/src/UI.ts

@@ -306,6 +306,9 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
 
     public motionPath?: boolean
 
+    public motionPrecision?: INumber
+
+
     public motion?: INumber | IUnitData
 
     public motionRotation?: INumber | IBoolean
@@ -377,11 +380,13 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     public reset(_data?: IUIInputData): void { }
 
 
-    public set(data: IUIInputData, isTemp?: boolean): void {
-        if (isTemp) {
-            this.lockNormalStyle = true
-            Object.assign(this, data)
-            this.lockNormalStyle = false
+    public set(data: IUIInputData, transition?: ITransition | 'temp'): void {
+        if (transition) {
+            if (transition === 'temp') {
+                this.lockNormalStyle = true
+                Object.assign(this, data)
+                this.lockNormalStyle = false
+            } else this.animate(data, transition)
         } else Object.assign(this, data)
     }
 

package/types/index.d.ts

@@ -91,6 +91,7 @@ declare class UI extends Leaf implements IUI {
     transition?: ITransition;
     transitionOut?: ITransition;
     motionPath?: boolean;
+    motionPrecision?: INumber;
     motion?: INumber | IUnitData;
     motionRotation?: INumber | IBoolean;
     states?: IStates;
@@ -114,7 +115,7 @@ declare class UI extends Leaf implements IUI {
     get editInner(): string;
     constructor(data?: IUIInputData);
     reset(_data?: IUIInputData): void;
-    set(data: IUIInputData, isTemp?: boolean): void;
+    set(data: IUIInputData, transition?: ITransition | 'temp'): void;
     get(name?: string | string[] | IUIInputData): IUIInputData | IValue;
     createProxyData(): IUIInputData;
     find(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI[];
@@ -151,7 +152,7 @@ declare class Group extends UI implements IGroup {
     constructor(data?: IGroupInputData);
     reset(data?: IGroupInputData): void;
     __setBranch(): void;
-    set(data: IUIInputData, isTemp?: boolean): void;
+    set(data: IUIInputData, transition?: ITransition | 'temp'): void;
     toJSON(options?: IJSONOptions): IUIJSONData;
     pick(_hitPoint: IPointData, _options?: IPickOptions): IPickResult;
     addAt(child: IUI | IUI[] | IUIInputData | IUIInputData[], index: number): void;
@@ -172,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;
@@ -211,13 +213,14 @@ declare class Leafer extends Group implements ILeafer {
     init(userConfig?: ILeaferConfig, parentApp?: IApp): void;
     onInit(): void;
     initType(_type: ILeaferType): void;
-    set(data: IUIInputData): void;
+    set(data: IUIInputData, transition?: ITransition | 'temp'): void;
     start(): void;
     stop(): void;
     unlockLayout(): void;
     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;
@@ -383,7 +386,7 @@ declare class Text extends UI implements IText {
     fill?: IFill;
     strokeAlign?: IStrokeAlign;
     hitFill?: IHitType$1;
-    text?: IString;
+    text?: IString | INumber;
     fontFamily?: IString;
     fontSize?: INumber;
     fontWeight?: IFontWeight;