@leafer-ui/paint 1.0.0-beta.4 → 1.0.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/paint",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "description": "@leafer-ui/paint",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,11 +19,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-beta.4",
-    "@leafer-ui/color": "1.0.0-beta.4"
+    "@leafer/core": "1.0.0-beta.5",
+    "@leafer-ui/color": "1.0.0-beta.5"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.4",
-    "@leafer-ui/interface": "1.0.0-beta.4"
+    "@leafer/interface": "1.0.0-beta.5",
+    "@leafer-ui/interface": "1.0.0-beta.5"
   }
 }

package/src/paint/conic.ts

@@ -7,7 +7,7 @@ import { applyStops } from './linear'
 
 
 const { set, getAngle, getDistance } = PointHelper
-const { get, rotateOf, scaleOf } = MatrixHelper
+const { get, rotateOfOuter, scaleOfOuter } = MatrixHelper
 
 const defaultFrom = { x: 0.5, y: 0.5 }
 const defaultTo = { x: 0.5, y: 1 }
@@ -31,11 +31,11 @@ export function conicGradient(paint: IGradientPaint, box: IBoundsData): ILeafPai
     const angle = getAngle(realFrom, realTo)
 
     if (Platform.conicGradientRotate90) {
-        scaleOf(transform, realFrom, width / height * (stretch || 1), 1)
-        rotateOf(transform, realFrom, angle + 90)
+        scaleOfOuter(transform, realFrom, width / height * (stretch || 1), 1)
+        rotateOfOuter(transform, realFrom, angle + 90)
     } else {
-        scaleOf(transform, realFrom, 1, width / height * (stretch || 1))
-        rotateOf(transform, realFrom, angle)
+        scaleOfOuter(transform, realFrom, 1, width / height * (stretch || 1))
+        rotateOfOuter(transform, realFrom, angle)
     }
 
     const style = Platform.conicGradientSupport ? Platform.canvas.createConicGradient(0, realFrom.x, realFrom.y) : Platform.canvas.createRadialGradient(realFrom.x, realFrom.y, 0, realFrom.x, realFrom.y, getDistance(realFrom, realTo))

package/src/paint/image.ts

@@ -4,7 +4,7 @@ import { Platform, MatrixHelper, ImageEvent } from '@leafer/core'
 import { IUI, IImagePaint, ILeafPaint, IMatrixData, IImagePaintMode, IPointData } from '@leafer-ui/interface'
 
 
-const { get, rotateOf, translate, scaleOf, scale: scaleHelper, rotate } = MatrixHelper
+const { get, rotateOfOuter, translate, scaleOfOuter, scale: scaleHelper, rotate } = MatrixHelper
 
 export function image(ui: IUI, attrName: string, paint: IImagePaint, box: IBoundsData): ILeafPaint {
     let { type, blendMode } = paint
@@ -14,7 +14,8 @@ export function image(ui: IUI, attrName: string, paint: IImagePaint, box: IBound
         style: 'rgba(255,255,255,0)'
     }
 
-    const image = ui.leafer.imageManager.get(paint)
+    const { imageManager } = ui.leafer
+    const image = imageManager.get(paint)
 
     if (image.ready) {
 
@@ -47,14 +48,17 @@ export function image(ui: IUI, attrName: string, paint: IImagePaint, box: IBound
 
     } else {
 
-        image.load(() => {
-            if (!ui.__.__getInput('width')) ui.width = image.width
-            if (!ui.__.__getInput('height')) ui.height = image.height
-            ui.forceUpdate('width')
-            ui.emitEvent(new ImageEvent(ImageEvent.LOADED, ui, image, attrName, paint))
-        }, (error) => {
-            ui.emitEvent(new ImageEvent(ImageEvent.ERROR, ui, image, attrName, paint, error))
-        })
+        imageManager.load(image,
+            () => {
+                if (!ui.__.__getInput('width')) ui.width = image.width
+                if (!ui.__.__getInput('height')) ui.height = image.height
+                ui.forceUpdate('width')
+                ui.emitEvent(new ImageEvent(ImageEvent.LOADED, ui, image, attrName, paint))
+            },
+            (error) => {
+                ui.emitEvent(new ImageEvent(ImageEvent.ERROR, ui, image, attrName, paint, error))
+            }
+        )
 
     }
 
@@ -71,7 +75,7 @@ function getFillOrFitTransform(mode: IImagePaintMode, box: IBoundsData, width: n
     const y = box.y + (box.height - height * scale) / 2
     translate(transform, x, y)
     scaleHelper(transform, scale)
-    if (rotation) rotateOf(transform, { x: box.x + box.width / 2, y: box.y + box.height / 2 }, rotation)
+    if (rotation) rotateOfOuter(transform, { x: box.x + box.width / 2, y: box.y + box.height / 2 }, rotation)
     return transform
 }
 
@@ -102,7 +106,7 @@ function getRepeatTransform(box: IBoundsData, width: number, height: number, sca
         }
     }
     translate(transform, box.x, box.y)
-    if (scale) scaleOf(transform, box, scale)
+    if (scale) scaleOfOuter(transform, box, scale)
     return transform
 }
 

package/src/paint/radial.ts

@@ -7,7 +7,7 @@ import { applyStops } from './linear'
 
 
 const { set, getAngle, getDistance } = PointHelper
-const { get, rotateOf, scaleOf } = MatrixHelper
+const { get, rotateOfOuter, scaleOfOuter } = MatrixHelper
 
 const defaultFrom = { x: 0.5, y: 0.5 }
 const defaultTo = { x: 0.5, y: 1 }
@@ -30,8 +30,8 @@ export function radialGradient(paint: IGradientPaint, box: IBoundsData): ILeafPa
 
     if (width !== height || stretch) {
         transform = get()
-        scaleOf(transform, realFrom, width / height * (stretch || 1), 1)
-        rotateOf(transform, realFrom, getAngle(realFrom, realTo) + 90)
+        scaleOfOuter(transform, realFrom, width / height * (stretch || 1), 1)
+        rotateOfOuter(transform, realFrom, getAngle(realFrom, realTo) + 90)
     }
 
     const style = Platform.canvas.createRadialGradient(realFrom.x, realFrom.y, 0, realFrom.x, realFrom.y, getDistance(realFrom, realTo))