@leafer/interface 1.9.6 → 1.9.7

package/package.json

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

package/src/display/ILeaf.ts

@@ -235,6 +235,7 @@ export interface ILeafAttrData {
 
     dim?: IBoolean | INumber // 是否弱化内容，可设置具体透明度
     dimskip?: IBoolean //  跳过弱化，突出显示内容，不受dim影响
+    bright?: IBoolean // 突出显示内容，并置顶渲染，不受dim影响
 
     mask?: IBoolean | IMaskType
     eraser?: IBoolean | IEraserType
@@ -341,6 +342,7 @@ export interface ILeafComputedData {
 
     dim?: boolean | number // 是否弱化内容，可设置具体透明度
     dimskip?: boolean //  跳过弱化，突出显示内容，不受dim影响
+    bright?: boolean // 突出显示内容，并置顶渲染，不受dim影响
 
     mask?: boolean | IMaskType
     eraser?: boolean | IEraserType
@@ -440,6 +442,7 @@ export interface ILeafComputedData {
     __useArrow?: boolean
     __useEffect?: boolean
     __usePathBox?: boolean // 是否使用路径的bounds作为元素box包围盒
+    __useDim?: boolean // 是否使用了弱化/突出元素功能
 
     __pathInputed?: number // 是否为输入path, 0：否，1：是，2：永远是（不自动检测）
     __pathForRender?: IPathCommandData

package/src/math/IMath.ts

@@ -209,6 +209,7 @@ export interface IMatrix extends IMatrixWithScaleData {
 
     scale(x: number, y?: number): IMatrix
     scaleWith(x: number, y?: number): IMatrix // change scaleX scaleY
+    pixelScale(pixelRatio: number): IMatrix
     scaleOfOuter(origin: IPointData, x: number, y?: number): IMatrix
     scaleOfInner(origin: IPointData, x: number, y?: number): IMatrix
 

package/src/platform/IPlatform.ts

@@ -7,6 +7,7 @@ import { IObject } from '../data/IData'
 import { ICanvasType } from '../canvas/ISkiaCanvas'
 import { ISelector } from '../selector/ISelector'
 import { IProgressFunction } from '../event/IProgress'
+import { IRenderOptions } from '../renderer/IRenderer'
 
 
 export interface IPlatform {
@@ -33,6 +34,7 @@ export interface IPlatform {
     selector?: ISelector // 公共查找选择器
     getSelector?(leaf: ILeaf): ISelector
     layout?(target: ILeaf): void
+    render?(target: ILeaf, canvas: ILeaferCanvas, options: IRenderOptions): void // 渲染元素，可处理内部产生的置顶渲染
 
     origin?: {
         createCanvas(width: number, height: number, format?: 'svg' | 'pdf'): any

package/src/renderer/IRenderer.ts

@@ -3,6 +3,7 @@ import { ILeaf } from '../display/ILeaf'
 import { IBounds, IMatrixWithScaleData } from '../math/IMath'
 import { IFunction } from '../function/IFunction'
 import { IControl } from '../control/IControl'
+import { ILeafList } from '../data/IList'
 
 export interface IRenderOptions {
     includes?: boolean,
@@ -10,9 +11,12 @@ export interface IRenderOptions {
     hideBounds?: IBounds,
     matrix?: IMatrixWithScaleData,
     inCamera?: boolean
-    dimOpacity?: number
     exporting?: boolean // 是否通过 export() 导出渲染
 
+    dimOpacity?: number // 淡化
+    topList?: ILeafList // 收集需要置顶渲染的内容
+    topRendering?: boolean // 是否正在渲染置顶内容
+
     // 只渲染外形
     shape?: boolean
     ignoreFill?: boolean, // 绘制外形时忽略fill

package/types/index.d.ts

@@ -156,6 +156,7 @@ interface IMatrix extends IMatrixWithScaleData {
     translateInner(x: number, y: number): IMatrix;
     scale(x: number, y?: number): IMatrix;
     scaleWith(x: number, y?: number): IMatrix;
+    pixelScale(pixelRatio: number): IMatrix;
     scaleOfOuter(origin: IPointData, x: number, y?: number): IMatrix;
     scaleOfInner(origin: IPointData, x: number, y?: number): IMatrix;
     rotate(angle: number): IMatrix;
@@ -1145,8 +1146,10 @@ interface IRenderOptions {
     hideBounds?: IBounds;
     matrix?: IMatrixWithScaleData;
     inCamera?: boolean;
-    dimOpacity?: number;
     exporting?: boolean;
+    dimOpacity?: number;
+    topList?: ILeafList;
+    topRendering?: boolean;
     shape?: boolean;
     ignoreFill?: boolean;
     ignoreStroke?: boolean;
@@ -1462,6 +1465,7 @@ interface ILeafAttrData {
     zIndex?: INumber;
     dim?: IBoolean | INumber;
     dimskip?: IBoolean;
+    bright?: IBoolean;
     mask?: IBoolean | IMaskType;
     eraser?: IBoolean | IEraserType;
     filter?: IFilter | IFilter[];
@@ -1538,6 +1542,7 @@ interface ILeafComputedData {
     zIndex?: number;
     dim?: boolean | number;
     dimskip?: boolean;
+    bright?: boolean;
     mask?: boolean | IMaskType;
     eraser?: boolean | IEraserType;
     filter?: IFilter[];
@@ -1609,6 +1614,7 @@ interface ILeafComputedData {
     __useArrow?: boolean;
     __useEffect?: boolean;
     __usePathBox?: boolean;
+    __useDim?: boolean;
     __pathInputed?: number;
     __pathForRender?: IPathCommandData;
     __path2DForRender?: IPath2D;
@@ -2296,6 +2302,7 @@ interface IPlatform {
     selector?: ISelector;
     getSelector?(leaf: ILeaf): ISelector;
     layout?(target: ILeaf): void;
+    render?(target: ILeaf, canvas: ILeaferCanvas, options: IRenderOptions): void;
     origin?: {
         createCanvas(width: number, height: number, format?: 'svg' | 'pdf'): any;
         canvasToDataURL(canvas: any, type?: IExportImageType, quality?: number): string | Promise<string>;