From 4ef4b0d4b9fb9532080b68b1d18d9e0d2cf064a2 Mon Sep 17 00:00:00 2001
From: CricketLaChica <cricket.lachica@medable.com>
Date: Tue, 7 Nov 2023 17:35:40 -1000
Subject: [PATCH] fix: cropToBounds in iOS is always returning a square aspect
 ratio

---
 ios/Plugin/VideoEditor.swift | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/ios/Plugin/VideoEditor.swift b/ios/Plugin/VideoEditor.swift
index 153115b..e06a08e 100644
--- a/ios/Plugin/VideoEditor.swift
+++ b/ios/Plugin/VideoEditor.swift
@@ -95,28 +95,35 @@ import UIKit
         }
     }
     
-    func cropToBounds(image: UIImage, width: Double, height: Double) -> UIImage {
+    func cropToBounds(image: UIImage, width: Double? = nil, height: Double? = nil) -> UIImage {
         let cgimage = image.cgImage!
         let contextImage: UIImage = UIImage(cgImage: cgimage)
         let contextSize: CGSize = contextImage.size
+
+        // Calculate the aspect ratio based on the provided width and height if available,
+        // or use contextSize.width and contextSize.height as defaults.
+        let aspectRatio: CGFloat
+        if let w = width, let h = height {
+            aspectRatio = CGFloat(w / h)
+        } else {
+            aspectRatio = contextSize.width / contextSize.height
+        }
+        
         var posX: CGFloat = 0.0
         var posY: CGFloat = 0.0
-        var cgwidth: CGFloat = CGFloat(width)
-        var cgheight: CGFloat = CGFloat(height)
-        
-        // See what size is longer and create the center off of that
-        if contextSize.width > contextSize.height {
-            posX = ((contextSize.width - contextSize.height) / 2)
-            posY = 0
-            cgwidth = contextSize.height
-            cgheight = contextSize.height
+        var cgwidth: CGFloat = contextSize.width
+        var cgheight: CGFloat = contextSize.height
+        
+        // Calculate the new dimensions while preserving the aspect ratio
+        if contextSize.width / aspectRatio > contextSize.height {
+            cgwidth = contextSize.height * aspectRatio
         } else {
-            posX = 0
-            posY = ((contextSize.height - contextSize.width) / 2)
-            cgwidth = contextSize.width
-            cgheight = contextSize.width
+            cgheight = contextSize.width / aspectRatio
         }
         
+        posX = (contextSize.width - cgwidth) / 2
+        posY = (contextSize.height - cgheight) / 2
+        
         let rect: CGRect = CGRect(x: posX, y: posY, width: cgwidth, height: cgheight)
         
         // Create bitmap image from context using the rect