@leafer-ui/display 1.0.0-rc.25 → 1.0.0-rc.26

package/package.json

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

package/src/Box.ts

@@ -1,5 +1,5 @@
-import { ILeaferCanvas, IRenderOptions, IBoundsData } from '@leafer/interface'
-import { rewrite, rewriteAble, registerUI, BoundsHelper, dataProcessor, affectRenderBoundsType } from '@leafer/core'
+import { ILeaferCanvas, IRenderOptions, IBoundsData, IBoolean } from '@leafer/interface'
+import { rewrite, rewriteAble, registerUI, BoundsHelper, dataProcessor, affectRenderBoundsType, dataType } from '@leafer/core'
 
 import { IBox, IBoxData, IBoxInputData, IOverflow } from '@leafer-ui/interface'
 import { BoxData } from '@leafer-ui/data'
@@ -23,6 +23,9 @@ export class Box extends Group implements IBox {
     @dataProcessor(BoxData)
     declare public __: IBoxData
 
+    @dataType(false)
+    public resizeChildren: IBoolean
+
     @affectRenderBoundsType('show')
     declare public overflow: IOverflow
 
@@ -56,8 +59,8 @@ export class Box extends Group implements IBox {
                 super.__updateBoxBounds()
                 if (!data.__autoSize) {
                     const b = this.__layout.boxBounds
-                    if (!data.__autoWidth) b.x = 0, b.width = data.width
-                    if (!data.__autoHeight) b.y = 0, b.height = data.height
+                    if (!data.__autoWidth) b.height += b.y, b.width = data.width, b.x = b.y = 0
+                    if (!data.__autoHeight) b.width += b.x, b.height = data.height, b.y = b.x = 0
                 }
             } else {
                 this.__updateRectBoxBounds()

package/src/Text.ts

@@ -1,5 +1,5 @@
 import { ILeaferCanvas, IPathDrawer, IPathCommandData, IBoolean, INumber, IString, IBoundsData, IUnitData } from '@leafer/interface'
-import { BoundsHelper, boundsType, surfaceType, dataProcessor, registerUI, affectStrokeBoundsType, hitType, MathHelper } from '@leafer/core'
+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 { TextData, UnitConvert } from '@leafer-ui/data'
@@ -26,6 +26,9 @@ export class Text extends UI implements IText {
     @boundsType(0)
     declare public height: INumber
 
+    @dataType(false)
+    public resizeFontSize: IBoolean
+
     @surfaceType('#000000')
     declare public fill: IFill
 

package/src/UI.ts

@@ -63,7 +63,7 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     @stateType(false)
     public disabled: IBoolean
 
-    @dataType(false)
+    @surfaceType(false)
     public locked: IBoolean
 
 
@@ -182,6 +182,9 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     @boundsType()  // rewrite in flow
     public autoHeight: IAutoSize
 
+    @boundsType()
+    public lockRatio: IBoolean
+
     @boundsType()
     public autoBox: IAutoBoxData | IConstraint
 
@@ -382,9 +385,9 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
 
     public findTag(tag: string | string[]): IUI[] { return this.find({ tag }) }
 
-    public findOne(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI { return undefined }
+    public findOne(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI | undefined { return undefined }
 
-    public findId(id: number | string): IUI { return this.findOne({ id }) }
+    public findId(id: number | string): IUI | undefined { return this.findOne({ id }) }
 
 
     // path

package/types/index.d.ts

@@ -53,6 +53,7 @@ declare class UI extends Leaf implements IUI {
     inFlow: IBoolean;
     autoWidth: IAutoSize;
     autoHeight: IAutoSize;
+    lockRatio: IBoolean;
     autoBox: IAutoBoxData | IConstraint;
     widthRange: IRangeSize;
     heightRange: IRangeSize;
@@ -105,8 +106,8 @@ declare class UI extends Leaf implements IUI {
     createProxyData(): IUIInputData;
     find(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI[];
     findTag(tag: string | string[]): IUI[];
-    findOne(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI;
-    findId(id: number | string): IUI;
+    findOne(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI | undefined;
+    findId(id: number | string): IUI | undefined;
     getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData;
     getPathString(curve?: boolean, pathForRender?: boolean): IPathString;
     load(): void;
@@ -240,6 +241,7 @@ declare class Box extends Group implements IBox {
     get __tag(): string;
     get isBranchLeaf(): boolean;
     __: IBoxData;
+    resizeChildren: IBoolean;
     overflow: IOverflow;
     isOverflow: boolean;
     constructor(data?: IBoxInputData);
@@ -355,6 +357,7 @@ declare class Text extends UI implements IText {
     __: ITextData;
     width: INumber;
     height: INumber;
+    resizeFontSize: IBoolean;
     fill: IFill;
     strokeAlign: IStrokeAlign;
     hitFill: IHitType$1;