@leafer-ui/display 1.12.1 → 1.12.2

package/package.json

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

package/src/Ellipse.ts

@@ -39,7 +39,6 @@ export class Ellipse<TInputData = IEllipseInputData> extends UI<TInputData> impl
             if (startAngle || endAngle) {
                 if (innerRadius < 1) ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius, 0, startAngle, endAngle, false)
                 ellipse(path, rx, ry, rx, ry, 0, endAngle, startAngle, true)
-                if (innerRadius < 1) closePath(path)
             } else {
                 if (innerRadius < 1) {
                     ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius)
@@ -48,21 +47,22 @@ export class Ellipse<TInputData = IEllipseInputData> extends UI<TInputData> impl
                 ellipse(path, rx, ry, rx, ry, 0, 360, 0, true)
             }
 
-            // fix node
-            if (Platform.ellipseToCurve) this.__.path = this.getPath(true)
-
         } else {
 
             if (startAngle || endAngle) {
                 moveTo(path, rx, ry)
                 ellipse(path, rx, ry, rx, ry, 0, startAngle, endAngle, false)
-                closePath(path)
             } else {
                 ellipse(path, rx, ry, rx, ry)
             }
 
         }
 
+        closePath(path)
+
+        // fix node
+        if (Platform.ellipseToCurve) this.__.path = this.getPath(true)
+
     }
 
 }

package/src/Leafer.ts

@@ -44,7 +44,7 @@ export class Leafer extends Group implements ILeafer {
 
     public transforming: boolean
 
-    public view: unknown
+    public get view(): unknown { return this.canvas && this.canvas.view }
 
     //  manager
     public canvas: ILeaferCanvas
@@ -128,7 +128,6 @@ export class Leafer extends Group implements ILeafer {
 
         if (this.isApp) this.__setApp()
         this.__checkAutoLayout()
-        this.view = canvas.view
 
         // interaction / manager
         if (!parentApp) {
@@ -466,7 +465,7 @@ export class Leafer extends Group implements ILeafer {
 
                     if (this.canvas) this.canvas.destroy()
 
-                    this.config.view = this.view = this.parentApp = null
+                    this.config.view = this.parentApp = null
                     if (this.userConfig) this.userConfig.view = null
 
                     super.destroy()

package/src/UI.ts

@@ -104,6 +104,9 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
     @scaleType(1, true)
     public scaleY?: INumber
 
+    // @leafer-in/scale-fixed will rewrite
+    public scaleFixed?: IScaleFixed
+
     // rotate
     @rotationType(0, true)
     public rotation?: INumber
@@ -438,7 +441,7 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
     public getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData {
         this.__layout.update()
         let path = pathForRender ? this.__.__pathForRender : this.__.path
-        if (!path) pen.set(path = []), this.__drawPathByBox(pen)
+        if (!path) pen.set(path = []), this.__drawPathByBox(pen, !pathForRender)
         return curve ? PathConvert.toCanvasData(path, true) : path
     }
 
@@ -473,19 +476,20 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
 
     public __drawPath(canvas: ILeaferCanvas): void {
         canvas.beginPath()
-        this.__drawPathByData(canvas, this.__.path)
+        this.__drawPathByData(canvas, this.__.path, true)
     }
 
-    public __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void {
-        data ? PathDrawer.drawPathByData(drawer, data) : this.__drawPathByBox(drawer)
+    public __drawPathByData(drawer: IPathDrawer, data: IPathCommandData, ignoreCornerRadius?: boolean): void {
+        data ? PathDrawer.drawPathByData(drawer, data) : this.__drawPathByBox(drawer, ignoreCornerRadius)
     }
 
-    public __drawPathByBox(drawer: IPathDrawer): void {
+    public __drawPathByBox(drawer: IPathDrawer, ignoreCornerRadius?: boolean): void {
         const { x, y, width, height } = this.__layout.boxBounds
-        if (this.__.cornerRadius) {
+        if (this.__.cornerRadius && !ignoreCornerRadius) {
             const { cornerRadius } = this.__
             drawer.roundRect(x, y, width, height, isNumber(cornerRadius) ? [cornerRadius] : cornerRadius) // 修复微信浏览器bug, 后续需进一步优化
         } else drawer.rect(x, y, width, height)
+        drawer.closePath()
     }
 
     public drawImagePlaceholder(_paint: ILeafPaint, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void {

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IString, INumber, IBoolean, IMaskType, IEraserType, IAlign, IUnitPointData, IFourNumber, IPathCommandData, IPathCommandNode, 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, IFindCondition, ILeaferCanvas, IPathDrawer, IRenderOptions, IExportFileType, IJSONOptions, IPickOptions, IPickResult, ILeaferMode, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IValue, ICanvasSizeAttr, IZoomType, IZoomOptions, IClientPointData, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D } from '@leafer/interface';
+import { IString, INumber, IBoolean, IMaskType, IEraserType, IScaleFixed, IAlign, IUnitPointData, IFourNumber, IPathCommandData, IPathCommandNode, IPathCommandObject, IPathString, IWindingRule, IFlowType, IGap, IPointGap, IFlowAlign, IFlowAxisAlign, IFlowWrap, IFlowBoxType, IAutoSize, IAutoBoxData, IConstraint, IRangeSize, IAxis, IBoundsData, IDragBoundsType, IHitType, ICursorType, IFilter, ITransition, IUnitData, IObject, IPointData, IPathCreator, IFindCondition, ILeaferCanvas, IPathDrawer, IRenderOptions, IExportFileType, IJSONOptions, IPickOptions, IPickResult, ILeaferMode, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IValue, ICanvasSizeAttr, IZoomType, IZoomOptions, IClientPointData, ILeaferImage, 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, ILeafPaint, 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';
 
@@ -31,6 +31,7 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     height?: INumber;
     scaleX?: INumber;
     scaleY?: INumber;
+    scaleFixed?: IScaleFixed;
     rotation?: INumber;
     skewX?: INumber;
     skewY?: INumber;
@@ -140,8 +141,8 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     __updateRenderPath(): void;
     __drawRenderPath(canvas: ILeaferCanvas): void;
     __drawPath(canvas: ILeaferCanvas): void;
-    __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void;
-    __drawPathByBox(drawer: IPathDrawer): void;
+    __drawPathByData(drawer: IPathDrawer, data: IPathCommandData, ignoreCornerRadius?: boolean): void;
+    __drawPathByBox(drawer: IPathDrawer, ignoreCornerRadius?: boolean): void;
     drawImagePlaceholder(_paint: ILeafPaint, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], _options?: ITransition, _type?: IAnimateType, _isTemp?: boolean): IAnimate;
     killAnimate(_type?: IAnimateType, _nextStyle?: IUIInputData): void;
@@ -200,7 +201,7 @@ declare class Leafer extends Group implements ILeafer {
     get imageReady(): boolean;
     get layoutLocked(): boolean;
     transforming: boolean;
-    view: unknown;
+    get view(): unknown;
     canvas: ILeaferCanvas;
     renderer: IRenderer;
     watcher: IWatcher;