Port in-app fix

roninopf · roninopf · commit b129eaafe969 · 2020-01-30T15:29:24.000-08:00
diff --git a/host-app/ViewController.swift b/host-app/ViewController.swift
@@ -109,7 +109,7 @@ class ViewController: UIViewController {
         config.inAppDelegate = mockInAppDelegate
         let payload = ["inAppMessages" : [[
             "content" : [
-                "html" : "<a href='https://www.google.com/q=something'>Click Here</a>",
+                "html" : "<body style='height:100px'><a href='https://www.google.com/q=something'>Click Here</a></body><meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no'>",
                 "inAppDisplaySettings" : ["backgroundAlpha" : 0.5, "left" : ["percentage" : 60], "right" : ["percentage" : 60], "bottom" : ["displayOption" : "AutoExpand"], "top" : ["displayOption" : "AutoExpand"]]
             ],
             "messageId" : "messageId",
@@ -167,7 +167,10 @@ class ViewController: UIViewController {
         
         let messageId = "zeeMessageId"
         let html = """
+            <body style='height:100px'>
             <a href="http://website/resource#something">Click Me</a>
+            <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no'>
+            </body>
         """
         let content = IterableHtmlInAppContent(edgeInsets: UIEdgeInsets(top: -1, left: 10, bottom: -1, right: 10), backgroundAlpha: 0.5, html: html)
         let message = IterableInAppMessage(messageId: messageId, campaignId: "zeeCampaignId", content: content)
diff --git a/swift-sdk/Internal/IterableInAppHTMLViewController.swift b/swift-sdk/Internal/IterableInAppHTMLViewController.swift
@@ -122,21 +122,13 @@ class IterableInAppHTMLViewController: UIViewController {
     }
     
     override var prefersStatusBarHidden: Bool {return true}
-
-    override func viewWillLayoutSubviews() {
-        super.viewWillLayoutSubviews()
-        if let webView = webView {
-            resizeWebView(webView)
-        }
-    }
     
     private let htmlString: String
     private var insetPadding: UIEdgeInsets = UIEdgeInsets.zero
     private var customBlockCallback: ITBURLCallback?
     private var trackParams: IterableNotificationMetadata?
     private var webView: WKWebView?
     private var location: InAppNotificationType = .full
-    private var loaded = false
     
     required init?(coder aDecoder: NSCoder) {
         self.htmlString = aDecoder.decodeObject(forKey: "htmlString") as? String ?? ""
@@ -150,47 +142,62 @@ class IterableInAppHTMLViewController: UIViewController {
      - parameter: aWebView the webview
      */
     private func resizeWebView(_ aWebView: WKWebView) {
-        guard loaded else {
-            return
-        }
         guard location != .full else {
             webView?.frame = CGRect(x: 0, y: 0, width: view.frame.width, height: view.frame.height)
             return
         }
         
-        // Resizes the frame to match the HTML content with a max of the screen size.
-        var frame = aWebView.frame
-        frame.size.height = 1
-        aWebView.frame = frame;
-        let fittingSize = aWebView.scrollView.contentSize
-        frame.size = fittingSize
+        aWebView.evaluateJavaScript("document.body.offsetHeight", completionHandler: { height, _ in
+            guard let floatHeight = height as? CGFloat, floatHeight >= 20 else {
+                ITBError("unable to get height")
+                return
+            }
+            self.resize(webView: aWebView, withHeight: floatHeight)
+        })
+    }
+    
+    private func resize(webView: WKWebView, withHeight height: CGFloat) {
+        ITBInfo("height: \(height)")
+        // set the height
+        webView.frame.size.height = height
+        
+        // now set the width
         let notificationWidth = 100 - (insetPadding.left + insetPadding.right)
         let screenWidth = view.bounds.width
-        frame.size.width = screenWidth*notificationWidth/100
-        frame.size.height = min(frame.height, self.view.bounds.height)
-        aWebView.frame = frame;
+        webView.frame.size.width = screenWidth * notificationWidth / 100
         
-        let resizeCenterX = screenWidth*(insetPadding.left + notificationWidth/2)/100
-
         // Position webview
-        var center = self.view.center
-        let webViewHeight = aWebView.frame.height/2
+        var center = view.center
+        
+        // set center x
+        center.x = screenWidth * (insetPadding.left + notificationWidth / 2) / 100
+        
+        // set center y
+        let halfWebViewHeight = webView.frame.height / 2
         switch location {
         case .top:
-            center.y = webViewHeight
+            if #available(iOS 11, *) {
+                center.y = halfWebViewHeight + view.safeAreaInsets.top
+            } else {
+                center.y = halfWebViewHeight
+            }
         case .bottom:
-            center.y = view.frame.height - webViewHeight
-        case .center,.full: break
+            if #available(iOS 11, *) {
+                center.y = view.frame.height - halfWebViewHeight - view.safeAreaInsets.bottom
+            } else {
+                center.y = view.frame.height - halfWebViewHeight
+            }
+        default: break
         }
-        center.x = resizeCenterX;
-        aWebView.center = center;
+        
+        webView.center = center
     }
 }
 
 extension IterableInAppHTMLViewController : WKNavigationDelegate {
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         ITBInfo()
-        loaded = true
+        
         if let myWebview = self.webView {
             resizeWebView(myWebview)
         }
