@leafer-ui/interface 1.9.12 → 1.10.1

package/package.json

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

package/src/IUI.ts

@@ -15,6 +15,7 @@ import { ILeafer } from './app/ILeafer'
 import { IEditorConfig } from './editor/IEditor'
 import { IColorString } from './type/IStringType'
 import { IScroller, IScrollConfig } from './IScroller'
+import { ILeafPaint } from './type/IComputedType'
 
 // Line
 export interface ILine extends ILineAttrData, IUI {
@@ -227,6 +228,7 @@ export interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIDat
     __letterSpacing?: number
     __padding?: number[]
     __clipText?: boolean
+    __isCharMode?: boolean
     __isPlacehold?: boolean
     __textBoxBounds?: IBoundsData
 }
@@ -426,7 +428,7 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
     __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
-    drawImagePlaceholder(canvas: ILeaferCanvas, image: ILeaferImage): void
+    drawImagePlaceholder(image: ILeafPaint, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
 
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate
     killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void

package/src/editor/IEditor.ts

@@ -54,6 +54,8 @@ export interface IEditorBase extends IGroup, ISelectorProxy, ITransformTool {
 
     update(): void
     updateEditBox(): void
+
+    getEditTool(name: string): IObject
     updateEditTool(): void
     unloadEditTool(): void
 
@@ -64,6 +66,7 @@ export interface IEditorBase extends IGroup, ISelectorProxy, ITransformTool {
     openGroup(group: IGroup): void
     closeGroup(group: IGroup): void
 
+    getInnerEditor(name: string): IObject
     openInnerEditor(target?: IUI, nameOrSelect?: string | boolean, select?: boolean): void
     closeInnerEditor(onlyInnerEditor?: boolean): void
 
@@ -105,7 +108,7 @@ export interface IEditorConfig extends IObject {
 
     point?: IEditPointInputData | IEditPointInputData[]
     middlePoint?: IEditPointInputData | IEditPointInputData[]
-    resizeLine?: IEditPointInputData
+    resizeLine?: IEditPointInputData | IEditPointInputData[]
 
     rect?: IBoxInputData
     rectThrough?: boolean // 是否穿透rect（穿透后，可以拾取到rect下面的元素，默认单选元素时穿透）

package/src/module/IPaint.ts

@@ -1,6 +1,6 @@
-import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage, IAlign, IPointData, IMatrixData } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage, IAlign, IPointData, IMatrixData, IScaleData, IFunction, ITaskItem } from '@leafer/interface'
 
-import { ILeafPaint, ILeafPaintPatternData } from '../type/IComputedType'
+import { ILeafPaint, ILeafStrokePaint, ILeafPaintPatternData } from '../type/IComputedType'
 import { IUI, IUIData } from '../IUI'
 import { ICachedShape } from '../ICachedShape'
 import { IGradientPaint, IImagePaint, IPaintAttr } from '../type/IType'
@@ -9,18 +9,19 @@ import { IGradientPaint, IImagePaint, IPaintAttr } from '../type/IType'
 export interface IPaintModule {
     compute(attrName: IPaintAttr, ui: IUI): void
 
-    fill(fill: string, ui: IUI, canvas: ILeaferCanvas,): void
-    fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
+    fill(fill: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
 
-    fillPathOrText(ui: IUI, canvas: ILeaferCanvas): void
-    fillText(ui: IUI, canvas: ILeaferCanvas): void
+    fillPathOrText(ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    fillText(ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
 
-    stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas): void
-    strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
+    stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
 
-    strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
-    strokeArrow?(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
-    drawTextStroke(ui: IUI, canvas: ILeaferCanvas): void
+    strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    strokeArrow?(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    drawStrokesStyle(strokes: ILeafStrokePaint[], strokeWidthScale: number, isText: boolean, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    drawTextStroke(ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
 
     shape(ui: IUI, current: ILeaferCanvas, renderOptions: IRenderOptions): ICachedShape
 }
@@ -28,10 +29,16 @@ export interface IPaintModule {
 
 export interface IPaintImageModule {
     image(ui: IUI, attrName: string, paint: IImagePaint, boxBounds: IBoundsData, firstUse: boolean): ILeafPaint
-    checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean // 返回true表示已进行了原生绘制
-    createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): boolean
+
+    checkImage(paint: ILeafPaint, allowDraw: boolean, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): boolean // 返回true表示已进行了原生绘制
+    drawImage(paint: ILeafPaint, imageScaleX: number, imageScaleY: number, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    getImageRenderScaleData(paint: ILeafPaint, ui: IUI, canvas?: ILeaferCanvas, renderOptions?: IRenderOptions): IScaleData // 当前图片渲染的比例数据，必须马上分解使用
     recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap
 
+    createPatternTask(paint: ILeafPaint, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    createPattern(paint: ILeafPaint, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions, resolve?: IFunction, task?: ITaskItem): void
+    getPatternFixScale(paint: ILeafPaint, imageScaleX: number, imageScaleY: number): number
+
     createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void
     getPatternData(paint: IImagePaint, box: IBoundsData, image: ILeaferImage): ILeafPaintPatternData
 

package/src/type/IComputedType.ts

@@ -1,7 +1,7 @@
 import { IBlendMode, IDirection, ILeaferImage, IMatrixData, IPointData, IScaleFixed, ITaskItem } from '@leafer/interface'
 
 import { IColorString } from './IStringType'
-import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode, IImageFilters } from './IType'
+import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode, IImageFilters, IPaint } from './IType'
 import { IPaintType } from './IType'
 import { IStrokeComputedStyle } from '../ICommonAttr'
 
@@ -12,22 +12,17 @@ export interface ILeafPaint {
     style?: ILeafPaintColor
     strokeStyle?: IStrokeComputedStyle // 子描边样式选项
     transform?: IMatrixData // 存在时表示pattern自身不能应用transform
-    blendMode?: IBlendMode
     image?: ILeaferImage
+    level?: number
     loadId?: number
     patternId?: string
     patternTask?: ITaskItem
-    changeful?: boolean // 会频繁变化，不生成图案（有特殊性能优化，一般用于游戏精灵、动图场景）
-    sync?: boolean // 同步显示图片，不走任务列表生成图案
     isTransparent?: boolean // 是否为透明色
     data?: ILeafPaintPatternData
-    editing?: boolean // 标记编辑中
-    scaleFixed?: IScaleFixed // 平铺图片不跟随画布缩放
+    originPaint?: IPaint // 原始paint对象
 }
 
 export interface ILeafPaintPatternData {
-    width?: number
-    height?: number
     scaleX?: number
     scaleY?: number
     gap?: IPointData

package/src/type/IType.ts

@@ -20,6 +20,7 @@ export interface IPaintBase {
 
     style?: IStrokeStyle
     editing?: boolean // 标记编辑中
+    scaleFixed?: IScaleFixed // 不跟随画布缩放
 }
 
 export type IPaintType =
@@ -94,11 +95,10 @@ export interface IImagePaint extends IPaintBase {
 
     repeat?: IRepeat
     gap?: IGap | IPointGap
-    scaleFixed?: IScaleFixed // 平铺图片不跟随画布缩放
 
     changeful?: boolean // 会频繁变化，不生成图案（有特殊性能优化，一般用于游戏精灵、动图场景）
     sync?: boolean // 同步显示，不走任务列表生成图案
-    showProgress?: boolean // 是否显示进度
+    showProgress?: boolean | IColorString // 是否显示进度
 }
 
 export interface IStrokeImagePaint extends IImagePaint { }
@@ -146,7 +146,15 @@ export interface IPathDataArrowOffset {
 }
 
 // 文本
-export type ITextAlign = 'left' | 'center' | 'right' | 'justify' | 'both'
+export type ITextAlign =
+    | 'left'
+    | 'center'
+    | 'right'
+    | 'justify' // 两端对齐，最后一行不处理，适合段落文本，英文会均分单词
+    | 'justify-letter' // 字符级对齐
+    | 'both' // 所有行两端对齐，适合单行文本，英文会均分单词
+    | 'both-letter' // 字符级对齐
+
 export type IVerticalAlign = 'top' | 'middle' | 'bottom'
 export type ITextCase = | 'upper' | 'lower' | 'title' | 'none' | 'small-caps'
 export type IFontWeight = IFontWeightNumer | IFontWeightString

package/types/index.d.ts

@@ -1,4 +1,4 @@
-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';
+import { IBlendMode, IScaleFixed, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, IOptionSizeData, ISizeData, IGap, IPointGap, 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, IScaleData as IScaleData$1, IBooleanMap, IFunction, 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, 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';
 
@@ -25,6 +25,7 @@ interface IPaintBase {
     opacity?: number;
     style?: IStrokeStyle;
     editing?: boolean;
+    scaleFixed?: IScaleFixed;
 }
 type IPaintType = 'image' | 'solid' | IGradientType;
 type IGradientType = 'linear' | 'radial' | 'angular';
@@ -74,10 +75,9 @@ interface IImagePaint extends IPaintBase {
     clipSize?: ISizeData;
     repeat?: IRepeat;
     gap?: IGap | IPointGap;
-    scaleFixed?: IScaleFixed;
     changeful?: boolean;
     sync?: boolean;
-    showProgress?: boolean;
+    showProgress?: boolean | IColorString;
 }
 interface IStrokeImagePaint extends IImagePaint {
 }
@@ -115,7 +115,7 @@ interface IPathDataArrowOffset {
     bevelJoin?: number;
     roundJoin?: number;
 }
-type ITextAlign = 'left' | 'center' | 'right' | 'justify' | 'both';
+type ITextAlign = 'left' | 'center' | 'right' | 'justify' | 'justify-letter' | 'both' | 'both-letter';
 type IVerticalAlign = 'top' | 'middle' | 'bottom';
 type ITextCase = 'upper' | 'lower' | 'title' | 'none' | 'small-caps';
 type IFontWeight = IFontWeightNumer | IFontWeightString;
@@ -168,21 +168,16 @@ interface ILeafPaint {
     style?: ILeafPaintColor;
     strokeStyle?: IStrokeComputedStyle;
     transform?: IMatrixData;
-    blendMode?: IBlendMode;
     image?: ILeaferImage;
+    level?: number;
     loadId?: number;
     patternId?: string;
     patternTask?: ITaskItem;
-    changeful?: boolean;
-    sync?: boolean;
     isTransparent?: boolean;
     data?: ILeafPaintPatternData;
-    editing?: boolean;
-    scaleFixed?: IScaleFixed;
+    originPaint?: IPaint;
 }
 interface ILeafPaintPatternData {
-    width?: number;
-    height?: number;
     scaleX?: number;
     scaleY?: number;
     gap?: IPointData;
@@ -458,6 +453,7 @@ interface IEditorBase extends IGroup$1, ISelectorProxy, ITransformTool {
     setBright(value: boolean): void;
     update(): void;
     updateEditBox(): void;
+    getEditTool(name: string): IObject$1;
     updateEditTool(): void;
     unloadEditTool(): void;
     getEditSize(ui: ILeaf): IEditSize;
@@ -465,6 +461,7 @@ interface IEditorBase extends IGroup$1, ISelectorProxy, ITransformTool {
     ungroup(): IUI$1[];
     openGroup(group: IGroup$1): void;
     closeGroup(group: IGroup$1): void;
+    getInnerEditor(name: string): IObject$1;
     openInnerEditor(target?: IUI$1, nameOrSelect?: string | boolean, select?: boolean): void;
     closeInnerEditor(onlyInnerEditor?: boolean): void;
     lock(): void;
@@ -495,7 +492,7 @@ interface IEditorConfig extends IObject$1 {
     pointRadius?: number;
     point?: IEditPointInputData | IEditPointInputData[];
     middlePoint?: IEditPointInputData | IEditPointInputData[];
-    resizeLine?: IEditPointInputData;
+    resizeLine?: IEditPointInputData | IEditPointInputData[];
     rect?: IBoxInputData$1;
     rectThrough?: boolean;
     area?: IRectInputData$1;
@@ -864,6 +861,7 @@ interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIData {
     __letterSpacing?: number;
     __padding?: number[];
     __clipText?: boolean;
+    __isCharMode?: boolean;
     __isPlacehold?: boolean;
     __textBoxBounds?: IBoundsData;
 }
@@ -1023,7 +1021,7 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     __drawPathByBox(drawer: IPathDrawer): void;
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void;
-    drawImagePlaceholder(canvas: ILeaferCanvas, image: ILeaferImage): void;
+    drawImagePlaceholder(image: ILeafPaint, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate;
     killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void;
     export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
@@ -1225,22 +1223,27 @@ interface ICachedShape extends ICachedLeaf {
 
 interface IPaintModule {
     compute(attrName: IPaintAttr, ui: IUI): void;
-    fill(fill: string, ui: IUI, canvas: ILeaferCanvas): void;
-    fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
-    fillPathOrText(ui: IUI, canvas: ILeaferCanvas): void;
-    fillText(ui: IUI, canvas: ILeaferCanvas): void;
-    stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas): void;
-    strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
-    strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
-    strokeArrow?(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
-    drawTextStroke(ui: IUI, canvas: ILeaferCanvas): void;
+    fill(fill: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    fillPathOrText(ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    fillText(ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    strokeArrow?(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    drawStrokesStyle(strokes: ILeafStrokePaint[], strokeWidthScale: number, isText: boolean, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    drawTextStroke(ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     shape(ui: IUI, current: ILeaferCanvas, renderOptions: IRenderOptions): ICachedShape;
 }
 interface IPaintImageModule {
     image(ui: IUI, attrName: string, paint: IImagePaint, boxBounds: IBoundsData, firstUse: boolean): ILeafPaint;
-    checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean;
-    createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): boolean;
+    checkImage(paint: ILeafPaint, allowDraw: boolean, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): boolean;
+    drawImage(paint: ILeafPaint, imageScaleX: number, imageScaleY: number, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    getImageRenderScaleData(paint: ILeafPaint, ui: IUI, canvas?: ILeaferCanvas, renderOptions?: IRenderOptions): IScaleData$1;
     recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap;
+    createPatternTask(paint: ILeafPaint, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    createPattern(paint: ILeafPaint, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions, resolve?: IFunction, task?: ITaskItem): void;
+    getPatternFixScale(paint: ILeafPaint, imageScaleX: number, imageScaleY: number): number;
     createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void;
     getPatternData(paint: IImagePaint, box: IBoundsData, image: ILeaferImage): ILeafPaintPatternData;
     stretchMode(data: ILeafPaintPatternData, box: IBoundsData, scaleX: number, scaleY: number): void;