@leafer-ui/display 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/display",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "@leafer-ui/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -13,23 +13,23 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/leaferjs/ui.git"
+    "url": "https://github.com/leaferjs/leafer-ui.git"
   },
-  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/display",
-  "bugs": "https://github.com/leaferjs/ui/issues",
+  "homepage": "https://github.com/leaferjs/leafer-ui/tree/main/packages/display",
+  "bugs": "https://github.com/leaferjs/leafer-ui/issues",
   "keywords": [
     "leafer-ui",
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.3",
-    "@leafer-ui/data": "1.0.3",
-    "@leafer-ui/display-module": "1.0.3",
-    "@leafer-ui/decorator": "1.0.3",
-    "@leafer-ui/external": "1.0.3"
+    "@leafer/core": "1.0.5",
+    "@leafer-ui/data": "1.0.5",
+    "@leafer-ui/display-module": "1.0.5",
+    "@leafer-ui/decorator": "1.0.5",
+    "@leafer-ui/external": "1.0.5"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.3",
-    "@leafer-ui/interface": "1.0.3"
+    "@leafer/interface": "1.0.5",
+    "@leafer-ui/interface": "1.0.5"
   }
 }

package/src/Box.ts

@@ -7,10 +7,10 @@ import { BoxData } from '@leafer-ui/data'
 import { Group } from './Group'
 import { Rect } from './Rect'
 
-const rect = Rect.prototype
-const group = Group.prototype
+
+const { copy, add, includes } = BoundsHelper
+const rect = Rect.prototype, group = Group.prototype
 const childrenRenderBounds = {} as IBoundsData
-const { copy, add, includes, copyAndSpread } = BoundsHelper
 
 @rewriteAble()
 @registerUI()
@@ -26,6 +26,9 @@ export class Box extends Group implements IBox {
     @dataType(false)
     public resizeChildren?: IBoolean
 
+    @dataType(false)
+    public textBox?: IBoolean
+
     @affectRenderBoundsType('show')
     declare public overflow?: IOverflow
 
@@ -50,32 +53,35 @@ export class Box extends Group implements IBox {
     @rewrite(rect.__updateBoxBounds)
     public __updateRectBoxBounds(): void { }
 
-    public __updateBoxBounds(secondLayout?: boolean): void {
+
+    // @leafer-in/flow will rewrite
+    public __updateBoxBounds(_secondLayout?: boolean): void {
         const data = this.__
 
         if (this.children.length) {
+
             if (data.__autoSide) {
 
-                if (this.leafer && this.leafer.ready) this.leafer.layouter.addExtra(this)
                 super.__updateBoxBounds()
 
                 const { boxBounds } = this.__layout
 
                 if (!data.__autoSize) {
-                    if (data.__autoWidth) boxBounds.width += boxBounds.x, boxBounds.height = data.height, boxBounds.y = boxBounds.x = 0
-                    else boxBounds.height += boxBounds.y, boxBounds.width = data.width, boxBounds.x = boxBounds.y = 0
+                    if (data.__autoWidth) {
+                        boxBounds.width += boxBounds.x, boxBounds.x = 0
+                        boxBounds.height = data.height, boxBounds.y = 0
+                    } else {
+                        boxBounds.height += boxBounds.y, boxBounds.y = 0
+                        boxBounds.width = data.width, boxBounds.x = 0
+                    }
                 }
 
-                if (secondLayout && data.flow && data.padding) copyAndSpread(boxBounds, boxBounds, data.padding, false, data.__autoSize ? null : (data.__autoWidth ? 'width' : 'height'))
-
                 this.__updateNaturalSize()
 
             } else {
                 this.__updateRectBoxBounds()
             }
 
-            if (data.flow) this.__updateContentBounds()
-
         } else {
             this.__updateRectBoxBounds()
         }

package/src/Group.ts

@@ -1,7 +1,7 @@
 import { IJSONOptions, IPickOptions, IPickResult, IPointData } from '@leafer/interface'
 import { Branch, useModule, dataProcessor, registerUI, UICreator } from '@leafer/core'
 
-import { IGroup, IGroupData, IGroupInputData, IUI, IUIInputData, IUIJSONData } from '@leafer-ui/interface'
+import { IGroup, IGroupData, IGroupInputData, IUI, IUIInputData, IUIJSONData, IFindCondition, IFindUIMethod } from '@leafer-ui/interface'
 import { GroupData } from '@leafer-ui/data'
 
 import { UI } from './UI'
@@ -76,25 +76,25 @@ export class Group extends UI implements IGroup {   // tip: rewrited Box
 
     // add
 
-    public addAt(child: IUI, index: number): void {
+    public addAt(child: IUI | IUIInputData, index: number): void {
         this.add(child, index)
     }
 
-    public addAfter(child: IUI, after: IUI): void {
+    public addAfter(child: IUI | IUIInputData, after: IUI): void {
         this.add(child, this.children.indexOf(after) + 1)
     }
 
-    public addBefore(child: IUI, before: IUI): void {
+    public addBefore(child: IUI | IUIInputData, before: IUI): void {
         this.add(child, this.children.indexOf(before))
     }
 
     // Branch rewrite
 
-    public add(_child: IUI, _index?: number): void { }
+    public add(_child: IUI | IUIInputData, _index?: number): void { }
 
-    public addMany(..._children: IUI[]): void { }
+    public addMany(..._children: IUI[] | IUIInputData[]): void { }
 
-    public remove(_child?: IUI, _destroy?: boolean): void { }
+    public remove(_child?: IUI | number | string | IFindCondition | IFindUIMethod, _destroy?: boolean): void { }
 
     public removeAll(_destroy?: boolean): void { }
 

package/src/Text.ts

@@ -77,6 +77,9 @@ export class Text extends UI implements IText {
     @boundsType('top')
     public verticalAlign?: IVerticalAlign
 
+    @boundsType(true)
+    public autoSizeAlign?: IBoolean
+
     @boundsType('normal')
     public textWrap?: ITextWrap
 

package/src/UI.ts

@@ -444,11 +444,7 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     }
 
     public __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void {
-        if (data) {
-            PathDrawer.drawPathByData(drawer, data)
-        } else {
-            this.__drawPathByBox(drawer)
-        }
+        data ? PathDrawer.drawPathByData(drawer, data) : this.__drawPathByBox(drawer)
     }
 
     public __drawPathByBox(drawer: IPathDrawer): void {
@@ -456,9 +452,7 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
         if (this.__.cornerRadius) {
             const { cornerRadius } = this.__
             drawer.roundRect(x, y, width, height, typeof cornerRadius === 'number' ? [cornerRadius] : cornerRadius) // 修复微信浏览器bug, 后续需进一步优化
-        } else {
-            drawer.rect(x, y, width, height)
-        }
+        } else drawer.rect(x, y, width, height)
     }
 
     // @leafer-in/animate rewrite
@@ -476,9 +470,9 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
         return Export.export(this, filename, options)
     }
 
-    public clone(newData?: IUIInputData): IUI {
+    public clone(data?: IUIInputData): IUI {
         const json = this.toJSON()
-        if (newData) Object.assign(json, newData)
+        if (data) Object.assign(json, data)
         return UI.one(json)
     }
 

package/types/index.d.ts

@@ -1,6 +1,6 @@
 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, 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, IAnimation, ITransition, IStates, IStateName, IAnimate, IEditorConfig, IFindUIMethod, IKeyframe, IAnimateType, IExportOptions, IExportResult, IEditorConfigFunction, IEditToolFunction, IGroupData, IGroupInputData, IUIJSONData, 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, 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';
 
 declare class UI extends Leaf implements IUI {
     __: IUIData;
@@ -132,7 +132,7 @@ declare class UI extends Leaf implements IUI {
     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>;
-    clone(newData?: IUIInputData): IUI;
+    clone(data?: IUIInputData): IUI;
     static one(data: IUIInputData, x?: number, y?: number, width?: number, height?: number): IUI;
     static registerUI(): void;
     static registerData(data: IUIData): void;
@@ -153,12 +153,12 @@ declare class Group extends UI implements IGroup {
     set(data: IUIInputData, isTemp?: boolean): void;
     toJSON(options?: IJSONOptions): IUIJSONData;
     pick(_hitPoint: IPointData, _options?: IPickOptions): IPickResult;
-    addAt(child: IUI, index: number): void;
-    addAfter(child: IUI, after: IUI): void;
-    addBefore(child: IUI, before: IUI): void;
-    add(_child: IUI, _index?: number): void;
-    addMany(..._children: IUI[]): void;
-    remove(_child?: IUI, _destroy?: boolean): void;
+    addAt(child: IUI | IUIInputData, index: number): void;
+    addAfter(child: IUI | IUIInputData, after: IUI): void;
+    addBefore(child: IUI | IUIInputData, before: IUI): void;
+    add(_child: IUI | IUIInputData, _index?: number): void;
+    addMany(..._children: IUI[] | IUIInputData[]): void;
+    remove(_child?: IUI | number | string | IFindCondition$1 | IFindUIMethod, _destroy?: boolean): void;
     removeAll(_destroy?: boolean): void;
     clear(): void;
 }
@@ -259,6 +259,7 @@ declare class Box extends Group implements IBox {
     get isBranchLeaf(): boolean;
     __: IBoxData;
     resizeChildren?: IBoolean;
+    textBox?: IBoolean;
     overflow?: IOverflow;
     isOverflow: boolean;
     constructor(data?: IBoxInputData);
@@ -266,7 +267,7 @@ declare class Box extends Group implements IBox {
     __updateRectRenderSpread(): number;
     __updateRenderSpread(): number;
     __updateRectBoxBounds(): void;
-    __updateBoxBounds(secondLayout?: boolean): void;
+    __updateBoxBounds(_secondLayout?: boolean): void;
     __updateStrokeBounds(): void;
     __updateRenderBounds(): void;
     __updateRectRenderBounds(): void;
@@ -394,6 +395,7 @@ declare class Text extends UI implements IText {
     paraSpacing?: INumber;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
+    autoSizeAlign?: IBoolean;
     textWrap?: ITextWrap;
     textOverflow?: IOverflow | string;
     get editInner(): string;