Skip to content

Ensure running unregisterDelegate.dispose() on main thread. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dangthaison91 merged 2 commits into from
May 25, 2018
+8 −2
Merged

Ensure running unregisterDelegate.dispose() on main thread. #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
333b6ef
Ensure running unregisterDelegate.dispose() on main thread
mongris Apr 23, 2018
e072de3
Ensure dispose unregisterDelegate on main thread
mongris May 24, 2018
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
10 changes: 8 additions & 2 deletions Sources/DataSources/RxHelper/ASDelegateProxy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ extension ObservableType {
where DelegateProxy.ParentObject: ASDisplayNode {

let proxy = DelegateProxy.proxy(for: object)
let unregisterDelegate = DelegateProxy.installForwardDelegate(dataSource, retainDelegate: retainDataSource, onProxyForObject: object)

// ensure dispose unregisterDelegate on main thread
let unregisterDelegate = ScheduledDisposable(
scheduler: MainScheduler.instance,
disposable: DelegateProxy.installForwardDelegate(dataSource, retainDelegate: retainDataSource, onProxyForObject: object)
)

// this is needed to flush any delayed old state (https://github.com/RxSwiftCommunity/RxDataSources/pull/75)
object.layoutIfNeeded()

Expand Down Expand Up @@ -49,7 +55,7 @@ extension ObservableType {
default:
break
}
}
}

return Disposables.create { [weak object] in
Copy link
Copy Markdown
Contributor

@fumito-ito fumito-ito May 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about usingScheduledDisposable ?

let disposable = Disposable.create { /* do something */ }
ScheduledDisposable(scheduler: MainScheduler(), disposable: disposable)

subscription.dispose()
Expand Down