@leafer-ui/display 1.9.5 → 1.9.7

package/package.json

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

package/src/Leafer.ts

@@ -1,5 +1,5 @@
-import { ILeaferCanvas, IRenderer, ILayouter, ISelector, IWatcher, IInteraction, ILeaferConfig, ICanvasManager, IHitCanvasManager, IAutoBounds, IScreenSizeData, IResizeEvent, IEventListenerId, ITimer, IValue, IObject, IControl, IPointData, ILeaferType, ICursorType, IBoundsData, INumber, IZoomType, IZoomOptions, IFourNumber, IBounds, IClientPointData, ITransition, ICanvasSizeAttr } from '@leafer/interface'
-import { AutoBounds, LayoutEvent, ResizeEvent, LeaferEvent, CanvasManager, ImageManager, Resource, DataHelper, Creator, Run, Debug, RenderEvent, registerUI, boundsType, canvasSizeAttrs, dataProcessor, WaitHelper, WatchEvent, Bounds, LeafList, Plugin, getBoundsData } from '@leafer/core'
+import { ILeaferCanvas, IRenderer, ILayouter, ISelector, IWatcher, IInteraction, ILeaferConfig, ICanvasManager, IHitCanvasManager, IAutoBounds, IScreenSizeData, IResizeEvent, IEventListenerId, ITimer, IValue, IObject, IControl, IPointData, ILeaferType, ICursorType, IBoundsData, INumber, IZoomType, IZoomOptions, IFourNumber, IBounds, IClientPointData, ITransition, ICanvasSizeAttr, ILeaferMode } from '@leafer/interface'
+import { AutoBounds, LayoutEvent, ResizeEvent, LeaferEvent, CanvasManager, ImageManager, Resource, DataHelper, Creator, Run, Debug, RenderEvent, registerUI, boundsType, canvasSizeAttrs, dataProcessor, WaitHelper, WatchEvent, Bounds, LeafList, Plugin, getBoundsData, dataType } from '@leafer/core'
 
 import { ILeaferInputData, ILeaferData, IFunction, IUIInputData, ILeafer, IApp, IEditorBase } from '@leafer-ui/interface'
 import { LeaferData } from '@leafer-ui/data'
@@ -23,6 +23,9 @@ export class Leafer extends Group implements ILeafer {
     @boundsType()
     declare public pixelRatio?: INumber
 
+    @dataType('normal')
+    public mode: ILeaferMode
+
     public get isApp(): boolean { return false }
     public get app(): ILeafer { return this.parent || this }
 
@@ -268,7 +271,7 @@ export class Leafer extends Group implements ILeafer {
             } else if (attrName === 'zIndex') {
                 this.canvas.zIndex = newValue as any
                 setTimeout(() => this.parent && this.parent.__updateSortChildren())
-            }
+            } else if (attrName === 'mode') this.emit(LeaferEvent.UPDATE_MODE, { mode: newValue })
         }
         return super.__setAttr(attrName, newValue)
     }

package/src/Polygon.ts

@@ -1,16 +1,14 @@
 import { INumber, IPointData } from '@leafer/interface'
-import { PathCommandDataHelper, dataProcessor, pathType, registerUI, rewrite, rewriteAble } from '@leafer/core'
+import { PathCommandDataHelper, dataProcessor, pathType, registerUI, rewriteAble } from '@leafer/core'
 
 import { IPolygon, IPolygonData, IPolygonInputData } from '@leafer-ui/interface'
 import { PolygonData } from '@leafer-ui/data'
 
 import { UI } from './UI'
-import { Line } from './Line'
 
 
 const { sin, cos, PI } = Math
 const { moveTo, lineTo, closePath, drawPoints } = PathCommandDataHelper
-const line = Line.prototype
 
 @rewriteAble()
 @registerUI()
@@ -57,10 +55,4 @@ export class Polygon<TInputData = IPolygonInputData> extends UI<TInputData> impl
 
     }
 
-    @rewrite(line.__updateRenderPath)
-    public __updateRenderPath(): void { }
-
-    @rewrite(line.__updateBoxBounds)
-    public __updateBoxBounds(): void { }
-
 }

package/src/Text.ts

@@ -154,11 +154,6 @@ export class Text<TConstructorData = ITextInputData> extends UI<TConstructorData
         else data.__textBoxBounds = b
     }
 
-    override __onUpdateSize(): void {
-        if (this.__box) this.__box.__onUpdateSize()
-        super.__onUpdateSize()
-    }
-
     override __updateRenderSpread(): number {
         let width = super.__updateRenderSpread()
         if (!width) width = this.isOverflow ? 1 : 0
@@ -171,6 +166,12 @@ export class Text<TConstructorData = ITextInputData> extends UI<TConstructorData
         if (this.__box) this.__box.__layout.renderBounds = renderBounds
     }
 
+    override __updateChange(): void {
+        super.__updateChange()
+        const box = this.__box
+        if (box) box.__onUpdateSize(), box.__updateChange()
+    }
+
     override __drawRenderPath(canvas: ILeaferCanvas): void {
         canvas.font = this.__.__font
     }

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

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, 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, 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 { 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;
@@ -185,6 +186,7 @@ declare class Leafer extends Group implements ILeafer {
     get __tag(): string;
     __: ILeaferData;
     pixelRatio?: INumber;
+    mode: ILeaferMode;
     get isApp(): boolean;
     get app(): ILeafer;
     get isLeafer(): boolean;
@@ -334,8 +336,6 @@ declare class Polygon<TInputData = IPolygonInputData> extends UI<TInputData> imp
     points?: number[] | IPointData[];
     curve?: boolean | number;
     __updatePath(): void;
-    __updateRenderPath(): void;
-    __updateBoxBounds(): void;
 }
 
 declare class Star<TInputData = IStarInputData> extends UI<TInputData> implements IStar {
@@ -423,9 +423,9 @@ declare class Text<TConstructorData = ITextInputData> extends UI<TConstructorDat
     get textDrawData(): ITextDrawData;
     __updateTextDrawData(): void;
     __updateBoxBounds(): void;
-    __onUpdateSize(): void;
     __updateRenderSpread(): number;
     __updateRenderBounds(): void;
+    __updateChange(): void;
     __drawRenderPath(canvas: ILeaferCanvas): void;
     __draw(canvas: ILeaferCanvas, options: IRenderOptions, originCanvas?: ILeaferCanvas): void;
     __drawShape(canvas: ILeaferCanvas, options: IRenderOptions): void;