⭐️ Impl: OnModalFocusChangeEventPayload.modalLevel

dominicstop · Oct 2, 2024 · b888791 · b888791
1 parent e54cfd0
commit b888791
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/ios/RNIModalSheetView/RNIModalSheetViewDelegate.swift b/ios/RNIModalSheetView/RNIModalSheetViewDelegate.swift
@@ -480,11 +480,17 @@ extension RNIModalSheetViewDelegate: ModalFocusEventNotifiable {
     currentState: ModalFocusState,
     nextState: ModalFocusState
   ) {
+
+    let modalLevel =
+         viewController.modalRegistryEntry?.modalFocusIndex
+      ?? viewController.modalLevel
+      ?? -1;
 
     var payload: Dictionary<String, Any> = [
       "viewControllerInstanceID": viewController.synthesizedStringID,
       "currentState": currentState.rawValue,
       "nextState": nextState.rawValue,
+      "modalLevel":  modalLevel,
     ];
 
     payload.unwrapAndMerge(withOther: [

diff --git a/src/types/CommonModalEvents.ts b/src/types/CommonModalEvents.ts
@@ -49,6 +49,7 @@ export type OnModalDidHideEventPayload = Readonly<{
 
 export type OnModalFocusChangeEventPayload = Readonly<{
   viewControllerInstanceID: string;
+  modalLevel: number;
   prevState?: ModalFocusState;
   currentState: ModalFocusState;
   nextState: ModalFocusState;