🐞 Fix: RNIPresentedViewControllerCache

dominicstop · May 5, 2023 · 67fc0d4 · 67fc0d4
1 parent ca20ef3
commit 67fc0d4
Showing 1 changed file with 7 additions and 17 deletions.
diff --git a/ios/src_library/React Native/RNIModal/RNIPresentedViewControllerCache.swift b/ios/src_library/React Native/RNIModal/RNIPresentedViewControllerCache.swift
@@ -13,25 +13,14 @@ class RNIPresentedViewControllerCache {
   class Cache {
     weak var targetWindow: UIWindow? = nil;
 
-    var cacheRequestCount = 0 {
-      willSet {
-        guard newValue <= 0 else { return };
-        self._cache = nil;
-      }
-    }
+    var cacheRequestCount = 0;
 
     // note: this retains the vc instances...
-    private var _cache: [UIViewController]?;
+    var cache: [UIViewController]?;
 
-    var cache: [UIViewController]? {
-      get {
-        guard self.cacheRequestCount > 0 else { return nil };
-        return self._cache;
-      }
-      set {
-        self._cache = newValue;
-        self.targetWindow = nil;
-      }
+    func clear(){
+      self.targetWindow = nil;
+      self.cache = nil;
     };
   };
 
@@ -62,14 +51,15 @@ class RNIPresentedViewControllerCache {
       cache.cacheRequestCount -= 1;
 
       guard cache.cacheRequestCount <= 0 else { return };
+
+      cache.clear();
       self.map.removeValue(forKey: windowID);
     };
   };
 
   func getPresentedViewControllers(
     forWindow window: UIWindow?
   ) -> [UIViewController] {
-    return RNIUtilities.getPresentedViewControllers(for: window);
     guard let windowID = window?.synthesizedStringID,
           let cacheContainer = self.map[windowID],
           let vcItemsCached = cacheContainer.cache