@leafer-ui/interface 1.9.7 → 1.9.9

package/package.json

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

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

@@ -144,6 +144,7 @@ export interface IEditorConfig extends IObject {
     hover?: boolean
     hoverStyle?: IUIInputData
     select?: 'press' | 'tap'
+    selectKeep?: boolean
     selectedStyle?: IUIInputData
     multipleSelect?: boolean
 
@@ -159,6 +160,7 @@ export interface IEditorConfig extends IObject {
 
     multipleSelectKey?: IShortcutKeysCheck | IShortcutKeys
     rotateKey?: IShortcutKeysCheck | IShortcutKeys
+    diagonalRotateKey?: IShortcutKeysCheck | IShortcutKeys // 对角旋转的快捷键
 
     beforeSelect?: IEditorBeforeSelect
     beforeEditOuter?: IEditorBeforeEditOuter
@@ -308,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/src/type/IComputedType.ts

@@ -50,18 +50,18 @@ export interface ILeafStrokePaint extends ILeafPaint {
 }
 
 export interface ILeafShadowEffect {
-    x: number
-    y: number
-    blur: number
+    x?: number
+    y?: number
+    blur?: number
     spread?: number
-    color: IColorString
+    color?: IColorString
     blendMode?: IBlendMode
     box?: boolean
     scaleFixed?: IScaleFixed
 
-    // 斜切、旋转阴影
-    skewX?: number
-    skewY?: number
+    // 斜切、缩放、旋转阴影
+    skew?: IPointData
+    scale?: IPointData
     rotation?: number
     origin?: IDirection // 斜切、旋转原点方位，相对元素的box包围盒，默认为 bottom
 }

package/src/type/IType.ts

@@ -181,19 +181,19 @@ export interface IVectorPath {
 
 // 特效
 export interface IShadowEffect {
-    x: number
-    y: number
-    blur: number
+    x?: number
+    y?: number
+    blur?: number
     spread?: number
-    color: IColorString | IColor
+    color?: IColorString | IColor
     blendMode?: IBlendMode
     visible?: boolean
     box?: boolean
     scaleFixed?: IScaleFixed
 
-    // 斜切、旋转阴影
-    skewX?: number
-    skewY?: number
+    // 斜切、缩放、旋转阴影
+    skew?: IPointData
+    scale?: IPointData
     rotation?: number
     origin?: IDirection // 斜切、旋转原点方位，相对元素的box包围盒，默认为 bottom
 }

package/types/index.d.ts

@@ -135,17 +135,17 @@ interface IVectorPath {
     data: string | IPathCommandData;
 }
 interface IShadowEffect {
-    x: number;
-    y: number;
-    blur: number;
+    x?: number;
+    y?: number;
+    blur?: number;
     spread?: number;
-    color: IColorString | IColor;
+    color?: IColorString | IColor;
     blendMode?: IBlendMode;
     visible?: boolean;
     box?: boolean;
     scaleFixed?: IScaleFixed;
-    skewX?: number;
-    skewY?: number;
+    skew?: IPointData;
+    scale?: IPointData;
     rotation?: number;
     origin?: IDirection;
 }
@@ -202,16 +202,16 @@ interface ILeafStrokePaint extends ILeafPaint {
     miterLimit?: number;
 }
 interface ILeafShadowEffect {
-    x: number;
-    y: number;
-    blur: number;
+    x?: number;
+    y?: number;
+    blur?: number;
     spread?: number;
-    color: IColorString;
+    color?: IColorString;
     blendMode?: IBlendMode;
     box?: boolean;
     scaleFixed?: IScaleFixed;
-    skewX?: number;
-    skewY?: number;
+    skew?: IPointData;
+    scale?: IPointData;
     rotation?: number;
     origin?: IDirection;
 }
@@ -526,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;
@@ -538,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;
@@ -645,6 +647,7 @@ interface IEditBoxBase extends IGroup$1 {
 interface IEditorDragStartData {
     x: number;
     y: number;
+    totalOffset: IPointData$1;
     point: IPointData$1;
     bounds: ILayoutBoundsData;
     rotation: number;
@@ -1212,6 +1215,7 @@ interface IStateModule {
 interface ICachedShape extends ICachedLeaf {
     worldCanvas?: ILeaferCanvas;
     shapeBounds: IBoundsData;
+    renderBounds: IBoundsData;
     scaleX: number;
     scaleY: number;
 }
@@ -1237,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 {
@@ -1252,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 {