💫 Update: RNIModalData

Related: * `TODO:2023-03-04-13-15-11` - Refactor: Update Modal Events * `TODO:2023-04-14-23-40-15` - Impl. Update `RNIModalData` - Add more modal-related data.
dominicstop · Apr 14, 2023 · 792243b · 792243b
1 parent 250f1d5
commit 792243b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/ios/src_library/React Native/RNIModal/RNIModal+Helpers.swift b/ios/src_library/React Native/RNIModal/RNIModal+Helpers.swift
@@ -95,9 +95,16 @@ extension RNIModalState where Self: RNIModal {
       modalFocusState: self.modalFocusState.state,
       modalFocusStatePref: self.modalFocusState.statePrev,
 
+      wasBlurCancelled: self.modalFocusState.wasBlurCancelled,
+      wasFocusCancelled: self.modalFocusState.wasFocusCancelled,
+
       modalPresentationState: self.modalPresentationState.state,
       modalPresentationStatePrev: self.modalPresentationState.statePrev,
 
+      isInitialPresent: self.modalPresentationState.isInitialPresent,
+      wasCancelledDismissViaGesture:
+        self.modalPresentationState.wasCancelledDismissViaGesture,
+
       isModalPresented: self.modalPresentationState.isPresented,
       isModalInFocus: self.synthesizedIsModalInFocus,
 

diff --git a/ios/src_library/React Native/RNIModal/RNIModalData.swift b/ios/src_library/React Native/RNIModal/RNIModalData.swift
@@ -16,9 +16,15 @@ public struct RNIModalData: RNIDictionarySynthesizable {
   public let modalFocusState: RNIModalFocusState;
   public let modalFocusStatePref: RNIModalFocusState;
 
+  public let wasBlurCancelled: Bool;
+  public let wasFocusCancelled: Bool;
+
   public let modalPresentationState: RNIModalPresentationState;
   public let modalPresentationStatePrev: RNIModalPresentationState;
 
+  public let isInitialPresent: Bool;
+  public let wasCancelledDismissViaGesture: Bool;
+
   public let isModalPresented: Bool;
   public let isModalInFocus: Bool;