Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 95 additions & 8 deletions ios/Sources/PoltioSDK/UI/PoltioOverlayManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@
override var shouldAutorotate: Bool {
true
}

override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
super.viewWillTransition(to: size, with: coordinator)
// A rotation can change the host tab bar's height: measure it again once both windows
// have laid out at the new size.
coordinator.animate(alongsideTransition: nil) { _ in
PoltioOverlayManager.shared.refreshTabBarClearance()
}
}
Comment thread
onurhanavci marked this conversation as resolved.
Resolved
}

/// Manages attaching, presenting, and dismissing native Poltio floating triggers and interactive webviews.
Expand All @@ -51,6 +60,10 @@
private var activeTriggerView: (UIView & PoltioTriggerPresentable)?
/// How far the active trigger slides in from, and out to, beyond its docked edge.
private var triggerSlideOffsetX: CGFloat = 80
/// The active trigger's bottom constraint when it's bottom-docked, and its own inset above the
/// safe area, kept so its clearance over the host tab bar can follow the bar after it's built.
private var triggerBottomConstraint: NSLayoutConstraint?
private var triggerBottomInset: CGFloat = 0
private var currentPublicId: String?
private var currentTriggerType: String?
/// Widgets can share content and trigger type yet differ in copy, colors and position, so the
Expand Down Expand Up @@ -113,6 +126,9 @@
// widget and trigger type alone and return here, leaving the trigger invisible in
// the scene actually on screen instead of reattaching to it.
PoltioSDK.shared.reportCtaView(widget: widget)
// The screen tracked may have hidden or shown the host tab bar (a push with
// `hidesBottomBarWhenPushed`), so the kept trigger measures it again.
refreshTabBarClearance()
return
}

Expand Down Expand Up @@ -188,6 +204,8 @@
let isLeftDocked = widget.overlayOptions.isLeftDocked
let bottomObstruction = vertical == "bottom" ? hostTabBarOverlap() : 0
let triggerView: UIView & PoltioTriggerPresentable
let bottomConstraint: NSLayoutConstraint?
let bottomInset: CGFloat

if widget.overlayOptions.isPillTrigger {
let pillView = PoltioFloatingPillTriggerView(
Expand All @@ -197,9 +215,10 @@
)
pillView.translatesAutoresizingMaskIntoConstraints = false
rootVC.view.addSubview(pillView)
Self.pinTrigger(
bottomInset = 70
bottomConstraint = Self.pinTrigger(
pillView, in: rootVC.view, vertical: vertical, isLeftDocked: isLeftDocked,
horizontalInset: 16, verticalInset: 70, hugsRawEdgeHorizontally: false,
horizontalInset: 16, verticalInset: bottomInset, hugsRawEdgeHorizontally: false,
bottomObstruction: bottomObstruction
)
triggerView = pillView
Expand All @@ -210,9 +229,10 @@
)
cardView.translatesAutoresizingMaskIntoConstraints = false
rootVC.view.addSubview(cardView)
Self.pinTrigger(
bottomInset = 70
bottomConstraint = Self.pinTrigger(
cardView, in: rootVC.view, vertical: vertical, isLeftDocked: isLeftDocked,
horizontalInset: 0, verticalInset: 70, hugsRawEdgeHorizontally: true,
horizontalInset: 0, verticalInset: bottomInset, hugsRawEdgeHorizontally: true,
bottomObstruction: bottomObstruction
)
triggerView = cardView
Expand All @@ -224,15 +244,18 @@
)
boxView.translatesAutoresizingMaskIntoConstraints = false
rootVC.view.addSubview(boxView)
Self.pinTrigger(
bottomInset = 24
bottomConstraint = Self.pinTrigger(
boxView, in: rootVC.view, vertical: vertical, isLeftDocked: isLeftDocked,
horizontalInset: 0, verticalInset: 24, hugsRawEdgeHorizontally: true,
horizontalInset: 0, verticalInset: bottomInset, hugsRawEdgeHorizontally: true,
bottomObstruction: bottomObstruction
)
triggerView = boxView
}

activeTriggerView = triggerView
triggerBottomConstraint = bottomConstraint
triggerBottomInset = bottomInset
triggerSlideOffsetX = isLeftDocked ? -80 : 80
overlayWindow = window
window.isHidden = false
Expand Down Expand Up @@ -277,6 +300,7 @@

overlayWindow = nil
activeTriggerView = nil
triggerBottomConstraint = nil

guard let view = viewToClose, let window = windowToClose else { return }

Expand All @@ -299,6 +323,7 @@
currentWidgetId = nil
activeTriggerView?.removeFromSuperview()
activeTriggerView = nil
triggerBottomConstraint = nil
overlayWindow?.isHidden = true
overlayWindow = nil
}
Expand All @@ -312,6 +337,9 @@
/// Anchors are physical (`left`/`right`), not `leading`/`trailing`: `floating-position` names a
/// physical side, and the triggers draw their rounded corners for it, so a right-to-left app
/// language must not flip the trigger onto the other edge.
///
/// Returns the bottom constraint of a bottom-docked trigger, for `updateBottomClearance`.
@discardableResult
static func pinTrigger(
_ view: UIView,
in container: UIView,
Expand All @@ -321,8 +349,9 @@
verticalInset: CGFloat,
hugsRawEdgeHorizontally: Bool,
bottomObstruction: CGFloat = 0
) {
) -> NSLayoutConstraint? {
var constraints: [NSLayoutConstraint] = []
var bottomConstraint: NSLayoutConstraint?

if isLeftDocked {
let anchor = hugsRawEdgeHorizontally ? container.leftAnchor : container.safeAreaLayoutGuide.leftAnchor
Expand All @@ -338,10 +367,26 @@
case "center":
constraints.append(view.centerYAnchor.constraint(equalTo: container.centerYAnchor, constant: -verticalInset))
default: // "bottom"
constraints.append(view.bottomAnchor.constraint(equalTo: container.safeAreaLayoutGuide.bottomAnchor, constant: -(verticalInset + bottomObstruction)))
let bottom = view.bottomAnchor.constraint(equalTo: container.safeAreaLayoutGuide.bottomAnchor)
updateBottomClearance(bottom, inset: verticalInset, overlap: bottomObstruction)
constraints.append(bottom)
bottomConstraint = bottom
}

NSLayoutConstraint.activate(constraints)
return bottomConstraint
}

/// Points a bottom-docked trigger's bottom `constraint` `inset` above the safe area plus the
/// `overlap` of host tab bar. Returns whether it moved.
@discardableResult
static func updateBottomClearance(_ constraint: NSLayoutConstraint, inset: CGFloat, overlap: CGFloat) -> Bool {
let constant = -(inset + overlap)
guard constraint.constant != constant else { return false }
constraint.constant = constant
// A new constant alone doesn't always flag the layout as stale; the next pass must move it.
(constraint.firstItem as? UIView)?.superview?.setNeedsLayout()
return true
}

// MARK: - Host Tab Bar
Expand All @@ -360,6 +405,46 @@
)
}

/// Measures the host tab bar again and moves a bottom-docked trigger to keep clear of it: the
/// bar can hide (`hidesBottomBarWhenPushed`), come back, or change height on rotation while the
/// same trigger stays up. A host transition still running (a push hiding the bar) finishes first.
func refreshTabBarClearance() {
DispatchQueue.main.async { [weak self] in
guard let self, triggerBottomConstraint != nil else { return }
if let coordinator = Self.transitionInFlight(under: findHostKeyWindow()?.rootViewController) {
coordinator.animate(alongsideTransition: nil) { [weak self] _ in
self?.applyTabBarClearance()
}
} else {
applyTabBarClearance()
}
Comment thread
onurhanavci marked this conversation as resolved.
Resolved
}
}

private func applyTabBarClearance() {
guard let constraint = triggerBottomConstraint,
let trigger = activeTriggerView,
Self.updateBottomClearance(constraint, inset: triggerBottomInset, overlap: hostTabBarOverlap())
else { return }
UIView.animate(withDuration: 0.25, delay: 0, options: [.curveEaseInOut, .allowUserInteraction]) {
trigger.superview?.layoutIfNeeded()
}
}

/// A view controller transition running anywhere under `root` (a push, a presentation), if any.
private static func transitionInFlight(under root: UIViewController?) -> UIViewControllerTransitionCoordinator? {
guard let root else { return nil }
if let coordinator = root.transitionCoordinator {
return coordinator
}
for child in root.children {
if let coordinator = transitionInFlight(under: child) {
return coordinator
}
}
return transitionInFlight(under: root.presentedViewController)
}

/// The tab bar on screen under `root`, if any: searched from the topmost presented controller
/// (a modal over a tab bar controller hides its bar), through child controllers, which is where
/// SwiftUI's `TabView` keeps its `UITabBarController`.
Expand Down Expand Up @@ -413,6 +498,8 @@

// Reset to collapsed tab after user interacted with webview
trigger.resetToCollapsed(animated: false)
// The host may have rotated or changed screens while the sheet covered it.
self.refreshTabBarClearance()

window.isHidden = false
trigger.alpha = 0
Expand Down
39 changes: 39 additions & 0 deletions ios/Tests/PoltioSDKTests/PoltioSDKTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1981,6 +1981,45 @@ final class PoltioSDKTests: XCTestCase {
XCTAssertNil(PoltioOverlayManager.visibleTabBar(under: UIViewController()))
}

func testBottomTriggerFollowsTheTabBarAfterItIsBuilt() throws {
let container = UIView(frame: CGRect(x: 0, y: 0, width: 402, height: 874))
func addTrigger() -> UIView {
let trigger = UIView()
trigger.translatesAutoresizingMaskIntoConstraints = false
container.addSubview(trigger)
NSLayoutConstraint.activate([
trigger.widthAnchor.constraint(equalToConstant: 42),
trigger.heightAnchor.constraint(equalToConstant: 140),
])
return trigger
}

let trigger = addTrigger()
let bottom = try XCTUnwrap(PoltioOverlayManager.pinTrigger(
trigger, in: container, vertical: "bottom", isLeftDocked: false,
horizontalInset: 0, verticalInset: 24, hugsRawEdgeHorizontally: true,
bottomObstruction: 50
))
container.layoutIfNeeded()
XCTAssertEqual(trigger.frame.maxY, 874 - 24 - 50)

// The tab bar hides: the trigger drops back to its own inset.
XCTAssertTrue(PoltioOverlayManager.updateBottomClearance(bottom, inset: 24, overlap: 0))
container.layoutIfNeeded()
XCTAssertEqual(trigger.frame.maxY, 874 - 24)

// Measured again with nothing changed, it stays put.
XCTAssertFalse(PoltioOverlayManager.updateBottomClearance(bottom, inset: 24, overlap: 0))

// Only a bottom-docked trigger has a clearance to follow.
for vertical in ["top", "center"] {
XCTAssertNil(PoltioOverlayManager.pinTrigger(
addTrigger(), in: container, vertical: vertical, isLeftDocked: false,
horizontalInset: 0, verticalInset: 24, hugsRawEdgeHorizontally: true
), vertical)
}
}

func testPoltioWordmarkContrastsWithTheCardBackground() {
func isLight(_ color: UIColor) -> Bool {
var white: CGFloat = 0, alpha: CGFloat = 0
Expand Down
Loading