@leafer-ui/interface 1.7.0 → 1.8.0

package/package.json

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

package/src/IAnimation.ts

@@ -56,6 +56,7 @@ export interface IComputedKeyframe {
 
 export interface IAnimate extends IAnimateOptions, IEventer {
     target: IUI | IObject
+    parent?: IAnimateList
 
     keyframes: IKeyframe[]
     config?: IAnimateOptions
@@ -92,4 +93,5 @@ export interface IAnimate extends IAnimateOptions, IEventer {
 export interface IAnimateList extends IAnimate {
     list: IAnimate[]
     updateList(animation?: IAnimation[] | IAnimate[], isTemp?: boolean): void
+    onChildEvent(type: string, _animate: IAnimate): void
 }

package/src/ICommonAttr.ts

@@ -36,24 +36,21 @@ export interface IBorderComputedData {
 }
 
 // stroke---
-export interface IStrokeAttrData {
+export interface IStrokeAttrData extends IStrokeStyle {
     stroke?: IStroke
 
-    strokeAlign?: IStrokeAlign
-    strokeWidth?: IFourNumber | IStrokeWidthString
-    strokeWidthFixed?: IBoolean
-    strokeCap?: IStrokeCap
-    strokeJoin?: IStrokeJoin
-    dashPattern?: INumber[] | IDashPatternString
-    dashOffset?: INumber
-    miterLimit?: INumber
-
     startArrow?: IArrowType
     endArrow?: IArrowType
 }
-export interface IStrokeInputData {
+
+export interface IStrokeInputData extends IStrokeStyle {
     stroke?: IStroke
 
+    startArrow?: IArrowType
+    endArrow?: IArrowType
+}
+
+export interface IStrokeStyle {
     strokeAlign?: IStrokeAlign
     strokeWidth?: IFourNumber | IStrokeWidthString
     strokeWidthFixed?: IBoolean
@@ -62,13 +59,16 @@ export interface IStrokeInputData {
     dashPattern?: INumber[] | IDashPatternString
     dashOffset?: INumber
     miterLimit?: INumber
+}
+
+export interface IStrokeComputedData extends IStrokeComputedStyle {
+    stroke?: IColorString | ILeafStrokePaint[]
 
     startArrow?: IArrowType
     endArrow?: IArrowType
 }
-export interface IStrokeComputedData {
-    stroke?: IColorString | ILeafStrokePaint[]
 
+export interface IStrokeComputedStyle {
     strokeAlign?: IStrokeAlign
     strokeWidth?: number
     strokeWidths?: number[]
@@ -78,9 +78,6 @@ export interface IStrokeComputedData {
     dashPattern?: number[]
     dashOffset?: number
     miterLimit?: number
-
-    startArrow?: IArrowType
-    endArrow?: IArrowType
 }
 
 // text---

package/src/IUI.ts

@@ -6,7 +6,8 @@ import {
     ICornerRadiusAttrData, ICornerRadiusInputData, ICornerRadiusComputedData,
     IStrokeAttrData, IStrokeComputedData, IStrokeInputData,
     IEffectAttrData, IEffectInputData, IEffectComputedData,
-    ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData
+    ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData,
+    IStrokeComputedStyle
 } from './ICommonAttr'
 import { IOverflow } from './type/IType'
 import { IAnimation, IAnimate, IKeyframe, IKeyframeId, IAnimateType } from './IAnimation'
@@ -339,6 +340,8 @@ export interface IFrameInputData extends IBoxInputData {
 // Box
 export interface IBox extends IBoxAttrData, IGroup {
     __: IBoxData
+    scrollBar?: IGroup
+    __updateScrollBar(): void
     __updateRectRenderBounds(): void
     __renderGroup(canvas: ILeaferCanvas, options: IRenderOptions): void
 }
@@ -356,6 +359,7 @@ export interface IBoxInputData extends IBoxAttrData, IGroupInputData { }
 export interface IGroup extends IUI {
     __: IGroupData
     children: IUI[]
+    childlessJSON?: boolean  // 子级 JSON 不导出
     pick(hitPoint: IPointData, options?: IPickOptions): IPickResult
     add(child: IUI | IUI[] | IUIInputData | IUIInputData[], index?: number): void
     addAt(child: IUI | IUI[] | IUIInputData | IUIInputData[], index: number): void
@@ -477,7 +481,10 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __isFills?: boolean
     __isStrokes?: boolean
 
-    readonly __strokeWidth: number
+    readonly __strokeWidth: number // 会受 strokeWidthFixed 影响
+    readonly __maxStrokeWidth: number
+    __hasMultiStrokeStyle?: number // 是否存在多个不同的描述样式（同时存储多个描边样式中的最大宽度用于运算）
+    readonly __hasMultiPaint?: boolean
 
     __isAlphaPixelFill?: boolean // png / svg / webp
     __isAlphaPixelStroke?: boolean
@@ -504,6 +511,7 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
 
     __needComputePaint?: boolean
     __computePaint(): void
+    __getRealStrokeWidth(childStyle?: IStrokeComputedStyle): number
 
     __setPaint(attrName: 'fill' | 'stroke', value: IValue): void
     __removePaint(attrName: 'fill' | 'stroke', removeInput?: boolean): void

package/src/editor/IEditor.ts

@@ -1,8 +1,8 @@
-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 } 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 } from '@leafer-ui/interface'
 
 export interface IEditorBase extends IGroup, ISelectorProxy, ITransformTool {
     config: IEditorConfig
-    readonly mergeConfig: IEditorConfig // 实际使用，合并了选中元素上的editConfig，频繁访问会消耗性能
+    readonly mergeConfig: IEditorConfig // 实际使用，合并了选中元素、默认editBox上的editConfig，频繁访问会消耗性能
     readonly mergedConfig: IEditorConfig // 合并之后的缓存配置
 
     hoverTarget?: IUI
@@ -19,9 +19,15 @@ export interface IEditorBase extends IGroup, ISelectorProxy, ITransformTool {
     readonly multiple: boolean
     readonly single: boolean
 
+    readonly dragPoint: IEditPoint // 正在拖拽的控制点
+
     readonly dragging: boolean
+    readonly gesturing: boolean // 手势操作元素中
+
     readonly moving: boolean
-    readonly dragPoint: IEditPoint // 正在拖拽的控制点
+    readonly resizing: boolean
+    readonly rotating: boolean
+    readonly skewing: boolean
 
     element?: IUI
     buttons: IGroup
@@ -43,6 +49,7 @@ export interface IEditorBase extends IGroup, ISelectorProxy, ITransformTool {
     update(): void
     updateEditBox(): void
     updateEditTool(): void
+    unloadEditTool(): void
 
     getEditSize(ui: ILeaf): IEditSize
 
@@ -51,8 +58,8 @@ export interface IEditorBase extends IGroup, ISelectorProxy, ITransformTool {
     openGroup(group: IGroup): void
     closeGroup(group: IGroup): void
 
-    openInnerEditor(target?: IUI, select?: boolean): void
-    closeInnerEditor(): void
+    openInnerEditor(target?: IUI, nameOrSelect?: string | boolean, select?: boolean): void
+    closeInnerEditor(onlyInnerEditor?: boolean): void
 
     lock(): void
     unlock(): void
@@ -84,6 +91,8 @@ export interface IEditorConfig extends IObject {
     stroke?: IStroke
     strokeWidth?: number
 
+    spread?: IFourNumber // 扩张编辑框的大小，与实际元素之间产生一定的间隙
+
     pointFill?: IFill
     pointSize?: number
     pointRadius?: number
@@ -112,9 +121,10 @@ export interface IEditorConfig extends IObject {
     rotateCursor?: IImageCursor
     skewCursor?: IImageCursor
 
-    around?: IAlign | IUnitPointData
-    lockRatio?: boolean | 'corner'
+    around?: IAlign | IUnitPointData // 缩放、旋转、倾斜时围绕的中心点
+    rotateAround?: IAlign | IUnitPointData // 单独设置旋转围绕的中心点，比 around 优先级高
     rotateGap?: number
+    lockRatio?: boolean | 'corner'
 
     selector?: boolean
     editBox?: boolean
@@ -127,10 +137,10 @@ export interface IEditorConfig extends IObject {
     continuousSelect?: boolean // 点击可以连续选择
     openInner?: 'double' | 'long' // 双击/长按打开内部
 
-    moveable?: boolean | 'move'
-    resizeable?: boolean | 'zoom'
+    moveable?: boolean | 'gesture' | 'move'
+    resizeable?: boolean | 'gesture' | 'zoom'
     flipable?: boolean
-    rotateable?: boolean | 'rotate'
+    rotateable?: boolean | 'gesture' | 'rotate'
     skewable?: boolean
 
     beforeSelect?: IEditorBeforeSelect
@@ -206,7 +216,12 @@ export interface IEditBoxBase extends IGroup {
     editor: IEditorBase
 
     dragging: boolean
+    gesturing: boolean // 手势操作元素中
+
     moving: boolean
+    resizing: boolean
+    rotating: boolean
+    skewing: boolean
 
     view: IGroup //  放置默认编辑工具控制点
 
@@ -238,6 +253,9 @@ export interface IEditBoxBase extends IGroup {
     readonly flippedY: boolean
     readonly flippedOne: boolean
 
+    readonly canUse: boolean // 编辑框是否处于激活状态
+    readonly canGesture: boolean // 是否支持手势
+
     getPointStyle(userStyle?: IBoxInputData): IBoxInputData
     getPointsStyle(): IBoxInputData[]
     getMiddlePointsStyle(): IBoxInputData[]

package/src/index.ts

@@ -28,10 +28,10 @@ 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, ITextDecorationType, ITextDecorationData, 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, IStrokePaint, IStrokeSolidPaint, IGradientPaint, IStrokeGradientPaint, IImagePaint, IStrokeImagePaint, 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'
+export { IStrokeAttrData, IStrokeInputData, IStrokeComputedData, IStrokeComputedStyle, IStrokeStyle, ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData, IEffectAttrData, IEffectInputData, IEffectComputedData } from './ICommonAttr'
 
 export { IAnimation, IAnimate, IAnimateList, IAnimateType, IKeyframe, IKeyframeId, IAnimateKeyframe, IComputedKeyframe, IStyleAnimation, IKeyframesAnimation } from './IAnimation'
 

package/src/module/IPaint.ts

@@ -1,4 +1,4 @@
-import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage, IAround, IPointData, IMatrixData } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage, IAround, IPointData, IMatrixData, ISizeData } 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): 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
 }
 

package/src/type/IComputedType.ts

@@ -3,12 +3,14 @@ import { IBlendMode, ILeaferImage, IMatrixData, ITaskItem } from '@leafer/interf
 import { IColorString } from './IStringType'
 import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode, IImageFilters } from './IType'
 import { IPaintType } from './IType'
+import { IStrokeComputedStyle } from '../ICommonAttr'
 
 export type ILeafPaintColor = IColorString | CanvasGradient | CanvasPattern
 
 export interface ILeafPaint {
     type?: IPaintType
     style?: ILeafPaintColor
+    strokeStyle?: IStrokeComputedStyle // 子描边样式选项
     transform?: IMatrixData // 存在时表示pattern自身不能应用transform
     blendMode?: IBlendMode
     image?: ILeaferImage
@@ -20,6 +22,7 @@ export interface ILeafPaint {
     isTransparent?: boolean // 是否为透明色
     data?: ILeafPaintPatternData
     editing?: boolean // 标记编辑中
+    scaleFixed?: boolean // 平铺图片不跟随画布缩放
 }
 
 export interface ILeafPaintPatternData {

package/src/type/IType.ts

@@ -1,11 +1,14 @@
-import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, IFourNumber, IAlign, IUnitPointData, IAxis, IAxisReverse, IFilter, IOptionSizeData } from '@leafer/interface'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, IFourNumber, IAlign, IUnitPointData, IAxis, IAxisReverse, IFilter, IOptionSizeData, ISizeData } from '@leafer/interface'
 import { IColorString, IPaintString } from './IStringType'
+import { IStrokeStyle } from '../ICommonAttr'
 
 export type IPaint = ISolidPaint | IGradientPaint | IImagePaint
 
+export type IStrokePaint = IStrokeSolidPaint | IStrokeGradientPaint | IStrokeImagePaint
+
 export type IFill = IPaint | IPaint[] | IPaintString
 
-export type IStroke = IPaint | IPaint[] | IPaintString
+export type IStroke = IStrokePaint | IStrokePaint[] | IPaintString
 
 export type IPaintAttr = 'fill' | 'stroke'
 
@@ -14,6 +17,9 @@ export interface IPaintBase {
     blendMode?: IBlendMode
     visible?: boolean
     opacity?: number
+
+    style?: IStrokeStyle
+    editing?: boolean // 标记编辑中
 }
 
 export type IPaintType =
@@ -32,6 +38,8 @@ export interface ISolidPaint extends IPaintBase {
     color: IColor
 }
 
+export interface IStrokeSolidPaint extends ISolidPaint { }
+
 export type IColor = IColorString | IRGB | IRGBA
 export interface IRGB {
     r: number
@@ -51,6 +59,9 @@ export interface IGradientPaint extends IPaintBase {
     stretch?: number
     stops: IColorStop[] | IColorString[]
 }
+
+export interface IStrokeGradientPaint extends IGradientPaint { }
+
 export interface IColorStop {
     offset: number
     color: IColor
@@ -77,14 +88,17 @@ export interface IImagePaint extends IPaintBase {
     rotation?: number
     skew?: | IPointData
 
+    clipSize?: ISizeData
+
     repeat?: IRepeat
+    scaleFixed?: boolean // 平铺图片不跟随画布缩放
 
     changeful?: boolean // 会频繁变化，不生成图案（有特殊性能优化，一般用于游戏精灵、动图场景）
     sync?: boolean // 同步显示，不走任务列表生成图案
     showProgress?: boolean // 是否显示进度
-
-    editing?: boolean // 标记编辑中
 }
+
+export interface IStrokeImagePaint extends IImagePaint { }
 export interface IImageFilters {
     exposure?: number // 曝光
     contrast?: number // 对比度

package/types/index.d.ts

@@ -1,6 +1,6 @@
-import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, IOptionSizeData, IPathCommandData, IAxis, IAxisReverse, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventParamsMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IPercentData, ILeafInputData, ISizeData, 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, 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';
 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, 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, 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';
 
 type IPercent = string;
 type IColorString = string;
@@ -14,14 +14,17 @@ type IImagePaintString = string;
 type IShadowString = string;
 
 type IPaint = ISolidPaint | IGradientPaint | IImagePaint;
+type IStrokePaint = IStrokeSolidPaint | IStrokeGradientPaint | IStrokeImagePaint;
 type IFill = IPaint | IPaint[] | IPaintString;
-type IStroke = IPaint | IPaint[] | IPaintString;
+type IStroke = IStrokePaint | IStrokePaint[] | IPaintString;
 type IPaintAttr = 'fill' | 'stroke';
 interface IPaintBase {
     type: IPaintType;
     blendMode?: IBlendMode;
     visible?: boolean;
     opacity?: number;
+    style?: IStrokeStyle;
+    editing?: boolean;
 }
 type IPaintType = 'image' | 'solid' | IGradientType;
 type IGradientType = 'linear' | 'radial' | 'angular';
@@ -29,6 +32,8 @@ interface ISolidPaint extends IPaintBase {
     type: 'solid';
     color: IColor;
 }
+interface IStrokeSolidPaint extends ISolidPaint {
+}
 type IColor = IColorString | IRGB | IRGBA;
 interface IRGB {
     r: number;
@@ -46,6 +51,8 @@ interface IGradientPaint extends IPaintBase {
     stretch?: number;
     stops: IColorStop[] | IColorString[];
 }
+interface IStrokeGradientPaint extends IGradientPaint {
+}
 interface IColorStop {
     offset: number;
     color: IColor;
@@ -63,11 +70,14 @@ interface IImagePaint extends IPaintBase {
     scale?: number | IPointData;
     rotation?: number;
     skew?: IPointData;
+    clipSize?: ISizeData;
     repeat?: IRepeat;
+    scaleFixed?: boolean;
     changeful?: boolean;
     sync?: boolean;
     showProgress?: boolean;
-    editing?: boolean;
+}
+interface IStrokeImagePaint extends IImagePaint {
 }
 interface IImageFilters {
     exposure?: number;
@@ -142,6 +152,7 @@ type ILeafPaintColor = IColorString | CanvasGradient | CanvasPattern;
 interface ILeafPaint {
     type?: IPaintType;
     style?: ILeafPaintColor;
+    strokeStyle?: IStrokeComputedStyle;
     transform?: IMatrixData;
     blendMode?: IBlendMode;
     image?: ILeaferImage;
@@ -153,6 +164,7 @@ interface ILeafPaint {
     isTransparent?: boolean;
     data?: ILeafPaintPatternData;
     editing?: boolean;
+    scaleFixed?: boolean;
 }
 interface ILeafPaintPatternData {
     width?: number;
@@ -209,21 +221,17 @@ interface IBorderComputedData {
     borderWidth?: number | number[];
     borderRadius?: number | number[];
 }
-interface IStrokeAttrData {
+interface IStrokeAttrData extends IStrokeStyle {
     stroke?: IStroke;
-    strokeAlign?: IStrokeAlign;
-    strokeWidth?: IFourNumber | IStrokeWidthString;
-    strokeWidthFixed?: IBoolean;
-    strokeCap?: IStrokeCap;
-    strokeJoin?: IStrokeJoin;
-    dashPattern?: INumber[] | IDashPatternString;
-    dashOffset?: INumber;
-    miterLimit?: INumber;
     startArrow?: IArrowType;
     endArrow?: IArrowType;
 }
-interface IStrokeInputData {
+interface IStrokeInputData extends IStrokeStyle {
     stroke?: IStroke;
+    startArrow?: IArrowType;
+    endArrow?: IArrowType;
+}
+interface IStrokeStyle {
     strokeAlign?: IStrokeAlign;
     strokeWidth?: IFourNumber | IStrokeWidthString;
     strokeWidthFixed?: IBoolean;
@@ -232,11 +240,13 @@ interface IStrokeInputData {
     dashPattern?: INumber[] | IDashPatternString;
     dashOffset?: INumber;
     miterLimit?: INumber;
+}
+interface IStrokeComputedData extends IStrokeComputedStyle {
+    stroke?: IColorString | ILeafStrokePaint[];
     startArrow?: IArrowType;
     endArrow?: IArrowType;
 }
-interface IStrokeComputedData {
-    stroke?: IColorString | ILeafStrokePaint[];
+interface IStrokeComputedStyle {
     strokeAlign?: IStrokeAlign;
     strokeWidth?: number;
     strokeWidths?: number[];
@@ -246,8 +256,6 @@ interface IStrokeComputedData {
     dashPattern?: number[];
     dashOffset?: number;
     miterLimit?: number;
-    startArrow?: IArrowType;
-    endArrow?: IArrowType;
 }
 interface ITextStyleAttrData {
     fontFamily?: IString;
@@ -360,6 +368,7 @@ interface IComputedKeyframe {
 }
 interface IAnimate extends IAnimateOptions, IEventer {
     target: IUI | IObject;
+    parent?: IAnimateList;
     keyframes: IKeyframe[];
     config?: IAnimateOptions;
     event?: IEventParamsMap;
@@ -386,6 +395,7 @@ interface IAnimate extends IAnimateOptions, IEventer {
 interface IAnimateList extends IAnimate {
     list: IAnimate[];
     updateList(animation?: IAnimation[] | IAnimate[], isTemp?: boolean): void;
+    onChildEvent(type: string, _animate: IAnimate): void;
 }
 
 interface IEditorBase extends IGroup$1, ISelectorProxy, ITransformTool {
@@ -402,9 +412,13 @@ interface IEditorBase extends IGroup$1, ISelectorProxy, ITransformTool {
     readonly groupOpening: boolean;
     readonly multiple: boolean;
     readonly single: boolean;
+    readonly dragPoint: IEditPoint;
     readonly dragging: boolean;
+    readonly gesturing: boolean;
     readonly moving: boolean;
-    readonly dragPoint: IEditPoint;
+    readonly resizing: boolean;
+    readonly rotating: boolean;
+    readonly skewing: boolean;
     element?: IUI$1;
     buttons: IGroup$1;
     selector: IGroup$1;
@@ -421,13 +435,14 @@ interface IEditorBase extends IGroup$1, ISelectorProxy, ITransformTool {
     update(): void;
     updateEditBox(): void;
     updateEditTool(): void;
+    unloadEditTool(): void;
     getEditSize(ui: ILeaf): IEditSize;
     group(group?: IGroup$1 | IGroupInputData$1): IGroup$1;
     ungroup(): IUI$1[];
     openGroup(group: IGroup$1): void;
     closeGroup(group: IGroup$1): void;
-    openInnerEditor(target?: IUI$1, select?: boolean): void;
-    closeInnerEditor(): void;
+    openInnerEditor(target?: IUI$1, nameOrSelect?: string | boolean, select?: boolean): void;
+    closeInnerEditor(onlyInnerEditor?: boolean): void;
     lock(): void;
     unlock(): void;
     toTop(): void;
@@ -450,6 +465,7 @@ interface IEditorConfig extends IObject$1 {
     keyEvent?: boolean;
     stroke?: IStroke$1;
     strokeWidth?: number;
+    spread?: IFourNumber$1;
     pointFill?: IFill$1;
     pointSize?: number;
     pointRadius?: number;
@@ -472,8 +488,9 @@ interface IEditorConfig extends IObject$1 {
     rotateCursor?: IImageCursor;
     skewCursor?: IImageCursor;
     around?: IAlign$1 | IUnitPointData$1;
-    lockRatio?: boolean | 'corner';
+    rotateAround?: IAlign$1 | IUnitPointData$1;
     rotateGap?: number;
+    lockRatio?: boolean | 'corner';
     selector?: boolean;
     editBox?: boolean;
     hover?: boolean;
@@ -484,10 +501,10 @@ interface IEditorConfig extends IObject$1 {
     boxSelect?: boolean;
     continuousSelect?: boolean;
     openInner?: 'double' | 'long';
-    moveable?: boolean | 'move';
-    resizeable?: boolean | 'zoom';
+    moveable?: boolean | 'gesture' | 'move';
+    resizeable?: boolean | 'gesture' | 'zoom';
     flipable?: boolean;
-    rotateable?: boolean | 'rotate';
+    rotateable?: boolean | 'gesture' | 'rotate';
     skewable?: boolean;
     beforeSelect?: IEditorBeforeSelect;
     beforeMove?: IEditorBeforeMove;
@@ -544,7 +561,11 @@ type IEditPointType = 'resize' | 'rotate' | 'skew' | 'resize-rotate' | 'button';
 interface IEditBoxBase extends IGroup$1 {
     editor: IEditorBase;
     dragging: boolean;
+    gesturing: boolean;
     moving: boolean;
+    resizing: boolean;
+    rotating: boolean;
+    skewing: boolean;
     view: IGroup$1;
     circle: IEditPoint;
     rect: IRect$1;
@@ -565,6 +586,8 @@ interface IEditBoxBase extends IGroup$1 {
     readonly flippedX: boolean;
     readonly flippedY: boolean;
     readonly flippedOne: boolean;
+    readonly canUse: boolean;
+    readonly canGesture: boolean;
     getPointStyle(userStyle?: IBoxInputData$1): IBoxInputData$1;
     getPointsStyle(): IBoxInputData$1[];
     getMiddlePointsStyle(): IBoxInputData$1[];
@@ -851,6 +874,8 @@ interface IFrameInputData extends IBoxInputData {
 }
 interface IBox extends IBoxAttrData, IGroup {
     __: IBoxData;
+    scrollBar?: IGroup;
+    __updateScrollBar(): void;
     __updateRectRenderBounds(): void;
     __renderGroup(canvas: ILeaferCanvas, options: IRenderOptions): void;
 }
@@ -866,6 +891,7 @@ interface IBoxInputData extends IBoxAttrData, IGroupInputData {
 interface IGroup extends IUI {
     __: IGroupData;
     children: IUI[];
+    childlessJSON?: boolean;
     pick(hitPoint: IPointData, options?: IPickOptions): IPickResult;
     add(child: IUI | IUI[] | IUIInputData | IUIInputData[], index?: number): void;
     addAt(child: IUI | IUI[] | IUIInputData | IUIInputData[], index: number): void;
@@ -953,6 +979,9 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __isFills?: boolean;
     __isStrokes?: boolean;
     readonly __strokeWidth: number;
+    readonly __maxStrokeWidth: number;
+    __hasMultiStrokeStyle?: number;
+    readonly __hasMultiPaint?: boolean;
     __isAlphaPixelFill?: boolean;
     __isAlphaPixelStroke?: boolean;
     __isTransparentFill?: boolean;
@@ -970,6 +999,7 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __textDrawData?: ITextDrawData;
     __needComputePaint?: boolean;
     __computePaint(): void;
+    __getRealStrokeWidth(childStyle?: IStrokeComputedStyle): number;
     __setPaint(attrName: 'fill' | 'stroke', value: IValue): void;
     __removePaint(attrName: 'fill' | 'stroke', removeInput?: boolean): void;
 }
@@ -1127,7 +1157,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): 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;
 }
 interface IPaintGradientModule {
@@ -1161,4 +1191,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, IAppForEachFunction, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBackgroundBoxStyle, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorBeforeMove, IEditorBeforeRotate, IEditorBeforeScale, IEditorBeforeSelect, IEditorBeforeSkew, IEditorConfig, IEditorConfigFunction, IEditorDragStartData, IEditorMoveData, IEditorRotationData, IEditorScaleData, IEditorSelectData, 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, ITransformTool, 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, IAppForEachFunction, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBackgroundBoxStyle, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorBeforeMove, IEditorBeforeRotate, IEditorBeforeScale, IEditorBeforeSelect, IEditorBeforeSkew, IEditorConfig, IEditorConfigFunction, IEditorDragStartData, IEditorMoveData, IEditorRotationData, IEditorScaleData, IEditorSelectData, 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, IStrokeComputedStyle, IStrokeGradientPaint, IStrokeImagePaint, IStrokeInputData, IStrokeJoin, IStrokePaint, IStrokeSolidPaint, IStrokeStyle, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDecorationData, ITextDecorationType, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransformTool, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };