⭐️ Impl. Update: wasCancelledDismissViaGesture

Summary: Replace  `RNIModalPresentationStateMachine.wasDismissViaGestureCancelled` w/ `wasCancelledDismissViaGesture`.

ios/src_library/React Native/RNIModal/RNIModalPresentationState.swift

@@ -142,20 +142,29 @@ public struct RNIModalPresentationStateMachine {
   public var onDismissWillCancel: (() -> Void)?;
   public var onDismissDidCancel: (() -> Void)?;
 
+  // MARK: - Properties
+  // ------------------
+
+  public var wasCancelledDismissViaGesture: Bool = false;
+
   // MARK: - Computed Properties
   // ---------------------------
 
   public var isPresented: Bool {
     self.state.isPresented
   };
 
-  public var wasDismissViaGestureCancelled: Bool {
-    self.statePrev.isDismissViaGestureCancelling
-  };
-
   // MARK: - Functions
   // -----------------
 
+  init(
+    onDismissWillCancel: ( () -> Void)? = nil,
+    onDismissDidCancel: ( () -> Void)? = nil
+  ) {
+    self.onDismissWillCancel = onDismissWillCancel;
+    self.onDismissDidCancel = onDismissDidCancel;
+  }
+
   public mutating func set(state nextState: RNIModalPresentationState){
     let prevState = self.state;
 
@@ -191,6 +200,7 @@ public struct RNIModalPresentationStateMachine {
     self.statePrev = prevState;
 
     if prevState.isDismissingViaGesture && nextState.isPresenting {
+      self.wasCancelledDismissViaGesture = true;
       self.state = .DISMISS_GESTURE_CANCELLING;
       self.onDismissWillCancel?();
 
@@ -201,5 +211,23 @@ public struct RNIModalPresentationStateMachine {
     } else  {
       self.state = nextState;
     };
+
+    #if DEBUG
+    print(
+        "Log - RNIModalPresentationStateMachine.set"
+      + " - statePrev: \(self.statePrev)"
+      + " - nextState: \(self.state)"
+      + " - wasCancelledDismissViaGesture: \(wasCancelledDismissViaGesture)"
+    );
+    #endif
+
+    self.resetIfNeeded();
+  };
+
+  mutating func resetIfNeeded(){
+    if self.state == .DISMISSED {
+      // reset
+      self.wasCancelledDismissViaGesture = false;
+    };
   };
 };

ios/src_library/React Native/RNIModalView/RNIModalView.swift

@@ -747,7 +747,7 @@ extension RNIModalView: RNIViewControllerLifeCycleNotifiable {
     self.modalPresentationNotificationDelegate
       .notifyOnModalDidShow(sender: self);
 
-    if !self.modalPresentationState.wasDismissViaGestureCancelled {
+    if !self.modalPresentationState.wasCancelledDismissViaGesture {
       self.onModalShow?(
         self.synthesizedBaseEventData.synthesizedJSDictionary
       );