Fix notification crash

gh123man · Jun 27, 2023 · 0b808ac · 0b808ac
1 parent 30262b5
commit 0b808ac
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/Examples/ContentView.swift b/Examples/ContentView.swift
@@ -13,6 +13,20 @@ struct ScrollViewLoaderTestApp: App {
 
 struct ContentView: View {
 
+
+    var body: some View {
+        NavigationView {
+            NavigationLink(destination: DetailsSearch()) {
+                Text("Go to details")
+                    .padding()
+            }
+        }
+
+
+    }
+}
+
+struct DetailsSearch: View {
     @State var data: [Int] = Array(0..<1)
 
     var body: some View {

diff --git a/Sources/ScrollViewLoader/ScrollViewLoader.swift b/Sources/ScrollViewLoader/ScrollViewLoader.swift
@@ -26,7 +26,7 @@ struct DelegateHolder<Content: View>: View {
         content
             .introspectScrollView { scrollView in
                 scrollView.delegate = offsetNotifier
-                scrollView.addObserver(offsetNotifier, forKeyPath: "contentSize", context: nil)
+                offsetNotifier.scrollView = scrollView
                 offsetNotifier.scrollViewDidScroll(scrollView)
             }
     }
@@ -38,14 +38,19 @@ class ScrollOffsetNotifier: NSObject, UIScrollViewDelegate, ObservableObject {
     private var canNotify = true
     private var trigger: OffsetTrigger
     private var oldContentHeight: Double = 0
+    weak var scrollView: UIScrollView? {
+        didSet {
+            scrollView?.addObserver(self, forKeyPath: "contentSize", context: nil)
+        }
+    }
 
     init(offsetTrigger: OffsetTrigger, onNotify: @escaping () async -> ()) {
         self.trigger = offsetTrigger
         self.onNotify = onNotify
     }
 
     deinit {
-        removeObserver(self, forKeyPath: "contentSize")
+        scrollView?.removeObserver(self, forKeyPath: "contentSize")
     }
 
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {