fix webview presenting

plaidev · Oct 23, 2023 · 69f2796 · 69f2796
1 parent 6667a44
commit 69f2796
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/ios/Nativebrik/Classes/component.swift b/ios/Nativebrik/Classes/component.swift
@@ -19,7 +19,18 @@ class ModalComponentViewController: UIViewController {
             return
         }
         let safariVC = SFSafariViewController(url: urlObj)
-        self.presentToTop(safariVC)
+        if let modal = self.currentModal {
+            if !isPresenting(presented: self.presentedViewController, vc: modal) {
+                self.currentModal?.dismiss(animated: false)
+                self.currentModal = nil
+            }
+        }
+
+        if let modal = self.currentModal {
+            modal.present(safariVC, animated: true)
+        } else {
+            self.presentToTop(safariVC)
+        }
     }
 
     func presentNavigation(

diff --git a/ios/Nativebrik/Classes/root.swift b/ios/Nativebrik/Classes/root.swift
@@ -72,6 +72,11 @@ class ModalRootViewController: UIViewController {
             self.modalViewController?.dismissModal()
             return
         }
+
+        if page?.data?.kind == PageKind.WEBVIEW_MODAL {
+            self.modalViewController?.presentWebview(url: page?.data?.webviewUrl ?? "https://nativebrik.com/intl/en/docs/reference/ios")
+            return
+        }
 
         let pageView = PageView(
             page: page,