💫 Update: RNIModal+Helpers

Related: * TODO:2023-03-04-15-39-46 - Impl. `RNIModalManager`.
dominicstop · Mar 24, 2023 · a0bf812 · a0bf812
1 parent 54221c4
commit a0bf812
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ios/src_library/React Native/RNIModal/RNIModal+Helpers.swift b/ios/src_library/React Native/RNIModal/RNIModal+Helpers.swift
@@ -16,17 +16,18 @@ extension RNIModalState where Self: RNIModalPresentation {
       RNIModalManager.getPresentedViewControllers(for: self.window);
 
     return listPresentedVC.contains {
-      $0 === self;
+      $0 === self.modalViewController;
     };
   };
 
   /// Programmatically check if this instance is in focus
-  var synthesizedIsModalInFocus: Bool? {
+  var synthesizedIsModalInFocus: Bool {
     let listPresentedVC =
       RNIModalManager.getPresentedViewControllers(for: self.window);
 
+    guard let topmostVC = listPresentedVC.last
+    else { return self.isModalInFocus };
 
-    guard let topmostVC = listPresentedVC.last else { return nil };
     return topmostVC === self.modalViewController;
   };
 };