@leafer/web 1.0.0-rc.8 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/web",
-  "version": "1.0.0-rc.8",
+  "version": "1.0.0",
   "description": "@leafer/web",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,13 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.8",
-    "@leafer/partner": "1.0.0-rc.8",
-    "@leafer/canvas-web": "1.0.0-rc.8",
-    "@leafer/interaction-web": "1.0.0-rc.8",
-    "@leafer/image-web": "1.0.0-rc.8"
+    "@leafer/core": "1.0.0",
+    "@leafer/canvas-web": "1.0.0",
+    "@leafer/image-web": "1.0.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.8"
+    "@leafer/interface": "1.0.0"
   }
 }

package/src/index.ts

@@ -1,16 +1,13 @@
 export * from '@leafer/core'
-export * from '@leafer/partner'
 
 export * from '@leafer/canvas-web'
 export * from '@leafer/image-web'
-export * from '@leafer/interaction-web'
 
 import { ICreator, IFunction, IExportImageType, IExportFileType, IObject, ICanvasType } from '@leafer/interface'
 import { Platform, Creator, FileHelper } from '@leafer/core'
 
 import { LeaferCanvas } from '@leafer/canvas-web'
 import { LeaferImage } from '@leafer/image-web'
-import { Interaction } from '@leafer/interaction-web'
 
 
 const { mineType, fileType } = FileHelper
@@ -18,10 +15,7 @@ const { mineType, fileType } = FileHelper
 
 Object.assign(Creator, {
     canvas: (options?, manager?) => new LeaferCanvas(options, manager),
-    image: (options) => new LeaferImage(options),
-    hitCanvas: (options?, manager?) => new LeaferCanvas(options, manager),
-
-    interaction: (target, canvas, selector, options?) => new Interaction(target, canvas, selector, options),
+    image: (options) => new LeaferImage(options)
 } as ICreator)
 
 
@@ -36,9 +30,13 @@ export function useCanvas(_canvasType: ICanvasType, _power?: IObject): void {
         canvasToDataURL: (canvas: HTMLCanvasElement, type?: IExportImageType, quality?: number) => canvas.toDataURL(mineType(type), quality),
         canvasToBolb: (canvas: HTMLCanvasElement, type?: IExportFileType, quality?: number) => new Promise((resolve) => canvas.toBlob(resolve, mineType(type), quality)),
         canvasSaveAs: (canvas: HTMLCanvasElement, filename: string, quality?: any) => {
+            const url = canvas.toDataURL(mineType(fileType(filename)), quality)
+            return Platform.origin.download(url, filename)
+        },
+        download(url: string, filename: string): Promise<void> {
             return new Promise((resolve) => {
                 let el = document.createElement('a')
-                el.href = canvas.toDataURL(mineType(fileType(filename)), quality)
+                el.href = url
                 el.download = filename
                 document.body.appendChild(el)
                 el.click()
@@ -49,12 +47,14 @@ export function useCanvas(_canvasType: ICanvasType, _power?: IObject): void {
         loadImage(src: any): Promise<HTMLImageElement> {
             return new Promise((resolve, reject) => {
                 const img = new Image()
-                img.setAttribute('crossOrigin', 'anonymous')
-                img.crossOrigin = 'anonymous'
+                const { crossOrigin } = Platform.image
+                if (crossOrigin) {
+                    img.setAttribute('crossOrigin', crossOrigin)
+                    img.crossOrigin = crossOrigin
+                }
                 img.onload = () => { resolve(img) }
                 img.onerror = (e) => { reject(e) }
-                if (!src.startsWith('data:') && Platform.image.suffix) src += (src.includes("?") ? "&" : "?") + Platform.image.suffix
-                img.src = src
+                img.src = Platform.image.getRealURL(src)
             })
         }
     }

package/types/index.d.ts

@@ -1,8 +1,6 @@
 export * from '@leafer/core';
-export * from '@leafer/partner';
 export * from '@leafer/canvas-web';
 export * from '@leafer/image-web';
-export * from '@leafer/interaction-web';
 import { ICanvasType, IObject } from '@leafer/interface';
 
 declare function useCanvas(_canvasType: ICanvasType, _power?: IObject): void;