Merge pull request #13 from splendo/feature/fix-observable-freezing

force main thread for Observable, Subject and LivecycleViewModel
splendo · Feb 2, 2022 · 2aa465c · 2aa465c
2 parents 581b8a4 + 051d83a
commit 2aa465c
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 7 deletions.
diff --git a/stencils/LifecycleViewModel.stencil b/stencils/LifecycleViewModel.stencil
@@ -7,12 +7,16 @@ class LifecycleViewModel<VM: BaseViewModel> {
     let containerView: ContainerView?
 
     init(_ viewModel: VM, containerView: ContainerView? = nil) {
+        assert(Thread.isMainThread, "Constructor must be called on the main thread, but called on \(Thread.current)")
         self.viewModel = viewModel
         self.containerView = containerView
     }
 
     deinit {
-        viewModel.clear()
+        let vm = viewModel
+        DispatchQueue.main.async {
+            vm.clear()
+        }
     }
 
     func lifecycleView<V: View>(view: (VM) -> V) -> some View {

diff --git a/stencils/ListObservable.stencil b/stencils/ListObservable.stencil
@@ -17,6 +17,7 @@ class ListObservable<Output: Equatable>: ObservableObject {
         animated: Bool = false,
         mapper: @escaping (NSArray) -> [Output] = ListMapper.to
     ) {
+        assert(Thread.isMainThread, "Constructor must be called on the main thread, but called on \(Thread.current)")
         input = observable.currentOrNull
         if input != nil {
             value = mapper(input!)
@@ -48,7 +49,10 @@ class ListObservable<Output: Equatable>: ObservableObject {
     }
 
     deinit {
-        disposeBag.dispose()
+        let bag = disposeBag
+        DispatchQueue.main.async {
+            bag.dispose()
+        }
     }
 }
 

diff --git a/stencils/ListSubject.stencil b/stencils/ListSubject.stencil
@@ -18,6 +18,7 @@ class ListSubject<Output: Equatable>: ObservableObject {
          animated: Bool = false,
          mapper: @escaping (NSArray) -> [Output] = ListMapper.to
     ) {
+        assert(Thread.isMainThread, "Constructor must be called on the main thread, but called on \(Thread.current)")
         input = subject.currentOrNull
         if input != nil {
             value = mapper(input!)
@@ -54,7 +55,10 @@ class ListSubject<Output: Equatable>: ObservableObject {
     }
 
     deinit {
-        disposeBag.dispose()
+        let bag = disposeBag
+        DispatchQueue.main.async {
+            bag.dispose()
+        }
     }
 }
 

diff --git a/stencils/Observable.stencil b/stencils/Observable.stencil
@@ -29,6 +29,7 @@ class Observable<Input: KotlinObject, Output: Equatable>: ObservableObject {
         animated: Bool = false,
         mapper: @escaping (Input) -> Output
     ) {
+        assert(Thread.isMainThread, "Constructor must be called on the main thread, but called on \(Thread.current)")
         input = observable.currentOrNull
         if input != nil {
             value = mapper(input!)
@@ -59,7 +60,10 @@ class Observable<Input: KotlinObject, Output: Equatable>: ObservableObject {
     }
 
     deinit {
-        disposeBag.dispose()
+        let bag = disposeBag
+        DispatchQueue.main.async {
+            bag.dispose()
+        }
     }
 }
 

diff --git a/stencils/Subject.stencil b/stencils/Subject.stencil
@@ -25,6 +25,7 @@ class Subject<Input: KotlinObject, Output: Equatable>: ObservableObject {
          toMapper: @escaping (Input) -> Output,
          fromMapper: @escaping (Output) -> Input
     ) {
+        assert(Thread.isMainThread, "Constructor must be called on the main thread, but called on \(Thread.current)")
         input = subject.currentOrNull
         if input != nil {
             value = toMapper(input!)
@@ -61,7 +62,10 @@ class Subject<Input: KotlinObject, Output: Equatable>: ObservableObject {
     }
 
     deinit {
-        disposeBag.dispose()
+        let bag = disposeBag
+        DispatchQueue.main.async {
+            bag.dispose()
+        }
     }
 }
 

diff --git a/stencils/UninitializedObservable.stencil b/stencils/UninitializedObservable.stencil
@@ -25,6 +25,7 @@ class UninitializedObservable<Input: KotlinObject, Output: Equatable>: Observabl
         animated: Bool = false,
         mapper: @escaping (Input?) -> Output?
     ) {
+        assert(Thread.isMainThread, "Constructor must be called on the main thread, but called on \(Thread.current)")
         input = observable.currentOrNull
         if input != nil {
             value = mapper(input!)
@@ -53,7 +54,10 @@ class UninitializedObservable<Input: KotlinObject, Output: Equatable>: Observabl
     }
 
     deinit {
-        disposeBag.dispose()
+        let bag = disposeBag
+        DispatchQueue.main.async {
+            bag.dispose()
+        }
     }
 }
 

diff --git a/stencils/UninitializedSubject.stencil b/stencils/UninitializedSubject.stencil
@@ -22,6 +22,7 @@ class UninitializedSubject<Input: KotlinObject, Output: Equatable>: ObservableOb
          toMapper: @escaping (Input?) -> Output?,
          fromMapper: @escaping (Output?) -> Input?
     ) {
+        assert(Thread.isMainThread, "Constructor must be called on the main thread, but called on \(Thread.current)")
         input = subject.currentOrNull
         if input != nil {
             value = toMapper(input!)
@@ -65,7 +66,10 @@ class UninitializedSubject<Input: KotlinObject, Output: Equatable>: ObservableOb
     }
 
     deinit {
-        disposeBag.dispose()
+        let bag = disposeBag
+        DispatchQueue.main.async {
+            bag.dispose()
+        }
     }
 }