@leafer-ui/display 1.7.0 → 1.9.0

package/package.json

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

package/src/Box.ts

@@ -1,7 +1,7 @@
 import { ILeaferCanvas, IRenderOptions, IBoundsData, IBoolean, INumber } from '@leafer/interface'
 import { rewrite, rewriteAble, registerUI, BoundsHelper, dataProcessor, affectRenderBoundsType, dataType, boundsType, DataHelper } from '@leafer/core'
 
-import { IBox, IBoxData, IBoxInputData, IOverflow } from '@leafer-ui/interface'
+import { IBox, IBoxData, IBoxInputData, IGroup, IOverflow } from '@leafer-ui/interface'
 import { BoxData } from '@leafer-ui/data'
 
 import { Group } from './Group'
@@ -41,6 +41,8 @@ export class Box extends Group implements IBox {
 
     public isOverflow: boolean
 
+    public scrollBar?: IGroup
+
     constructor(data?: IBoxInputData) {
         super(data)
         this.__layout.renderChanged || this.__layout.renderChange()
@@ -61,10 +63,10 @@ export class Box extends Group implements IBox {
 
     // @leafer-in/flow will rewrite
     public __updateBoxBounds(_secondLayout?: boolean): void {
-        const data = this.__
-
         if (this.children.length && !this.pathInputed) {
 
+            const data = this.__
+
             if (data.__autoSide) {
 
                 if (data.__hasSurface) this.__extraUpdate() // Box自身存在样式，需要额外更新
@@ -95,23 +97,36 @@ export class Box extends Group implements IBox {
 
     public __updateRenderBounds(): void {
         let isOverflow: boolean
-        const { renderBounds } = this.__layout
 
         if (this.children.length) {
+            const data = this.__, { renderBounds, boxBounds } = this.__layout
+
             super.__updateRenderBounds()
             copy(childrenRenderBounds, renderBounds)
             this.__updateRectRenderBounds()
 
-            isOverflow = !includes(renderBounds, childrenRenderBounds)
-            if (isOverflow && this.__.overflow !== 'hide') add(renderBounds, childrenRenderBounds)
+            // 增加滚动逻辑
+            if (data.scrollY || data.scrollX) {
+                childrenRenderBounds.x += data.scrollX
+                childrenRenderBounds.y += data.scrollY
+            }
+
+            isOverflow = !includes(boxBounds, childrenRenderBounds)
+            if (isOverflow && data.overflow !== 'hide') add(renderBounds, childrenRenderBounds)
         } else this.__updateRectRenderBounds()
 
         DataHelper.stintSet(this, 'isOverflow', isOverflow)
+
+        this.__updateScrollBar()
     }
 
     @rewrite(rect.__updateRenderBounds)
     public __updateRectRenderBounds(): void { }
 
+    //  need rewrite
+    public __updateScrollBar(): void { }
+
+
     @rewrite(rect.__updateChange)
     public __updateRectChange(): void { }
 
@@ -135,13 +150,14 @@ export class Box extends Group implements IBox {
             this.__renderRect(canvas, options)
             if (this.children.length) this.__renderGroup(canvas, options)
         }
+        if (this.scrollBar) this.scrollBar.__render(canvas, options)
     }
 
     // in __drawAfterFill()
     public __drawContent(canvas: ILeaferCanvas, options: IRenderOptions): void {
         this.__renderGroup(canvas, options)
 
-        if (this.__.__useStroke) { // 还原绘制路径
+        if (this.__.__useStroke || this.__.__useEffect) { // 还原绘制路径
             canvas.setWorld(this.__nowWorld)
             this.__drawRenderPath(canvas)
         }

package/src/Canvas.ts

@@ -1,5 +1,5 @@
 import { ILeaferCanvas, ILeaferCanvasConfig, INumber, IRenderOptions, IPointData, ICanvasContext2D, ICanvasContext2DSettings, IScreenSizeData } from '@leafer/interface'
-import { Creator, ImageEvent, LeaferImage, Matrix, dataProcessor, dataType, registerUI } from '@leafer/core'
+import { Creator, ImageEvent, LeaferImage, Matrix, dataProcessor, dataType, registerUI, isNumber } from '@leafer/core'
 
 import { ICanvas, ICanvasData, ICanvasInputData, IUI } from '@leafer-ui/interface'
 import { CanvasData } from '@leafer-ui/data'
@@ -62,7 +62,7 @@ export class Canvas extends Rect implements ICanvas {
 
         const m = new Matrix()
         if (offset) m.translate(offset.x, offset.y)
-        if (scale) typeof scale === 'number' ? m.scale(scale) : m.scale(scale.x, scale.y)
+        if (scale) isNumber(scale) ? m.scale(scale) : m.scale(scale.x, scale.y)
         if (rotation) m.rotate(rotation)
         matrix.multiplyParent(m)
 

package/src/Group.ts

@@ -27,6 +27,8 @@ export class Group extends UI implements IGroup {   // tip: rewrited Box
 
     declare public children: IUI[]
 
+    public childlessJSON?: boolean
+
     constructor(data?: IGroupInputData) {
         super(data)
     }
@@ -43,7 +45,7 @@ export class Group extends UI implements IGroup {   // tip: rewrited Box
 
     // data
 
-    public set(data: IUIInputData, transition?: ITransition | 'temp'): void {
+    override set(data: IUIInputData, transition?: ITransition | 'temp'): void {
         if (data) {
             if (data.children) {
                 const { children } = data
@@ -60,9 +62,9 @@ export class Group extends UI implements IGroup {   // tip: rewrited Box
         }
     }
 
-    public toJSON(options?: IJSONOptions): IUIJSONData {
+    override toJSON(options?: IJSONOptions): IUIJSONData {
         const data = super.toJSON(options)
-        data.children = this.children.map(child => child.toJSON(options))
+        if (!this.childlessJSON) data.children = this.children.map(child => child.toJSON(options))
         return data
     }
 

package/src/Image.ts

@@ -1,5 +1,5 @@
 import { ILeaferImage, IString } from '@leafer/interface'
-import { boundsType, dataProcessor, registerUI } from '@leafer/core'
+import { boundsType, dataProcessor, registerUI, isArray } from '@leafer/core'
 
 import { IImage, IImageInputData, IImageData } from '@leafer-ui/interface'
 import { ImageData } from '@leafer-ui/data'
@@ -20,7 +20,7 @@ export class Image extends Rect implements IImage {
 
     public get ready(): boolean { const { image } = this; return image && image.ready }
 
-    public get image(): ILeaferImage { const { fill } = this.__; return fill instanceof Array && fill[0].image }
+    public get image(): ILeaferImage { const { fill } = this.__; return isArray(fill) && fill[0].image }
 
     constructor(data?: IImageInputData) {
         super(data)

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, ITransition, IFilter, ILeaferImage } 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, DataHelper } from '@leafer/core'
+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, ITransition, IFilter, ILeaferImage, IScaleFixed } 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, DataHelper, affectRenderBoundsType, isString, isNumber } 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, IAnimateType, IStateStyle, IColorString } 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, IAnimateType, IStateStyle, IColorString, IAnimateList } from '@leafer-ui/interface'
 import { effectType, zoomLayerType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
@@ -143,6 +143,10 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     public pixelRatio?: INumber
 
 
+    @affectRenderBoundsType(0)
+    public renderSpread?: INumber // 强行扩大渲染边界
+
+
     // path
     @pathInputType()
     public path?: IPathCommandData | IPathCommandObject[] | IPathString
@@ -245,7 +249,7 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     public strokeWidth?: IFourNumber | IStrokeWidthString
 
     @strokeType(false)
-    public strokeWidthFixed?: IBoolean
+    public strokeWidthFixed?: IScaleFixed
 
     @strokeType('none')
     public strokeCap?: IStrokeCap
@@ -376,10 +380,13 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     public set scale(value: INumber | IPointData) { MathHelper.assignScale(this as IScaleData, value) }
     public get scale(): INumber | IPointData { return this.__.scale }
 
+    public get isAutoWidth(): boolean { const t = this.__; return t.__autoWidth || t.autoWidth as boolean }
+    public get isAutoHeight(): boolean { const t = this.__; return t.__autoHeight || t.autoHeight as boolean }
+
     public useFastShadow?: boolean // 将忽略 stroke 产生的阴影，只对单个 fill 有效
 
     public __box?: IUI // 背景box, 一般用于文本背景框
-    public __animate?: IAnimate
+    public __animate?: IAnimate | IAnimateList
 
     public get pen(): IPathCreator {
         const { path } = this.__
@@ -413,7 +420,7 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     }
 
     public get(name?: string | string[] | IUIInputData): IUIInputData | IValue {
-        return typeof name === 'string' ? this.__.__getInput(name) : this.__.__getInputData(name)
+        return isString(name) ? this.__.__getInput(name) : this.__.__getInputData(name)
     }
 
     public createProxyData(): IUIInputData { return undefined }
@@ -481,7 +488,7 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
         const { x, y, width, height } = this.__layout.boxBounds
         if (this.__.cornerRadius) {
             const { cornerRadius } = this.__
-            drawer.roundRect(x, y, width, height, typeof cornerRadius === 'number' ? [cornerRadius] : cornerRadius) // 修复微信浏览器bug, 后续需进一步优化
+            drawer.roundRect(x, y, width, height, isNumber(cornerRadius) ? [cornerRadius] : cornerRadius) // 修复微信浏览器bug, 后续需进一步优化
         } else drawer.rect(x, y, width, height)
     }
 

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, IFilter, ITransition, IUnitData, IObject, IPointData, IPathCreator, IValue, IFindCondition, ILeaferCanvas, IPathDrawer, ILeaferImage, IExportFileType, IJSONOptions, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IZoomType, IZoomOptions, IClientPointData, IRenderOptions, ICanvasContext2DSettings, ICanvasContext2D } from '@leafer/interface';
+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, IScaleFixed, IFilter, ITransition, IUnitData, IObject, IPointData, IPathCreator, IValue, IFindCondition, ILeaferCanvas, IPathDrawer, ILeaferImage, IExportFileType, IJSONOptions, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IZoomType, IZoomOptions, IClientPointData, IRenderOptions, 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, IStates, IStateName, IStateStyle, IColorString, IEditorConfig, IAnimate, 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, IBackgroundBoxStyle, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, IWritingMode, ITextAlign, IVerticalAlign, ITextWrap, ITextDrawData, ITextInputData, IPath, IPathData, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData, IPointData as IPointData$1 } 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, IStates, IStateName, IStateStyle, IColorString, IEditorConfig, IAnimate, IAnimateList, 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, IBackgroundBoxStyle, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, IWritingMode, ITextAlign, IVerticalAlign, ITextWrap, ITextDrawData, ITextInputData, IPath, IPathData, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData, IPointData as IPointData$1 } from '@leafer-ui/interface';
 
 declare class UI extends Leaf implements IUI {
     __: IUIData;
@@ -41,6 +41,7 @@ declare class UI extends Leaf implements IUI {
     around?: IAlign | IUnitPointData;
     lazy?: IBoolean;
     pixelRatio?: INumber;
+    renderSpread?: INumber;
     path?: IPathCommandData | IPathCommandObject[] | IPathString;
     windingRule?: IWindingRule;
     closed?: boolean;
@@ -72,7 +73,7 @@ declare class UI extends Leaf implements IUI {
     stroke?: IStroke;
     strokeAlign?: IStrokeAlign;
     strokeWidth?: IFourNumber | IStrokeWidthString;
-    strokeWidthFixed?: IBoolean;
+    strokeWidthFixed?: IScaleFixed;
     strokeCap?: IStrokeCap;
     strokeJoin?: IStrokeJoin;
     dashPattern?: INumber[] | IDashPatternString;
@@ -116,9 +117,11 @@ declare class UI extends Leaf implements IUI {
     data: IObject;
     set scale(value: INumber | IPointData);
     get scale(): INumber | IPointData;
+    get isAutoWidth(): boolean;
+    get isAutoHeight(): boolean;
     useFastShadow?: boolean;
     __box?: IUI;
-    __animate?: IAnimate;
+    __animate?: IAnimate | IAnimateList;
     get pen(): IPathCreator;
     constructor(data?: IUIInputData);
     reset(_data?: IUIInputData): void;
@@ -160,6 +163,7 @@ declare class Group extends UI implements IGroup {
     width?: INumber;
     height?: INumber;
     children: IUI[];
+    childlessJSON?: boolean;
     constructor(data?: IGroupInputData);
     reset(data?: IGroupInputData): void;
     __setBranch(): void;
@@ -280,6 +284,7 @@ declare class Box extends Group implements IBox {
     textBox?: IBoolean;
     overflow?: IOverflow;
     isOverflow: boolean;
+    scrollBar?: IGroup;
     constructor(data?: IBoxInputData);
     __updateStrokeSpread(): number;
     __updateRectRenderSpread(): number;
@@ -289,6 +294,7 @@ declare class Box extends Group implements IBox {
     __updateStrokeBounds(): void;
     __updateRenderBounds(): void;
     __updateRectRenderBounds(): void;
+    __updateScrollBar(): void;
     __updateRectChange(): void;
     __updateChange(): void;
     __renderRect(_canvas: ILeaferCanvas, _options: IRenderOptions): void;