💫 Update: RNIModalData

Related: * `TODO:2023-05-01-19-12-26` - Implement: `ModalView` events. * `TODO:2023-05-01-19-19-20` - Update `RNIModalView` event objects.
dominicstop · May 5, 2023 · 9eaefdf · 9eaefdf
1 parent 59bc1da
commit 9eaefdf
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 55 deletions.
diff --git a/ios/src_library/React Native/RNIModal/RNIModal+Helpers.swift b/ios/src_library/React Native/RNIModal/RNIModal+Helpers.swift
@@ -97,24 +97,8 @@ extension RNIModalState where Self: RNIModal {
       modalIndexPrev: self.modalIndexPrev,
       currentModalIndex: self.currentModalIndex,
 
-      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,
-      wasCancelledPresent: self.modalPresentationState.wasCancelledPresent,
-      wasCancelledDismiss: self.modalPresentationState.wasCancelledDismiss,
-
-      wasCancelledDismissViaGesture:
-        self.modalPresentationState.wasCancelledDismissViaGesture,
-
-      isModalPresented: self.modalPresentationState.isPresented,
-      isModalInFocus: self.synthesizedIsModalInFocus,
+      modalFocusState: self.modalFocusState,
+      modalPresentationState: self.modalPresentationState,
 
       computedIsModalInFocus: self.computedIsModalInFocus,
       computedIsModalPresented: self.computedIsModalPresented,

diff --git a/ios/src_library/React Native/RNIModal/RNIModalData.swift b/ios/src_library/React Native/RNIModal/RNIModalData.swift
@@ -14,22 +14,8 @@ public struct RNIModalData: RNIDictionarySynthesizable {
   public let modalIndexPrev: Int;
   public let currentModalIndex: Int;
 
-  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 wasCancelledPresent: Bool;
-  public let wasCancelledDismiss: Bool;
-  public let wasCancelledDismissViaGesture: Bool;
-
-  public let isModalPresented: Bool;
-  public let isModalInFocus: Bool;
+  public let modalFocusState: RNIModalFocusStateMachine;
+  public let modalPresentationState: RNIModalPresentationStateMachine;
 
   public let computedIsModalInFocus: Bool;
   public let computedIsModalPresented: Bool;

diff --git a/ios/src_library/React Native/RNIModal/RNIModalFocusState.swift b/ios/src_library/React Native/RNIModal/RNIModalFocusState.swift
@@ -53,7 +53,7 @@ public enum RNIModalFocusState: String {
   };
 };
 
-public struct RNIModalFocusStateMachine {
+public struct RNIModalFocusStateMachine: RNIDictionaryRepresentable {
 
   // MARK: - Properties
   // ------------------
@@ -68,6 +68,19 @@ public struct RNIModalFocusStateMachine {
     self.statePrev != self.state;
   };
 
+  // MARK: - RNIDictionaryRepresentable
+  // ----------------------------------
+
+  public var asDictionary: [String : Any] {[
+    "state": self.state,
+    "statePrev": self.statePrev,
+    "isFocused": self.state.isFocused,
+    "isBlurred": self.state.isBlurred,
+    "isTransitioning": self.state.isTransitioning,
+    "wasBlurCancelled": self.wasBlurCancelled,
+    "wasFocusCancelled": self.wasFocusCancelled,
+  ]};
+
   // MARK: - Functions
   // ------------------
 

diff --git a/ios/src_library/React Native/RNIModal/RNIModalPresentationState.swift b/ios/src_library/React Native/RNIModal/RNIModalPresentationState.swift
@@ -139,7 +139,7 @@ public enum RNIModalPresentationState: String, CaseIterable {
   };
 };
 
-public struct RNIModalPresentationStateMachine {
+public struct RNIModalPresentationStateMachine: RNIDictionaryRepresentable {
 
   // MARK: - Properties
   // ------------------
@@ -181,6 +181,20 @@ public struct RNIModalPresentationStateMachine {
     self.statePrev != self.state;
   };
 
+  // MARK: RNIDictionaryRepresentable
+  // --------------------------------
+
+  public var asDictionary: [String : Any] {[
+    "state": self.state,
+    "statePrev": self.statePrev,
+    "isInitialPresent": self.isInitialPresent,
+    "isPresented": self.isPresented,
+    "isDismissed": self.state.isDismissed,
+    "wasCancelledDismiss": self.wasCancelledDismiss,
+    "wasCancelledPresent": self.wasCancelledPresent,
+    "wasCancelledDismissViaGesture": self.wasCancelledDismissViaGesture,
+  ]};
+
   // MARK: - Functions
   // -----------------
 

diff --git a/src/components/ModalView/ModalView.tsx b/src/components/ModalView/ModalView.tsx
@@ -500,7 +500,7 @@ export class ModalView extends
     );
 
     this.setState({
-      focusState: event.nativeEvent.modalFocusState,
+      focusState: event.nativeEvent.modalFocusState.state,
     });
   };
 
@@ -528,7 +528,7 @@ export class ModalView extends
 
     this.setState({
       isModalInFocus: true,
-      focusState: event.nativeEvent.modalFocusState,
+      focusState: event.nativeEvent.modalFocusState.state,
     });
   };
 
@@ -544,7 +544,7 @@ export class ModalView extends
     );
 
     this.setState({
-      focusState: event.nativeEvent.modalFocusState,
+      focusState: event.nativeEvent.modalFocusState.state,
     });
   };
 
@@ -572,7 +572,7 @@ export class ModalView extends
 
     this.setState({
       isModalInFocus: false,
-      focusState: event.nativeEvent.modalFocusState,
+      focusState: event.nativeEvent.modalFocusState.state,
     });
   };
 
@@ -887,10 +887,10 @@ class ModalViewHelpers {
       modalUUID: event.modalNativeID,
       modalID: event.modalID,
       reactTag: event.reactTag,
-      isInFocus: event.isModalInFocus,
+      isInFocus: event.modalFocusState.isFocused,
       modalLevel: event.modalIndex,
       modalLevelPrev: event.modalIndexPrev,
-      isPresented: event.isModalPresented,
+      isPresented: event.modalPresentationState.isPresented,
     };
   }
 

diff --git a/src/types/RNIModalTypes.ts b/src/types/RNIModalTypes.ts
@@ -34,28 +34,46 @@ export type ModalPresentationState =
   | 'DISMISS_GESTURE_CANCELLING'
   | 'DISMISSED';
 
+
+/** Based on `RNIModalFocusStateMachine.asDictionary` */
+export type RNIModalFocusStateMachine = {
+  state: ModalFocusState;
+  statePrev: ModalFocusState;
+  isFocused: boolean;
+  isBlurred: boolean;
+  isTransitioning: boolean;
+  wasBlurCancelled: boolean;
+  wasFocusCancelled: boolean;
+};
+
+/** Based on `RNIModalPresentationStateMachine.asDictionary` */
+export type RNIModalPresentationStateMachine = {
+  state: ModalPresentationState;
+  statePrev: ModalPresentationState;
+  isInitialPresent: boolean;
+  isPresented: boolean;
+  isDismissed: boolean;
+  wasCancelledDismiss: boolean;
+  wasCancelledPresent: boolean;
+  wasCancelledDismissViaGesture: boolean;
+};
+
 /** 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;
+
+  modalFocusState: RNIModalFocusStateMachine;
+  modalPresentationState: RNIModalPresentationStateMachine;
+
   computedIsModalInFocus: boolean;
   computedIsModalPresented: boolean;
   computedModalIndex: number;
   computedViewControllerIndex: number;
   computedCurrentModalIndex: number;
+
   synthesizedWindowID?: string;
-};
+};