🛠 Refactor: RNIDictionarySynthesizable

Summary: Re-write `RNIDictionarySynthesizable.synthesizedDictionary`, and update usage.
dominicstop · Apr 10, 2023 · 043d64e · 043d64e
1 parent db9f121
commit 043d64e
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 23 deletions.
diff --git a/ios/src_library/Helpers+Utilities/RNIDictionarySynthesizable.swift b/ios/src_library/Helpers+Utilities/RNIDictionarySynthesizable.swift
@@ -21,8 +21,7 @@ public protocol RNIDictionarySynthesizable {
   static var synthesizedDictionaryInlinedProperties: [PartialKeyPath<Self>] { get };
 
   /// A map of the property names and their respective values
-  var synthesizedDictionary: Dictionary<String, Any> { get };
-
+  func synthesizedDictionary(isJSDict: Bool) -> Dictionary<String, Any>;
 };
 
 extension RNIDictionarySynthesizable {
@@ -35,7 +34,10 @@ extension RNIDictionarySynthesizable {
     [];
   };
 
-  public var synthesizedDictionary: Dictionary<String, Any> {
+  public func synthesizedDictionary(
+    isJSDict: Bool
+  ) -> Dictionary<String, Any> {
+
     let mirror = Mirror(reflecting: self);
     let properties = mirror.children;
 
@@ -58,11 +60,22 @@ extension RNIDictionarySynthesizable {
             !Self.synthesizedDictionaryIgnore.contains(propertyKey)
       else { return nil };
 
-      if let synthesizableDict = value as? (any RNIDictionarySynthesizable) {
-        return(propertyKey, synthesizableDict.synthesizedDictionary);
-      };
+      let parseValue: Any = {
+        if let synthesizableDict = value as? (any RNIDictionarySynthesizable) {
+          return synthesizableDict.synthesizedDictionary;
+
+        } else if isJSDict,
+                  let rawValue = value as? any RawRepresentable {
+
+          return rawValue.rawValue;
+        };
+
+        return value;
+      }();
+
 
-      return (propertyKey, value)
+
+      return (propertyKey, parseValue)
     };
 
     var baseDict = Dictionary(
@@ -73,10 +86,14 @@ extension RNIDictionarySynthesizable {
       guard let value = self[keyPath: $0] as? (any RNIDictionarySynthesizable)
       else { return };
 
-      baseDict =
-        baseDict.merging(value.synthesizedDictionary){ old, _ in old };
+      let inlindedDict = value.synthesizedDictionary(isJSDict: isJSDict);
+      baseDict = baseDict.merging(inlindedDict){ old, _ in old };
     };
 
     return baseDict;
   };
+
+  public var synthesizedJSDictionary: Dictionary<String, Any> {
+    self.synthesizedDictionary(isJSDict: true);
+  };
 };
diff --git a/ios/src_library/React Native/RNIModal/RNIModal+Helpers.swift b/ios/src_library/React Native/RNIModal/RNIModal+Helpers.swift
@@ -100,8 +100,4 @@ extension RNIModalState where Self: RNIModal {
       synthesizedWindowID: self.window?.synthesizedStringID
     );
   };
-
-  public var synthesizedModalDataDict: Dictionary<String, Any> {
-    self.synthesizedModalData.synthesizedDictionary;
-  };
 };
diff --git a/ios/src_library/React Native/RNIModalView/RNIModalView.swift b/ios/src_library/React Native/RNIModalView/RNIModalView.swift
@@ -603,7 +603,7 @@ public class RNIModalView: UIView, RNIIdentifiable,
     ];
 
     let baseEventDataDict =
-      self.synthesizedBaseEventData.synthesizedDictionary;
+      self.synthesizedBaseEventData.synthesizedJSDictionary;
 
     baseEventDataDict.forEach { (key, value) in
       params[key] = value
@@ -694,7 +694,7 @@ extension RNIModalView: UIAdaptivePresentationControllerDelegate {
   ///
   public func presentationControllerDidAttemptToDismiss(_ presentationController: UIPresentationController) {
     self.onModalAttemptDismiss?(
-      self.synthesizedBaseEventData.synthesizedDictionary
+      self.synthesizedBaseEventData.synthesizedJSDictionary
     );
 
     #if DEBUG
@@ -751,7 +751,7 @@ extension RNIModalView: RNIViewControllerLifeCycleNotifiable {
 
     if !self.modalPresentationState.wasDismissViaGestureCancelled {
       self.onModalShow?(
-        self.synthesizedBaseEventData.synthesizedDictionary
+        self.synthesizedBaseEventData.synthesizedJSDictionary
       );
     };
   };
@@ -765,7 +765,7 @@ extension RNIModalView: RNIViewControllerLifeCycleNotifiable {
 
     if self.modalPresentationState.state.isDismissingViaGesture {
       self.onModalWillDismiss?(
-        self.synthesizedBaseEventData.synthesizedDictionary
+        self.synthesizedBaseEventData.synthesizedJSDictionary
       );
     };
   };
@@ -779,12 +779,12 @@ extension RNIModalView: RNIViewControllerLifeCycleNotifiable {
 
     if self.modalPresentationState.statePrev.isDismissingViaGesture {
       self.onModalDidDismiss?(
-        self.synthesizedBaseEventData.synthesizedDictionary
+        self.synthesizedBaseEventData.synthesizedJSDictionary
       );
 
     } else {
       self.onModalDismiss?(
-        self.synthesizedBaseEventData.synthesizedDictionary
+        self.synthesizedBaseEventData.synthesizedJSDictionary
       );
     };
 
@@ -892,7 +892,7 @@ extension RNIModalView: RNIModalFocusNotifiable {
     #endif
 
     self.onModalFocus?(
-      eventData.synthesizedDictionary
+      eventData.synthesizedJSDictionary
     );
   };
 
@@ -918,7 +918,7 @@ extension RNIModalView: RNIModalFocusNotifiable {
     #endif
 
     self.onModalBlur?(
-      eventData.synthesizedDictionary
+      eventData.synthesizedJSDictionary
     );
   };
 };
diff --git a/ios/src_library/React Native/RNIModalViewModule/RNIModalViewModule.swift b/ios/src_library/React Native/RNIModalViewModule/RNIModalViewModule.swift
@@ -156,7 +156,7 @@ class RNIModalViewModule: RCTEventEmitter {
       modalView.setModalVisibility(visibility: visibility) { isSuccess, error in
         if isSuccess {
           resolve(
-            modalView.synthesizedBaseEventData.synthesizedDictionary
+            modalView.synthesizedBaseEventData.synthesizedJSDictionary
           );
 
         } else {
@@ -183,7 +183,7 @@ class RNIModalViewModule: RCTEventEmitter {
       };
 
       resolve(
-        modalView.synthesizedBaseEventData.synthesizedDictionary
+        modalView.synthesizedBaseEventData.synthesizedJSDictionary
       );
     };
   };