@leafer-ui/display 1.4.2 → 1.5.0

package/package.json

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

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, 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 } from '@leafer/core'
+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'
 import { LeaferData } from '@leafer-ui/data'
@@ -72,7 +72,7 @@ export class Leafer extends Group implements ILeafer {
 
     public get FPS(): number { return this.renderer ? this.renderer.FPS : 60 }
     public get cursorPoint(): IPointData { return (this.interaction && this.interaction.hoverData) || { x: this.width / 2, y: this.height / 2 } }
-    public get clientBounds(): IBoundsData { return this.canvas && this.canvas.getClientBounds() }
+    public get clientBounds(): IBoundsData { return (this.canvas && this.canvas.getClientBounds(true)) || getBoundsData() }
     public leafs = 0
 
     public __eventIds: IEventListenerId[] = []
@@ -402,6 +402,11 @@ export class Leafer extends Group implements ILeafer {
         return this.getPagePoint(this.getWorldPointByClient(clientPoint, updateClient))
     }
 
+    public getClientPointByWorld(worldPoint: IPointData): IPointData {
+        const { x, y } = this.clientBounds
+        return { x: x + worldPoint.x, y: y + worldPoint.y }
+    }
+
     public updateClientBounds(): void {
         this.canvas && this.canvas.updateClientBounds()
     }

package/src/Pen.ts

@@ -1,6 +1,6 @@
 import { PathCreator, dataProcessor, defineKey, registerUI, useModule } from '@leafer/core'
 
-import { IPenData, IPenInputData, IPathInputData, IPathCommandData, IPath, IPen } from '@leafer-ui/interface'
+import { IPenData, IPenInputData, IPathInputData, IPathCommandData, IPath, IPen, IPointData } from '@leafer-ui/interface'
 import { PenData } from '@leafer-ui/data'
 
 import { Group } from './Group'
@@ -69,7 +69,7 @@ export class Pen extends Group implements IPen {
 
     public drawArc(_x: number, _y: number, _radius: number, _startAngle?: number, _endAngle?: number, _anticlockwise?: boolean): Pen { return this }
 
-    public drawPoints(_points: number[], _curve?: boolean | number, _close?: boolean): Pen { return this }
+    public drawPoints(_points: number[] | IPointData[], _curve?: boolean | number, _close?: boolean): Pen { return this }
 
     public clearPath(): Pen { return this } // = beginPath()
 

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 } 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 } from '@leafer/core'
+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 { effectType, zoomLayerType } from '@leafer-ui/decorator'
@@ -365,11 +365,11 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
 
     //  @leafer-in/editor rewrite
 
-    public get editConfig(): IEditorConfig { return undefined }
+    public editConfig: IEditorConfig
 
-    public get editOuter(): string { return '' }
+    public editOuter: string
 
-    public get editInner(): string { return '' }
+    public editInner: string
 
 
     constructor(data?: IUIInputData) {
@@ -484,8 +484,12 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
         return Plugin.need('export')
     }
 
+    public syncExport(_filename: IExportFileType | string, _options?: IExportOptions | number | boolean): IExportResult {
+        return Plugin.need('export')
+    }
+
     public clone(data?: IUIInputData): IUI {
-        const json = this.toJSON()
+        const json = DataHelper.clone(this.toJSON())
         if (data) Object.assign(json, data)
         return UI.one(json)
     }

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 { 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, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, IWritingMode, 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, 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, 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;
@@ -111,9 +111,9 @@ declare class UI extends Leaf implements IUI {
     get scale(): INumber | IPointData;
     __animate?: IAnimate;
     get pen(): IPathCreator;
-    get editConfig(): IEditorConfig;
-    get editOuter(): string;
-    get editInner(): string;
+    editConfig: IEditorConfig;
+    editOuter: string;
+    editInner: string;
     constructor(data?: IUIInputData);
     reset(_data?: IUIInputData): void;
     set(data: IUIInputData, transition?: ITransition | 'temp'): void;
@@ -135,6 +135,7 @@ declare class UI extends Leaf implements IUI {
     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>;
+    syncExport(_filename: IExportFileType | string, _options?: IExportOptions | number | boolean): IExportResult;
     clone(data?: IUIInputData): IUI;
     static one(data: IUIInputData, x?: number, y?: number, width?: number, height?: number): IUI;
     static registerUI(): void;
@@ -251,6 +252,7 @@ declare class Leafer extends Group implements ILeafer {
     getValidScale(changeScale: number): number;
     getWorldPointByClient(clientPoint: IClientPointData, updateClient?: boolean): IPointData;
     getPagePointByClient(clientPoint: IClientPointData, updateClient?: boolean): IPointData;
+    getClientPointByWorld(worldPoint: IPointData): IPointData;
     updateClientBounds(): void;
     receiveEvent(_event: any): void;
     protected emitLeafer(type: string): void;
@@ -445,7 +447,7 @@ declare class Pen extends Group implements IPen {
     arcTo(_x1: number, _y1: number, _x2: number, _y2: number, _radius: number): Pen;
     drawEllipse(_x: number, _y: number, _radiusX: number, _radiusY: number, _rotation?: number, _startAngle?: number, _endAngle?: number, _anticlockwise?: boolean): Pen;
     drawArc(_x: number, _y: number, _radius: number, _startAngle?: number, _endAngle?: number, _anticlockwise?: boolean): Pen;
-    drawPoints(_points: number[], _curve?: boolean | number, _close?: boolean): Pen;
+    drawPoints(_points: number[] | IPointData$1[], _curve?: boolean | number, _close?: boolean): Pen;
     clearPath(): Pen;
     paint(): void;
 }