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

package/package.json

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

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/Canvas.ts

@@ -1,5 +1,5 @@
-import { ILeaferCanvas, ILeaferCanvasConfig, INumber, IRenderOptions, IPointData, ICanvasContext2D, ICanvasContext2DSettings, IScreenSizeData, ISizeData, IHitType } from '@leafer/interface'
-import { Creator, Matrix, Platform, dataProcessor, registerUI, hitType } from '@leafer/core'
+import { ILeaferCanvas, ILeaferCanvasConfig, INumber, IRenderOptions, IPointData, ICanvasContext2D, ICanvasContext2DSettings, IScreenSizeData, ISizeData } from '@leafer/interface'
+import { Creator, Matrix, Platform, dataProcessor, registerUI } from '@leafer/core'
 
 import { ICanvas, ICanvasData, ICanvasInputData, IUI } from '@leafer-ui/interface'
 import { CanvasData } from '@leafer-ui/data'
@@ -31,9 +31,6 @@ export class Canvas extends Rect implements ICanvas {
     @resizeType()
     public contextSettings: ICanvasContext2DSettings
 
-    @hitType('all')
-    declare public hitFill: IHitType
-
     public canvas: ILeaferCanvas
 
     public context: ICanvasContext2D
@@ -42,7 +39,7 @@ export class Canvas extends Rect implements ICanvas {
         super(data)
         this.canvas = Creator.canvas(this.__ as ILeaferCanvasConfig)
         this.context = this.canvas.context
-        this.__.__drawAfterFill = true
+        this.__.__isCanvas = this.__.__drawAfterFill = true
     }
 
     public draw(ui: IUI, offset?: IPointData, scale?: number | IPointData, rotation?: number): void {

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

@@ -1,4 +1,4 @@
-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 } from '@leafer/interface'
+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 } 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 } 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 } from '@leafer-ui/interface'
@@ -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
 
@@ -323,6 +326,11 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     public disabledStyle: IUIInputData
 
 
+    // 预留给用户使用的数据对象
+    @dataType({})
+    public data: IObject
+
+
     public set scale(value: INumber | IPointData) {
         if (typeof value === 'number') {
             this.scaleX = this.scaleY = value
@@ -382,9 +390,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

@@ -1,4 +1,4 @@
-import { IString, INumber, IBoolean, IMaskType, IEraserType, IAlign, IUnitPointData, IPathCommandData, IPathString, IWindingRule, IFlowType, IFourNumber, IGap, IPointGap, IFlowAlign, IFlowAxisAlign, IFlowWrap, IFlowBoxType, IAutoSize, IAutoBoxData, IConstraint, IRangeSize, IAxis, IBoundsData, IHitType, ICursorType, IPointData, IPathCreator, IValue, IFindCondition, ILeaferCanvas, IPathDrawer, IExportFileType, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IObject, IZoomType, IClientPointData, IRenderOptions, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D, IUnitData } from '@leafer/interface';
+import { IString, INumber, IBoolean, IMaskType, IEraserType, IAlign, IUnitPointData, IPathCommandData, IPathString, IWindingRule, IFlowType, IFourNumber, IGap, IPointGap, IFlowAlign, IFlowAxisAlign, IFlowWrap, IFlowBoxType, IAutoSize, IAutoBoxData, IConstraint, IRangeSize, IAxis, IBoundsData, IHitType, ICursorType, IObject, IPointData, IPathCreator, IValue, IFindCondition, ILeaferCanvas, IPathDrawer, IExportFileType, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IZoomType, IClientPointData, IRenderOptions, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D, IUnitData } 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, IEditorConfig, IFindUIMethod, IExportOptions, IExportResult, IEditorConfigFunction, IEditToolFunction, IGroupData, IGroupInputData, 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';
 
@@ -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;
@@ -92,6 +93,7 @@ declare class UI extends Leaf implements IUI {
     focusStyle: IUIInputData;
     selectedStyle: IUIInputData;
     disabledStyle: IUIInputData;
+    data: IObject;
     set scale(value: INumber | IPointData);
     get scale(): INumber | IPointData;
     get pen(): IPathCreator;
@@ -105,8 +107,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 +242,7 @@ declare class Box extends Group implements IBox {
     get __tag(): string;
     get isBranchLeaf(): boolean;
     __: IBoxData;
+    resizeChildren: IBoolean;
     overflow: IOverflow;
     isOverflow: boolean;
     constructor(data?: IBoxInputData);
@@ -339,7 +342,6 @@ declare class Canvas extends Rect implements ICanvas {
     pixelRatio: INumber;
     smooth: boolean;
     contextSettings: ICanvasContext2DSettings;
-    hitFill: IHitType;
     canvas: ILeaferCanvas;
     context: ICanvasContext2D;
     constructor(data?: ICanvasInputData);
@@ -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;