@leafer-ui/interface 1.5.0 → 1.5.2

package/package.json

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

package/src/IUI.ts

@@ -263,7 +263,8 @@ export interface ITextDrawData {
     paraNumber: number
     font: string
     maxWidth?: number // 获取最大的行宽，自动宽度 且非 autoSizeAlign 时才有值
-    decorationY?: number
+    decorationY?: number[]
+    decorationColor?: string
     decorationHeight?: number
     overflow?: number // overflowed row number, not index
 }

package/src/editor/IEditor.ts

@@ -1,4 +1,4 @@
-import { IGroup, IUI, IBox, IRectInputData, ISelectorProxy, IEditSize, ICursorType, IAlign, IUnitPointData, IDragEvent, IRotateEvent, IStroke, IFill, ILeaf, ILeafList, IObject, IBoxInputData, IGroupInputData, IImageCursor, IRect, IBoundsData, IKeyEvent, IUIInputData, IZoomEvent, IColorString, IDirection4, IPointData, ILayoutBoundsData } from '@leafer-ui/interface'
+import { IGroup, IUI, IBox, IRectInputData, ISelectorProxy, IEditSize, ICursorType, IAlign, IUnitPointData, IDragEvent, IRotateEvent, IStroke, IFill, ILeaf, ILeafList, IObject, IBoxInputData, IGroupInputData, IImageCursor, IRect, IBoundsData, IKeyEvent, IUIInputData, IZoomEvent, IColorString, IDirection4, IPointData, IScaleData, ISkewData, ILayoutBoundsData } from '@leafer-ui/interface'
 
 export interface IEditorBase extends IGroup, ISelectorProxy {
     config: IEditorConfig
@@ -66,7 +66,6 @@ export interface IEditorBase extends IGroup, ISelectorProxy {
 
 export interface IEditorConfig extends IObject {
     editSize?: IEditSize
-    dualEvent?: boolean
     keyEvent?: boolean
 
     stroke?: IStroke
@@ -110,6 +109,7 @@ export interface IEditorConfig extends IObject {
     hoverStyle?: IUIInputData
     select?: 'press' | 'tap'
     selectedStyle?: IUIInputData
+    multipleSelect?: boolean
     boxSelect?: boolean
     continuousSelect?: boolean // 点击可以连续选择
     openInner?: 'double' | 'long' // 双击/长按打开内部
@@ -120,10 +120,53 @@ export interface IEditorConfig extends IObject {
     rotateable?: boolean | 'rotate'
     skewable?: boolean
 
+    beforeMove?: IEditorBeforeMove
+    beforeScale?: IEditorBeforeScale
+    beforeRotate?: IEditorBeforeRotate
+    beforeSkew?: IEditorBeforeSkew
+
     textEditor?: IObject
     pathEditor?: IObject
 }
 
+export interface IEditorMoveData extends IPointData, IObject {
+    target: IUI
+}
+
+export interface IEditorScaleData extends IScaleData, IObject {
+    target: IUI
+    origin: IPointData | IAlign
+}
+
+export interface IEditorRotationData extends IObject {
+    target: IUI
+    origin: IPointData | IAlign
+    rotation: number
+}
+
+export interface IEditorSkewData extends ISkewData, IObject {
+    target: IUI
+    origin: IPointData | IAlign
+}
+
+
+export interface IEditorBeforeMove {
+    (data: IEditorMoveData): IPointData | boolean | void
+}
+
+export interface IEditorBeforeScale {
+    (data: IEditorScaleData): IScaleData | boolean | void
+}
+
+export interface IEditorBeforeRotate {
+    (data: IEditorRotationData): number | boolean | void
+}
+
+export interface IEditorBeforeSkew {
+    (data: IEditorSkewData): ISkewData | boolean | void
+}
+
+
 export interface IEditPointInputData extends IBoxInputData {
     direction?: number
     pointType?: IEditPointType
@@ -133,7 +176,7 @@ export interface IEditPoint extends IBox {
     pointType: IEditPointType
 }
 
-export type IEditPointType = 'rotate' | 'resize' | 'resize-rotate' | 'button'
+export type IEditPointType = 'resize' | 'rotate' | 'skew' | 'resize-rotate' | 'button'
 
 export interface IEditBoxBase extends IGroup {
     editor: IEditorBase

package/src/index.ts

@@ -28,7 +28,7 @@ export {
     IUITag, IUIInputData, IUIJSONData, IStateStyle, IStates, IStateName
 } from './IUI'
 
-export { IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IEffect, IFill, IStroke, IPaintAttr, IStrokeAlign, IStrokeJoin, IStrokeCap, IArrowType, IPathDataArrow, IPathDataArrowMap, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, IFontWeightNumer, IFontWeightString, ITextCase, ITextDecoration, IWritingMode, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IRepeat, IGradientType, IPaintType, IImageFilters, IPathDataArrowOffset, ISolidPaint, IPaintBase } from './type/IType'
+export { IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IEffect, IFill, IStroke, IPaintAttr, IStrokeAlign, IStrokeJoin, IStrokeCap, IArrowType, IPathDataArrow, IPathDataArrowMap, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, IFontWeightNumer, IFontWeightString, ITextCase, ITextDecoration, ITextDecorationType, ITextDecorationData, IWritingMode, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IRepeat, IGradientType, IPaintType, IImageFilters, IPathDataArrowOffset, ISolidPaint, IPaintBase } from './type/IType'
 export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IColorString } from './type/IStringType'
 export { ILeafFill, ILeafPaint, ILeafPaintPatternData, ILeafPaintColor, ILeafStrokePaint, ILeafShadowEffect } from './type/IComputedType'
 export { IStrokeAttrData, IStrokeInputData, IStrokeComputedData, ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData, IEffectAttrData, IEffectInputData, IEffectComputedData } from './ICommonAttr'
@@ -50,4 +50,4 @@ export { IEffectModule } from './module/IEffect'
 export { IFilterModule, IFilterProcessor, IFilterFunction } from './module/IFilter'
 export { ICachedShape } from './ICachedShape'
 
-export { IEditorBase, IEditorConfig, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditorDragStartData, IEditToolFunction, IEditorConfigFunction } from './editor/IEditor'
+export { IEditorBase, IEditorConfig, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditorDragStartData, IEditToolFunction, IEditorConfigFunction, IEditorBeforeMove, IEditorBeforeScale, IEditorBeforeRotate, IEditorBeforeSkew, IEditorMoveData, IEditorScaleData, IEditorRotationData, IEditorSkewData } from './editor/IEditor'

package/src/type/IType.ts

@@ -1,4 +1,4 @@
-import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, ISizeData, IFourNumber, IAlign, IUnitPointData, IAxis, IAxisReverse, IFilter } from '@leafer/interface'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, IFourNumber, IAlign, IUnitPointData, IAxis, IAxisReverse, IFilter, IOptionSizeData } from '@leafer/interface'
 import { IColorString, IPaintString } from './IStringType'
 
 export type IPaint = ISolidPaint | IGradientPaint | IImagePaint
@@ -72,7 +72,7 @@ export interface IImagePaint extends IPaintBase {
     align?: IAlign
     offset?: IPointData
 
-    size?: number | ISizeData
+    size?: number | IOptionSizeData
     scale?: number | IPointData
     rotation?: number
 
@@ -134,7 +134,14 @@ export type IFontWeightString =
     | 'bold'
     | 'extra-bold'
     | 'black'
-export type ITextDecoration = 'none' | 'under' | 'delete'
+
+export type ITextDecoration = ITextDecorationType | ITextDecorationData
+export type ITextDecorationType = 'none' | 'under' | 'delete' | 'under-delete'
+export interface ITextDecorationData {
+    type: ITextDecorationType
+    color: IColor
+}
+
 export type ITextWrap = 'normal' | 'none' | 'break'
 export type IWritingMode = IAxis | IAxisReverse
 

package/types/index.d.ts

@@ -1,6 +1,6 @@
-import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, ISizeData, IPathCommandData, IAxis, IAxisReverse, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IPercentData, ILeafInputData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IBoundsData as IBoundsData$1, IPathCreator, IJSONOptions, IValue, 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, IPathCommandData, IAxis, IAxisReverse, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IPercentData, ILeafInputData, ISizeData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IBoundsData as IBoundsData$1, IPathCreator, IJSONOptions, IValue, 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';
 export * from '@leafer/interface';
-import { IObject as IObject$1, IEditSize, IStroke as IStroke$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, IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, ILeafList, IBox as IBox$1, IRect as IRect$1, IPointData as IPointData$1, ILayoutBoundsData, IBoundsData, IKeyEvent, ILeaf, IDragEvent, IZoomEvent, IRotateEvent, 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, 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, IPointData as IPointData$1, IUI as IUI$1, IScaleData, ISkewData, IGroup as IGroup$1, ISelectorProxy, ILeafList, IBox as IBox$1, IRect as IRect$1, ILayoutBoundsData, IBoundsData, IKeyEvent, ILeaf, IDragEvent, IZoomEvent, IRotateEvent, 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;
@@ -59,7 +59,7 @@ interface IImagePaint extends IPaintBase {
     padding?: IFourNumber;
     align?: IAlign;
     offset?: IPointData;
-    size?: number | ISizeData;
+    size?: number | IOptionSizeData;
     scale?: number | IPointData;
     rotation?: number;
     repeat?: IRepeat;
@@ -101,7 +101,12 @@ type ITextCase = 'upper' | 'lower' | 'title' | 'none' | 'small-caps';
 type IFontWeight = IFontWeightNumer | IFontWeightString;
 type IFontWeightNumer = 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;
 type IFontWeightString = 'thin' | 'extra-light' | 'light' | 'normal' | 'medium' | 'semi-bold' | 'bold' | 'extra-bold' | 'black';
-type ITextDecoration = 'none' | 'under' | 'delete';
+type ITextDecoration = ITextDecorationType | ITextDecorationData;
+type ITextDecorationType = 'none' | 'under' | 'delete' | 'under-delete';
+interface ITextDecorationData {
+    type: ITextDecorationType;
+    color: IColor;
+}
 type ITextWrap = 'normal' | 'none' | 'break';
 type IWritingMode = IAxis | IAxisReverse;
 interface IVectorPath {
@@ -426,7 +431,6 @@ interface IEditorBase extends IGroup$1, ISelectorProxy {
 }
 interface IEditorConfig extends IObject$1 {
     editSize?: IEditSize;
-    dualEvent?: boolean;
     keyEvent?: boolean;
     stroke?: IStroke$1;
     strokeWidth?: number;
@@ -460,6 +464,7 @@ interface IEditorConfig extends IObject$1 {
     hoverStyle?: IUIInputData$1;
     select?: 'press' | 'tap';
     selectedStyle?: IUIInputData$1;
+    multipleSelect?: boolean;
     boxSelect?: boolean;
     continuousSelect?: boolean;
     openInner?: 'double' | 'long';
@@ -468,9 +473,41 @@ interface IEditorConfig extends IObject$1 {
     flipable?: boolean;
     rotateable?: boolean | 'rotate';
     skewable?: boolean;
+    beforeMove?: IEditorBeforeMove;
+    beforeScale?: IEditorBeforeScale;
+    beforeRotate?: IEditorBeforeRotate;
+    beforeSkew?: IEditorBeforeSkew;
     textEditor?: IObject$1;
     pathEditor?: IObject$1;
 }
+interface IEditorMoveData extends IPointData$1, IObject$1 {
+    target: IUI$1;
+}
+interface IEditorScaleData extends IScaleData, IObject$1 {
+    target: IUI$1;
+    origin: IPointData$1 | IAlign$1;
+}
+interface IEditorRotationData extends IObject$1 {
+    target: IUI$1;
+    origin: IPointData$1 | IAlign$1;
+    rotation: number;
+}
+interface IEditorSkewData extends ISkewData, IObject$1 {
+    target: IUI$1;
+    origin: IPointData$1 | IAlign$1;
+}
+interface IEditorBeforeMove {
+    (data: IEditorMoveData): IPointData$1 | boolean | void;
+}
+interface IEditorBeforeScale {
+    (data: IEditorScaleData): IScaleData | boolean | void;
+}
+interface IEditorBeforeRotate {
+    (data: IEditorRotationData): number | boolean | void;
+}
+interface IEditorBeforeSkew {
+    (data: IEditorSkewData): ISkewData | boolean | void;
+}
 interface IEditPointInputData extends IBoxInputData$1 {
     direction?: number;
     pointType?: IEditPointType;
@@ -479,7 +516,7 @@ interface IEditPoint extends IBox$1 {
     direction: number;
     pointType: IEditPointType;
 }
-type IEditPointType = 'rotate' | 'resize' | 'resize-rotate' | 'button';
+type IEditPointType = 'resize' | 'rotate' | 'skew' | 'resize-rotate' | 'button';
 interface IEditBoxBase extends IGroup$1 {
     editor: IEditorBase;
     dragging: boolean;
@@ -727,7 +764,8 @@ interface ITextDrawData {
     paraNumber: number;
     font: string;
     maxWidth?: number;
-    decorationY?: number;
+    decorationY?: number[];
+    decorationColor?: string;
     decorationHeight?: number;
     overflow?: number;
 }
@@ -1071,4 +1109,4 @@ interface IFilterFunction {
     (filter: IFilter, ui: IUI, bounds: IMatrixWithBoundsScaleData, currentCanvas: ILeaferCanvas, originCanvas: ILeaferCanvas, shape: ICachedShape): void;
 }
 
-export type { IAnimate, IAnimateKeyframe, IAnimateList, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorConfig, IEditorConfigFunction, IEditorDragStartData, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFilterFunction, IFilterModule, IFilterProcessor, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFontWeightNumer, IFontWeightString, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGIF, IGIFData, IGIFInputData, IGradientPaint, IGradientType, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageFilters, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, IKeyframe, IKeyframeId, IKeyframesAnimation, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintBase, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPaintType, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathDataArrowOffset, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IRobot, IRobotActionName, IRobotActions, IRobotAnimation, IRobotComputedKeyframe, IRobotData, IRobotInputData, IRobotKeyframe, IShadowEffect, IShadowString, ISolidPaint, IStar, IStarData, IStarInputData, IStateModule, IStateName, IStateStyle, IStates, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };
+export type { IAnimate, IAnimateKeyframe, IAnimateList, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorBeforeMove, IEditorBeforeRotate, IEditorBeforeScale, IEditorBeforeSkew, IEditorConfig, IEditorConfigFunction, IEditorDragStartData, IEditorMoveData, IEditorRotationData, IEditorScaleData, IEditorSkewData, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFilterFunction, IFilterModule, IFilterProcessor, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFontWeightNumer, IFontWeightString, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGIF, IGIFData, IGIFInputData, IGradientPaint, IGradientType, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageFilters, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, IKeyframe, IKeyframeId, IKeyframesAnimation, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintBase, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPaintType, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathDataArrowOffset, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IRobot, IRobotActionName, IRobotActions, IRobotAnimation, IRobotComputedKeyframe, IRobotData, IRobotInputData, IRobotKeyframe, IShadowEffect, IShadowString, ISolidPaint, IStar, IStarData, IStarInputData, IStateModule, IStateName, IStateStyle, IStates, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDecorationData, ITextDecorationType, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };