@leafer/data 1.0.0-rc.12 → 1.0.0-rc.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/data",
-  "version": "1.0.0-rc.12",
+  "version": "1.0.0-rc.17",
   "description": "@leafer/data",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,6 +22,6 @@
     "leaferjs"
   ],
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.12"
+    "@leafer/interface": "1.0.0-rc.17"
   }
 }

package/src/LeafData.ts

@@ -1,4 +1,4 @@
-import { ILeafData, ILeaf, IObject, IValue } from '@leafer/interface'
+import { ILeafData, ILeaf, IObject, IValue, IPathCommandData } from '@leafer/interface'
 
 
 export class LeafData implements ILeafData {
@@ -12,6 +12,9 @@ export class LeafData implements ILeafData {
     public __naturalWidth?: number
     public __naturalHeight?: number
 
+    public __pathInputed?: number
+    public __pathForRender?: IPathCommandData
+
     public get __blendMode(): string {
         if ((this as ILeafData).eraser) return 'destination-out'
         const { blendMode } = (this as ILeafData)
@@ -52,6 +55,9 @@ export class LeafData implements ILeafData {
             const value = this.__input[name]
             if (value !== undefined) return value
         }
+
+        if (name === 'path' && !this.__pathInputed) return // no path mode
+
         return (this as IObject)['_' + name]
     }
 
@@ -66,6 +72,9 @@ export class LeafData implements ILeafData {
             if (key[0] !== '_') {
                 value = (this as IObject)['_' + key]
                 if (value !== undefined) {
+
+                    if (key === 'path' && !this.__pathInputed) continue // no path mode
+
                     inputValue = __input ? __input[key] : undefined
                     data[key] = (inputValue === undefined) ? value : inputValue
                 }
@@ -97,6 +106,10 @@ export class LeafData implements ILeafData {
         }
     }
 
+    public __removeNaturalSize(): void {
+        this.__naturalWidth = this.__naturalHeight = undefined
+    }
+
     public destroy(): void {
         this.__input = this.__middle = null
     }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IObject, ILeafData, ILeaf } from '@leafer/interface';
+import { IObject, ILeafData, ILeaf, IPathCommandData } from '@leafer/interface';
 
 declare const DataHelper: {
     default<T>(t: T, defaultData: IObject): T;
@@ -14,6 +14,8 @@ declare class LeafData implements ILeafData {
     __single: boolean;
     __naturalWidth?: number;
     __naturalHeight?: number;
+    __pathInputed?: number;
+    __pathForRender?: IPathCommandData;
     get __blendMode(): string;
     constructor(leaf: ILeaf);
     __get(name: string): any;
@@ -25,6 +27,7 @@ declare class LeafData implements ILeafData {
     __setMiddle(name: string, value: any): void;
     __getMiddle(name: string): any;
     __checkSingle(): void;
+    __removeNaturalSize(): void;
     destroy(): void;
 }