Fix SwiftUI hang

SwiftKickMobile · Jan 22, 2024 · eb9591a · eb9591a
1 parent e70fb07
commit eb9591a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/SwiftMessages/KeyboardTrackingView.swift b/SwiftMessages/KeyboardTrackingView.swift
@@ -128,20 +128,15 @@ open class KeyboardTrackingView: UIView {
     }
 
     private func animateKeyboardChange(change: Change, height: CGFloat, userInfo: [AnyHashable: Any]) {
-        self.heightConstraint.constant = height
-        if let durationNumber = userInfo[UIResponder.keyboardAnimationDurationUserInfoKey] as? NSNumber,
-            let curveNumber = userInfo[UIResponder.keyboardAnimationCurveUserInfoKey] as? NSNumber {
-            CATransaction.begin()
-            CATransaction.setCompletionBlock {
-                self.didChange(change: change, userInfo: userInfo)
-                self.delegate?.keyboardTrackingViewDidChange(change: change, userInfo: userInfo)
-            }
-            let curve = UIView.AnimationCurve(rawValue: curveNumber.intValue) ?? .easeInOut
-            let animation = UIViewPropertyAnimator(duration: durationNumber.doubleValue, curve: curve) {
+        if let durationNumber = userInfo[UIResponder.keyboardAnimationDurationUserInfoKey] as? NSNumber {
+            UIView.animate(withDuration: durationNumber.doubleValue, delay: 0, options: .curveEaseInOut, animations: {
+                self.heightConstraint.constant = height
                 self.updateConstraintsIfNeeded()
                 self.superview?.layoutIfNeeded()
+            }) { completed in
+                self.didChange(change: change, userInfo: userInfo)
+                self.delegate?.keyboardTrackingViewDidChange(change: change, userInfo: userInfo)
             }
-            animation.startAnimation()
         }
     }
 

diff --git a/SwiftMessages/MessageHostingView.swift b/SwiftMessages/MessageHostingView.swift
@@ -10,7 +10,7 @@ import UIKit
 
 /// A rudimentary hosting view for SwiftUI messages.
 @available(iOS 14.0, *)
-public class MessageHostingView<Content>: BaseView, Identifiable where Content: View {
+public class MessageHostingView<Content>: UIView, Identifiable where Content: View {
 
     // MARK: - API
 
@@ -50,4 +50,17 @@ public class MessageHostingView<Content>: BaseView, Identifiable where Content:
         if view == self || view?.superview == self { return nil }
         return view
     }
+
+    // MARK: - Configuration
+
+    private func installContentView(_ contentView: UIView) {
+        contentView.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(contentView)
+        NSLayoutConstraint.activate([
+            contentView.topAnchor.constraint(equalTo: topAnchor),
+            contentView.bottomAnchor.constraint(equalTo: bottomAnchor),
+            contentView.leftAnchor.constraint(equalTo: leftAnchor),
+            contentView.rightAnchor.constraint(equalTo: rightAnchor),
+        ])
+    }
 }