@leafer-ui/display 1.9.6 → 1.9.8

package/package.json

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

package/src/Box.ts

@@ -1,4 +1,4 @@
-import { ILeaferCanvas, IRenderOptions, IBoolean, INumber, IScrollPointData } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions, IBoolean, INumber, IScrollPointData, IFourNumber } from '@leafer/interface'
 import { rewrite, rewriteAble, registerUI, BoundsHelper, dataProcessor, affectRenderBoundsType, dataType, boundsType, DataHelper, getBoundsData } from '@leafer/core'
 
 import { IBox, IBoxData, IBoxInputData, IOverflow, IScrollConfig, IScroller } from '@leafer-ui/interface'
@@ -52,12 +52,12 @@ export class Box<TInputData = IBoxInputData> extends Group<TInputData> implement
     }
 
     @rewrite(rect.__updateStrokeSpread)
-    public __updateStrokeSpread(): number { return 0 }
+    public __updateStrokeSpread(): IFourNumber { return 0 }
 
     @rewrite(rect.__updateRenderSpread)
-    public __updateRectRenderSpread(): number { return 0 }
+    public __updateRectRenderSpread(): IFourNumber { return 0 }
 
-    public __updateRenderSpread(): number { return this.__updateRectRenderSpread() || -1 }
+    public __updateRenderSpread(): IFourNumber { return this.__updateRectRenderSpread() || -1 }
 
 
     @rewrite(rect.__updateBoxBounds)

package/src/Text.ts

@@ -1,4 +1,4 @@
-import { ILeaferCanvas, IBoolean, INumber, IString, IBoundsData, IUnitData, IRenderOptions } from '@leafer/interface'
+import { ILeaferCanvas, IBoolean, INumber, IString, IBoundsData, IUnitData, IRenderOptions, IFourNumber } from '@leafer/interface'
 import { BoundsHelper, boundsType, surfaceType, dataProcessor, registerUI, affectStrokeBoundsType, dataType, hitType, MathHelper, DataHelper } from '@leafer/core'
 
 import { IFill, IText, IFontWeight, ITextCase, ITextDecoration, ITextData, ITextInputData, ITextAlign, IVerticalAlign, ITextDrawData, ITextOverflow, IStrokeAlign, IHitType, ITextWrap, IWritingMode, IBackgroundBoxStyle } from '@leafer-ui/interface'
@@ -154,10 +154,10 @@ export class Text<TConstructorData = ITextInputData> extends UI<TConstructorData
         else data.__textBoxBounds = b
     }
 
-    override __updateRenderSpread(): number {
-        let width = super.__updateRenderSpread()
-        if (!width) width = this.isOverflow ? 1 : 0
-        return width
+    override __updateRenderSpread(): IFourNumber {
+        let spread = super.__updateRenderSpread()
+        if (!spread) spread = this.isOverflow ? 1 : 0
+        return spread
     }
 
     override __updateRenderBounds(): void {

package/src/UI.ts

@@ -1,5 +1,5 @@
 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, IDragBoundsType } from '@leafer/interface'
-import { Leaf, PathDrawer, surfaceType, dataType, positionType, scrollType, 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 { Leaf, PathDrawer, surfaceType, dimType, dataType, positionType, scrollType, 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, IArrowStyle, 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'
@@ -61,12 +61,16 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
     public locked?: IBoolean
 
 
-    @surfaceType(false)
+    // @leafer-in/bright will rewrite
+
+    @dimType(false)
     public dim?: IBoolean | INumber // 是否弱化内容，可设置具体透明度
 
-    @surfaceType(false)
+    @dimType(false)
     public dimskip?: IBoolean // 跳过弱化，突出显示内容，不受dim影响
 
+    public bright?: IBoolean // 突出显示内容，并置顶渲染，不受dim影响
+
 
     @sortType(0)
     public zIndex?: INumber
@@ -144,7 +148,7 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
 
 
     @affectRenderBoundsType(0)
-    public renderSpread?: INumber // 强行扩大渲染边界
+    public renderSpread?: IFourNumber // 强行扩大渲染边界
 
 
     // path
@@ -405,7 +409,7 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
     public reset(_data?: IUIInputData): void { }
 
 
-    // @leafer-in/animate will rewrite
+    // @leafer-in/animate and @leafer-in/state will rewrite
 
     public set(data: IUIInputData, _transition?: ITransition | 'temp'): void {
         if (data) Object.assign(this, data)

package/types/index.d.ts

@@ -1,4 +1,4 @@
-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, IDragBoundsType, IHitType, ICursorType, IScaleFixed, IFilter, ITransition, IUnitData, IObject, IPointData, IPathCreator, IValue, IFindCondition, ILeaferCanvas, IPathDrawer, ILeaferImage, IExportFileType, IJSONOptions, IPickOptions, IPickResult, ILeaferMode, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, ICanvasSizeAttr, IZoomType, IZoomOptions, IClientPointData, IRenderOptions, ICanvasContext2DSettings, ICanvasContext2D } from '@leafer/interface';
+import { IString, INumber, IBoolean, IMaskType, IEraserType, IAlign, IUnitPointData, IFourNumber, IPathCommandData, IPathCommandObject, IPathString, IWindingRule, IFlowType, IGap, IPointGap, IFlowAlign, IFlowAxisAlign, IFlowWrap, IFlowBoxType, IAutoSize, IAutoBoxData, IConstraint, IRangeSize, IAxis, IBoundsData, IDragBoundsType, IHitType, ICursorType, IScaleFixed, IFilter, ITransition, IUnitData, IObject, IPointData, IPathCreator, IValue, IFindCondition, ILeaferCanvas, IPathDrawer, ILeaferImage, IExportFileType, IJSONOptions, IPickOptions, IPickResult, ILeaferMode, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, ICanvasSizeAttr, IZoomType, IZoomOptions, IClientPointData, IRenderOptions, ICanvasContext2DSettings, ICanvasContext2D } from '@leafer/interface';
 import { Leaf, LeafList } from '@leafer/core';
 import { IUIInputData, IUI, IUIData, ILeafer, IGroup, IBlendMode, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowStyle, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IAnimation, IStates, IStateName, IStateStyle, IColorString, IEditorConfig, IAnimate, IAnimateList, IFindUIMethod, IKeyframe, IAnimateType, IExportOptions, IExportResult, IEditorConfigFunction, IEditToolFunction, IGroupInputData, IGroupData, IUIJSONData, IFindCondition as IFindCondition$1, ILeaferData, IApp, IEditorBase, IFunction, ILeaferInputData, IBoxInputData, IBox, IBoxData, IOverflow, IScrollConfig, IScroller, IFrameInputData, IFrame, IFrameData, IRectInputData, IRect, IRectData, IEllipseInputData, IEllipse, IEllipseData, IPolygonInputData, IPolygon, IPolygonData, IStarInputData, IStar, IStarData, ILineInputData, ILine, ILineData, IImageInputData, IImage, IImageData, ICanvasInputData, ICanvas, ICanvasData, ITextInputData, IText, ITextData, IBackgroundBoxStyle, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, IWritingMode, ITextAlign, IVerticalAlign, ITextWrap, ITextOverflow, ITextDrawData, IPathInputData, IPath, IPathData, IPenInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPointData as IPointData$1 } from '@leafer-ui/interface';
 
@@ -21,6 +21,7 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     locked?: IBoolean;
     dim?: IBoolean | INumber;
     dimskip?: IBoolean;
+    bright?: IBoolean;
     zIndex?: INumber;
     mask?: IBoolean | IMaskType;
     eraser?: IBoolean | IEraserType;
@@ -41,7 +42,7 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     around?: IAlign | IUnitPointData;
     lazy?: IBoolean;
     pixelRatio?: INumber;
-    renderSpread?: INumber;
+    renderSpread?: IFourNumber;
     path?: IPathCommandData | IPathCommandObject[] | IPathString;
     windingRule?: IWindingRule;
     closed?: boolean;
@@ -289,9 +290,9 @@ declare class Box<TInputData = IBoxInputData> extends Group<TInputData> implemen
     scroller?: IScroller;
     hasScroller?: boolean;
     constructor(data?: TInputData);
-    __updateStrokeSpread(): number;
-    __updateRectRenderSpread(): number;
-    __updateRenderSpread(): number;
+    __updateStrokeSpread(): IFourNumber;
+    __updateRectRenderSpread(): IFourNumber;
+    __updateRenderSpread(): IFourNumber;
     __updateRectBoxBounds(): void;
     __updateBoxBounds(_secondLayout?: boolean): void;
     __updateStrokeBounds(): void;
@@ -422,7 +423,7 @@ declare class Text<TConstructorData = ITextInputData> extends UI<TConstructorDat
     get textDrawData(): ITextDrawData;
     __updateTextDrawData(): void;
     __updateBoxBounds(): void;
-    __updateRenderSpread(): number;
+    __updateRenderSpread(): IFourNumber;
     __updateRenderBounds(): void;
     __updateChange(): void;
     __drawRenderPath(canvas: ILeaferCanvas): void;