@leafer/canvas 1.6.3 → 1.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/canvas",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "@leafer/canvas",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,15 +22,15 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/file": "1.6.3",
-    "@leafer/list": "1.6.3",
-    "@leafer/math": "1.6.3",
-    "@leafer/data": "1.6.3",
-    "@leafer/path": "1.6.3",
-    "@leafer/debug": "1.6.3",
-    "@leafer/platform": "1.6.3"
+    "@leafer/file": "1.6.5",
+    "@leafer/list": "1.6.5",
+    "@leafer/math": "1.6.5",
+    "@leafer/data": "1.6.5",
+    "@leafer/path": "1.6.5",
+    "@leafer/debug": "1.6.5",
+    "@leafer/platform": "1.6.5"
   },
   "devDependencies": {
-    "@leafer/interface": "1.6.3"
+    "@leafer/interface": "1.6.5"
   }
 }

package/src/LeaferCanvasBase.ts

@@ -1,4 +1,4 @@
-import { IBounds, ILeaferCanvas, ICanvasStrokeOptions, ILeaferCanvasConfig, IExportOptions, IMatrixData, IBoundsData, IAutoBounds, IScreenSizeData, IResizeEventListener, IMatrixWithBoundsData, IPointData, InnerId, ICanvasManager, IWindingRule, IBlendMode, IExportImageType, IExportFileType, IBlob, ICursorType, ILeaferCanvasView, IRadiusPointData, IObject, IMatrixWithOptionHalfData } from '@leafer/interface'
+import { IBounds, ILeaferCanvas, ICanvasStrokeOptions, ILeaferCanvasConfig, IWindingRuleData, IExportOptions, IMatrixData, IBoundsData, IAutoBounds, IScreenSizeData, IResizeEventListener, IMatrixWithBoundsData, IPointData, InnerId, ICanvasManager, IWindingRule, IBlendMode, IExportImageType, IExportFileType, IBlob, ICursorType, ILeaferCanvasView, IRadiusPointData, IObject, IMatrixWithOptionHalfData } from '@leafer/interface'
 import { Bounds, tempBounds, BoundsHelper, MatrixHelper, IncrementId } from '@leafer/math'
 import { Creator, Platform } from '@leafer/platform'
 import { DataHelper } from '@leafer/data'
@@ -272,11 +272,6 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
         if (blendMode) this.blendMode = 'source-over'
     }
 
-    public clearWorld(bounds: IBoundsData, ceilPixel?: boolean): void {
-        this.setTempBounds(bounds, ceilPixel)
-        this.clearRect(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height)
-    }
-
     public clipWorld(bounds: IBoundsData, ceilPixel?: boolean): void {
         this.beginPath()
         this.setTempBounds(bounds, ceilPixel)
@@ -285,6 +280,15 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
 
     }
 
+    public clipUI(ruleData: IWindingRuleData): void {
+        ruleData.windingRule ? this.clip(ruleData.windingRule) : this.clip()
+    }
+
+    public clearWorld(bounds: IBoundsData, ceilPixel?: boolean): void {
+        this.setTempBounds(bounds, ceilPixel)
+        this.clearRect(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height)
+    }
+
     public clear(): void {
         const { pixelRatio } = this
         this.clearRect(0, 0, this.width * pixelRatio + 2, this.height * pixelRatio + 2)

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ICanvasManager, ILeaferCanvas, IScreenSizeData, ICanvasAttr, InnerId, ICanvasContext2D, IBlendMode, IMatrixData, IPath2D, IWindingRule, ITextMetrics, IBounds, IBoundsData, ILeaferCanvasConfig, ILeaferCanvasView, IExportFileType, IExportOptions, IBlob, IExportImageType, IAutoBounds, IResizeEventListener, ICursorType, IMatrixWithOptionHalfData, ICanvasStrokeOptions, IPointData, IRadiusPointData, IMatrixWithBoundsData, IPathDrawer } from '@leafer/interface';
+import { ICanvasManager, ILeaferCanvas, IScreenSizeData, ICanvasAttr, InnerId, ICanvasContext2D, IBlendMode, IMatrixData, IPath2D, IWindingRule, ITextMetrics, IBounds, IBoundsData, ILeaferCanvasConfig, ILeaferCanvasView, IExportFileType, IExportOptions, IBlob, IExportImageType, IAutoBounds, IResizeEventListener, ICursorType, IMatrixWithOptionHalfData, ICanvasStrokeOptions, IPointData, IRadiusPointData, IMatrixWithBoundsData, IWindingRuleData, IPathDrawer } from '@leafer/interface';
 
 declare class CanvasManager implements ICanvasManager {
     list: ILeaferCanvas[];
@@ -137,8 +137,9 @@ declare class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     useEraser(eraserCanvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData): void;
     fillWorld(bounds: IBoundsData, color: string | object, blendMode?: IBlendMode): void;
     strokeWorld(bounds: IBoundsData, color: string | object, blendMode?: IBlendMode): void;
-    clearWorld(bounds: IBoundsData, ceilPixel?: boolean): void;
     clipWorld(bounds: IBoundsData, ceilPixel?: boolean): void;
+    clipUI(ruleData: IWindingRuleData): void;
+    clearWorld(bounds: IBoundsData, ceilPixel?: boolean): void;
     clear(): void;
     protected setTempBounds(bounds: IBoundsData, ceil?: boolean, intersect?: boolean): void;
     isSameSize(size: IScreenSizeData): boolean;