Merge branch 'main' into fix/sync-deadlock

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 - fix: reading screen size could sometimes lead to a deadlock ([#252](https://github.com/PostHog/posthog-ios/pull/252))
 
+## 3.15.3 - 2024-11-18
+
+- fix: mangled wireframe layouts ([#250](https://github.com/PostHog/posthog-ios/pull/250))
+- recording: do not rotate the session id for hybrid SDKs ([#253](https://github.com/PostHog/posthog-ios/pull/253))
+
 ## 3.15.2 - 2024-11-13
 
 - fix: allow changing person properties after identify ([#249](https://github.com/PostHog/posthog-ios/pull/249))

PostHog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "PostHog"
-  s.version          = "3.15.2"
+  s.version          = "3.15.3"
   s.summary          = "The hassle-free way to add posthog to your iOS app."
 
   s.description      = <<-DESC

PostHog/PostHogSessionManager.swift

@@ -46,7 +46,17 @@ import Foundation
         timeNow - sessionLastTimestamp > sessionChangeThreshold
     }
 
+    private func isiOSNativeSdk() -> Bool {
+        // postHogSdkName will be set to eg posthog-react-native if not
+        postHogSdkName == postHogiOSSdkName
+    }
+
     func resetSessionIfExpired(_ completion: () -> Void) {
+        // for hybrid SDKs, the session is handled by the hybrid SDK
+        guard isiOSNativeSdk() else {
+            return
+        }
+
         sessionLock.withLock {
             let timeNow = now().timeIntervalSince1970
             if sessionId != nil,
@@ -79,6 +89,11 @@ import Foundation
     }
 
     func rotateSessionIdIfRequired(_ completion: @escaping (() -> Void)) {
+        // for hybrid SDKs, the session is handled by the hybrid SDK
+        guard isiOSNativeSdk() else {
+            return
+        }
+
         sessionLock.withLock {
             let timeNow = now().timeIntervalSince1970
 
@@ -94,6 +109,11 @@ import Foundation
     }
 
     func updateSessionLastTime() {
+        // for hybrid SDKs, the session is handled by the hybrid SDK
+        guard isiOSNativeSdk() else {
+            return
+        }
+
         sessionLock.withLock {
             sessionLastTimestamp = now().timeIntervalSince1970
         }

PostHog/PostHogVersion.swift

@@ -9,7 +9,8 @@ import Foundation
 
 // if you change this, make sure to also change it in the podspec and check if the script scripts/bump-version.sh still works
 // This property is internal only
-public var postHogVersion = "3.15.2"
+public var postHogVersion = "3.15.3"
 
+public let postHogiOSSdkName = "posthog-ios"
 // This property is internal only
-public var postHogSdkName = "posthog-ios"
+public var postHogSdkName = postHogiOSSdkName

PostHog/Replay/PostHogReplayIntegration.swift

@@ -146,14 +146,19 @@
             style.paddingLeft = Int(insets.left)
         }
 
-        private func createBasicWireframe(_ window: UIView) -> RRWireframe {
+        private func createBasicWireframe(_ view: UIView) -> RRWireframe {
             let wireframe = RRWireframe()
 
-            wireframe.id = window.hash
-            wireframe.posX = Int(window.frame.origin.x)
-            wireframe.posY = Int(window.frame.origin.y)
-            wireframe.width = Int(window.frame.size.width)
-            wireframe.height = Int(window.frame.size.height)
+            // since FE will render each node of the wireframe with position: fixed
+            // we need to convert bounds to global screen coordinates
+            // otherwise each view of depth > 1 will likely have an origin of 0,0 (which is the local origin)
+            let frame = view.toAbsoluteRect(view.window)
+
+            wireframe.id = view.hash
+            wireframe.posX = Int(frame.origin.x)
+            wireframe.posY = Int(frame.origin.y)
+            wireframe.width = Int(frame.size.width)
+            wireframe.height = Int(frame.size.height)
 
             return wireframe
         }
@@ -448,6 +453,8 @@
                 wireframe.disabled = !button.isEnabled
 
                 if let text = button.titleLabel?.text {
+                    // NOTE: this will create a ghosting effect since text will also be captured in child UILabel
+                    //       We also may be masking this UIButton but child UILabel may remain unmasked
                     wireframe.value = isButtonSensitive(button) ? text.mask() : text
                 }
             }

PostHog/Replay/PostHogSessionReplayConfig.swift

@@ -8,7 +8,7 @@
     import Foundation
 
     @objc(PostHogSessionReplayConfig) public class PostHogSessionReplayConfig: NSObject {
-        /// Enable masking of all text input fields
+        /// Enable masking of all text and text input fields
         /// Experimental support
         /// Default: true
         @objc public var maskAllTextInputs: Bool = true

PostHog/Replay/UIView+Util.swift

@@ -59,7 +59,7 @@
         }
 
         // you need this because of SwiftUI otherwise the coordinates always zeroed for some reason
-        func toAbsoluteRect(_ window: UIWindow) -> CGRect {
+        func toAbsoluteRect(_ window: UIWindow?) -> CGRect {
             convert(bounds, to: window)
         }
     }

PostHog/Utils/UIApplication+.swift

@@ -25,10 +25,8 @@
                     }
                 } else {
                     // check scene.windows.isKeyWindow
-                    for window in scene.windows {
-                        if window.isKeyWindow {
-                            return window
-                        }
+                    for window in scene.windows where window.isKeyWindow {
+                        return window
                     }
                 }