@leafer/interface 1.11.2 → 1.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/interface",
-  "version": "1.11.2",
+  "version": "1.12.1",
   "description": "@leafer/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",

package/src/display/ILeaf.ts

@@ -679,8 +679,8 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     // ILeafHit ->
     hit(world: IPointData, hitRadius?: number): boolean
-    __hitWorld(point: IRadiusPointData): boolean
-    __hit(local: IRadiusPointData): boolean
+    __hitWorld(point: IRadiusPointData, forceHitFill?: boolean): boolean
+    __hit(local: IRadiusPointData, forceHitFill?: boolean): boolean
     __hitFill(inner: IRadiusPointData): boolean
     __hitStroke(inner: IRadiusPointData, strokeWidth: number): boolean
     __hitPixel(inner: IRadiusPointData): boolean

package/src/image/IImageManager.ts

@@ -12,7 +12,12 @@ export interface IImageManager {
 
     get(config: ILeaferImageConfig): ILeaferImage
     recycle(image: ILeaferImage): void
-    clearRecycled(): void
+
+    recyclePaint(paint: any): void
+
+    clearRecycled(force?: boolean): void
+    clearLevels(): void
+
     hasAlphaPixel(config: ILeaferImageConfig): boolean // png / svg / webp
     isFormat(format: IExportFileType, config: ILeaferImageConfig): boolean
 

package/src/image/ILeaferImage.ts

@@ -2,7 +2,7 @@ import { ICanvasPattern } from '../canvas/ICanvas'
 import { IObject } from '../data/IData'
 import { InnerId } from '../event/IEventer'
 import { IExportFileType } from '../file/IFileType'
-import { IMatrixData, IPointData } from '../math/IMath'
+import { IBoundsData, IMatrixData, IPointData } from '../math/IMath'
 import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
 import { IProgressData } from '../event/IProgress'
 import { IImageCrossOrigin } from '../platform/IPlatform'
@@ -44,6 +44,7 @@ export interface ILeaferImageSliceData {
 
 export interface ILeaferImageSlice {
     view?: any
+    bounds?: IBoundsData
     task?: ITaskItem
 }
 
@@ -53,6 +54,7 @@ export interface ILeaferImageLevel {
     view?: any
     url?: string
     slice?: ILeaferImageSliceData
+    use?: number // 引用次数
 }
 
 export interface ILeaferImage {
@@ -80,7 +82,7 @@ export interface ILeaferImage {
 
     progress?: IProgressData // 加载进度
 
-    use: number
+    use: number // 引用次数
     config: ILeaferImageConfig
 
     load(onSuccess?: ILeaferImageOnLoaded, onError?: ILeaferImageOnError): number
@@ -88,6 +90,8 @@ export interface ILeaferImage {
     getFull(filters?: IObject): any
     getCanvas(width: number, height: number, opacity?: number, filters?: IObject, xGap?: number, yGap?: number, smooth?: boolean): any
     getPattern(canvas: any, repeat: string | null, transform?: IMatrixData, paint?: IObject): ICanvasPattern
+
+    clearLevels(checkUse?: boolean): void
     destroy(): void
 }
 

package/src/layouter/ILayouter.ts

@@ -28,6 +28,7 @@ export interface IPartLayoutConfig {
 }
 
 export interface ILayouterConfig {
+    usePartLayout?: boolean
     partLayout?: IPartLayoutConfig
 }
 

package/src/path/IPathCommand.ts

@@ -118,7 +118,6 @@ export interface ClosePathCommandNode {
     a?: IPointData
     b?: IPointData
     ab?: PathNodeHandleType
-
 }
 
 export type IPathCommandNode = MoveToCommandNode | LineToCommandNode | BezierCurveToCommandNode | ClosePathCommandNode // M | L | C | Z   路径节点命令(适合可视化编辑)

package/src/platform/IPlatform.ts

@@ -39,6 +39,7 @@ export interface IPlatform {
 
     origin?: {
         createCanvas(width: number, height: number, format?: 'svg' | 'pdf'): any
+        createOffscreenCanvas?(width: number, height: number, format?: 'svg' | 'pdf'): any
         canvasToDataURL(canvas: any, type?: IExportImageType, quality?: number): string | Promise<string>
         canvasToBolb(canvas: any, type?: IExportFileType, quality?: number): Promise<any>
         canvasSaveAs(canvas: any, filename: string, quality?: number): Promise<void>
@@ -74,7 +75,10 @@ export interface IPlatform {
         getRealURL: IStringFunction // 处理前缀、后缀
         resize(image: any, width: number, height: number, xGap?: number, yGap?: number, clip?: IBoundsData, smooth?: boolean, opacity?: number, filters?: IObject): any
         setPatternTransform(pattern: ICanvasPattern, transform?: IMatrixData, paint?: IObject): void
-    }
+    },
+
+    canCreateImageBitmap?: boolean // 是否能使用 createImageBitmap
+    canClipImageBitmap?: boolean // 是否能使用 createImageBitmap 裁剪图片
 }
 
 export type IImageCrossOrigin = 'anonymous' | 'use-credentials' // 图片跨域设置

package/src/renderer/IRenderer.ts

@@ -4,6 +4,7 @@ import { IBounds, IMatrixWithScaleData } from '../math/IMath'
 import { IFunction } from '../function/IFunction'
 import { IControl } from '../control/IControl'
 import { ILeafList } from '../data/IList'
+import { IObject } from '../data/IData'
 
 export interface IRenderOptions {
     includes?: boolean,
@@ -21,10 +22,13 @@ export interface IRenderOptions {
     shape?: boolean
     ignoreFill?: boolean, // 绘制外形时忽略fill
     ignoreStroke?: boolean // 绘制外形时忽略stroke
+
+    cellList?: ILeafList
 }
 
 export interface IRendererConfig {
     usePartRender?: boolean
+    useCellRender?: boolean | IObject
     maxFPS?: number
     fill?: string
 }

package/src/watcher/IWatcher.ts

@@ -1,12 +1,13 @@
 import { ILeaf } from '../display/ILeaf'
 import { ILeafList } from '../data/IList'
 import { IControl } from '../control/IControl'
+import { ILayouterConfig } from '../layouter/ILayouter'
 
 export interface IWatchEventData {
     updatedList: ILeafList
 }
 
-export interface IWatcherConfig {
+export interface IWatcherConfig extends ILayouterConfig {
 
 }
 

package/types/index.d.ts

@@ -296,27 +296,6 @@ interface IControl {
     destroy(): void;
 }
 
-interface IWatchEventData {
-    updatedList: ILeafList;
-}
-interface IWatcherConfig {
-}
-interface IWatcher extends IControl {
-    target: ILeaf;
-    totalTimes: number;
-    disabled: boolean;
-    running: boolean;
-    changed: boolean;
-    hasVisible: boolean;
-    hasAdd: boolean;
-    hasRemove: boolean;
-    readonly childrenChanged: boolean;
-    config: IWatcherConfig;
-    updatedList: ILeafList;
-    disable(): void;
-    update(): void;
-}
-
 interface ILayoutChangedData {
     matrixList: ILeaf[];
     boundsList: ILeaf[];
@@ -337,6 +316,7 @@ interface IPartLayoutConfig {
     maxTimes?: number;
 }
 interface ILayouterConfig {
+    usePartLayout?: boolean;
     partLayout?: IPartLayoutConfig;
 }
 interface ILayouter extends IControl {
@@ -362,6 +342,27 @@ interface ILayouter extends IControl {
     addBlocks(current: ILayoutBlockData[]): void;
 }
 
+interface IWatchEventData {
+    updatedList: ILeafList;
+}
+interface IWatcherConfig extends ILayouterConfig {
+}
+interface IWatcher extends IControl {
+    target: ILeaf;
+    totalTimes: number;
+    disabled: boolean;
+    running: boolean;
+    changed: boolean;
+    hasVisible: boolean;
+    hasAdd: boolean;
+    hasRemove: boolean;
+    readonly childrenChanged: boolean;
+    config: IWatcherConfig;
+    updatedList: ILeafList;
+    disable(): void;
+    update(): void;
+}
+
 interface IEvent {
     origin?: IObject;
     type?: string;
@@ -1192,9 +1193,11 @@ interface IRenderOptions {
     shape?: boolean;
     ignoreFill?: boolean;
     ignoreStroke?: boolean;
+    cellList?: ILeafList;
 }
 interface IRendererConfig {
     usePartRender?: boolean;
+    useCellRender?: boolean | IObject;
     maxFPS?: number;
     fill?: string;
 }
@@ -1820,8 +1823,8 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     resizeWidth(width: number): void;
     resizeHeight(height: number): void;
     hit(world: IPointData, hitRadius?: number): boolean;
-    __hitWorld(point: IRadiusPointData): boolean;
-    __hit(local: IRadiusPointData): boolean;
+    __hitWorld(point: IRadiusPointData, forceHitFill?: boolean): boolean;
+    __hit(local: IRadiusPointData, forceHitFill?: boolean): boolean;
     __hitFill(inner: IRadiusPointData): boolean;
     __hitStroke(inner: IRadiusPointData, strokeWidth: number): boolean;
     __hitPixel(inner: IRadiusPointData): boolean;
@@ -1917,6 +1920,7 @@ interface IPlatform {
     render?(target: ILeaf, canvas: ILeaferCanvas, options: IRenderOptions): void;
     origin?: {
         createCanvas(width: number, height: number, format?: 'svg' | 'pdf'): any;
+        createOffscreenCanvas?(width: number, height: number, format?: 'svg' | 'pdf'): any;
         canvasToDataURL(canvas: any, type?: IExportImageType, quality?: number): string | Promise<string>;
         canvasToBolb(canvas: any, type?: IExportFileType, quality?: number): Promise<any>;
         canvasSaveAs(canvas: any, filename: string, quality?: number): Promise<void>;
@@ -1949,6 +1953,8 @@ interface IPlatform {
         resize(image: any, width: number, height: number, xGap?: number, yGap?: number, clip?: IBoundsData, smooth?: boolean, opacity?: number, filters?: IObject): any;
         setPatternTransform(pattern: ICanvasPattern, transform?: IMatrixData, paint?: IObject): void;
     };
+    canCreateImageBitmap?: boolean;
+    canClipImageBitmap?: boolean;
 }
 type IImageCrossOrigin = 'anonymous' | 'use-credentials';
 interface IMiniappSelect extends IObject {
@@ -2036,6 +2042,7 @@ interface ILeaferImageSliceData {
 }
 interface ILeaferImageSlice {
     view?: any;
+    bounds?: IBoundsData;
     task?: ITaskItem;
 }
 interface ILeaferImageLevel {
@@ -2044,6 +2051,7 @@ interface ILeaferImageLevel {
     view?: any;
     url?: string;
     slice?: ILeaferImageSliceData;
+    use?: number;
 }
 interface ILeaferImage {
     readonly innerId: InnerId;
@@ -2070,6 +2078,7 @@ interface ILeaferImage {
     getFull(filters?: IObject): any;
     getCanvas(width: number, height: number, opacity?: number, filters?: IObject, xGap?: number, yGap?: number, smooth?: boolean): any;
     getPattern(canvas: any, repeat: string | null, transform?: IMatrixData, paint?: IObject): ICanvasPattern;
+    clearLevels(checkUse?: boolean): void;
     destroy(): void;
 }
 
@@ -2427,7 +2436,9 @@ interface IImageManager {
     patternLocked?: boolean;
     get(config: ILeaferImageConfig): ILeaferImage;
     recycle(image: ILeaferImage): void;
-    clearRecycled(): void;
+    recyclePaint(paint: any): void;
+    clearRecycled(force?: boolean): void;
+    clearLevels(): void;
     hasAlphaPixel(config: ILeaferImageConfig): boolean;
     isFormat(format: IExportFileType, config: ILeaferImageConfig): boolean;
     destroy(): void;