@leafer-ui/interface 1.9.6 → 1.9.8

package/package.json

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

package/src/ICachedShape.ts

@@ -2,7 +2,9 @@ import { ILeaferCanvas, IBoundsData, ICachedLeaf } from '@leafer/interface'
 
 export interface ICachedShape extends ICachedLeaf {
     worldCanvas?: ILeaferCanvas // 元素太大放不下，经过裁剪后的元素区域缓存画布
-    shapeBounds: IBoundsData
+    shapeBounds: IBoundsData // 形状内容的包围盒，可能缩小了，但未进行偏移
+    // bounds: IBoundsData // 形状内容的包围盒，可能会缩小、偏移至原点
+    renderBounds: IBoundsData // 渲染内容的包围盒，可能会缩小、偏移至原点
     scaleX: number
     scaleY: number
 }

package/src/editor/IEditor.ts

@@ -1,12 +1,13 @@
-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, ILeafer } 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, IKeyEvent, IUIInputData, IZoomEvent, IColorString, IDirection4, IPointData, IScaleData, ISkewData, ILayoutBoundsData, ITransition, IFourNumber, IShortcutKeys, IShortcutKeysCheck, IUIEvent, ILeafer } from '@leafer-ui/interface'
 
 export interface IEditorBase extends IGroup, ISelectorProxy, ITransformTool {
     config: IEditorConfig
     readonly mergeConfig: IEditorConfig // 实际使用，合并了选中元素、默认editBox上的editConfig，频繁访问会消耗性能
     readonly mergedConfig: IEditorConfig // 合并之后的缓存配置
 
-    hoverTarget?: IUI
     target?: IUI | IUI[]
+    hoverTarget?: IUI
+    dimTarget?: IGroup | IGroup[] // 需要淡化的容器
 
     readonly list: IUI[]
     leafList: ILeafList
@@ -48,6 +49,9 @@ export interface IEditorBase extends IGroup, ISelectorProxy, ITransformTool {
     addItem(item: IUI): void
     removeItem(item: IUI): void
 
+    setDimOthers(value: boolean | number): void
+    setBright(value: boolean): void
+
     update(): void
     updateEditBox(): void
     updateEditTool(): void
@@ -101,10 +105,14 @@ export interface IEditorConfig extends IObject {
 
     point?: IEditPointInputData | IEditPointInputData[]
     middlePoint?: IEditPointInputData | IEditPointInputData[]
+    resizeLine?: IEditPointInputData
 
     rect?: IBoxInputData
     area?: IRectInputData
+
     mask?: boolean | IColorString
+    dimOthers?: boolean | number // 是否弱化其他内容，突出显示选中元素
+    bright?: boolean // 仅突出显示选中元素
 
     circle?: IEditPointInputData
     circleDirection?: IDirection4
@@ -136,6 +144,7 @@ export interface IEditorConfig extends IObject {
     hover?: boolean
     hoverStyle?: IUIInputData
     select?: 'press' | 'tap'
+    selectKeep?: boolean
     selectedStyle?: IUIInputData
     multipleSelect?: boolean
 
@@ -151,6 +160,7 @@ export interface IEditorConfig extends IObject {
 
     multipleSelectKey?: IShortcutKeysCheck | IShortcutKeys
     rotateKey?: IShortcutKeysCheck | IShortcutKeys
+    diagonalRotateKey?: IShortcutKeysCheck | IShortcutKeys // 对角旋转的快捷键
 
     beforeSelect?: IEditorBeforeSelect
     beforeEditOuter?: IEditorBeforeEditOuter
@@ -236,7 +246,7 @@ export interface IEditPoint extends IBox {
     pointType: IEditPointType
 }
 
-export type IEditPointType = 'resize' | 'rotate' | 'skew' | 'resize-rotate' | 'button'
+export type IEditPointType = 'move' | 'resize' | 'rotate' | 'skew' | 'resize-rotate' | 'button'
 
 export interface IEditBoxBase extends IGroup {
 
@@ -253,7 +263,7 @@ export interface IEditBoxBase extends IGroup {
     view: IGroup //  放置默认编辑工具控制点
 
     circle: IEditPoint
-    rect: IRect
+    rect: IEditPoint
 
     buttons: IGroup
 
@@ -300,9 +310,10 @@ export interface IEditBoxBase extends IGroup {
 export interface IEditorDragStartData {
     x: number
     y: number
-    point: IPointData
-    bounds: ILayoutBoundsData
-    rotation: number
+    totalOffset: IPointData // 缩放、旋转造成的总偏移量，一般用于手势操作的move纠正
+    point: IPointData  // 用于移动
+    bounds: ILayoutBoundsData // 用于resize
+    rotation: number // 用于旋转
 }
 
 export interface IEditorConfigFunction {

package/src/module/IEffect.ts

@@ -1,4 +1,4 @@
-import { ILeaferCanvas, IBoundsData } from '@leafer/interface'
+import { ILeaferCanvas, IFourNumber, IBoundsData, IMatrixData } from '@leafer/interface'
 
 import { IUI } from '../IUI'
 import { ICachedShape } from '../ICachedShape'
@@ -12,7 +12,9 @@ export interface IEffectModule {
     backgroundBlur(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void
 
     // shadow
-    getShadowSpread(ui: IUI, shadow: ILeafShadowEffect[]): number
+    getShadowRenderSpread(ui: IUI, shadow: ILeafShadowEffect[], spreadSign?: 1 | -1): IFourNumber
+    getShadowTransform(ui: IUI, canvas: ILeaferCanvas, shape: ICachedShape, shadow: ILeafShadowEffect, outBounds: IBoundsData, otherScale: number, isInnerShaodw?: boolean): IMatrixData
     isTransformShadow(shadow: ILeafShadowEffect): boolean
-    renderTransformShadow?(ui: IUI, current: ILeaferCanvas, fromCanvas: ILeaferCanvas, fromWorld: IBoundsData, shadow: ILeafShadowEffect): void
+
+    getInnerShadowSpread(ui: IUI, innerShadow: ILeafShadowEffect[]): IFourNumber
 }

package/src/module/IPaint.ts

@@ -1,4 +1,4 @@
-import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage, IAlign, IPointData, IMatrixData, ISizeData } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage, IAlign, IPointData, IMatrixData } from '@leafer/interface'
 
 import { ILeafPaint, ILeafPaintPatternData } from '../type/IComputedType'
 import { IUI, IUIData } from '../IUI'
@@ -35,7 +35,7 @@ export interface IPaintImageModule {
     createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void
     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
+    clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, clipScaleX?: number, clipScaleY?: number): 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
 }
 

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, IOptionSizeData, ISizeData, IGap, IPointGap, IScaleFixed, IPathCommandData, IAxis, IAxisReverse, IDirection, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, INumber, IString, IBoolean, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventParamsMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IPercentData, IBounds, 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, 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, ILeafer as ILeafer$1, 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, ILayoutBoundsData, IKeyEvent, IUIEvent, IDragEvent, IMoveEvent, IZoomEvent, IRotateEvent, ITransition as ITransition$1, ILeafList, ILeafer as ILeafer$1, 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;
@@ -422,8 +422,9 @@ interface IEditorBase extends IGroup$1, ISelectorProxy, ITransformTool {
     config: IEditorConfig;
     readonly mergeConfig: IEditorConfig;
     readonly mergedConfig: IEditorConfig;
-    hoverTarget?: IUI$1;
     target?: IUI$1 | IUI$1[];
+    hoverTarget?: IUI$1;
+    dimTarget?: IGroup$1 | IGroup$1[];
     readonly list: IUI$1[];
     leafList: ILeafList;
     openedGroupList: ILeafList;
@@ -453,6 +454,8 @@ interface IEditorBase extends IGroup$1, ISelectorProxy, ITransformTool {
     shiftItem(item: IUI$1): void;
     addItem(item: IUI$1): void;
     removeItem(item: IUI$1): void;
+    setDimOthers(value: boolean | number): void;
+    setBright(value: boolean): void;
     update(): void;
     updateEditBox(): void;
     updateEditTool(): void;
@@ -492,9 +495,12 @@ interface IEditorConfig extends IObject$1 {
     pointRadius?: number;
     point?: IEditPointInputData | IEditPointInputData[];
     middlePoint?: IEditPointInputData | IEditPointInputData[];
+    resizeLine?: IEditPointInputData;
     rect?: IBoxInputData$1;
     area?: IRectInputData$1;
     mask?: boolean | IColorString$1;
+    dimOthers?: boolean | number;
+    bright?: boolean;
     circle?: IEditPointInputData;
     circleDirection?: IDirection4;
     circleMargin?: number;
@@ -520,6 +526,7 @@ interface IEditorConfig extends IObject$1 {
     hover?: boolean;
     hoverStyle?: IUIInputData$1;
     select?: 'press' | 'tap';
+    selectKeep?: boolean;
     selectedStyle?: IUIInputData$1;
     multipleSelect?: boolean;
     boxSelect?: boolean;
@@ -532,6 +539,7 @@ interface IEditorConfig extends IObject$1 {
     skewable?: boolean;
     multipleSelectKey?: IShortcutKeysCheck | IShortcutKeys;
     rotateKey?: IShortcutKeysCheck | IShortcutKeys;
+    diagonalRotateKey?: IShortcutKeysCheck | IShortcutKeys;
     beforeSelect?: IEditorBeforeSelect;
     beforeEditOuter?: IEditorBeforeEditOuter;
     beforeEditInner?: IEditorBeforeEditInner;
@@ -596,7 +604,7 @@ interface IEditPoint extends IBox$1 {
     direction: number;
     pointType: IEditPointType;
 }
-type IEditPointType = 'resize' | 'rotate' | 'skew' | 'resize-rotate' | 'button';
+type IEditPointType = 'move' | 'resize' | 'rotate' | 'skew' | 'resize-rotate' | 'button';
 interface IEditBoxBase extends IGroup$1 {
     editor: IEditorBase;
     dragging: boolean;
@@ -607,7 +615,7 @@ interface IEditBoxBase extends IGroup$1 {
     skewing: boolean;
     view: IGroup$1;
     circle: IEditPoint;
-    rect: IRect$1;
+    rect: IEditPoint;
     buttons: IGroup$1;
     resizePoints: IEditPoint[];
     rotatePoints: IEditPoint[];
@@ -639,6 +647,7 @@ interface IEditBoxBase extends IGroup$1 {
 interface IEditorDragStartData {
     x: number;
     y: number;
+    totalOffset: IPointData$1;
     point: IPointData$1;
     bounds: ILayoutBoundsData;
     rotation: number;
@@ -1206,6 +1215,7 @@ interface IStateModule {
 interface ICachedShape extends ICachedLeaf {
     worldCanvas?: ILeaferCanvas;
     shapeBounds: IBoundsData;
+    renderBounds: IBoundsData;
     scaleX: number;
     scaleY: number;
 }
@@ -1231,7 +1241,7 @@ interface IPaintImageModule {
     createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void;
     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;
+    clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, clipScaleX?: number, clipScaleY?: number): 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 {
@@ -1246,9 +1256,10 @@ interface IEffectModule {
     innerShadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void;
     blur(ui: IUI, current: ILeaferCanvas, origin: ILeaferCanvas): void;
     backgroundBlur(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void;
-    getShadowSpread(ui: IUI, shadow: ILeafShadowEffect[]): number;
+    getShadowRenderSpread(ui: IUI, shadow: ILeafShadowEffect[], spreadSign?: 1 | -1): IFourNumber;
+    getShadowTransform(ui: IUI, canvas: ILeaferCanvas, shape: ICachedShape, shadow: ILeafShadowEffect, outBounds: IBoundsData, otherScale: number, isInnerShaodw?: boolean): IMatrixData;
     isTransformShadow(shadow: ILeafShadowEffect): boolean;
-    renderTransformShadow?(ui: IUI, current: ILeaferCanvas, fromCanvas: ILeaferCanvas, fromWorld: IBoundsData, shadow: ILeafShadowEffect): void;
+    getInnerShadowSpread(ui: IUI, innerShadow: ILeafShadowEffect[]): IFourNumber;
 }
 
 interface IFilterModule {