From 9a10af7117ff2c818a137241a5b4271c2a882f10 Mon Sep 17 00:00:00 2001
From: Hazem Ali <y3m@hotmail.com>
Date: Mon, 11 Nov 2024 00:10:09 +0200
Subject: Fix Retain Cycles in SheetViewController (#6202)

* Fix retain cycle in SheetViewController.swift

* Fix retain cycles
---
 modules/bottom-sheet/ios/SheetViewController.swift | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'modules/bottom-sheet/ios/SheetViewController.swift')

diff --git a/modules/bottom-sheet/ios/SheetViewController.swift b/modules/bottom-sheet/ios/SheetViewController.swift
index a8b8f0c05..90d0fed0d 100644
--- a/modules/bottom-sheet/ios/SheetViewController.swift
+++ b/modules/bottom-sheet/ios/SheetViewController.swift
@@ -64,11 +64,14 @@ class SheetViewController: UIViewController {
 
   func updateDetents(contentHeight: CGFloat, preventExpansion: Bool) {
     if let sheet = self.sheetPresentationController {
-      sheet.animateChanges {
-        self.setDetents(contentHeight: contentHeight, preventExpansion: preventExpansion)
-        if #available(iOS 16.0, *) {
-          sheet.invalidateDetents()
-        }
+      // Capture `self` weakly to prevent retain cycles.
+      // Also, capture `sheet` weakly to avoid potential strong references held by animateChanges.
+      sheet.animateChanges { [weak self, weak sheet] in
+          guard let weakSelf = self, let weakSheet = sheet else { return }
+          weakSelf.setDetents(contentHeight: contentHeight, preventExpansion: preventExpansion)
+          if #available(iOS 16.0, *) {
+              weakSheet.invalidateDetents()
+          }
       }
     }
   }
-- 
cgit 1.4.1