diff --git a/src/native_components/RNIModalView/RNIModalViewEventData.ts b/src/native_components/RNIModalView/RNIModalViewEventData.ts index b68f3dc1..75e60b6c 100644 --- a/src/native_components/RNIModalView/RNIModalViewEventData.ts +++ b/src/native_components/RNIModalView/RNIModalViewEventData.ts @@ -1,39 +1,9 @@ import type { CGPoint, CGSize } from 'src/types/NativeTypes'; - -import type { - ModalFocusState, - ModalPresentationState, -} from 'src/types/RNIModalTypes'; +import type { RNIModalData } from 'src/types/RNIModalTypes'; // Event Object Types // ------------------ -/** Based on `RNIModalData` */ -export type RNIModalData = { - modalNativeID: string; - modalIndex: number; - modalIndexPrev: number; - currentModalIndex: number; - modalFocusState: ModalFocusState; - modalFocusStatePref: ModalFocusState; - wasBlurCancelled: boolean; - wasFocusCancelled: boolean; - modalPresentationState: ModalPresentationState; - modalPresentationStatePrev: ModalPresentationState; - isInitialPresent: boolean; - wasCancelledPresent: boolean; - wasCancelledDismiss: boolean; - wasCancelledDismissViaGesture: boolean; - isModalPresented: boolean; - isModalInFocus: boolean; - computedIsModalInFocus: boolean; - computedIsModalPresented: boolean; - computedModalIndex: number; - computedViewControllerIndex: number; - computedCurrentModalIndex: number; - synthesizedWindowID?: string; -}; - /** Based on `RNIModalBaseEventData` */ export type RNIModalBaseEventData = RNIModalData & { reactTag: number; diff --git a/src/types/RNIModalTypes.ts b/src/types/RNIModalTypes.ts index 9a7b1040..b79f0471 100644 --- a/src/types/RNIModalTypes.ts +++ b/src/types/RNIModalTypes.ts @@ -33,3 +33,29 @@ export type ModalPresentationState = | 'DISMISSING_UNKNOWN' | 'DISMISS_GESTURE_CANCELLING' | 'DISMISSED'; + +/** Based on `RNIModalData` */ +export type RNIModalData = { + modalNativeID: string; + modalIndex: number; + modalIndexPrev: number; + currentModalIndex: number; + modalFocusState: ModalFocusState; + modalFocusStatePref: ModalFocusState; + wasBlurCancelled: boolean; + wasFocusCancelled: boolean; + modalPresentationState: ModalPresentationState; + modalPresentationStatePrev: ModalPresentationState; + isInitialPresent: boolean; + wasCancelledPresent: boolean; + wasCancelledDismiss: boolean; + wasCancelledDismissViaGesture: boolean; + isModalPresented: boolean; + isModalInFocus: boolean; + computedIsModalInFocus: boolean; + computedIsModalPresented: boolean; + computedModalIndex: number; + computedViewControllerIndex: number; + computedCurrentModalIndex: number; + synthesizedWindowID?: string; +}; \ No newline at end of file