@leafer-ui/display 1.2.2 → 1.3.0

package/package.json

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

package/src/Group.ts

@@ -37,18 +37,20 @@ export class Group extends UI implements IGroup {   // tip: rewrited Box
     // data
 
     public set(data: IUIInputData, transition?: ITransition | 'temp'): void {
-        if (data.children) {
-            const { children } = data
+        if (data) {
+            if (data.children) {
+                const { children } = data
 
-            delete data.children
-            this.children ? this.clear() : this.__setBranch()
+                delete data.children
+                this.children ? this.clear() : this.__setBranch()
 
-            super.set(data, transition)
+                super.set(data, transition)
 
-            children.forEach(child => this.add(child))
-            data.children = children
+                children.forEach(child => this.add(child))
+                data.children = children
 
-        } else super.set(data, transition)
+            } else super.set(data, transition)
+        }
     }
 
     public toJSON(options?: IJSONOptions): IUIJSONData {

package/src/Leafer.ts

@@ -397,11 +397,6 @@ export class Leafer extends Group implements ILeafer {
     // miniapp rewrite
     public receiveEvent(_event: any): void { }
 
-
-    protected __checkUpdateLayout(): void {
-        this.__layout.update()
-    }
-
     protected emitLeafer(type: string): void {
         this.emitEvent(new LeaferEvent(type, this))
     }
@@ -416,7 +411,6 @@ export class Leafer extends Group implements ILeafer {
         this.__eventIds.push(
             this.on_(WatchEvent.DATA, this.__onWatchData, this),
             this.on_(RenderEvent.NEXT, this.__onNextRender, this),
-            this.on_(LayoutEvent.CHECK_UPDATE, this.__checkUpdateLayout, this)
         )
     }
 

package/src/Text.ts

@@ -1,7 +1,7 @@
 import { ILeaferCanvas, IPathDrawer, IPathCommandData, IBoolean, INumber, IString, IBoundsData, IUnitData } from '@leafer/interface'
 import { BoundsHelper, boundsType, surfaceType, dataProcessor, registerUI, affectStrokeBoundsType, dataType, hitType, MathHelper } from '@leafer/core'
 
-import { IFill, IText, IFontWeight, ITextCase, ITextDecoration, ITextData, ITextInputData, ITextAlign, IVerticalAlign, ITextDrawData, IOverflow, IStrokeAlign, IHitType, ITextWrap } from '@leafer-ui/interface'
+import { IFill, IText, IFontWeight, ITextCase, ITextDecoration, ITextData, ITextInputData, ITextAlign, IVerticalAlign, ITextDrawData, IOverflow, IStrokeAlign, IHitType, ITextWrap, IWritingMode } from '@leafer-ui/interface'
 import { TextData } from '@leafer-ui/data'
 
 import { TextConvert, UnitConvert } from '@leafer-ui/external'
@@ -71,6 +71,9 @@ export class Text extends UI implements IText {
     @boundsType(0)
     public paraSpacing?: INumber
 
+    @boundsType('x')
+    public writingMode?: IWritingMode
+
     @boundsType('left')
     public textAlign?: ITextAlign
 

package/src/UI.ts

@@ -292,9 +292,9 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
 
     // @leafer-in/animate rewrite
 
-    public animation?: IAnimation
+    public animation?: IAnimation | IAnimation[]
 
-    public animationOut?: IAnimation
+    public animationOut?: IAnimation | IAnimation[]
 
 
     public transition?: ITransition
@@ -381,13 +381,15 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
 
 
     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)
+        if (data) {
+            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)
+        }
     }
 
     public get(name?: string | string[] | IUIInputData): IUIInputData | IValue {
@@ -399,11 +401,11 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
 
     // hit rewrite
 
-    public find(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI[] { return undefined }
+    public find(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI[] { return Plugin.need('find') }
 
     public findTag(tag: string | string[]): IUI[] { return this.find({ tag }) }
 
-    public findOne(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI | undefined { return undefined }
+    public findOne(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI | undefined { return Plugin.need('find') }
 
     public findId(id: number | string): IUI | undefined { return this.findOne({ id }) }
 
@@ -465,17 +467,18 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
 
     // @leafer-in/animate rewrite
 
-    public animate(_keyframe?: IUIInputData | IKeyframe[] | IAnimation, _options?: ITransition, _type?: IAnimateType, _isTemp?: boolean): IAnimate {
+    public animate(_keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], _options?: ITransition, _type?: IAnimateType, _isTemp?: boolean): IAnimate {
         return Plugin.need('animate')
     }
 
-    public killAnimate(_type?: IAnimateType): void { }
+    public killAnimate(_type?: IAnimateType, _killStyle?: IUIInputData): void { }
 
 
     // create
 
-    public export(filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult> {
-        return Export.export(this, filename, options)
+    // @leafer-in/export will rewrite
+    public export(_filename: IExportFileType | string, _options?: IExportOptions | number | boolean): Promise<IExportResult> {
+        return Plugin.need('export')
     }
 
     public clone(data?: IUIInputData): IUI {

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import { IString, INumber, IBoolean, IMaskType, IEraserType, IAlign, IUnitPointData, IPathCommandData, IPathCommandObject, IPathString, IWindingRule, IFlowType, IFourNumber, IGap, IPointGap, IFlowAlign, IFlowAxisAlign, IFlowWrap, IFlowBoxType, IAutoSize, IAutoBoxData, IConstraint, IRangeSize, IAxis, IBoundsData, IHitType, ICursorType, IUnitData, IObject, IPointData, IPathCreator, IValue, IFindCondition, ILeaferCanvas, IPathDrawer, IExportFileType, IJSONOptions, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IZoomType, IClientPointData, IRenderOptions, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D } from '@leafer/interface';
 import { Leaf, LeafList } from '@leafer/core';
-import { IUI, IUIData, IUIInputData, ILeafer, IGroup, IBlendMode, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowType, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IEffect, IAnimation, ITransition, IStates, IStateName, IAnimate, IEditorConfig, IFindUIMethod, IKeyframe, IAnimateType, IExportOptions, IExportResult, IEditorConfigFunction, IEditToolFunction, IGroupData, IGroupInputData, IUIJSONData, IFindCondition as IFindCondition$1, ILeaferData, IApp, IEditorBase, IFunction, ILeaferInputData, IBox, IBoxData, IOverflow, IBoxInputData, IFrame, IFrameData, IFrameInputData, IRect, IRectData, IRectInputData, IEllipse, IEllipseData, IEllipseInputData, IPolygon, IPolygonData, IPolygonInputData, IStar, IStarData, IStarInputData, ILine, ILineData, ILineInputData, IImage, IImageData, IImageInputData, ICanvas, ICanvasData, ICanvasInputData, IText, ITextData, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, ITextWrap, ITextDrawData, ITextInputData, IPath, IPathData, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
+import { IUI, IUIData, IUIInputData, ILeafer, IGroup, IBlendMode, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowType, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IEffect, IAnimation, ITransition, IStates, IStateName, IAnimate, IEditorConfig, IFindUIMethod, IKeyframe, IAnimateType, IExportOptions, IExportResult, IEditorConfigFunction, IEditToolFunction, IGroupData, IGroupInputData, IUIJSONData, IFindCondition as IFindCondition$1, ILeaferData, IApp, IEditorBase, IFunction, ILeaferInputData, IBox, IBoxData, IOverflow, IBoxInputData, IFrame, IFrameData, IFrameInputData, IRect, IRectData, IRectInputData, IEllipse, IEllipseData, IEllipseInputData, IPolygon, IPolygonData, IPolygonInputData, IStar, IStarData, IStarInputData, ILine, ILineData, ILineInputData, IImage, IImageData, IImageInputData, ICanvas, ICanvasData, ICanvasInputData, IText, ITextData, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, IWritingMode, ITextAlign, IVerticalAlign, ITextWrap, ITextDrawData, ITextInputData, IPath, IPathData, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
 
 declare class UI extends Leaf implements IUI {
     __: IUIData;
@@ -86,8 +86,8 @@ declare class UI extends Leaf implements IUI {
     backgroundBlur?: INumber | IBlurEffect;
     grayscale?: INumber | IGrayscaleEffect;
     filter?: IEffect | IEffect[];
-    animation?: IAnimation;
-    animationOut?: IAnimation;
+    animation?: IAnimation | IAnimation[];
+    animationOut?: IAnimation | IAnimation[];
     transition?: ITransition;
     transitionOut?: ITransition;
     motionPath?: boolean;
@@ -131,9 +131,9 @@ declare class UI extends Leaf implements IUI {
     __drawPath(canvas: ILeaferCanvas): void;
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void;
     __drawPathByBox(drawer: IPathDrawer): void;
-    animate(_keyframe?: IUIInputData | IKeyframe[] | IAnimation, _options?: ITransition, _type?: IAnimateType, _isTemp?: boolean): IAnimate;
-    killAnimate(_type?: IAnimateType): void;
-    export(filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
+    animate(_keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], _options?: ITransition, _type?: IAnimateType, _isTemp?: boolean): IAnimate;
+    killAnimate(_type?: IAnimateType, _killStyle?: 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;
     static registerUI(): void;
@@ -251,7 +251,6 @@ declare class Leafer extends Group implements ILeafer {
     getPagePointByClient(clientPoint: IClientPointData, updateClient?: boolean): IPointData;
     updateClientBounds(): void;
     receiveEvent(_event: any): void;
-    protected __checkUpdateLayout(): void;
     protected emitLeafer(type: string): void;
     protected __listenEvents(): void;
     protected __removeListenEvents(): void;
@@ -398,6 +397,7 @@ declare class Text extends UI implements IText {
     lineHeight?: INumber | IUnitData;
     paraIndent?: INumber;
     paraSpacing?: INumber;
+    writingMode?: IWritingMode;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
     autoSizeAlign?: IBoolean;