@leafer-ui/display 1.0.0-rc.17 → 1.0.0-rc.18

package/package.json

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

package/src/Group.ts

@@ -51,7 +51,7 @@ export class Group extends UI implements IGroup {
 
             let child: IUI
             children.forEach(childData => {
-                child = UICreator.get(childData.tag, childData) as IUI
+                child = (childData as IUI).__ ? childData as IUI : UICreator.get(childData.tag, childData) as IUI
                 this.add(child)
             })
 

package/src/Leafer.ts

@@ -1,7 +1,7 @@
-import { ILeaferCanvas, IRenderer, ILayouter, ISelector, IWatcher, IInteraction, ILeaferConfig, ICanvasManager, IHitCanvasManager, IAutoBounds, IScreenSizeData, IResizeEvent, ILeaf, IEventListenerId, ITimer, IValue, IObject, IControl, IPointData, ILeaferType, ICursorType, IBoundsData, INumber } from '@leafer/interface'
+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 } from '@leafer/interface'
 import { AutoBounds, LayoutEvent, ResizeEvent, LeaferEvent, CanvasManager, ImageManager, DataHelper, Creator, Run, Debug, RenderEvent, registerUI, boundsType, canvasSizeAttrs, dataProcessor, WaitHelper, WatchEvent, Bounds } from '@leafer/core'
 
-import { ILeaferInputData, ILeaferData, IFunction, IUIInputData, ILeafer, IGroup, IApp, IEditorBase } from '@leafer-ui/interface'
+import { ILeaferInputData, ILeaferData, IFunction, IUIInputData, ILeafer, IApp, IEditorBase } from '@leafer-ui/interface'
 import { LeaferData } from '@leafer-ui/data'
 import { Group } from './Group'
 
@@ -54,8 +54,6 @@ export class Leafer extends Group implements ILeafer {
     // plugin
     public editor: IEditorBase
 
-    public zoomLayer: IGroup = this
-
     public userConfig: ILeaferConfig
     public config: ILeaferConfig = {
         type: 'design',
@@ -69,7 +67,6 @@ export class Leafer extends Group implements ILeafer {
         move: {
             holdSpaceKey: true,
             holdMiddleKey: true,
-            dragOut: true,
             autoDistance: 2
         }
     }
@@ -236,10 +233,6 @@ export class Leafer extends Group implements ILeafer {
         this.__level = 1
     }
 
-    public setZoomLayer(zoomLayer: ILeaf): void {
-        this.zoomLayer = zoomLayer as IGroup
-    }
-
     protected __checkAutoLayout(config: ILeaferConfig): void {
         if (!config.width || !config.height) {
             this.autoLayout = new AutoBounds(config)
@@ -327,15 +320,18 @@ export class Leafer extends Group implements ILeafer {
         }
     }
 
-    public waitReady(item: IFunction): void {
+    public waitReady(item: IFunction, bind?: IObject): void {
+        if (bind) item = item.bind(bind)
         this.ready ? item() : this.__readyWait.push(item)
     }
 
-    public waitViewReady(item: IFunction): void {
+    public waitViewReady(item: IFunction, bind?: IObject): void {
+        if (bind) item = item.bind(bind)
         this.viewReady ? item() : this.__viewReadyWait.push(item)
     }
 
-    public waitViewCompleted(item: IFunction): void {
+    public waitViewCompleted(item: IFunction, bind?: IObject): void {
+        if (bind) item = item.bind(bind)
         this.__viewCompletedWait.push(item)
         if (this.viewCompleted) {
             this.__checkViewCompleted(false)
@@ -344,7 +340,8 @@ export class Leafer extends Group implements ILeafer {
         }
     }
 
-    public nextRender(item: IFunction, off?: 'off'): void {
+    public nextRender(item: IFunction, bind?: IObject, off?: 'off'): void {
+        if (bind) item = item.bind(bind)
         const list = this.__nextRenderWait
         if (off) {
             for (let i = 0; i < list.length; i++) {
@@ -355,6 +352,16 @@ export class Leafer extends Group implements ILeafer {
         }
     }
 
+    // need view plugin
+    public zoom(_zoomType: IZoomType, _padding?: IFourNumber, _fixedScale?: boolean): IBoundsData { return undefined }
+
+    public validScale(changeScale: number): number {
+        const { scaleX } = this.zoomLayer.__, { min, max } = this.app.config.zoom, absScale = Math.abs(scaleX * changeScale)
+        if (absScale < min) changeScale = min / scaleX
+        else if (absScale > max) changeScale = max / scaleX
+        return changeScale
+    }
+
     protected __checkUpdateLayout(): void {
         this.__layout.update()
     }

package/src/UI.ts

@@ -1,8 +1,8 @@
-import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IAround, IValue, IWindingRule } 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, PathCreator, naturalBoundsType, pathInputType } from '@leafer/core'
+import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IAround, IValue, IWindingRule, IPathCreator } 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 } from '@leafer-ui/interface'
-import { arrowType, effectType } from '@leafer-ui/decorator'
+import { arrowType, effectType, stateType, zoomLayerType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
 import { UIBounds, UIRender } from '@leafer-ui/display-module'
@@ -10,6 +10,8 @@ import { UIBounds, UIRender } from '@leafer-ui/display-module'
 import { Export, PathArrow } from '@leafer-ui/external'
 
 
+
+
 @useModule(UIBounds)
 @useModule(UIRender)
 @rewriteAble()
@@ -26,6 +28,9 @@ export class UI extends Leaf implements IUI {
     declare public leafer?: ILeafer
     declare public parent?: IGroup
 
+    @zoomLayerType()
+    public zoomLayer: IGroup
+
     public get isFrame(): boolean { return false }
 
     declare public children?: IUI[]
@@ -53,9 +58,17 @@ export class UI extends Leaf implements IUI {
     @opacityType(true)
     public visible: IBoolean
 
+
+    @stateType(false)
+    public selected: IBoolean
+
+    @stateType(false)
+    public disabled: IBoolean
+
     @dataType(false)
     public locked: IBoolean
 
+
     @sortType(0)
     public zIndex: INumber
 
@@ -231,6 +244,27 @@ export class UI extends Leaf implements IUI {
     public grayscale: INumber | IGrayscaleEffect
 
 
+    // states
+
+    @dataType()
+    public normalStyle: IUIInputData // auto restore hover / press / focus / selected / disabled style
+
+    @dataType()
+    public hoverStyle: IUIInputData
+
+    @dataType()
+    public pressStyle: IUIInputData
+
+    @dataType()
+    public focusStyle: IUIInputData
+
+    @dataType()
+    public selectedStyle: IUIInputData
+
+    @dataType()
+    public disabledStyle: IUIInputData
+
+
     public set scale(value: INumber | IPointData) {
         if (typeof value === 'number') {
             this.scaleX = this.scaleY = value
@@ -246,6 +280,12 @@ export class UI extends Leaf implements IUI {
     }
 
 
+    public get pen(): IPathCreator {
+        pen.set(this.path = this.__.path || [])
+        return pen
+    }
+
+
     constructor(data?: IUIInputData) {
         super(data)
     }
@@ -261,8 +301,8 @@ export class UI extends Leaf implements IUI {
         Object.assign(this, data)
     }
 
-    public get(name?: string): IUIInputData | IValue {
-        return name ? this.__.__getInput(name) : this.__.__getInputData()
+    public get(name?: string | string[] | IUIInputData): IUIInputData | IValue {
+        return typeof name === 'string' ? this.__.__getInput(name) : this.__.__getInputData(name)
     }
 
     public createProxyData(): IUIInputData { return undefined }
@@ -281,9 +321,11 @@ export class UI extends Leaf implements IUI {
         this.__layout.update()
         let path = pathForRender ? this.__.__pathForRender : this.__.path
         if (!path) {
-            path = []
             const { width, height } = this.boxBounds
-            if (width || height) this.__drawPathByBox(new PathCreator(path))
+            if (width || height) {
+                pen.set(path = [])
+                this.__drawPathByBox(pen)
+            }
         }
         return curve ? PathConvert.toCanvasData(path, true) : path
     }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IString, INumber, IBoolean, IMaskType, IAround, IHitType, ICursorType, IPathCommandData, IPathString, IWindingRule, IPointData, IValue, ILeaferCanvas, IPathDrawer, IExportFileType, IPickOptions, IPickResult, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IBoundsData, IResizeEvent, ILeaf, IRenderOptions, ILeaferImage, ICanvasContext2D } from '@leafer/interface';
+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, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IBoundsData, IResizeEvent, IObject, IZoomType, IFourNumber, IRenderOptions, ILeaferImage, ICanvasContext2D } from '@leafer/interface';
 import { Leaf } from '@leafer/core';
 import { IUI, IUIData, IUIInputData, ILeafer, IGroup, IBlendMode, IEditSize, 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';
 
@@ -9,6 +9,7 @@ declare class UI extends Leaf implements IUI {
     get app(): ILeafer;
     leafer?: ILeafer;
     parent?: IGroup;
+    zoomLayer: IGroup;
     get isFrame(): boolean;
     children?: IUI[];
     id: IString;
@@ -17,6 +18,8 @@ declare class UI extends Leaf implements IUI {
     blendMode: IBlendMode;
     opacity: INumber;
     visible: IBoolean;
+    selected: IBoolean;
+    disabled: IBoolean;
     locked: IBoolean;
     zIndex: INumber;
     mask: IBoolean;
@@ -66,12 +69,19 @@ declare class UI extends Leaf implements IUI {
     blur: INumber | IBlurEffect;
     backgroundBlur: INumber | IBlurEffect;
     grayscale: INumber | IGrayscaleEffect;
+    normalStyle: IUIInputData;
+    hoverStyle: IUIInputData;
+    pressStyle: IUIInputData;
+    focusStyle: IUIInputData;
+    selectedStyle: IUIInputData;
+    disabledStyle: IUIInputData;
     set scale(value: INumber | IPointData);
     get scale(): INumber | IPointData;
+    get pen(): IPathCreator;
     constructor(data?: IUIInputData);
     reset(_data?: IUIInputData): void;
     set(data: IUIInputData): void;
-    get(name?: string): IUIInputData | IValue;
+    get(name?: string | string[] | IUIInputData): IUIInputData | IValue;
     createProxyData(): IUIInputData;
     find(_condition: number | string | IFindUIMethod, _options?: any): IUI[];
     findOne(_condition: number | string | IFindUIMethod, _options?: any): IUI;
@@ -138,7 +148,6 @@ declare class Leafer extends Group implements ILeafer {
     canvasManager: ICanvasManager;
     hitCanvasManager?: IHitCanvasManager;
     editor: IEditorBase;
-    zoomLayer: IGroup;
     userConfig: ILeaferConfig;
     config: ILeaferConfig;
     autoLayout?: IAutoBounds;
@@ -169,7 +178,6 @@ declare class Leafer extends Group implements ILeafer {
     protected __setApp(): void;
     protected __bindApp(app: IApp): void;
     __setLeafer(leafer: ILeafer): void;
-    setZoomLayer(zoomLayer: ILeaf): void;
     protected __checkAutoLayout(config: ILeaferConfig): void;
     __setAttr(attrName: string, newValue: IValue): void;
     __getAttr(attrName: string): IValue;
@@ -181,10 +189,12 @@ declare class Leafer extends Group implements ILeafer {
     protected __onNextRender(): void;
     protected __checkViewCompleted(emit?: boolean): void;
     protected __onWatchData(): void;
-    waitReady(item: IFunction): void;
-    waitViewReady(item: IFunction): void;
-    waitViewCompleted(item: IFunction): void;
-    nextRender(item: IFunction, off?: 'off'): void;
+    waitReady(item: IFunction, bind?: IObject): void;
+    waitViewReady(item: IFunction, bind?: IObject): void;
+    waitViewCompleted(item: IFunction, bind?: IObject): void;
+    nextRender(item: IFunction, bind?: IObject, off?: 'off'): void;
+    zoom(_zoomType: IZoomType, _padding?: IFourNumber, _fixedScale?: boolean): IBoundsData;
+    validScale(changeScale: number): number;
     protected __checkUpdateLayout(): void;
     protected emitLeafer(type: string): void;
     protected __listenEvents(): void;