@leafer/display 1.0.0-rc.19 → 1.0.0-rc.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display",
-  "version": "1.0.0-rc.19",
+  "version": "1.0.0-rc.20",
   "description": "@leafer/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,16 +22,16 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.0-rc.19",
-    "@leafer/data": "1.0.0-rc.19",
-    "@leafer/layout": "1.0.0-rc.19",
-    "@leafer/display-module": "1.0.0-rc.19",
-    "@leafer/event": "1.0.0-rc.19",
-    "@leafer/decorator": "1.0.0-rc.19",
-    "@leafer/helper": "1.0.0-rc.19",
-    "@leafer/platform": "1.0.0-rc.19"
+    "@leafer/math": "1.0.0-rc.20",
+    "@leafer/data": "1.0.0-rc.20",
+    "@leafer/layout": "1.0.0-rc.20",
+    "@leafer/display-module": "1.0.0-rc.20",
+    "@leafer/event": "1.0.0-rc.20",
+    "@leafer/decorator": "1.0.0-rc.20",
+    "@leafer/helper": "1.0.0-rc.20",
+    "@leafer/platform": "1.0.0-rc.20"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.19"
+    "@leafer/interface": "1.0.0-rc.20"
   }
 }

package/src/Branch.ts

@@ -14,7 +14,7 @@ const { localBoxBounds, localStrokeBounds, localRenderBounds, maskLocalBoxBounds
 
 
 @useModule(BranchRender)
-export class Branch extends Leaf {
+export class Branch extends Leaf { // tip: rewrited Group
 
     // overwrite
 

package/src/Leaf.ts

@@ -81,7 +81,6 @@ export class Leaf implements ILeaf {
     public get __ignoreHitWorld(): boolean { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren }
 
     public get pathInputed(): boolean { return !!this.__.__pathInputed }
-    public pathClosed: boolean
 
     // event
     public __captureMap?: IEventListenerMap
@@ -184,7 +183,7 @@ export class Leaf implements ILeaf {
 
     // LeafDataProxy rewrite
 
-    public __setAttr(_attrName: string, _newValue: IValue): void { }
+    public __setAttr(_attrName: string, _newValue: IValue): boolean { return true }
 
     public __getAttr(_attrName: string): IValue { return undefined }
 
@@ -462,23 +461,19 @@ export class Leaf implements ILeaf {
 
     public __scaleResize(_scaleX: number, _scaleY: number): void { }
 
-    // LeafHit rewrite
+    // @leafer-ui/hit LeafHit rewrite
 
     public __hitWorld(_point: IRadiusPointData): boolean { return true }
 
     public __hit(_local: IRadiusPointData): boolean { return true }
 
-    public __hitFill(inner: IRadiusPointData, windingRule?: string): boolean {
-        return this.__hitCanvas?.hitFill(inner, windingRule)
-    }
+    public __hitFill(_inner: IRadiusPointData): boolean { return true }
 
-    public __hitStroke(inner: IRadiusPointData, strokeWidth: number): boolean {
-        return this.__hitCanvas?.hitStroke(inner, strokeWidth)
-    }
+    public __hitStroke(_inner: IRadiusPointData, _strokeWidth: number): boolean { return true }
 
-    public __drawHitPath(canvas: ILeaferCanvas): void {
-        if (canvas) this.__drawRenderPath(canvas)
-    }
+    public __hitPixel(_inner: IRadiusPointData): boolean { return true }
+
+    public __drawHitPath(_canvas: ILeaferCanvas): void { }
 
     public __updateHitCanvas(): void { }
 
@@ -496,7 +491,7 @@ export class Leaf implements ILeaf {
 
     public __clip(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }
 
-    public __renderShape(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }
+    public __renderShape(_canvas: ILeaferCanvas, _options: IRenderOptions, _ignoreFill?: boolean, _ignoreStroke?: boolean): void { }
 
 
     public __updateWorldOpacity(): void { }

package/types/index.d.ts

@@ -42,7 +42,6 @@ declare class Leaf implements ILeaf {
     get __onlyHitMask(): boolean;
     get __ignoreHitWorld(): boolean;
     get pathInputed(): boolean;
-    pathClosed: boolean;
     __captureMap?: IEventListenerMap;
     __bubbleMap?: IEventListenerMap;
     __parentWait?: IFunction[];
@@ -62,7 +61,7 @@ declare class Leaf implements ILeaf {
     get(_name?: string): ILeafInputData | IValue;
     toJSON(): IObject;
     toString(): string;
-    __setAttr(_attrName: string, _newValue: IValue): void;
+    __setAttr(_attrName: string, _newValue: IValue): boolean;
     __getAttr(_attrName: string): IValue;
     setProxyAttr(_attrName: string, _newValue: IValue): void;
     getProxyAttr(_attrName: string): IValue;
@@ -123,15 +122,16 @@ declare class Leaf implements ILeaf {
     __scaleResize(_scaleX: number, _scaleY: number): void;
     __hitWorld(_point: IRadiusPointData): boolean;
     __hit(_local: IRadiusPointData): boolean;
-    __hitFill(inner: IRadiusPointData, windingRule?: string): boolean;
-    __hitStroke(inner: IRadiusPointData, strokeWidth: number): boolean;
-    __drawHitPath(canvas: ILeaferCanvas): void;
+    __hitFill(_inner: IRadiusPointData): boolean;
+    __hitStroke(_inner: IRadiusPointData, _strokeWidth: number): boolean;
+    __hitPixel(_inner: IRadiusPointData): boolean;
+    __drawHitPath(_canvas: ILeaferCanvas): void;
     __updateHitCanvas(): void;
     __render(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __drawFast(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __draw(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __clip(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
-    __renderShape(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
+    __renderShape(_canvas: ILeaferCanvas, _options: IRenderOptions, _ignoreFill?: boolean, _ignoreStroke?: boolean): void;
     __updateWorldOpacity(): void;
     __updateChange(): void;
     __drawPath(_canvas: ILeaferCanvas): void;