@leafer-ui/display 1.0.7 → 1.0.8

package/package.json

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

package/src/Leafer.ts

@@ -166,10 +166,10 @@ export class Leafer extends Group implements ILeafer {
     public start(): void {
         clearTimeout(this.__startTimer)
         if (!this.running && this.canvas) {
+            this.running = true
             this.ready ? this.emitLeafer(LeaferEvent.RESTART) : this.emitLeafer(LeaferEvent.START)
             this.__controllers.forEach(item => item.start())
             if (!this.isApp) this.renderer.render()
-            this.running = true
         }
     }
 
@@ -280,11 +280,8 @@ export class Leafer extends Group implements ILeafer {
 
     protected __changeFill(newValue: string): void {
         this.config.fill = newValue as string
-        if (this.canvas.allowBackgroundColor) {
-            this.canvas.backgroundColor = newValue as string
-        } else {
-            this.forceRender()
-        }
+        if (this.canvas.allowBackgroundColor) this.canvas.backgroundColor = newValue as string
+        else this.forceRender()
     }
 
     protected __onCreated(): void {
@@ -352,11 +349,8 @@ export class Leafer extends Group implements ILeafer {
     public waitViewCompleted(item: IFunction, bind?: IObject): void {
         if (bind) item = item.bind(bind)
         this.__viewCompletedWait.push(item)
-        if (this.viewCompleted) {
-            this.__checkViewCompleted(false)
-        } else {
-            if (!this.running) this.start()
-        }
+        if (this.viewCompleted) this.__checkViewCompleted(false)
+        else if (!this.running) this.start()
     }
 
     public nextRender(item: IFunction, bind?: IObject, off?: 'off'): void {
@@ -366,9 +360,7 @@ export class Leafer extends Group implements ILeafer {
             for (let i = 0; i < list.length; i++) {
                 if (list[i] === item) { list.splice(i, 1); break }
             }
-        } else {
-            list.push(item)
-        }
+        } else list.push(item)
     }
 
     // need view plugin
@@ -434,9 +426,7 @@ export class Leafer extends Group implements ILeafer {
                     this.emitEvent(new LeaferEvent(LeaferEvent.END, this))
                     this.__removeListenEvents()
 
-                    this.__controllers.forEach(item => {
-                        if (!(this.parent && item === this.interaction)) item.destroy()
-                    })
+                    this.__controllers.forEach(item => !(this.parent && item === this.interaction) && item.destroy())
                     this.__controllers.length = 0
 
                     if (!this.parent) {

package/src/Pen.ts

@@ -6,7 +6,7 @@ import { PenData } from '@leafer-ui/data'
 import { Group } from './Group'
 import { Path } from './Path'
 
-@useModule(PathCreator, ['set', 'beginPath', 'path', 'paint'])
+@useModule(PathCreator, ['set', 'path', 'paint'])
 @registerUI()
 export class Pen extends Group implements IPen {
 
@@ -35,14 +35,10 @@ export class Pen extends Group implements IPen {
         return this
     }
 
-    public beginPath(): Pen {
-        this.__path.length = 0
-        this.paint()
-        return this
-    }
-
     // svg and canvas
 
+    public beginPath(): Pen { return this }
+
     public moveTo(_x: number, _y: number): Pen { return this }
 
     public lineTo(_x: number, _y: number): Pen { return this }
@@ -75,7 +71,8 @@ export class Pen extends Group implements IPen {
 
     public drawPoints(_points: number[], _curve?: boolean | number, _close?: boolean): Pen { return this }
 
-    public clearPath(): Pen { return this }
+    public clearPath(): Pen { return this } // = beginPath()
+
 
     public paint(): void {
         if (!this.pathElement.__layout.boxChanged) this.pathElement.forceUpdate('path')

package/src/Text.ts

@@ -119,21 +119,8 @@ export class Text extends UI implements IText {
 
     public __updateTextDrawData(): void {
         const data = this.__
-        data.__textDrawData = TextConvert.getDrawData(data.text, this.__)
-
-    }
-
-    public __updateBoxBounds(): void {
-
-        const data = this.__
-        const layout = this.__layout
         const { lineHeight, letterSpacing, fontFamily, fontSize, fontWeight, italic, textCase, textOverflow, padding } = data
 
-        const autoWidth = data.__autoWidth
-        const autoHeight = data.__autoHeight
-
-        // compute
-
         data.__lineHeight = UnitConvert.number(lineHeight, fontSize)
         data.__letterSpacing = UnitConvert.number(letterSpacing, fontSize)
         data.__padding = padding ? MathHelper.fourNumber(padding) : undefined
@@ -141,10 +128,20 @@ 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
 
-        this.__updateTextDrawData()
+        data.__textDrawData = TextConvert.getDrawData(data.text, this.__)
+    }
+
+    public __updateBoxBounds(): void {
+
+        const data = this.__
+        const layout = this.__layout
+        const { fontSize, italic, padding, __autoWidth: autoWidth, __autoHeight: autoHeight } = data
+
+        this.__updateTextDrawData() // layout text
 
         const { bounds } = data.__textDrawData
         const b = layout.boxBounds
+        console.log(bounds, autoWidth, autoHeight)
 
         if (data.__lineHeight < fontSize) spread(bounds, fontSize / 2)
 
@@ -156,19 +153,11 @@ export class Text extends UI implements IText {
 
             if (padding) {
                 const [top, right, bottom, left] = data.__padding
-                if (autoWidth) {
-                    b.x -= left
-                    b.width += (right + left)
-                }
-                if (autoHeight) {
-                    b.y -= top
-                    b.height += (bottom + top)
-                }
+                if (autoWidth) b.x -= left, b.width += (right + left)
+                if (autoHeight) b.y -= top, b.height += (bottom + top)
             }
             this.__updateNaturalSize()
-        } else {
-            super.__updateBoxBounds()
-        }
+        } else super.__updateBoxBounds()
 
         if (italic) b.width += fontSize * 0.16 // 倾斜会导致文本的bounds增大
 

package/src/UI.ts

@@ -1,7 +1,7 @@
 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 } 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, needPlugin } 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, ITransition, IAnimateType } 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, ITransition, IAnimateType, IEffect } from '@leafer-ui/interface'
 import { effectType, zoomLayerType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
@@ -284,6 +284,8 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     @effectType()
     public grayscale?: INumber | IGrayscaleEffect
 
+    public filter?: IEffect | IEffect[]
+
 
     // @leafer-in/animate rewrite
 
@@ -407,8 +409,8 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
         return curve ? PathConvert.toCanvasData(path, true) : path
     }
 
-    public getPathString(curve?: boolean, pathForRender?: boolean): IPathString {
-        return PathConvert.stringify(this.getPath(curve, pathForRender))
+    public getPathString(curve?: boolean, pathForRender?: boolean, floatLength?: number): IPathString {
+        return PathConvert.stringify(this.getPath(curve, pathForRender), floatLength)
     }
 
 

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, 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 { 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, ITransition, IStates, IStateName, 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, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, ITextWrap, ITextDrawData, ITextInputData, IPath, IPathData, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
+import { IUI, IUIData, IUIInputData, ILeafer, IGroup, IBlendMode, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowType, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IEffect, IAnimation, ITransition, IStates, IStateName, 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, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, ITextWrap, ITextDrawData, ITextInputData, IPath, IPathData, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
 
 declare class UI extends Leaf implements IUI {
     __: IUIData;
@@ -85,6 +85,7 @@ declare class UI extends Leaf implements IUI {
     blur?: INumber | IBlurEffect;
     backgroundBlur?: INumber | IBlurEffect;
     grayscale?: INumber | IGrayscaleEffect;
+    filter?: IEffect | IEffect[];
     animation?: IAnimation;
     animationOut?: IAnimation;
     transition?: ITransition;
@@ -121,7 +122,7 @@ declare class UI extends Leaf implements IUI {
     findOne(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI | undefined;
     findId(id: number | string): IUI | undefined;
     getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData;
-    getPathString(curve?: boolean, pathForRender?: boolean): IPathString;
+    getPathString(curve?: boolean, pathForRender?: boolean, floatLength?: number): IPathString;
     load(): void;
     __onUpdateSize(): void;
     __updateRenderPath(): void;