@leafer-ui/interface 1.9.5 → 1.9.7

package/package.json

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

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
@@ -236,7 +244,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 +261,7 @@ export interface IEditBoxBase extends IGroup {
     view: IGroup //  放置默认编辑工具控制点
 
     circle: IEditPoint
-    rect: IRect
+    rect: IEditPoint
 
     buttons: IGroup
 

package/src/module/IEffect.ts

@@ -1,7 +1,8 @@
-import { ILeaferCanvas } from '@leafer/interface'
+import { ILeaferCanvas, IBoundsData } from '@leafer/interface'
 
 import { IUI } from '../IUI'
 import { ICachedShape } from '../ICachedShape'
+import { ILeafShadowEffect } from '../type/IComputedType'
 
 
 export interface IEffectModule {
@@ -9,4 +10,9 @@ export 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
+
+    // shadow
+    getShadowSpread(ui: IUI, shadow: ILeafShadowEffect[]): number
+    isTransformShadow(shadow: ILeafShadowEffect): boolean
+    renderTransformShadow?(ui: IUI, current: ILeaferCanvas, fromCanvas: ILeaferCanvas, fromWorld: IBoundsData, shadow: ILeafShadowEffect): void
 }

package/src/type/IComputedType.ts

@@ -1,4 +1,4 @@
-import { IBlendMode, ILeaferImage, IMatrixData, IPointData, IScaleFixed, ITaskItem } from '@leafer/interface'
+import { IBlendMode, IDirection, ILeaferImage, IMatrixData, IPointData, IScaleFixed, ITaskItem } from '@leafer/interface'
 
 import { IColorString } from './IStringType'
 import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode, IImageFilters } from './IType'
@@ -59,6 +59,9 @@ export interface ILeafShadowEffect {
     box?: boolean
     scaleFixed?: IScaleFixed
 
-    skew?: IPointData // 倾斜阴影
-    rotation?: number // 旋转阴影
+    // 斜切、旋转阴影
+    skewX?: number
+    skewY?: number
+    rotation?: number
+    origin?: IDirection // 斜切、旋转原点方位，相对元素的box包围盒，默认为 bottom
 }

package/src/type/IType.ts

@@ -1,4 +1,4 @@
-import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, IFourNumber, IAlign, IUnitPointData, IAxis, IAxisReverse, IFilter, IOptionSizeData, ISizeData, IGap, IPointGap, IScaleFixed } from '@leafer/interface'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, IFourNumber, IAlign, IUnitPointData, IAxis, IAxisReverse, IFilter, IOptionSizeData, ISizeData, IGap, IPointGap, IScaleFixed, IDirection } from '@leafer/interface'
 import { IColorString, IPaintString } from './IStringType'
 import { IStrokeStyle } from '../ICommonAttr'
 
@@ -167,6 +167,7 @@ export type ITextDecorationType = 'none' | 'under' | 'delete' | 'under-delete'
 export interface ITextDecorationData {
     type: ITextDecorationType
     color: IColor
+    offset?: number
 }
 
 export type ITextWrap = 'normal' | 'none' | 'break'
@@ -190,8 +191,11 @@ export interface IShadowEffect {
     box?: boolean
     scaleFixed?: IScaleFixed
 
-    skew?: IPointData // 倾斜阴影
-    rotation?: number // 旋转阴影
+    // 斜切、旋转阴影
+    skewX?: number
+    skewY?: number
+    rotation?: number
+    origin?: IDirection // 斜切、旋转原点方位，相对元素的box包围盒，默认为 bottom
 }
 
 export interface IBlurEffect {

package/types/index.d.ts

@@ -1,6 +1,6 @@
-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, 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';
+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;
@@ -126,6 +126,7 @@ type ITextDecorationType = 'none' | 'under' | 'delete' | 'under-delete';
 interface ITextDecorationData {
     type: ITextDecorationType;
     color: IColor;
+    offset?: number;
 }
 type ITextWrap = 'normal' | 'none' | 'break';
 type IWritingMode = IAxis | IAxisReverse;
@@ -143,8 +144,10 @@ interface IShadowEffect {
     visible?: boolean;
     box?: boolean;
     scaleFixed?: IScaleFixed;
-    skew?: IPointData;
+    skewX?: number;
+    skewY?: number;
     rotation?: number;
+    origin?: IDirection;
 }
 interface IBlurEffect {
     blur: number;
@@ -207,8 +210,10 @@ interface ILeafShadowEffect {
     blendMode?: IBlendMode;
     box?: boolean;
     scaleFixed?: IScaleFixed;
-    skew?: IPointData;
+    skewX?: number;
+    skewY?: number;
     rotation?: number;
+    origin?: IDirection;
 }
 
 interface ICornerRadiusAttrData {
@@ -417,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;
@@ -448,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;
@@ -487,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;
@@ -591,7 +602,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;
@@ -602,7 +613,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[];
@@ -1241,6 +1252,9 @@ 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;
+    isTransformShadow(shadow: ILeafShadowEffect): boolean;
+    renderTransformShadow?(ui: IUI, current: ILeaferCanvas, fromCanvas: ILeaferCanvas, fromWorld: IBoundsData, shadow: ILeafShadowEffect): void;
 }
 
 interface IFilterModule {