💫 Update: RNIModalManager.notifyOnModalDidHide

dominicstop · Apr 14, 2023 · 3413764 · 3413764
1 parent c5fe2d8
commit 3413764
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/ios/src_library/React Native/RNIModal/RNIModalManager.swift b/ios/src_library/React Native/RNIModal/RNIModalManager.swift
@@ -613,7 +613,6 @@ extension RNIModalManager: RNIModalPresentationNotifiable {
     };
     #endif
 
-    let presentedModalList = Self.getPresentedModals(forWindow: senderWindow);
     windowData.apply(forBlurredModal: sender);
 
     #if DEBUG
@@ -630,24 +629,20 @@ extension RNIModalManager: RNIModalPresentationNotifiable {
 
     sender.onModalDidBlurNotification(sender: sender);
 
-    presentedModalList.forEach {
-      guard $0 !== sender,
-            $0.modalFocusState.state.isFocusing
-      else { return };
-
+    guard let modalToFocus = windowData.nextModalToFocus else { return };
+
     #if DEBUG
     print(
         "Log - RNIModalManager.notifyOnModalDidHide"
       + " - arg sender.modalNativeID: \(sender.modalNativeID)"
       + " - notify FOCUSED"
-      + " - for modal.modalNativeID:\($0.modalNativeID)"
-      + " - for modal.modalIndex:\($0.modalIndex ?? -1)"
+      + " - for modal.modalNativeID:\(modalToFocus.modalNativeID)"
+      + " - for modal.modalIndex:\(modalToFocus.modalIndex ?? -1)"
     );
     #endif
 
-      $0.modalFocusState.set(state: .FOCUSED);
-      $0.onModalDidFocusNotification(sender: sender);
-    };
+    modalToFocus.modalFocusState.set(state: .FOCUSED);
+    modalToFocus.onModalDidFocusNotification(sender: sender);
 
     // reset
     windowData.nextModalToFocus = nil;