🛠 Refactor: Replace RNIModal.isModalPresented

Related: * `TODO:2023-03-31-18-33-34` - Unify/streamline/consolidate logic for invoking modal focus/blur. * `TODO:2023-04-07-06-10-22` Refactor - Replace `RNIModalState.isModalPresented` w/ `RNIModalPresentationState`. Summary: * Replace `RNIModalState.isModalPresented` w/ `modalState`. * Remove `RNIModalView.isModalPresented`. * Impl. `RNIModalView.modalState`. * Impl. `RNIModalPresentationState.isPresented`. * Replace all usage of `RNIModalState.isModalPresented` w/ `RNIModalPresentationStateMachine.isPresented`.
dominicstop · Apr 6, 2023 · 9e4fac4 · 9e4fac4
1 parent 1a8f5e0
commit 9e4fac4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/ios/src_library/React Native/RNIModal/RNIModal+Helpers.swift b/ios/src_library/React Native/RNIModal/RNIModal+Helpers.swift
@@ -85,7 +85,7 @@ extension RNIModalState where Self: RNIModal {
       modalNativeID: self.modalNativeID,
       modalIndex: self.modalIndex,
       currentModalIndex: self.synthesizedCurrentModalIndex,
-      isModalPresented: self.isModalPresented,
+      isModalPresented: self.modalState.isPresented,
       isModalInFocus: self.isModalInFocus,
       synthesizedIsModalInFocus: self.synthesizedIsModalInFocus,
       synthesizedIsModalPresented: self.synthesizedIsModalPresented,

diff --git a/ios/src_library/React Native/RNIModal/RNIModal.swift b/ios/src_library/React Native/RNIModal/RNIModal.swift
@@ -33,7 +33,7 @@ public protocol RNIModalState: AnyObject {
 
   var modalIndex: Int! { set get };
 
-  var isModalPresented: Bool { set get };
+  var modalState: RNIModalPresentationStateMachine { set get };
 
   var isModalInFocus: Bool { set get };
 

diff --git a/ios/src_library/React Native/RNIModal/RNIModalManager.swift b/ios/src_library/React Native/RNIModal/RNIModalManager.swift
@@ -185,7 +185,7 @@ public class RNIModalManager {
 
   public var presentedModals: [any RNIModal] {
     self.modalInstances.compactMap {
-      $0.isModalPresented ? $0 : nil;
+      $0.modalState.isPresented ? $0 : nil;
     };
   };
 
@@ -196,7 +196,6 @@ public class RNIModalManager {
     modal.modalIndex = -1;
     modal.modalIndexPrev = -1;
 
-    modal.isModalPresented = false;
     modal.isModalInFocus = false;
 
     modal.modalFocusDelegate = self;
@@ -263,11 +262,12 @@ extension RNIModalManager: RNIModalFocusNotifiable {
 
     self.setCurrentModalIndex(for: senderWindow, index: nextModalIndex);
 
+    sender.modalState.set(state: .PRESENTING_UNKNOWN);
     sender.onModalWillFocusNotification(sender: sender);
 
     self.modalInstances.forEach {
       guard $0 !== sender,
-            $0.isModalPresented,
+            $0.modalState.isPresented,
             $0.isModalInFocus,
             $0.modalIndex == prevModalIndex
       else { return };
@@ -291,7 +291,7 @@ extension RNIModalManager: RNIModalFocusNotifiable {
     let currentModalIndex = self.getCurrentModalIndex(for: senderWindow);
 
     sender.isModalInFocus = true;
-    sender.isModalPresented = true;
+    sender.modalState.set(state: .PRESENTED);
 
     #if DEBUG
     print(
@@ -307,7 +307,7 @@ extension RNIModalManager: RNIModalFocusNotifiable {
 
     self.modalInstances.forEach {
       guard $0 !== sender,
-            $0.isModalPresented,
+            $0.modalState.isPresented,
             $0.isModalInFocus,
             $0.modalIndex == currentModalIndex - 1
       else { return };
@@ -337,11 +337,12 @@ extension RNIModalManager: RNIModalFocusNotifiable {
     sender.modalIndexPrev = sender.modalIndex;
     sender.modalIndex = -1;
 
+    sender.modalState.set(state: .DISMISSING_UNKNOWN);
     sender.onModalWillBlurNotification(sender: sender);
 
     self.modalInstances.forEach {
       guard $0 !== sender,
-            $0.isModalPresented,
+            $0.modalState.isPresented,
             !$0.isModalInFocus,
             $0.modalIndex >= nextModalIndex
       else { return };
@@ -365,7 +366,7 @@ extension RNIModalManager: RNIModalFocusNotifiable {
     let currentModalIndex = self.getCurrentModalIndex(for: senderWindow);
 
     sender.isModalInFocus = false;
-    sender.isModalPresented = false;
+    sender.modalState.set(state: .DISMISSED);
 
     #if DEBUG
     print(
@@ -381,7 +382,7 @@ extension RNIModalManager: RNIModalFocusNotifiable {
 
     self.modalInstances.forEach {
       guard $0 !== sender,
-            $0.isModalPresented,
+            $0.modalState.isPresented,
             !$0.isModalInFocus,
             $0.modalIndex >= currentModalIndex
       else { return };

diff --git a/ios/src_library/React Native/RNIModal/RNIModalPresentationState.swift b/ios/src_library/React Native/RNIModal/RNIModalPresentationState.swift
@@ -104,6 +104,10 @@ public struct RNIModalPresentationStateMachine {
   // MARK: - Computed Properties
   // ---------------------------
 
+  var isPresented: Bool {
+    self.state == .PRESENTED;
+  };
+
   var wasDismissViaGestureCancelled: Bool {
     self.statePrev.isDismissViaGestureCancelling
   };

diff --git a/ios/src_library/React Native/RNIModalView/RNIModalView.swift b/ios/src_library/React Native/RNIModalView/RNIModalView.swift
@@ -30,16 +30,6 @@ class RNIModalView: UIView, RNIIdentifiable, RNIModalFocusNotifying,
   var modalContentWrapper: RNIWrapperView?;
   var modalVC: RNIModalViewController?;
 
-  lazy var modalState = RNIModalPresentationStateMachine(
-    onDismissWillCancel: { [weak self] in
-      // no-op - TBA
-    },
-    onDismissDidCancel: { [weak self] in
-      // no-op - TBA
-    }
-  );
-
-
   // MARK: - Properties - RNIModalFocusNotifying
   // -------------------------------------------
 
@@ -54,7 +44,15 @@ class RNIModalView: UIView, RNIIdentifiable, RNIModalFocusNotifying,
   // MARK: - Properties - RNIModalState
   // ----------------------------------
 
-  var isModalPresented: Bool = false;
+  lazy var modalState = RNIModalPresentationStateMachine(
+    onDismissWillCancel: { [weak self] in
+      // no-op - TBA
+    },
+    onDismissDidCancel: { [weak self] in
+      // no-op - TBA
+    }
+  );
+
   var isModalInFocus: Bool = false;
 
   // MARK: - Properties - RNIModalPresentation