@leafer-ui/display 1.3.1 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/display",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "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.3",
+    "@leafer-ui/data": "1.3.3",
+    "@leafer-ui/display-module": "1.3.3",
+    "@leafer-ui/decorator": "1.3.3",
+    "@leafer-ui/external": "1.3.3"
   },
   "devDependencies": {
-    "@leafer/interface": "1.3.1",
-    "@leafer-ui/interface": "1.3.1"
+    "@leafer/interface": "1.3.3",
+    "@leafer-ui/interface": "1.3.3"
   }
 }

package/src/Box.ts

@@ -60,6 +60,8 @@ export class Box extends Group implements IBox {
 
             if (data.__autoSide) {
 
+                if (data.__hasSurface) this.__extraUpdate() // Box自身存在样式，需要额外更新
+
                 super.__updateBoxBounds()
 
                 const { boxBounds } = this.__layout

package/src/Leafer.ts

@@ -256,7 +256,7 @@ export class Leafer extends Group implements ILeafer {
     override __setAttr(attrName: string, newValue: IValue): boolean {
         if (this.canvas) {
             if (canvasSizeAttrs.includes(attrName)) {
-                if (!newValue) debug.warn(attrName + ' is 0')
+                // if (!newValue) debug.warn(attrName + ' is 0')
                 this.__changeCanvasSize(attrName, newValue as number)
             } else if (attrName === 'fill') {
                 this.__changeFill(newValue as string)
@@ -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/Text.ts

@@ -41,7 +41,7 @@ export class Text extends UI implements IText {
     @boundsType('')
     public text?: IString | INumber
 
-    @boundsType('L')
+    @boundsType('caption')
     public fontFamily?: IString
 
     @boundsType(12)

package/src/UI.ts

@@ -1,7 +1,7 @@
 import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IEraserType, IValue, IWindingRule, IPathCreator, IFourNumber, IBoundsData, IFlowType, IGap, IFlowWrap, IAxis, IConstraint, IAutoBoxData, IFlowBoxType, IPointGap, IFlowAlign, IFlowAxisAlign, IFindCondition, IAutoSize, IRangeSize, IAlign, IUnitPointData, IObject, IScaleData, IUnitData, IPathCommandObject } from '@leafer/interface'
 import { Leaf, PathDrawer, surfaceType, dataType, positionType, boundsType, pathType, scaleType, rotationType, opacityType, visibleType, sortType, maskType, dataProcessor, registerUI, useModule, rewrite, rewriteAble, UICreator, PathCorner, hitType, strokeType, PathConvert, eraserType, cursorType, autoLayoutType, pen, naturalBoundsType, pathInputType, MathHelper, Plugin } from '@leafer/core'
 
-import { IUI, IShadowEffect, IBlurEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult, IFill, IStroke, IArrowType, IFindUIMethod, ILeafer, IEditorConfig, IEditorConfigFunction, IEditToolFunction, IKeyframe, IAnimation, IAnimate, IStates, IStateName, ITransition, IAnimateType, IEffect } from '@leafer-ui/interface'
+import { IUI, IShadowEffect, IBlurEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult, IFill, IStroke, IArrowType, IFindUIMethod, ILeafer, IEditorConfig, IEditorConfigFunction, IEditToolFunction, IKeyframe, IAnimation, IAnimate, IStates, IStateName, ITransition, IAnimateType, IEffect, IStateStyle } from '@leafer-ui/interface'
 import { effectType, zoomLayerType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
@@ -326,17 +326,19 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     public disabled?: IBoolean
 
 
-    public normalStyle?: IUIInputData
+    public normalStyle?: IStateStyle
 
-    public hoverStyle?: IUIInputData
+    public hoverStyle?: IStateStyle
 
-    public pressStyle?: IUIInputData
+    public pressStyle?: IStateStyle
 
-    public focusStyle?: IUIInputData
+    public focusStyle?: IStateStyle
 
-    public selectedStyle?: IUIInputData
+    public selectedStyle?: IStateStyle
 
-    public disabledStyle?: IUIInputData
+    public disabledStyle?: IStateStyle
+
+    public placeholderStyle?: IStateStyle
 
 
     public button?: IBoolean
@@ -471,7 +473,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

@@ -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, IWritingMode, 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, IStateStyle, 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;
@@ -98,12 +98,13 @@ declare class UI extends Leaf implements IUI {
     state?: IStateName;
     selected?: IBoolean;
     disabled?: IBoolean;
-    normalStyle?: IUIInputData;
-    hoverStyle?: IUIInputData;
-    pressStyle?: IUIInputData;
-    focusStyle?: IUIInputData;
-    selectedStyle?: IUIInputData;
-    disabledStyle?: IUIInputData;
+    normalStyle?: IStateStyle;
+    hoverStyle?: IStateStyle;
+    pressStyle?: IStateStyle;
+    focusStyle?: IStateStyle;
+    selectedStyle?: IStateStyle;
+    disabledStyle?: IStateStyle;
+    placeholderStyle?: IStateStyle;
     button?: IBoolean;
     data: IObject;
     set scale(value: INumber | IPointData);
@@ -132,7 +133,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 +237,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;