@leafer-ui/display 2.1.3 → 2.1.5

package/package.json

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

package/src/Group.ts

@@ -70,12 +70,6 @@ export class Group<TInputData = IGroupInputData> extends UI<TInputData> implemen
         return data
     }
 
-
-    // hit rewrite
-
-    public pick(_hitPoint: IPointData, _options?: IPickOptions): IPickResult { return undefined }
-
-
     // add
 
     public addAt(child: IUI | IUI[] | IUIInputData | IUIInputData[], index: number): void {
@@ -90,16 +84,18 @@ export class Group<TInputData = IGroupInputData> extends UI<TInputData> implemen
         this.add(child, this.children.indexOf(before))
     }
 
-    // Branch rewrite
-
-    public add(_child: IUI | IUI[] | IUIInputData | IUIInputData[], _index?: number): void { }
-
-    public addMany(..._children: IUI[] | IUIInputData[]): void { }
+}
 
-    public remove(_child?: IUI | number | string | IFindCondition | IFindUIMethod, _destroy?: boolean): void { }
+export interface Group {
 
-    public removeAll(_destroy?: boolean): void { }
+    // hit rewrite
+    pick(hitPoint: IPointData, options?: IPickOptions): IPickResult
 
-    public clear(): void { }
+    // Branch rewrite
+    add(child: IUI | IUI[] | IUIInputData | IUIInputData[], index?: number): void
+    addMany(...children: IUI[] | IUIInputData[]): void
+    remove(child?: IUI | number | string | IFindCondition | IFindUIMethod, destroy?: boolean): void
+    removeAll(_destroy?: boolean): void
+    clear(): void
 
 }

package/src/Pen.ts

@@ -6,6 +6,7 @@ import { PenData } from '@leafer-ui/data'
 import { Group } from './Group'
 import { Path } from './Path'
 
+
 @useModule(PathCreator, ['set', 'path', 'paint'])
 @registerUI()
 export class Pen<TInputData = IPenInputData> extends Group<TInputData> implements IPen {
@@ -32,49 +33,37 @@ export class Pen<TInputData = IPenInputData> extends Group<TInputData> implement
         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 }
+    public paint(): void {
+        const { pathElement } = this
+        if (!pathElement.__layout.boxChanged) pathElement.forceUpdate('path')
+    }
 
-    public bezierCurveTo(_x1: number, _y1: number, _x2: number, _y2: number, _x: number, _y: number): Pen { return this }
+}
 
-    public quadraticCurveTo(_x1: number, _y1: number, _x: number, _y: number): Pen { return this }
+export interface Pen {
 
-    public closePath(): Pen { return this }
+    // PathCreator rewrite
 
+    // svg and canvas
+    beginPath(): Pen
+    moveTo(x: number, y: number): Pen
+    lineTo(x: number, y: number): Pen
+    bezierCurveTo(x1: number, y1: number, x2: number, y2: number, x: number, y: number): Pen
+    quadraticCurveTo(x1: number, y1: number, x: number, y: number): Pen
+    closePath(): Pen
 
     // canvas
-
-    public rect(_x: number, _y: number, _width: number, _height: number): Pen { return this }
-
-    public roundRect(_x: number, _y: number, _width: number, _height: number, _cornerRadius: number | number[]): Pen { return this }
-
-    public ellipse(_x: number, _y: number, _radiusX: number, _radiusY: number, _rotation?: number, _startAngle?: number, _endAngle?: number, _anticlockwise?: boolean): Pen { return this }
-
-    public arc(_x: number, _y: number, _radius: number, _startAngle?: number, _endAngle?: number, _anticlockwise?: boolean): Pen { return this }
-
-    public arcTo(_x1: number, _y1: number, _x2: number, _y2: number, _radius: number): Pen { return this }
-
+    rect(x: number, y: number, width: number, height: number): Pen
+    roundRect(x: number, y: number, width: number, height: number, cornerRadius: number | number[]): Pen
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): Pen
+    arc(x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): Pen
+    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Pen
 
     // moveTo, then draw
-
-    public drawEllipse(_x: number, _y: number, _radiusX: number, _radiusY: number, _rotation?: number, _startAngle?: number, _endAngle?: number, _anticlockwise?: boolean): Pen { return this }
-
-    public drawArc(_x: number, _y: number, _radius: number, _startAngle?: number, _endAngle?: number, _anticlockwise?: boolean): Pen { return this }
-
-    public drawPoints(_points: number[] | IPointData[], _curve?: boolean | number, _close?: boolean): Pen { return this }
-
-    public clearPath(): Pen { return this } // = beginPath()
-
-
-    public paint(): void {
-        const { pathElement } = this
-        if (!pathElement.__layout.boxChanged) pathElement.forceUpdate('path')
-    }
+    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[] | IPointData[], curve?: boolean | number, close?: boolean): Pen
+    clearPath(): Pen  // = beginPath()
 
 }
 
@@ -84,4 +73,4 @@ function penPathType() {
             get() { return this.__path }
         })
     }
-}
+}

package/src/Text.ts

@@ -12,7 +12,7 @@ import { UI } from './UI'
 const { copyAndSpread, includes, setList } = BoundsHelper, { stintSet } = DataHelper
 
 @registerUI()
-export class Text<TConstructorData = ITextInputData> extends UI<TConstructorData> implements IText {
+export class Text<TInputData = ITextInputData> extends UI<TInputData> implements IText {
 
     public get __tag() { return 'Text' }
 

package/src/UI.ts

@@ -1,5 +1,5 @@
 import { ILeaferCanvas, IRenderOptions, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IEraserType, 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, IScaleFixed, IDragBoundsType, IPathCommandNode } from '@leafer/interface'
-import { Leaf, PathDrawer, surfaceType, dimType, dataType, positionType, scrollType, 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, affectRenderBoundsType, isString, isNumber } from '@leafer/core'
+import { Leaf, PathDrawer, surfaceType, dimType, dataType, positionType, scrollType, boundsType, pathType, scaleType, rotationType, opacityType, visibleType, sortType, maskType, dataProcessor, registerUI, useModule, rewriteAble, UICreator, PathCorner, hitType, strokeType, PathConvert, eraserType, cursorType, autoLayoutType, pen, naturalBoundsType, pathInputType, MathHelper, Plugin, DataHelper, affectRenderBoundsType, isString, isNumber } from '@leafer/core'
 
 import { IUI, IShadowEffect, IBlurEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult, IFill, IStroke, IArrowStyle, IFindUIMethod, ILeafer, IEditorConfig, IEditorConfigFunction, IEditToolFunction, IKeyframe, IAnimation, IAnimate, IStates, IStateName, IAnimateType, IStateStyle, IColorString, IAnimateList, ILeafPaint, ILinker, IPathCommandDataWithRadius } from '@leafer-ui/interface'
 import { effectType, zoomLayerType } from '@leafer-ui/decorator'
@@ -419,12 +419,6 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
     }
 
 
-    // data
-
-    @rewrite(Leaf.prototype.reset)
-    public reset(_data?: IUIInputData): void { }
-
-
     // @leafer-in/animate and @leafer-in/state will rewrite
 
     public set(data: IUIInputData, _transition?: ITransition | 'temp'): void {
@@ -435,9 +429,6 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
         return isString(name) ? this.__.__getInput(name) : this.__.__getInputData(name as string[] | undefined)
     }
 
-    public createProxyData(): IUIInputData { return undefined }
-    public clearProxyData(): void { }
-
 
     // hit rewrite
 
@@ -478,6 +469,8 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
         }
     }
 
+    public __updatePath(): void { }
+
     public __updateRenderPath(updateCache?: boolean): void {
         const data = this.__
         if (data.path) {
@@ -522,9 +515,6 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
         return Plugin.need('animate')
     }
 
-    public killAnimate(_type?: IAnimateType, _nextStyle?: IUIInputData): void { }
-
-
     // create
 
     // @leafer-in/export will rewrite
@@ -572,4 +562,16 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
         super.destroy()
     }
 
+}
+
+export interface UI {
+
+    reset(data?: IUIInputData): void
+
+    createProxyData(): IUIInputData
+    clearProxyData(): void
+
+    // @leafer-in/animate rewrite
+    killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void
+
 }

package/types/index.d.ts

@@ -131,11 +131,8 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     __box?: IUI;
     __animate?: IAnimate | IAnimateList;
     get pen(): IPathCreator;
-    reset(_data?: IUIInputData): void;
     set(data: IUIInputData, _transition?: ITransition | 'temp'): void;
     get<K extends keyof this>(name?: K | K[] | IUIInputData): IUIInputData | this[K];
-    createProxyData(): IUIInputData;
-    clearProxyData(): void;
     find(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI[];
     findTag(tag: string | string[]): IUI[];
     findOne(_condition: number | string | IFindCondition | IFindUIMethod, _options?: any): IUI | undefined;
@@ -145,6 +142,7 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     asPath(curve?: boolean, pathForRender?: boolean): void;
     load(): void;
     __onUpdateSize(): void;
+    __updatePath(): void;
     __updateRenderPath(updateCache?: boolean): void;
     __drawRenderPath(canvas: ILeaferCanvas): void;
     __drawPath(canvas: ILeaferCanvas): void;
@@ -152,7 +150,6 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     __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;
     export(_filename: IExportFileType | string, _options?: IExportOptions | number | boolean): Promise<IExportResult>;
     syncExport(_filename: IExportFileType | string, _options?: IExportOptions | number | boolean): IExportResult;
     clone(data?: IUIInputData): this;
@@ -164,6 +161,12 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     static setEditInner(_editorName: string | IEditToolFunction): void;
     destroy(): void;
 }
+interface UI {
+    reset(data?: IUIInputData): void;
+    createProxyData(): IUIInputData;
+    clearProxyData(): void;
+    killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void;
+}
 
 declare class Group<TInputData = IGroupInputData> extends UI<TInputData> implements IGroup {
     get __tag(): string;
@@ -178,13 +181,15 @@ declare class Group<TInputData = IGroupInputData> extends UI<TInputData> impleme
     __setBranch(): void;
     set(data: IUIInputData, transition?: ITransition | 'temp'): void;
     toJSON(options?: IJSONOptions): IUIJSONData;
-    pick(_hitPoint: IPointData, _options?: IPickOptions): IPickResult;
     addAt(child: IUI | IUI[] | IUIInputData | IUIInputData[], index: number): void;
     addAfter(child: IUI | IUI[] | IUIInputData | IUIInputData[], after: IUI): void;
     addBefore(child: IUI | IUI[] | IUIInputData | IUIInputData[], before: IUI): void;
-    add(_child: IUI | IUI[] | IUIInputData | IUIInputData[], _index?: number): void;
-    addMany(..._children: IUI[] | IUIInputData[]): void;
-    remove(_child?: IUI | number | string | IFindCondition$1 | IFindUIMethod, _destroy?: boolean): void;
+}
+interface Group {
+    pick(hitPoint: IPointData, options?: IPickOptions): IPickResult;
+    add(child: IUI | IUI[] | IUIInputData | IUIInputData[], index?: number): void;
+    addMany(...children: IUI[] | IUIInputData[]): void;
+    remove(child?: IUI | number | string | IFindCondition$1 | IFindUIMethod, destroy?: boolean): void;
     removeAll(_destroy?: boolean): void;
     clear(): void;
 }
@@ -403,7 +408,7 @@ declare class Canvas<TInputData = ICanvasInputData> extends Rect<TInputData> imp
     destroy(): void;
 }
 
-declare class Text<TConstructorData = ITextInputData> extends UI<TConstructorData> implements IText {
+declare class Text<TInputData = ITextInputData> extends UI<TInputData> implements IText {
     get __tag(): string;
     __: ITextData;
     width?: INumber;
@@ -459,22 +464,24 @@ declare class Pen<TInputData = IPenInputData> extends Group<TInputData> implemen
     path: IPathCommandData$1;
     __path: IPathCommandData$1;
     setStyle(data: IPathInputData): Pen;
+    paint(): void;
+}
+interface Pen {
     beginPath(): Pen;
-    moveTo(_x: number, _y: number): Pen;
-    lineTo(_x: number, _y: number): Pen;
-    bezierCurveTo(_x1: number, _y1: number, _x2: number, _y2: number, _x: number, _y: number): Pen;
-    quadraticCurveTo(_x1: number, _y1: number, _x: number, _y: number): Pen;
+    moveTo(x: number, y: number): Pen;
+    lineTo(x: number, y: number): Pen;
+    bezierCurveTo(x1: number, y1: number, x2: number, y2: number, x: number, y: number): Pen;
+    quadraticCurveTo(x1: number, y1: number, x: number, y: number): Pen;
     closePath(): Pen;
-    rect(_x: number, _y: number, _width: number, _height: number): Pen;
-    roundRect(_x: number, _y: number, _width: number, _height: number, _cornerRadius: number | number[]): Pen;
-    ellipse(_x: number, _y: number, _radiusX: number, _radiusY: number, _rotation?: number, _startAngle?: number, _endAngle?: number, _anticlockwise?: boolean): Pen;
-    arc(_x: number, _y: number, _radius: number, _startAngle?: number, _endAngle?: number, _anticlockwise?: boolean): Pen;
-    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[] | IPointData$1[], _curve?: boolean | number, _close?: boolean): Pen;
+    rect(x: number, y: number, width: number, height: number): Pen;
+    roundRect(x: number, y: number, width: number, height: number, cornerRadius: number | number[]): Pen;
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): Pen;
+    arc(x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): Pen;
+    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[] | IPointData$1[], curve?: boolean | number, close?: boolean): Pen;
     clearPath(): Pen;
-    paint(): void;
 }
 
 export { Box, Canvas, Ellipse, Frame, Group, Image, Leafer, Line, MyImage, Path, Pen, Polygon, Rect, Star, Text, UI };