Fix initial zoom ratio

Itvisors · Nov 21, 2022 · 7a57782 · 7a57782
1 parent ac79cc2
commit 7a57782
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nativeimageviewer",
   "widgetName": "NativeImageViewer",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Mendix native image viewer",
   "copyright": "ITvisors 2020",
   "author": "Marcel Groeneweg",

diff --git a/src/NativeImageViewer.jsx b/src/NativeImageViewer.jsx
@@ -40,14 +40,10 @@ export function NativeImageViewer({
     const pixelDensity = PixelRatio.get();
     imageWidth = PixelRatio.roundToNearestPixel(imageWidth / pixelDensity);
     imageHeight = PixelRatio.roundToNearestPixel(imageHeight / pixelDensity);
-    let zoomRatio = 0;
-    if (window.height > window.width) {
-        // Portrait
-        zoomRatio = window.width / imageWidth;
-    } else {
-        // Landscape
-        zoomRatio = window.height / imageHeight;
-    }
+    // Calculate the smallest zoom ratio and use that for the image zoom ratio.
+    const zoomRatioWidth = window.width / imageWidth;
+    const zoomRatioHeight = window.height / imageHeight;
+    const zoomRatio = zoomRatioHeight < zoomRatioWidth ? zoomRatioHeight : zoomRatioWidth;
 
     const renderImage = () => {
         switch (imageSource) {

diff --git a/src/package.xml b/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="NativeImageViewer" version="3.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="NativeImageViewer" version="3.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="NativeImageViewer.xml"/>
         </widgetFiles>

diff --git a/test/TestNativeImageViewer.mpr b/test/TestNativeImageViewer.mpr
diff --git a/test/widgets/itvisors.NativeImageViewer.mpk b/test/widgets/itvisors.NativeImageViewer.mpk