@leafer-ui/image 1.0.0-rc.22 → 1.0.0-rc.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/image",
-  "version": "1.0.0-rc.22",
+  "version": "1.0.0-rc.24",
   "description": "@leafer-ui/image",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.22",
-    "@leafer-ui/draw": "1.0.0-rc.22"
+    "@leafer/core": "1.0.0-rc.24",
+    "@leafer-ui/draw": "1.0.0-rc.24"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.22",
-    "@leafer-ui/interface": "1.0.0-rc.22"
+    "@leafer/interface": "1.0.0-rc.24",
+    "@leafer-ui/interface": "1.0.0-rc.24"
   }
 }

package/src/data.ts

@@ -1,5 +1,5 @@
 import { IBoundsData, ILeaferImage, IPointData } from '@leafer/interface'
-import { MatrixHelper, Bounds, AroundHelper } from '@leafer/core'
+import { MatrixHelper, Bounds, AlignHelper } from '@leafer/core'
 
 import { IImagePaint, ILeafPaint, ILeafPaintPatternData } from '@leafer-ui/interface'
 
@@ -14,12 +14,12 @@ export function createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: II
     let { width, height } = image
     if (paint.padding) box = tempBox.set(box).shrink(paint.padding)
 
-    const { opacity, mode, around, offset, scale, size, rotation, blendMode, repeat } = paint
+    const { opacity, mode, align, offset, scale, size, rotation, blendMode, repeat } = paint
     const sameBox = box.width === width && box.height === height
     if (blendMode) leafPaint.blendMode = blendMode
 
     const data: ILeafPaintPatternData = leafPaint.data = { mode }
-    const swapSize = around !== 'center' && (rotation || 0) % 180 === 90
+    const swapSize = align !== 'center' && (rotation || 0) % 180 === 90
     const swapWidth = swapSize ? height : width, swapHeight = swapSize ? width : height
 
     let x = 0, y = 0, scaleX: number, scaleY: number
@@ -38,10 +38,10 @@ export function createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: II
         scaleY = typeof scale === 'number' ? scale : scale.y
     }
 
-    if (around) {
+    if (align) {
         const imageBounds = { x, y, width: swapWidth, height: swapHeight }
         if (scaleX) imageBounds.width *= scaleX, imageBounds.height *= scaleY
-        AroundHelper.toPoint(around, box, tempPoint, true, imageBounds)
+        AlignHelper.toPoint(align, imageBounds, box, tempPoint, true)
         x += tempPoint.x, y += tempPoint.y
     }
 
@@ -56,7 +56,7 @@ export function createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: II
             if (x || y || scaleX || rotation) clipMode(data, box, x, y, scaleX, scaleY, rotation)
             break
         case 'repeat':
-            if (!sameBox || scaleX || rotation) repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation, around)
+            if (!sameBox || scaleX || rotation) repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation, align)
             if (!repeat) data.repeat = 'repeat'
             break
         case 'fit':

package/src/mode.ts

@@ -1,4 +1,4 @@
-import { IBoundsData, IPointData, IMatrixData, IAround, } from '@leafer/interface'
+import { IBoundsData, IPointData, IMatrixData, IAlign, } from '@leafer/interface'
 import { MatrixHelper } from '@leafer/core'
 
 import { ILeafPaintPatternData } from '@leafer-ui/interface'
@@ -25,10 +25,10 @@ export function clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: numbe
 }
 
 
-export function repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number, around: IAround): void {
+export function repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number, align: IAlign): void {
     const transform = get()
     if (rotation) {
-        if (around === 'center') {
+        if (align === 'center') {
             rotateOfOuter(transform, { x: width / 2, y: height / 2 }, rotation)
         } else {
             rotate(transform, rotation)