@leafer-ui/interface 1.8.0 → 1.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/interface",
-  "version": "1.8.0",
+  "version": "1.9.1",
   "description": "@leafer-ui/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,6 +22,6 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/interface": "1.8.0"
+    "@leafer/interface": "1.9.1"
   }
 }

package/src/ICachedShape.ts

@@ -1,7 +1,7 @@
 import { ILeaferCanvas, IBoundsData, ICachedLeaf } from '@leafer/interface'
 
 export interface ICachedShape extends ICachedLeaf {
-    worldCanvas?: ILeaferCanvas
+    worldCanvas?: ILeaferCanvas // 元素太大放不下，经过裁剪后的元素区域缓存画布
     shapeBounds: IBoundsData
     scaleX: number
     scaleY: number

package/src/ICommonAttr.ts

@@ -1,4 +1,4 @@
-import { INumber, IBoolean, IString, IFourNumber, IUnitData } from '@leafer/interface'
+import { INumber, IBoolean, IString, IFourNumber, IUnitData, IScaleFixed } from '@leafer/interface'
 import { IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IStroke, IFill, IArrowType, IWritingMode } from './type/IType'
 import { ILeafStrokePaint, ILeafShadowEffect, ILeafPaint } from './type/IComputedType'
 import { IDashPatternString, IShadowString, IColorString, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
@@ -53,7 +53,7 @@ export interface IStrokeInputData extends IStrokeStyle {
 export interface IStrokeStyle {
     strokeAlign?: IStrokeAlign
     strokeWidth?: IFourNumber | IStrokeWidthString
-    strokeWidthFixed?: IBoolean
+    strokeWidthFixed?: IScaleFixed
     strokeCap?: IStrokeCap
     strokeJoin?: IStrokeJoin
     dashPattern?: INumber[] | IDashPatternString
@@ -72,7 +72,7 @@ export interface IStrokeComputedStyle {
     strokeAlign?: IStrokeAlign
     strokeWidth?: number
     strokeWidths?: number[]
-    strokeWidthFixed?: boolean
+    strokeWidthFixed?: IScaleFixed
     strokeCap?: IStrokeCap
     strokeJoin?: IStrokeJoin
     dashPattern?: number[]

package/src/editor/IEditor.ts

@@ -1,4 +1,4 @@
-import { IGroup, IUI, IBox, IRectInputData, ISelectorProxy, IEditSize, ICursorType, IAlign, IUnitPointData, IDragEvent, IMoveEvent, IRotateEvent, IStroke, IFill, ILeaf, ILeafList, IObject, IBoxInputData, IGroupInputData, IImageCursor, IRect, IKeyEvent, IUIInputData, IZoomEvent, IColorString, IDirection4, IPointData, IScaleData, ISkewData, ILayoutBoundsData, ITransition, IFourNumber } from '@leafer-ui/interface'
+import { IGroup, IUI, IBox, IRectInputData, ISelectorProxy, IEditSize, ICursorType, IAlign, IUnitPointData, IDragEvent, IMoveEvent, IRotateEvent, IStroke, IFill, ILeaf, ILeafList, IObject, IBoxInputData, IGroupInputData, IImageCursor, IRect, IKeyEvent, IUIInputData, IZoomEvent, IColorString, IDirection4, IPointData, IScaleData, ISkewData, ILayoutBoundsData, ITransition, IFourNumber, IShortcutKeys, IShortcutKeysCheck, IUIEvent } from '@leafer-ui/interface'
 
 export interface IEditorBase extends IGroup, ISelectorProxy, ITransformTool {
     config: IEditorConfig
@@ -115,6 +115,8 @@ export interface IEditorConfig extends IObject {
 
     hideOnMove?: boolean
     hideOnSmall?: boolean | number
+    hideRotatePoints?: boolean // 是否隐藏透明的旋转控制点
+    hideResizeLines?: boolean  // 是否隐藏透明的resize线条
 
     moveCursor?: ICursorType
     resizeCursor?: IImageCursor
@@ -125,6 +127,7 @@ export interface IEditorConfig extends IObject {
     rotateAround?: IAlign | IUnitPointData // 单独设置旋转围绕的中心点，比 around 优先级高
     rotateGap?: number
     lockRatio?: boolean | 'corner'
+    dragLimitAnimate?: boolean | number // 限制拖动范围的元素，可在拖拽结束时进行动画归位，默认采用 app.config.pointer.dragLimitAnimate 的值
 
     selector?: boolean
     editBox?: boolean
@@ -133,6 +136,7 @@ export interface IEditorConfig extends IObject {
     select?: 'press' | 'tap'
     selectedStyle?: IUIInputData
     multipleSelect?: boolean
+
     boxSelect?: boolean
     continuousSelect?: boolean // 点击可以连续选择
     openInner?: 'double' | 'long' // 双击/长按打开内部
@@ -143,6 +147,9 @@ export interface IEditorConfig extends IObject {
     rotateable?: boolean | 'gesture' | 'rotate'
     skewable?: boolean
 
+    multipleSelectKey?: IShortcutKeysCheck | IShortcutKeys
+    rotateKey?: IShortcutKeysCheck | IShortcutKeys
+
     beforeSelect?: IEditorBeforeSelect
     beforeMove?: IEditorBeforeMove
     beforeScale?: IEditorBeforeScale
@@ -265,6 +272,7 @@ export interface IEditBoxBase extends IGroup {
     unload(): void
 
     onArrow(e: IKeyEvent): void
+    isHoldRotateKey(e: IUIEvent): boolean
 
 }
 

package/src/module/IPaint.ts

@@ -1,4 +1,4 @@
-import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage, IAround, IPointData, IMatrixData, ISizeData } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage, IAlign, IPointData, IMatrixData, ISizeData } from '@leafer/interface'
 
 import { ILeafPaint, ILeafPaintPatternData } from '../type/IComputedType'
 import { IUI, IUIData } from '../IUI'
@@ -36,7 +36,7 @@ export interface IPaintImageModule {
     getPatternData(paint: IImagePaint, box: IBoundsData, image: ILeaferImage): ILeafPaintPatternData
     fillOrFitMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void
     clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, clipSize?: ISizeData): void
-    repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number, around: IAround): void
+    repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, align: IAlign, freeTransform?: boolean): void
 }
 
 export interface IPaintGradientModule {

package/src/type/IComputedType.ts

@@ -1,4 +1,4 @@
-import { IBlendMode, ILeaferImage, IMatrixData, ITaskItem } from '@leafer/interface'
+import { IBlendMode, ILeaferImage, IMatrixData, IPointData, IScaleFixed, ITaskItem } from '@leafer/interface'
 
 import { IColorString } from './IStringType'
 import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode, IImageFilters } from './IType'
@@ -22,7 +22,7 @@ export interface ILeafPaint {
     isTransparent?: boolean // 是否为透明色
     data?: ILeafPaintPatternData
     editing?: boolean // 标记编辑中
-    scaleFixed?: boolean // 平铺图片不跟随画布缩放
+    scaleFixed?: IScaleFixed // 平铺图片不跟随画布缩放
 }
 
 export interface ILeafPaintPatternData {
@@ -30,6 +30,7 @@ export interface ILeafPaintPatternData {
     height?: number
     scaleX?: number
     scaleY?: number
+    gap?: IPointData
     opacity?: number
     transform?: IMatrixData
     filters?: IImageFilters
@@ -56,4 +57,5 @@ export interface ILeafShadowEffect {
     color: IColorString
     blendMode?: IBlendMode
     box?: boolean
+    scaleFixed?: IScaleFixed
 }

package/src/type/IType.ts

@@ -1,4 +1,4 @@
-import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, IFourNumber, IAlign, IUnitPointData, IAxis, IAxisReverse, IFilter, IOptionSizeData, ISizeData } from '@leafer/interface'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, IFourNumber, IAlign, IUnitPointData, IAxis, IAxisReverse, IFilter, IOptionSizeData, ISizeData, IGap, IPointGap, IScaleFixed } from '@leafer/interface'
 import { IColorString, IPaintString } from './IStringType'
 import { IStrokeStyle } from '../ICommonAttr'
 
@@ -88,10 +88,13 @@ export interface IImagePaint extends IPaintBase {
     rotation?: number
     skew?: | IPointData
 
+    freeTransform?: boolean // 平铺模式下是否进行自由变换，默认90度、缩放会进行特殊处理
+
     clipSize?: ISizeData
 
     repeat?: IRepeat
-    scaleFixed?: boolean // 平铺图片不跟随画布缩放
+    gap?: IGap | IPointGap
+    scaleFixed?: IScaleFixed // 平铺图片不跟随画布缩放
 
     changeful?: boolean // 会频繁变化，不生成图案（有特殊性能优化，一般用于游戏精灵、动图场景）
     sync?: boolean // 同步显示，不走任务列表生成图案
@@ -109,7 +112,7 @@ export interface IImageFilters {
     shadows?: number // 阴影
 }
 export type IImagePaintMode = 'normal' | 'cover' | 'fit' | 'stretch' | 'clip' | 'repeat'
-export type IRepeat = boolean | 'x' | 'y'
+export type IRepeat = boolean | 'x' | 'y' | IPointData
 
 // 描边
 export type IStrokeAlign = 'inside' | 'outside' | 'center'
@@ -179,6 +182,7 @@ export interface IShadowEffect {
     blendMode?: IBlendMode
     visible?: boolean
     box?: boolean
+    scaleFixed?: IScaleFixed
 }
 
 export interface IBlurEffect {

package/types/index.d.ts

@@ -1,6 +1,6 @@
-import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, IOptionSizeData, ISizeData, IPathCommandData, IAxis, IAxisReverse, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventParamsMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IPercentData, ILeafInputData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IBoundsData, IValue, IPathCreator, IJSONOptions, IFindCondition, IAnswer, IPathString, IPathDrawer, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPickOptions, IPickResult, ICanvasContext2DSettings, ICanvasContext2D, ILeaferAttrData, IControl, ILeaferType, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap, IAround, IMatrixWithBoundsScaleData } from '@leafer/interface';
+import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, IOptionSizeData, ISizeData, IGap, IPointGap, IScaleFixed, IPathCommandData, IAxis, IAxisReverse, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, INumber, IString, IBoolean, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventParamsMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IPercentData, ILeafInputData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IBoundsData, IValue, IPathCreator, IJSONOptions, IFindCondition, IAnswer, IPathString, IPathDrawer, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPickOptions, IPickResult, ICanvasContext2DSettings, ICanvasContext2D, ILeaferAttrData, IControl, ILeaferType, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap, IMatrixWithBoundsScaleData } from '@leafer/interface';
 export * from '@leafer/interface';
-import { IObject as IObject$1, IEditSize, IStroke as IStroke$1, IFourNumber as IFourNumber$1, IFill as IFill$1, IBoxInputData as IBoxInputData$1, IRectInputData as IRectInputData$1, IColorString as IColorString$1, IDirection4, ICursorType, IImageCursor, IAlign as IAlign$1, IUnitPointData as IUnitPointData$1, IUIInputData as IUIInputData$1, IUI as IUI$1, IPointData as IPointData$1, IScaleData, ISkewData, IGroup as IGroup$1, ISelectorProxy, IBox as IBox$1, IRect as IRect$1, ILayoutBoundsData, IKeyEvent, IDragEvent, IMoveEvent, IZoomEvent, IRotateEvent, ITransition as ITransition$1, ILeafList, ILeaf, IGroupInputData as IGroupInputData$1, IStateName as IStateName$1, IString as IString$1, IBoolean as IBoolean$1, IStateStyle as IStateStyle$1 } from '@leafer-ui/interface';
+import { IObject as IObject$1, IEditSize, IStroke as IStroke$1, IFourNumber as IFourNumber$1, IFill as IFill$1, IBoxInputData as IBoxInputData$1, IRectInputData as IRectInputData$1, IColorString as IColorString$1, IDirection4, ICursorType, IImageCursor, IAlign as IAlign$1, IUnitPointData as IUnitPointData$1, IUIInputData as IUIInputData$1, IShortcutKeysCheck, IShortcutKeys, IUI as IUI$1, IPointData as IPointData$1, IScaleData, ISkewData, IGroup as IGroup$1, ISelectorProxy, IBox as IBox$1, IRect as IRect$1, ILayoutBoundsData, IKeyEvent, IUIEvent, IDragEvent, IMoveEvent, IZoomEvent, IRotateEvent, ITransition as ITransition$1, ILeafList, ILeaf, IGroupInputData as IGroupInputData$1, IStateName as IStateName$1, IString as IString$1, IBoolean as IBoolean$1, IStateStyle as IStateStyle$1 } from '@leafer-ui/interface';
 
 type IPercent = string;
 type IColorString = string;
@@ -70,9 +70,11 @@ interface IImagePaint extends IPaintBase {
     scale?: number | IPointData;
     rotation?: number;
     skew?: IPointData;
+    freeTransform?: boolean;
     clipSize?: ISizeData;
     repeat?: IRepeat;
-    scaleFixed?: boolean;
+    gap?: IGap | IPointGap;
+    scaleFixed?: IScaleFixed;
     changeful?: boolean;
     sync?: boolean;
     showProgress?: boolean;
@@ -89,7 +91,7 @@ interface IImageFilters {
     shadows?: number;
 }
 type IImagePaintMode = 'normal' | 'cover' | 'fit' | 'stretch' | 'clip' | 'repeat';
-type IRepeat = boolean | 'x' | 'y';
+type IRepeat = boolean | 'x' | 'y' | IPointData;
 type IStrokeAlign = 'inside' | 'outside' | 'center';
 type IStrokeCap = 'none' | 'round' | 'square';
 type IStrokeJoin = 'bevel' | 'round' | 'miter';
@@ -135,6 +137,7 @@ interface IShadowEffect {
     blendMode?: IBlendMode;
     visible?: boolean;
     box?: boolean;
+    scaleFixed?: IScaleFixed;
 }
 interface IBlurEffect {
     blur: number;
@@ -164,13 +167,14 @@ interface ILeafPaint {
     isTransparent?: boolean;
     data?: ILeafPaintPatternData;
     editing?: boolean;
-    scaleFixed?: boolean;
+    scaleFixed?: IScaleFixed;
 }
 interface ILeafPaintPatternData {
     width?: number;
     height?: number;
     scaleX?: number;
     scaleY?: number;
+    gap?: IPointData;
     opacity?: number;
     transform?: IMatrixData;
     filters?: IImageFilters;
@@ -194,6 +198,7 @@ interface ILeafShadowEffect {
     color: IColorString;
     blendMode?: IBlendMode;
     box?: boolean;
+    scaleFixed?: IScaleFixed;
 }
 
 interface ICornerRadiusAttrData {
@@ -234,7 +239,7 @@ interface IStrokeInputData extends IStrokeStyle {
 interface IStrokeStyle {
     strokeAlign?: IStrokeAlign;
     strokeWidth?: IFourNumber | IStrokeWidthString;
-    strokeWidthFixed?: IBoolean;
+    strokeWidthFixed?: IScaleFixed;
     strokeCap?: IStrokeCap;
     strokeJoin?: IStrokeJoin;
     dashPattern?: INumber[] | IDashPatternString;
@@ -250,7 +255,7 @@ interface IStrokeComputedStyle {
     strokeAlign?: IStrokeAlign;
     strokeWidth?: number;
     strokeWidths?: number[];
-    strokeWidthFixed?: boolean;
+    strokeWidthFixed?: IScaleFixed;
     strokeCap?: IStrokeCap;
     strokeJoin?: IStrokeJoin;
     dashPattern?: number[];
@@ -483,6 +488,8 @@ interface IEditorConfig extends IObject$1 {
     buttonsMargin?: number;
     hideOnMove?: boolean;
     hideOnSmall?: boolean | number;
+    hideRotatePoints?: boolean;
+    hideResizeLines?: boolean;
     moveCursor?: ICursorType;
     resizeCursor?: IImageCursor;
     rotateCursor?: IImageCursor;
@@ -491,6 +498,7 @@ interface IEditorConfig extends IObject$1 {
     rotateAround?: IAlign$1 | IUnitPointData$1;
     rotateGap?: number;
     lockRatio?: boolean | 'corner';
+    dragLimitAnimate?: boolean | number;
     selector?: boolean;
     editBox?: boolean;
     hover?: boolean;
@@ -506,6 +514,8 @@ interface IEditorConfig extends IObject$1 {
     flipable?: boolean;
     rotateable?: boolean | 'gesture' | 'rotate';
     skewable?: boolean;
+    multipleSelectKey?: IShortcutKeysCheck | IShortcutKeys;
+    rotateKey?: IShortcutKeysCheck | IShortcutKeys;
     beforeSelect?: IEditorBeforeSelect;
     beforeMove?: IEditorBeforeMove;
     beforeScale?: IEditorBeforeScale;
@@ -595,6 +605,7 @@ interface IEditBoxBase extends IGroup$1 {
     update(): void;
     unload(): void;
     onArrow(e: IKeyEvent): void;
+    isHoldRotateKey(e: IUIEvent): boolean;
 }
 interface IEditorDragStartData {
     x: number;
@@ -1158,7 +1169,7 @@ interface IPaintImageModule {
     getPatternData(paint: IImagePaint, box: IBoundsData, image: ILeaferImage): ILeafPaintPatternData;
     fillOrFitMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void;
     clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, clipSize?: ISizeData): void;
-    repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number, around: IAround): void;
+    repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, align: IAlign, freeTransform?: boolean): void;
 }
 interface IPaintGradientModule {
     linearGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint;