💫 Update: RNIModalRequestable

dominicstop · May 13, 2023 · 77c3a73 · 77c3a73
1 parent 5d5167e
commit 77c3a73
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/ios/src_library/React Native/RNIModal/RNIModal.swift b/ios/src_library/React Native/RNIModal/RNIModal.swift
@@ -46,16 +46,16 @@ public protocol RNIModalState: AnyObject {
 public protocol RNIModalRequestable: AnyObject {
 
   func requestModalToShow(
-    sender: any RNIModal,
-    onRequestApprovedBlock: () -> Void,
-    onRequestDeniedBlock: (_ reason: String) -> Void
-  );
+    sender: Any,
+    animated: Bool,
+    completion: @escaping () -> Void
+  ) throws;
 
   func requestModalToHide(
-    sender: any RNIModal,
-    onRequestApprovedBlock: () -> Void,
-    onRequestDeniedBlock: (_ reason: String) -> Void
-  );
+    sender: Any,
+    animated: Bool,
+    completion: @escaping () -> Void
+  ) throws;
 };
 
 /// Contains functions that get called whenever a modal-related event occurs.

diff --git a/ios/src_library/React Native/RNIModalView/RNIModalView.swift b/ios/src_library/React Native/RNIModalView/RNIModalView.swift
@@ -1091,21 +1091,19 @@ extension RNIModalView: UISheetPresentationControllerDelegate {
 extension RNIModalView: RNIModalRequestable {
 
   public func requestModalToShow(
-    sender: any RNIModal,
-    onRequestApprovedBlock: () -> Void,
-    onRequestDeniedBlock: (String) -> Void
-  ) {
-    /// `TODO:2023-03-24-09-58-50` - Refactor `RNIModalView` to use `RNIModalManager`.
-    /// No-op - TBA
+    sender: Any,
+    animated: Bool,
+    completion: @escaping () -> Void
+  ) throws {
+    try self.presentModal(completion: completion);
   };
 
   public func requestModalToHide(
-    sender: any RNIModal,
-    onRequestApprovedBlock: () -> Void,
-    onRequestDeniedBlock: (String) -> Void
-  ) {
-    /// `TODO:2023-03-24-09-58-50` - Refactor `RNIModalView` to use `RNIModalManager`.
-    /// No-op - TBA
+    sender: Any,
+    animated: Bool,
+    completion: @escaping () -> Void
+  ) throws {
+    try self.dismissModal(completion: completion);
   };
 };
 

diff --git a/...rc_library/React Native/RNIModalViewControllerWrapper/RNIModalViewControllerWrapper.swift b/...rc_library/React Native/RNIModalViewControllerWrapper/RNIModalViewControllerWrapper.swift
@@ -76,17 +76,17 @@ public class RNIModalViewControllerWrapper:
 extension RNIModalViewControllerWrapper: RNIModalRequestable {
 
   public func requestModalToShow(
-    sender: any RNIModal,
-    onRequestApprovedBlock: () -> Void,
-    onRequestDeniedBlock: (String) -> Void
+    sender: Any,
+    animated: Bool,
+    completion: @escaping () -> Void
   ) {
     // TBA - no-op
   };
 
   public func requestModalToHide(
-    sender: any RNIModal,
-    onRequestApprovedBlock: () -> Void,
-    onRequestDeniedBlock: (String) -> Void
+    sender: Any,
+    animated: Bool,
+    completion: @escaping () -> Void
   ) {
     // TBA - no-op
   };