From b3483053f62745f7079e3a41233d7a49406b64fe Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 15 Aug 2022 17:45:51 -0500 Subject: [PATCH] removed filter Signed-off-by: Matt Bruce --- VDS/Components/Selector/SelectorBase.swift | 2 +- VDS/Protocols/ModelHandlerable.swift | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/VDS/Components/Selector/SelectorBase.swift b/VDS/Components/Selector/SelectorBase.swift index 2f91c7e0..a8ced11a 100644 --- a/VDS/Components/Selector/SelectorBase.swift +++ b/VDS/Components/Selector/SelectorBase.swift @@ -190,7 +190,7 @@ open class SelectorBase: Control, Changable func updateLabels(_ viewModel: ModelType) { //deal with labels - if model.shouldShowLabels { + if viewModel.shouldShowLabels { //add the stackview to hold the 2 labels //top label if let labelModel = viewModel.labelModel { diff --git a/VDS/Protocols/ModelHandlerable.swift b/VDS/Protocols/ModelHandlerable.swift index ef60f1df..2e357df4 100644 --- a/VDS/Protocols/ModelHandlerable.swift +++ b/VDS/Protocols/ModelHandlerable.swift @@ -23,6 +23,7 @@ extension ModelHandlerable { public func set(with model: ModelType) { if shouldUpdateView(viewModel: model){ + print("\(Self.self) updateView(viewModel)") updateView(viewModel: model) self.model = model } @@ -30,10 +31,6 @@ extension ModelHandlerable { public func setupUpdateView() { modelPublisher - .filter { [weak self] viewModel in - return self?.shouldUpdateView(viewModel: viewModel) ?? false - - } .debounce(for: .seconds(Constants.ModelStateDebounce), scheduler: RunLoop.main) .sink { [weak self] viewModel in self?.updateView(viewModel: viewModel)