Skip to content

Commit b14fb41

Browse files
committed
Update cancellable for different use cases.
1 parent d905f91 commit b14fb41

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

WooCommerce/Classes/ViewRelated/Filters/FilterListViewController.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ final class FilterListViewController: UIViewController {
9191

9292
private var clearAllBarButtonItem: UIBarButtonItem?
9393

94-
private var observationToken: ObservationToken?
94+
private var cancellableSelectedFilterType: ObservationToken?
95+
private var cancellableSelectedFilterValue: ObservationToken?
9596

9697
init(viewModel: FilterListViewModel) {
9798
self.viewModel = viewModel
@@ -104,7 +105,8 @@ final class FilterListViewController: UIViewController {
104105
}
105106

106107
deinit {
107-
observationToken?.cancel()
108+
cancellableSelectedFilterType?.cancel()
109+
cancellableSelectedFilterValue?.cancel()
108110
}
109111

110112
override func viewDidLoad() {
@@ -162,7 +164,7 @@ private extension FilterListViewController {
162164
}
163165

164166
func observeListSelectorCommandItemSelection() {
165-
observationToken = listSelectorCommand.onItemSelected.subscribe { [weak self] selected in
167+
cancellableSelectedFilterType = listSelectorCommand.onItemSelected.subscribe { [weak self] selected in
166168
guard let self = self else {
167169
return
168170
}
@@ -172,7 +174,7 @@ private extension FilterListViewController {
172174
let command = StaticListSelectorCommand(navigationBarTitle: selected.title,
173175
data: options,
174176
selected: selected.selectedValue)
175-
self.observationToken = command.onItemSelected.subscribe { [weak self] selectedOption in
177+
self.cancellableSelectedFilterValue = command.onItemSelected.subscribe { [weak self] selectedOption in
176178
guard let self = self else {
177179
return
178180
}

0 commit comments

Comments
 (0)