💫 Update: Types - Deprecated Events

Related: * `TODO:2023-03-04-13-15-11` - Refactor: Update Modal Events
dominicstop · Apr 16, 2023 · d0a3fe3 · d0a3fe3
1 parent a825083
commit d0a3fe3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/components/ModalView/ModalViewEmitterDeprecated.ts b/src/components/ModalView/ModalViewEmitterDeprecated.ts
@@ -6,9 +6,9 @@ import type {
   OnModalFocusEventObject,
   OnModalShowEventObject,
   OnModalDismissEventObject,
-  OnModalDidDismissEventObject,
-  OnModalWillDismissEventObject,
   OnModalAttemptDismissEventObject,
+  DeprecatedOnModalWillDismissEventObject,
+  DeprecatedOnModalDidDismissEventObject,
 } from 'src/native_components/RNIModalView';
 
 import type { KeyMapType } from '../../types/UtilityTypes';
@@ -20,8 +20,8 @@ export enum ModalViewEmitterEventsDeprecated {
   onModalFocus = 'onModalFocus',
   onModalShow = 'onModalShow',
   onModalDismiss = 'onModalDismiss',
-  onModalDidDismiss = 'onModalDidDismiss',
-  onModalWillDismiss = 'onModalWillDismiss',
+  _onModalDidDismiss = '_onModalDidDismiss',
+  _onModalWillDismiss = '_onModalWillDismiss',
   onModalAttemptDismiss = 'onModalAttemptDismiss',
 
   onLayoutModalContentContainer = 'onLayoutModalContentContainer',
@@ -39,8 +39,8 @@ export type ModalViewEmitterEventMapDeprecated =
     onModalFocus: OnModalFocusEventObject['nativeEvent'];
     onModalShow: OnModalShowEventObject['nativeEvent'];
     onModalDismiss: OnModalDismissEventObject['nativeEvent'];
-    onModalDidDismiss: OnModalDidDismissEventObject['nativeEvent'];
-    onModalWillDismiss: OnModalWillDismissEventObject['nativeEvent'];
+    _onModalDidDismiss: DeprecatedOnModalWillDismissEventObject['nativeEvent'];
+    _onModalWillDismiss: DeprecatedOnModalDidDismissEventObject['nativeEvent'];
     onModalAttemptDismiss: OnModalAttemptDismissEventObject['nativeEvent'];
 
     onLayoutModalContentContainer: LayoutChangeEvent['nativeEvent'];

diff --git a/src/native_components/RNIModalView/RNIModalViewDeprecatedEvents.ts b/src/native_components/RNIModalView/RNIModalViewDeprecatedEvents.ts
@@ -42,11 +42,13 @@ export type OnModalAttemptDismissEventObject = NativeSyntheticEvent<
   RNIModalDeprecatedBaseEvent & {}
 >;
 
-export type OnModalWillDismissEventObject = NativeSyntheticEvent<
+/** @deprecated */
+export type DeprecatedOnModalWillDismissEventObject = NativeSyntheticEvent<
   RNIModalDeprecatedBaseEvent & {}
 >;
 
-export type OnModalDidDismissEventObject = NativeSyntheticEvent<
+/** @deprecated */
+export type DeprecatedOnModalDidDismissEventObject = NativeSyntheticEvent<
   RNIModalDeprecatedBaseEvent & {}
 >;
 
@@ -84,10 +86,10 @@ export type OnModalAttemptDismissEvent = (
 
 /** @deprecated */
 export type DeprecatedOnModalWillDismissEvent = (
-  event: OnModalWillDismissEventObject
+  event: DeprecatedOnModalWillDismissEventObject
 ) => void;
 
 /** @deprecated */
 export type DeprecatedOnModalDidDismissEvent = (
-  event: OnModalDidDismissEventObject
+  event: DeprecatedOnModalDidDismissEventObject
 ) => void;