@leafer-ui/display 1.6.6 → 1.7.0

package/package.json

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

package/src/Box.ts

@@ -141,7 +141,7 @@ export class Box extends Group implements IBox {
     public __drawContent(canvas: ILeaferCanvas, options: IRenderOptions): void {
         this.__renderGroup(canvas, options)
 
-        if (this.__.__hasStroke) { // 还原绘制路径
+        if (this.__.__useStroke) { // 还原绘制路径
             canvas.setWorld(this.__nowWorld)
             this.__drawRenderPath(canvas)
         }

package/src/Leafer.ts

@@ -1,4 +1,4 @@
-import { ILeaferCanvas, IRenderer, ILayouter, ISelector, IWatcher, IInteraction, ILeaferConfig, ICanvasManager, IHitCanvasManager, IAutoBounds, IScreenSizeData, IResizeEvent, IEventListenerId, ITimer, IValue, IObject, IControl, IPointData, ILeaferType, ICursorType, IBoundsData, INumber, IZoomType, IFourNumber, IBounds, IClientPointData, ITransition } from '@leafer/interface'
+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 } 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 { ILeaferInputData, ILeaferData, IFunction, IUIInputData, ILeafer, IApp, IEditorBase } from '@leafer-ui/interface'
@@ -385,7 +385,7 @@ export class Leafer extends Group implements ILeafer {
     }
 
     // need view plugin
-    public zoom(_zoomType: IZoomType, _padding?: IFourNumber, _fixedScale?: boolean, _transition?: ITransition): IBoundsData {
+    public zoom(_zoomType: IZoomType, _optionsOrPadding?: IZoomOptions | IFourNumber, _scroll?: 'x' | 'y' | boolean, _transition?: ITransition): IBoundsData {
         return Plugin.need('view')
     }
 
@@ -446,7 +446,7 @@ export class Leafer extends Group implements ILeafer {
                 Leafer.list.remove(this)
                 try {
                     this.stop()
-                    this.emitEvent(new LeaferEvent(LeaferEvent.END, this))
+                    this.emitLeafer(LeaferEvent.END)
                     this.__removeListenEvents()
 
                     this.__controllers.forEach(item => !(this.parent && item === this.interaction) && item.destroy())

package/src/Polygon.ts

@@ -53,9 +53,10 @@ export class Polygon extends UI implements IPolygon {
                 lineTo(path, rx + rx * sin((i * 2 * PI) / sides), ry - ry * cos((i * 2 * PI) / sides))
             }
 
+            closePath(path)
+
         }
 
-        closePath(path)
     }
 
     @rewrite(line.__updateRenderPath)

package/src/Text.ts

@@ -4,7 +4,7 @@ import { BoundsHelper, boundsType, surfaceType, dataProcessor, registerUI, affec
 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'
 
-import { TextConvert, UnitConvert, Export } from '@leafer-ui/external'
+import { TextConvert, UnitConvert } from '@leafer-ui/external'
 
 import { UI } from './UI'
 
@@ -182,10 +182,15 @@ export class Text extends UI implements IText {
     override __draw(canvas: ILeaferCanvas, options: IRenderOptions, originCanvas?: ILeaferCanvas): void {
         const box = this.__box
         if (box) box.__nowWorld = this.__nowWorld, box.__draw(canvas, options, originCanvas)
-        if (this.textEditing && !Export.running) return
+        if (this.textEditing && !options.exporting) return
         super.__draw(canvas, options, originCanvas)
     }
 
+    override  __drawShape(canvas: ILeaferCanvas, options: IRenderOptions): void {
+        if (options.shape) this.__box && this.__box.__drawShape(canvas, options)
+        super.__drawShape(canvas, options)
+    }
+
     override destroy(): void {
         if (this.boxStyle) this.boxStyle = null
         super.destroy()

package/src/UI.ts

@@ -235,13 +235,13 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
 
     // stroke
 
-    @strokeType()
+    @strokeType(undefined, true)
     public stroke?: IStroke
 
     @strokeType('inside')
     public strokeAlign?: IStrokeAlign
 
-    @strokeType(1)
+    @strokeType(1, true)
     public strokeWidth?: IFourNumber | IStrokeWidthString
 
     @strokeType(false)
@@ -456,11 +456,11 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     }
 
     public __updateRenderPath(): void {
-        if (this.__.path) {
-            const data = this.__
+        const data = this.__
+        if (data.path) {
             data.__pathForRender = data.cornerRadius ? PathCorner.smooth(data.path, data.cornerRadius, data.cornerSmoothing) : data.path
             if (data.__useArrow) PathArrow.addArrows(this, !data.cornerRadius)
-        }
+        } else data.__pathForRender && (data.__pathForRender = undefined)
     }
 
     public __drawRenderPath(canvas: ILeaferCanvas): void {

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, 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 { 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 { 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';
 
@@ -256,7 +256,7 @@ declare class Leafer extends Group implements ILeafer {
     waitViewReady(item: IFunction, bind?: IObject): void;
     waitViewCompleted(item: IFunction, bind?: IObject): void;
     nextRender(item: IFunction, bind?: IObject, off?: 'off'): void;
-    zoom(_zoomType: IZoomType, _padding?: IFourNumber, _fixedScale?: boolean, _transition?: ITransition): IBoundsData;
+    zoom(_zoomType: IZoomType, _optionsOrPadding?: IZoomOptions | IFourNumber, _scroll?: 'x' | 'y' | boolean, _transition?: ITransition): IBoundsData;
     getValidMove(moveX: number, moveY: number): IPointData;
     getValidScale(changeScale: number): number;
     getWorldPointByClient(clientPoint: IClientPointData, updateClient?: boolean): IPointData;
@@ -430,6 +430,7 @@ declare class Text extends UI implements IText {
     __updateRenderBounds(): void;
     __drawRenderPath(canvas: ILeaferCanvas): void;
     __draw(canvas: ILeaferCanvas, options: IRenderOptions, originCanvas?: ILeaferCanvas): void;
+    __drawShape(canvas: ILeaferCanvas, options: IRenderOptions): void;
     destroy(): void;
 }