Merge pull request #31 from p-x9/feature/fix-unbalanced-calls-transit…

…ions fix `Unbalanced calls to begin/end appearance transitions`
p-x9 · Sep 5, 2023 · 1ca480c · 1ca480c
2 parents bafb63b + 67be11f
commit 1ca480c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Sources/TouchTracker/Cocoa/TouchTrackingUIView.swift b/Sources/TouchTracker/Cocoa/TouchTrackingUIView.swift
@@ -51,7 +51,9 @@ public class TouchTrackingUIView: UIView {
     var touches: Set<UITouch> = []
     var locations: [CGPoint] = [] {
         didSet {
-            updatePoints()
+            DispatchQueue.main.async {
+                self.updatePoints()
+            }
         }
     }
 
@@ -164,7 +166,9 @@ public class TouchTrackingUIView: UIView {
             pointWindows[touches.count..<pointWindows.count].forEach {
                 $0.isHidden = true
                 $0.windowScene = nil
-                $0.uiviewRemoveFormSuperView()
+                if $0.superview != nil {
+                    $0.uiviewRemoveFromSuperView()
+                }
             }
             pointWindows = Array(pointWindows[0..<touches.count])
         }
@@ -201,10 +205,13 @@ public class TouchTrackingUIView: UIView {
                let screen = self.window?.screen,
                let keyboardScene = UIWindowScene.keyboardScene(for: screen),
                let keyboardRemoteWindow = keyboardScene.allWindows.first {
+                window.rootViewController = nil
                 keyboardRemoteWindow.addSubview(window)
             } else {
                 // WORKAROUND: Apply changes of orientation
-                window.rootViewController = .init()
+                if window.rootViewController == nil {
+                    window.rootViewController = .init()
+                }
                 window.windowScene = self.window?.windowScene
             }
 

diff --git a/Sources/TouchTracker/Extension/UIWindow+.swift b/Sources/TouchTracker/Extension/UIWindow+.swift
@@ -77,7 +77,7 @@ extension UIWindow {
 }
 
 extension UIWindow {
-    func uiviewRemoveFormSuperView() {
+    func uiviewRemoveFromSuperView() {
         super.removeFromSuperview()
     }
 }