@leafer-ui/display 1.6.1 → 1.6.3

package/package.json

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

package/src/Box.ts

@@ -1,5 +1,5 @@
 import { ILeaferCanvas, IRenderOptions, IBoundsData, IBoolean, INumber } from '@leafer/interface'
-import { rewrite, rewriteAble, registerUI, BoundsHelper, dataProcessor, affectRenderBoundsType, dataType, boundsType } from '@leafer/core'
+import { rewrite, rewriteAble, registerUI, BoundsHelper, dataProcessor, affectRenderBoundsType, dataType, boundsType, DataHelper } from '@leafer/core'
 
 import { IBox, IBoxData, IBoxInputData, IOverflow } from '@leafer-ui/interface'
 import { BoxData } from '@leafer-ui/data'
@@ -102,11 +102,11 @@ export class Box extends Group implements IBox {
             copy(childrenRenderBounds, renderBounds)
             this.__updateRectRenderBounds()
 
-            isOverflow = !includes(renderBounds, childrenRenderBounds) || undefined
+            isOverflow = !includes(renderBounds, childrenRenderBounds)
             if (isOverflow && this.__.overflow !== 'hide') add(renderBounds, childrenRenderBounds)
         } else this.__updateRectRenderBounds()
 
-        this.isOverflow !== isOverflow && (this.isOverflow = isOverflow) // 节省赋值
+        DataHelper.stintSet(this, 'isOverflow', isOverflow)
     }
 
     @rewrite(rect.__updateRenderBounds)

package/src/Canvas.ts

@@ -36,7 +36,7 @@ export class Canvas extends Rect implements ICanvas {
 
     public canvas?: ILeaferCanvas
 
-    public context?: ICanvasContext2D
+    public get context(): ICanvasContext2D { return this.canvas.context }
 
     public get ready(): boolean { return !this.url }
 
@@ -45,7 +45,6 @@ export class Canvas extends Rect implements ICanvas {
     constructor(data?: ICanvasInputData) {
         super(data)
         this.canvas = Creator.canvas(this.__ as ILeaferCanvasConfig)
-        this.context = this.canvas.context
         if (data && data.url) this.drawImage(data.url)
     }
 
@@ -93,7 +92,7 @@ export class Canvas extends Rect implements ICanvas {
     public destroy(): void {
         if (this.canvas) {
             this.canvas.destroy()
-            this.canvas = this.context = null
+            this.canvas = null
         }
         super.destroy()
     }

package/src/Image.ts

@@ -1,5 +1,5 @@
 import { ILeaferImage, IString } from '@leafer/interface'
-import { ImageEvent, boundsType, dataProcessor, registerUI } from '@leafer/core'
+import { boundsType, dataProcessor, registerUI } from '@leafer/core'
 
 import { IImage, IImageInputData, IImageData } from '@leafer-ui/interface'
 import { ImageData } from '@leafer-ui/data'
@@ -18,20 +18,12 @@ export class Image extends Rect implements IImage {
     @boundsType('')
     public url: IString
 
-    public get ready(): boolean { return this.image ? this.image.ready : false }
+    public get ready(): boolean { const { image } = this; return image && image.ready }
 
-    public image?: ILeaferImage
+    public get image(): ILeaferImage { const { fill } = this.__; return fill instanceof Array && fill[0].image }
 
     constructor(data?: IImageInputData) {
         super(data)
-        this.on(ImageEvent.LOADED, (e: ImageEvent) => {
-            if (e.attrName === 'fill' && e.attrValue.url === this.url) this.image = e.image
-        })
-    }
-
-    public destroy(): void {
-        this.image = null
-        super.destroy()
     }
 
 }

package/src/Leafer.ts

@@ -421,20 +421,23 @@ export class Leafer extends Group implements ILeafer {
 
     protected __listenEvents(): void {
         const runId = Run.start('FirstCreate ' + this.innerName)
-        this.once(LeaferEvent.START, () => Run.end(runId))
-        this.once(LayoutEvent.START, () => this.updateLazyBounds())
-        this.once(RenderEvent.START, () => this.__onCreated())
-        this.once(RenderEvent.END, () => this.__onViewReady())
+        this.once([
+            [LeaferEvent.START, () => Run.end(runId)],
+            [LayoutEvent.START, this.updateLazyBounds, this],
+            [RenderEvent.START, this.__onCreated, this],
+            [RenderEvent.END, this.__onViewReady, this]
+        ])
         this.__eventIds.push(
-            this.on_(WatchEvent.DATA, this.__onWatchData, this),
-            this.on_(LayoutEvent.END, this.__onLayoutEnd, this),
-            this.on_(RenderEvent.NEXT, this.__onNextRender, this),
+            this.on_([
+                [WatchEvent.DATA, this.__onWatchData, this],
+                [LayoutEvent.END, this.__onLayoutEnd, this],
+                [RenderEvent.NEXT, this.__onNextRender, this]
+            ])
         )
     }
 
     protected __removeListenEvents(): void {
         this.off_(this.__eventIds)
-        this.__eventIds.length = 0
     }
 
     override destroy(sync?: boolean): void {

package/src/Text.ts

@@ -1,5 +1,5 @@
 import { ILeaferCanvas, IBoolean, INumber, IString, IBoundsData, IUnitData, IRenderOptions } from '@leafer/interface'
-import { BoundsHelper, boundsType, surfaceType, dataProcessor, registerUI, affectStrokeBoundsType, dataType, hitType, MathHelper } from '@leafer/core'
+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, IOverflow, IStrokeAlign, IHitType, ITextWrap, IWritingMode, IBackgroundBoxStyle } from '@leafer-ui/interface'
 import { TextData } from '@leafer-ui/data'
@@ -44,6 +44,9 @@ export class Text extends UI implements IText {
     @boundsType('')
     public text?: IString | INumber
 
+    @boundsType('')
+    public placeholder?: IString
+
     @boundsType('caption')
     public fontFamily?: IString
 
@@ -115,7 +118,7 @@ export class Text extends UI implements IText {
         data.__font = `${italic ? 'italic ' : ''}${textCase === 'small-caps' ? 'small-caps ' : ''}${fontWeight !== 'normal' ? fontWeight + ' ' : ''}${fontSize}px ${fontFamily}`
         data.__clipText = textOverflow !== 'show' && !data.__autoSize
 
-        data.__textDrawData = TextConvert.getDrawData(data.text, this.__)
+        data.__textDrawData = TextConvert.getDrawData((data.__isPlacehold = data.placeholder && data.text === '') ? data.placeholder : data.text, this.__)
     }
 
     override __updateBoxBounds(): void {
@@ -149,11 +152,10 @@ export class Text extends UI implements IText {
 
         if (italic) b.width += fontSize * 0.16 // 倾斜会导致文本的bounds增大
 
-        const isOverflow = !includes(b, contentBounds) || undefined
-        if (isOverflow) setList(data.__textBoxBounds = {} as IBoundsData, [b, contentBounds]), layout.renderChanged = true
-        else data.__textBoxBounds = b
+        DataHelper.stintSet(this, 'isOverflow', !includes(b, contentBounds))
 
-        this.isOverflow !== isOverflow && (this.isOverflow = isOverflow) // 节省赋值
+        if (this.isOverflow) setList(data.__textBoxBounds = {} as IBoundsData, [b, contentBounds]), layout.renderChanged = true
+        else data.__textBoxBounds = b
     }
 
     override __onUpdateSize(): void {

package/src/UI.ts

@@ -1,13 +1,13 @@
-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 } 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, 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 { 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 } 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 } from '@leafer-ui/interface'
 import { effectType, zoomLayerType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
 import { UIBounds, UIRender } from '@leafer-ui/display-module'
 
-import { Export, PathArrow } from '@leafer-ui/external'
+import { Export, Paint, PathArrow } from '@leafer-ui/external'
 
 
 @useModule(UIBounds)
@@ -346,12 +346,28 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
 
     public disabledStyle?: IStateStyle
 
+
     public placeholderStyle?: IStateStyle
 
+    @surfaceType()
+    public placeholderColor?: IColorString
+
+    @dataType(100)
+    public placeholderDelay?: INumber
+
 
     public button?: IBoolean
 
 
+    //  @leafer-in/editor rewrite
+
+    public editConfig: IEditorConfig
+
+    public editOuter: string
+
+    public editInner: string
+
+
     // 预留给用户使用的数据对象
     @dataType({})
     public data: IObject
@@ -360,6 +376,8 @@ 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 useFastShadow?: boolean // 将忽略 stroke 产生的阴影，只对单个 fill 有效
+
     public __box?: IUI // 背景box, 一般用于文本背景框
     public __animate?: IAnimate
 
@@ -371,15 +389,6 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     }
 
 
-    //  @leafer-in/editor rewrite
-
-    public editConfig: IEditorConfig
-
-    public editOuter: string
-
-    public editInner: string
-
-
     constructor(data?: IUIInputData) {
         super(data)
     }
@@ -476,6 +485,10 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
         } else drawer.rect(x, y, width, height)
     }
 
+    public drawImagePlaceholder(canvas: ILeaferCanvas, _image?: ILeaferImage): void {
+        Paint.fill(this.__.placeholderColor, this, canvas)  // 图片占位符
+    }
+
     // @leafer-in/animate rewrite
 
     public animate(_keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], _options?: ITransition, _type?: IAnimateType, _isTemp?: boolean): IAnimate {

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, 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 { 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, 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, 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, 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, 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;
@@ -107,16 +107,19 @@ declare class UI extends Leaf implements IUI {
     selectedStyle?: IStateStyle;
     disabledStyle?: IStateStyle;
     placeholderStyle?: IStateStyle;
+    placeholderColor?: IColorString;
+    placeholderDelay?: INumber;
     button?: IBoolean;
+    editConfig: IEditorConfig;
+    editOuter: string;
+    editInner: string;
     data: IObject;
     set scale(value: INumber | IPointData);
     get scale(): INumber | IPointData;
+    useFastShadow?: boolean;
     __box?: IUI;
     __animate?: IAnimate;
     get pen(): IPathCreator;
-    editConfig: IEditorConfig;
-    editOuter: string;
-    editInner: string;
     constructor(data?: IUIInputData);
     reset(_data?: IUIInputData): void;
     set(data: IUIInputData, transition?: ITransition | 'temp'): void;
@@ -135,6 +138,7 @@ declare class UI extends Leaf implements IUI {
     __drawPath(canvas: ILeaferCanvas): void;
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void;
     __drawPathByBox(drawer: IPathDrawer): void;
+    drawImagePlaceholder(canvas: ILeaferCanvas, _image?: ILeaferImage): void;
     animate(_keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], _options?: ITransition, _type?: IAnimateType, _isTemp?: boolean): IAnimate;
     killAnimate(_type?: IAnimateType, _nextStyle?: IUIInputData): void;
     export(_filename: IExportFileType | string, _options?: IExportOptions | number | boolean): Promise<IExportResult>;
@@ -360,9 +364,8 @@ declare class Image extends Rect implements IImage {
     __: IImageData;
     url: IString;
     get ready(): boolean;
-    image?: ILeaferImage;
+    get image(): ILeaferImage;
     constructor(data?: IImageInputData);
-    destroy(): void;
 }
 declare const MyImage: typeof Image;
 
@@ -376,7 +379,7 @@ declare class Canvas extends Rect implements ICanvas {
     safeResize?: boolean;
     contextSettings?: ICanvasContext2DSettings;
     canvas?: ILeaferCanvas;
-    context?: ICanvasContext2D;
+    get context(): ICanvasContext2D;
     get ready(): boolean;
     url?: string;
     constructor(data?: ICanvasInputData);
@@ -399,6 +402,7 @@ declare class Text extends UI implements IText {
     strokeAlign?: IStrokeAlign;
     hitFill?: IHitType$1;
     text?: IString | INumber;
+    placeholder?: IString;
     fontFamily?: IString;
     fontSize?: INumber;
     fontWeight?: IFontWeight;