@leafer-ui/paint 1.0.0-rc.7 → 1.0.0-rc.8

package/package.json

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

package/src/paint/image/check.ts

@@ -19,7 +19,7 @@ export function checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, al
         const { data } = paint
 
         if (allowPaint) {
-            if (data.mode !== 'repeat') {
+            if (!data.repeat) {
                 let { width, height } = data
                 width *= abs(scaleX) * canvas.pixelRatio
                 height *= abs(scaleY) * canvas.pixelRatio

package/src/paint/image/data.ts

@@ -11,7 +11,7 @@ const { get, translate } = MatrixHelper
 export function createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void {
     let { width, height } = image
 
-    const { opacity, mode, offset, scale, rotation, blendMode } = paint
+    const { opacity, mode, offset, scale, rotation, blendMode, repeat } = paint
     const sameBox = box.width === width && box.height === height
     if (blendMode) leafPaint.blendMode = blendMode
 
@@ -30,6 +30,7 @@ export function createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: II
             break
         case 'repeat':
             if (!sameBox || scale || rotation) repeatMode(data, box, width, height, scale as number, rotation)
+            if (!repeat) data.repeat = 'repeat'
             break
         case 'fit':
         case 'cover':
@@ -40,4 +41,5 @@ export function createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: II
     data.width = width
     data.height = height
     if (opacity) data.opacity = opacity
+    if (repeat) data.repeat = typeof repeat === 'string' ? (repeat === 'x' ? 'repeat-x' : 'repeat-y') : 'repeat'
 }

package/src/paint/image/image.ts

@@ -64,11 +64,11 @@ function hasNaturalSize(ui: IUI, attrName: string, image: ISizeData): boolean {
         d.__naturalWidth = image.width
         d.__naturalHeight = image.height
         if (!d.__getInput('width') || !d.__getInput('height')) {
+            ui.forceUpdate('width')
             if (ui.__proxyData) {
                 ui.setProxyAttr('width', ui.__.width)
                 ui.setProxyAttr('height', ui.__.height)
             }
-            ui.forceUpdate('width')
             return false
         }
     }

package/src/paint/image/pattern.ts

@@ -17,7 +17,7 @@ export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): b
         scaleY = Math.abs(scaleY)
 
         const { image, data } = paint
-        let imageScale: number, imageMatrix: IMatrixData, { width, height, scaleX: sx, scaleY: sy, opacity, transform, mode } = data
+        let imageScale: number, imageMatrix: IMatrixData, { width, height, scaleX: sx, scaleY: sy, opacity, transform, repeat } = data
 
         if (sx) {
             imageMatrix = get()
@@ -34,7 +34,7 @@ export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): b
 
         const size = width * height
 
-        if (paint.data.mode !== 'repeat') {
+        if (!repeat) {
             if (size > Platform.image.maxCacheSize) return false // same as check()
         }
 
@@ -67,7 +67,7 @@ export function createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): b
             scale(imageMatrix, 1 / scaleX, 1 / scaleY)
         }
 
-        const pattern = Platform.canvas.createPattern(image.getCanvas(width < 1 ? 1 : width, height < 1 ? 1 : height, opacity) as any, mode === 'repeat' ? 'repeat' : (Platform.origin.noRepeat || 'no-repeat'))
+        const pattern = Platform.canvas.createPattern(image.getCanvas(width < 1 ? 1 : width, height < 1 ? 1 : height, opacity) as any, repeat || (Platform.origin.noRepeat || 'no-repeat'))
 
         try {
             if (paint.transform) paint.transform = null