💫 Update: RNIModalData

dominicstop · Apr 10, 2023 · 8e637b2 · 8e637b2
1 parent 043d64e
commit 8e637b2
Show file tree

Hide file tree

Showing 2 changed files with 18 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
@@ -91,12 +91,23 @@ extension RNIModalState where Self: RNIModal {
       modalNativeID: self.modalNativeID,
       modalIndex: self.modalIndex,
       currentModalIndex: self.currentModalIndex,
+
+      modalFocusState: self.modalFocusState.state,
+      modalFocusStatePref: self.modalFocusState.statePrev,
+
+      modalPresentationState: self.modalPresentationState.state,
+      modalPresentationStatePrev: self.modalPresentationState.statePrev,
+
       isModalPresented: self.modalPresentationState.isPresented,
       isModalInFocus: self.synthesizedIsModalInFocus,
+
       computedIsModalInFocus: self.computedIsModalInFocus,
       computedIsModalPresented: self.computedIsModalPresented,
+
       computedModalIndex: self.computedModalIndex,
       computedViewControllerIndex: self.computedViewControllerIndex,
+      computedCurrentModalIndex: self.computedCurrentModalIndex,
+
       synthesizedWindowID: self.window?.synthesizedStringID
     );
   };

diff --git a/ios/src_library/React Native/RNIModal/RNIModalData.swift b/ios/src_library/React Native/RNIModal/RNIModalData.swift
@@ -13,6 +13,12 @@ public struct RNIModalData: RNIDictionarySynthesizable {
   public let modalIndex: Int;
   public let currentModalIndex: Int;
 
+  public let modalFocusState: RNIModalFocusState;
+  public let modalFocusStatePref: RNIModalFocusState;
+
+  public let modalPresentationState: RNIModalPresentationState;
+  public let modalPresentationStatePrev: RNIModalPresentationState;
+
   public let isModalPresented: Bool;
   public let isModalInFocus: Bool;
 
@@ -21,6 +27,7 @@ public struct RNIModalData: RNIDictionarySynthesizable {
 
   public let computedModalIndex: Int;
   public let computedViewControllerIndex: Int;
+  public let computedCurrentModalIndex: Int;
 
   public let synthesizedWindowID: String?;
 };