chore(image): iOS working noRatioEnforce

Author: farfromrefug

src/image/index.ios.ts

@@ -340,17 +340,26 @@ export class Img extends ImageBase {
         // if (Trace.isEnabled()) {
         //     CLog(CLogTypes.info, 'onMeasure', this.src, widthMeasureSpec, heightMeasureSpec, width, height, this.aspectRatio, image && image.imageOrientation);
         // }
-        if (image || this.aspectRatio > 0 || !this.noRatioEnforce) {
+        if (image || this.aspectRatio > 0) {
             const nativeWidth = image ? layout.toDevicePixels(image.size.width) : 0;
             const nativeHeight = image ? layout.toDevicePixels(image.size.height) : 0;
             const imgRatio = nativeWidth / nativeHeight;
             const ratio = this.aspectRatio || imgRatio;
             // const scale = this.computeScaleFactor(width, height, finiteWidth, finiteHeight, nativeWidth, nativeHeight, this.aspectRatio || imgRatio );
 
             if (!finiteWidth && finiteHeight) {
-                widthMeasureSpec = layout.makeMeasureSpec(height * ratio, layout.EXACTLY);
-            } else if (!finiteHeight && finiteWidth) {
-                heightMeasureSpec = layout.makeMeasureSpec(width / ratio, layout.EXACTLY);
+                if (!this.noRatioEnforce || this.horizontalAlignment !== 'stretch') {
+                    widthMeasureSpec = layout.makeMeasureSpec(height * ratio, layout.EXACTLY);
+                } else {
+                    widthMeasureSpec = layout.makeMeasureSpec(0, layout.AT_MOST);
+                }
+            }
+            else if (!finiteHeight && finiteWidth) {
+                if (!this.noRatioEnforce || this.verticalAlignment !== 'stretch') {
+                    heightMeasureSpec = layout.makeMeasureSpec(width / ratio, layout.EXACTLY);
+                } else {
+                    heightMeasureSpec = layout.makeMeasureSpec(0, layout.AT_MOST);
+                }
             } else if (!finiteWidth && !finiteHeight) {
                 const viewRatio = width / height;
                 if (viewRatio < ratio) {
@@ -366,11 +375,11 @@ export class Img extends ImageBase {
                 CLog(CLogTypes.info, 'onMeasure', this.src, this.aspectRatio, finiteWidth, finiteHeight, width, height, nativeWidth, nativeHeight, widthMeasureSpec, heightMeasureSpec);
             }
         } else {
-            if (!finiteWidth && finiteHeight) {
-                widthMeasureSpec = layout.makeMeasureSpec(0, layout.AT_MOST);
-            } else if (!finiteHeight && finiteWidth) {
-                heightMeasureSpec = layout.makeMeasureSpec(0, layout.AT_MOST);
-            }
+            // if (!finiteWidth && finiteHeight) {
+            //     widthMeasureSpec = layout.makeMeasureSpec(0, layout.UNSPECIFIED);
+            // } else if (!finiteHeight && finiteWidth) {
+            //     heightMeasureSpec = layout.makeMeasureSpec(0, layout.UNSPECIFIED);
+            // }
         }
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }