Add URL observer on WebViewHelper (#184)

Author: github-thibaud-saintetienne

Gemfile.lock

@@ -88,6 +88,7 @@ GEM
     zeitwerk (2.5.1)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-19
   x86_64-darwin-20
   x86_64-linux
@@ -96,4 +97,4 @@ DEPENDENCIES
   cocoapods (>= 1.10.2)
 
 BUNDLED WITH
-   2.2.21
+   2.3.13

Podfile.lock

@@ -66,10 +66,10 @@ PODS:
 
 DEPENDENCIES:
   - SwiftFormat/CLI
-  - TeadsAdMobAdapter (from `./`)
-  - TeadsAppLovinAdapter (from `./`)
-  - TeadsSASAdapter (from `./`)
-  - TeadsSDK (from `./`)
+  - TeadsAdMobAdapter (~> 5.0)
+  - TeadsAppLovinAdapter (~> 5.0)
+  - TeadsSASAdapter (~> 5.0)
+  - TeadsSDK (~> 5.0)
 
 SPEC REPOS:
   trunk:
@@ -83,16 +83,10 @@ SPEC REPOS:
     - Smart-Core-SDK
     - Smart-Display-SDK
     - SwiftFormat
-
-EXTERNAL SOURCES:
-  TeadsAdMobAdapter:
-    :path: "./"
-  TeadsAppLovinAdapter:
-    :path: "./"
-  TeadsSASAdapter:
-    :path: "./"
-  TeadsSDK:
-    :path: "./"
+    - TeadsAdMobAdapter
+    - TeadsAppLovinAdapter
+    - TeadsSASAdapter
+    - TeadsSDK
 
 SPEC CHECKSUMS:
   AppLovinSDK: 6ed446d284d8852520a786ad5a91796f1730c3f3
@@ -110,6 +104,6 @@ SPEC CHECKSUMS:
   TeadsSASAdapter: 4b9712a8e94722578fb38feffcdff7ed53f67afb
   TeadsSDK: 63cd22c0351854eee577ac0960fe5cba4b2b1bc6
 
-PODFILE CHECKSUM: 55210a42754a193fd1cc6ffc7f79bbae342aea73
+PODFILE CHECKSUM: 9003282ee893b30b3d0c343b3a7cf4667732b291
 
 COCOAPODS: 1.11.2

TeadsSampleApp/WebViewHelper/Resources/bootstrap.js

@@ -13,7 +13,7 @@
 
   var verticalSpacer = 10;
   var showHideTimerDuration = 100; 
-  var intervalCheckPosition = 500;
+  var intervalCheckPosition = 250;
   var opened = false;
   var bridge, teadsContainer, finalSize, intervalPosition, offset, heightSup, ratio, maxHeight;
   var transitionType = "height [DURATION]ms ease-in-out";

TeadsSampleApp/WebViewHelper/TeadsWebViewHelper.swift

@@ -71,6 +71,8 @@ import WebKit
     private var slotOpener: (() -> Void)?
     private var slotOpportunity: ((WKWebView, SlotPosition) -> Void)?
 
+    private static let urlKeyPath = NSExpression(forKeyPath: \WKWebView.url).keyPath
+
     /// Init the Teads webView helper
     ///
     /// - Note: handles slot position injection from TeadsSDK
@@ -87,6 +89,9 @@ import WebKit
         self.delegate = delegate
         super.init()
 
+        // URL Change observer
+        webView.addObserver(self, forKeyPath: Self.urlKeyPath, options: .new, context: nil)
+
         // add message handler method name to communicate with the wkwebview
         JSBootstrapOutput.allCases.map(\.rawValue).forEach {
             webView.configuration.userContentController.add(WKWeakScriptHandler(delegate: self), name: $0)
@@ -104,6 +109,15 @@ import WebKit
         NotificationCenter.default.removeObserver(self)
     }
 
+    override public func observeValue(forKeyPath keyPath: String?, of _: Any?, change: [NSKeyValueChangeKey: Any]?, context _: UnsafeMutableRawPointer?) {
+        if keyPath == Self.urlKeyPath,
+           let _ = change?[NSKeyValueChangeKey.newKey] {
+            adView?.removeFromSuperview()
+            containerView?.removeFromSuperview()
+            slotPosition = nil
+        }
+    }
+
     /// Inject Teads' bootstrap in the webview
     /// make sure bootstrap.js file is present in same the bundle of this file
     @objc public func injectJS() {
@@ -176,6 +190,7 @@ import WebKit
 
             // in case openSlot is called multiple times
             self.adView?.removeFromSuperview()
+            self.containerView?.removeFromSuperview()
 
             adView.isHidden = true
             adView.translatesAutoresizingMaskIntoConstraints = false
@@ -198,13 +213,14 @@ import WebKit
         let container = PassthroughView()
         container.clipsToBounds = true
         container.translatesAutoresizingMaskIntoConstraints = false
-        if let webView = webView {
+        if let webView = webView,
+           let slotPosition = slotPosition {
             webView.scrollView.addSubview(container)
             NSLayoutConstraint.activate([
                 container.topAnchor.constraint(equalTo: webView.topAnchor, constant: topOffset),
                 container.bottomAnchor.constraint(equalTo: webView.bottomAnchor, constant: -bottomOffset),
-                container.leadingAnchor.constraint(equalTo: webView.leadingAnchor),
-                container.trailingAnchor.constraint(equalTo: webView.trailingAnchor),
+                container.leadingAnchor.constraint(equalTo: webView.leadingAnchor, constant: slotPosition.left),
+                container.widthAnchor.constraint(equalToConstant: slotPosition.right - slotPosition.left),
             ])
         }
         return container
@@ -473,7 +489,10 @@ extension TeadsWebViewHelper {
 class PassthroughView: UIView {
     override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
         for view in subviews {
-            if view.isUserInteractionEnabled, view.point(inside: convert(point, to: view), with: event) {
+            if point.y > 0,
+               point.y < bounds.size.height,
+               view.isUserInteractionEnabled,
+               view.point(inside: convert(point, to: view), with: event) {
                 return true
             }
         }