@leafer-ui/display 1.0.0-rc.20 → 1.0.0-rc.22

package/package.json

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

package/src/Leafer.ts

@@ -11,9 +11,6 @@ const debug = Debug.get('Leafer')
 @registerUI()
 export class Leafer extends Group implements ILeafer {
 
-
-    static get version() { return '1.0.0-rc.20' }
-
     static list = new LeafList() // 所有leafer实例
 
 
@@ -123,7 +120,6 @@ export class Leafer extends Group implements ILeafer {
 
         if (this.isApp) this.__setApp()
         this.__checkAutoLayout(config)
-        this.updateLazyBounds()
         this.view = canvas.view
 
         // interaction / manager
@@ -390,6 +386,7 @@ export class Leafer extends Group implements ILeafer {
     protected __listenEvents(): void {
         const runId = Run.start('FirstCreate ' + this.innerName)
         this.once(LeaferEvent.START, () => Run.end(runId))
+        this.once(LayoutEvent.START, () => this.updateLazyBounds())
         this.once(LayoutEvent.END, () => this.__onReady())
         this.once(RenderEvent.START, () => this.__onCreated())
         this.once(RenderEvent.END, () => this.__onViewReady())

package/src/Text.ts

@@ -1,4 +1,4 @@
-import { ILeaferCanvas, IPathDrawer, IPathCommandData, IBoolean, INumber, IString, IBoundsData } from '@leafer/interface'
+import { ILeaferCanvas, IPathDrawer, IPathCommandData, IBoolean, INumber, IString, IBoundsData, IFourNumber } from '@leafer/interface'
 import { BoundsHelper, boundsType, surfaceType, dataProcessor, registerUI, affectStrokeBoundsType, hitType, MathHelper } from '@leafer/core'
 
 import { IFill, IText, IFontWeight, ITextCase, ITextDecoration, ITextData, ITextInputData, ITextAlign, IVerticalAlign, ITextDrawData, IOverflow, IUnitData, IStrokeAlign, IHitType, ITextWrap } from '@leafer-ui/interface'
@@ -27,7 +27,7 @@ export class Text extends UI implements IText {
     declare public height: INumber
 
     @boundsType(0)
-    public padding: number | number[]
+    public padding: IFourNumber
 
     @surfaceType('#000000')
     declare public fill: IFill
@@ -83,11 +83,14 @@ export class Text extends UI implements IText {
     @boundsType('show')
     public textOverflow: IOverflow | string
 
+    public get editInner(): string { return 'TextEditor' }
+
     public get textDrawData(): ITextDrawData {
         this.__layout.update()
         return this.__.__textDrawData
     }
 
+
     constructor(data?: ITextInputData) {
         super(data)
     }

package/src/UI.ts

@@ -1,7 +1,7 @@
-import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IAround, IValue, IWindingRule, IPathCreator } from '@leafer/interface'
+import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IAround, IValue, IWindingRule, IPathCreator, IFourNumber, IBoundsData } from '@leafer/interface'
 import { Leaf, PathDrawer, surfaceType, dataType, positionType, boundsType, pathType, scaleType, rotationType, opacityType, sortType, maskType, dataProcessor, registerUI, useModule, rewrite, rewriteAble, UICreator, PathCorner, hitType, strokeType, PathConvert, eraserType, cursorType, autoLayoutType, pen, naturalBoundsType, pathInputType } 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, IEditSize, ILeafer, IEditorConfig } 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, IEditSize, ILeafer, IEditorConfig, IEditorConfigFunction, IEditToolFunction } from '@leafer-ui/interface'
 import { arrowType, effectType, stateType, zoomLayerType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
@@ -119,7 +119,10 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
 
 
     @dataType(false)
-    public draggable: IBoolean
+    public draggable: IBoolean | 'x' | 'y'
+
+    @dataType()
+    public dragBounds?: IBoundsData | 'parent'
 
 
     @dataType(false)
@@ -128,9 +131,6 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     @dataType('size')
     public editSize?: IEditSize
 
-    @dataType()
-    public editorStyle: IEditorConfig
-
 
     // hit
     @hitType(true)
@@ -174,7 +174,7 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     public strokeAlign: IStrokeAlign
 
     @strokeType(1)
-    public strokeWidth: INumber | INumber[] | IStrokeWidthString
+    public strokeWidth: IFourNumber | IStrokeWidthString
 
     @strokeType(false)
     public strokeWidthFixed: IBoolean
@@ -225,7 +225,7 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     // corner
 
     @pathType(0)
-    public cornerRadius: number | number[] | ICornerRadiusString
+    public cornerRadius: IFourNumber | ICornerRadiusString
 
     @pathType()
     public cornerSmoothing: INumber
@@ -283,13 +283,21 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
         return scaleX !== scaleY ? { x: scaleX, y: scaleY } : scaleX
     }
 
-
     public get pen(): IPathCreator {
         pen.set(this.path = this.__.path || [])
         return pen
     }
 
 
+    // editor
+
+    public get editConfig(): IEditorConfig { return undefined }
+
+    public get editOuter(): string { return 'EditTool' }
+
+    public get editInner(): string { return 'PathEditor' }
+
+
     constructor(data?: IUIInputData) {
         super(data)
     }
@@ -375,7 +383,8 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
     public __drawPathByBox(drawer: IPathDrawer): void {
         const { x, y, width, height } = this.__layout.boxBounds
         if (this.__.cornerRadius) {
-            drawer.roundRect(x, y, width, height, this.__.cornerRadius)
+            const { cornerRadius } = this.__
+            drawer.roundRect(x, y, width, height, typeof cornerRadius === 'number' ? [cornerRadius] : cornerRadius) // 修复微信浏览器bug, 后续需进一步优化
         } else {
             drawer.rect(x, y, width, height)
         }
@@ -404,6 +413,16 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
         dataProcessor(data)(this.prototype)
     }
 
+
+    // @leafer-in/editor rewrite
+
+    static setEditConfig(_config: IEditorConfig | IEditorConfigFunction): void { }
+
+    static setEditOuter(_toolName: string | IEditToolFunction): void { }
+
+    static setEditInner(_editorName: string | IEditToolFunction): void { }
+
+
     public destroy(): void {
         this.fill = this.stroke = null
         super.destroy()

package/types/index.d.ts

@@ -1,6 +1,6 @@
-import { IString, INumber, IBoolean, IMaskType, IAround, IHitType, ICursorType, IPathCommandData, IPathString, IWindingRule, IPointData, IPathCreator, IValue, ILeaferCanvas, IPathDrawer, IExportFileType, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IBoundsData, IResizeEvent, IObject, IZoomType, IFourNumber, IRenderOptions, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D } from '@leafer/interface';
+import { IString, INumber, IBoolean, IMaskType, IAround, IBoundsData, IHitType, ICursorType, IFourNumber, IPathCommandData, IPathString, IWindingRule, IPointData, IPathCreator, IValue, ILeaferCanvas, IPathDrawer, IExportFileType, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IObject, IZoomType, IRenderOptions, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D } from '@leafer/interface';
 import { Leaf, LeafList } from '@leafer/core';
-import { IUI, IUIData, IUIInputData, ILeafer, IGroup, IBlendMode, IEditSize, IEditorConfig, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowType, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IFindUIMethod, IExportOptions, IExportResult, IGroupData, IGroupInputData, 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, IUnitData, 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, IEditSize, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowType, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IEditorConfig, IFindUIMethod, IExportOptions, IExportResult, IEditorConfigFunction, IEditToolFunction, IGroupData, IGroupInputData, 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, IUnitData, 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;
@@ -35,10 +35,10 @@ declare class UI extends Leaf implements IUI {
     skewX: INumber;
     skewY: INumber;
     around: IAround;
-    draggable: IBoolean;
+    draggable: IBoolean | 'x' | 'y';
+    dragBounds?: IBoundsData | 'parent';
     editable: IBoolean;
     editSize?: IEditSize;
-    editorStyle: IEditorConfig;
     hittable: IBoolean;
     hitFill: IHitType;
     hitStroke: IHitType;
@@ -50,7 +50,7 @@ declare class UI extends Leaf implements IUI {
     fill: IFill;
     stroke: IStroke;
     strokeAlign: IStrokeAlign;
-    strokeWidth: INumber | INumber[] | IStrokeWidthString;
+    strokeWidth: IFourNumber | IStrokeWidthString;
     strokeWidthFixed: IBoolean;
     strokeCap: IStrokeCap;
     strokeJoin: IStrokeJoin;
@@ -64,7 +64,7 @@ declare class UI extends Leaf implements IUI {
     closed: boolean;
     startArrow: IArrowType;
     endArrow: IArrowType;
-    cornerRadius: number | number[] | ICornerRadiusString;
+    cornerRadius: IFourNumber | ICornerRadiusString;
     cornerSmoothing: INumber;
     shadow: IShadowEffect | IShadowEffect[] | IShadowString;
     innerShadow: IShadowEffect | IShadowEffect[] | IShadowString;
@@ -80,6 +80,9 @@ declare class UI extends Leaf implements IUI {
     set scale(value: INumber | IPointData);
     get scale(): INumber | IPointData;
     get pen(): IPathCreator;
+    get editConfig(): IEditorConfig;
+    get editOuter(): string;
+    get editInner(): string;
     constructor(data?: IUIInputData);
     reset(_data?: IUIInputData): void;
     set(data: IUIInputData): void;
@@ -100,6 +103,9 @@ declare class UI extends Leaf implements IUI {
     static one(data: IUIInputData, x?: number, y?: number, width?: number, height?: number): IUI;
     static registerUI(): void;
     static registerData(data: IUIData): void;
+    static setEditConfig(_config: IEditorConfig | IEditorConfigFunction): void;
+    static setEditOuter(_toolName: string | IEditToolFunction): void;
+    static setEditInner(_editorName: string | IEditToolFunction): void;
     destroy(): void;
 }
 
@@ -125,7 +131,6 @@ declare class Group extends UI implements IGroup {
 }
 
 declare class Leafer extends Group implements ILeafer {
-    static get version(): string;
     static list: LeafList;
     get __tag(): string;
     __: ILeaferData;
@@ -330,7 +335,7 @@ declare class Text extends UI implements IText {
     __: ITextData;
     width: INumber;
     height: INumber;
-    padding: number | number[];
+    padding: IFourNumber;
     fill: IFill;
     strokeAlign: IStrokeAlign;
     hitFill: IHitType$1;
@@ -349,6 +354,7 @@ declare class Text extends UI implements IText {
     verticalAlign: IVerticalAlign;
     textWrap: ITextWrap;
     textOverflow: IOverflow | string;
+    get editInner(): string;
     get textDrawData(): ITextDrawData;
     constructor(data?: ITextInputData);
     __drawHitPath(canvas: ILeaferCanvas): void;