From df2b6b4db297a74edfa6fcecd1b8981f694680ed Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 12 Jan 2022 15:53:43 -0600 Subject: [PATCH] removed setting the form field validity within a validation Signed-off-by: Matt Bruce --- .../Rules/Rules/RuleEqualsIgnoreCaseModel.swift | 5 ----- MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift | 5 ++--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift index dd02070b..25e21d4f 100644 --- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift +++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift @@ -51,15 +51,10 @@ public class RuleEqualsIgnoreCaseModel: RulesProtocol { fieldValidity = false } - for formKey in fields { - guard let formField = fieldMolecules[formKey] else { continue } - (formField as? FormRuleWatcherFieldProtocol)?.setValidity(true, rule: self) - } break } previousValidity[formKey] = valid - (formField as? FormRuleWatcherFieldProtocol)?.setValidity(valid, rule: self) } return (valid: valid, fieldValidity: previousValidity) } diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift index fae81358..70b787bf 100644 --- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift +++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift @@ -43,8 +43,6 @@ public class RuleEqualsModel: RulesProtocol { if compareValue != formField.formFieldValue() { valid = false - previousValidity[formKey] = valid - (formField as? FormRuleWatcherFieldProtocol)?.setValidity(valid, rule: self) break } else { var fieldValidity = valid @@ -52,8 +50,9 @@ public class RuleEqualsModel: RulesProtocol { if let validity = previousFieldValidity[formKey], !validity, fieldValidity { fieldValidity = false } - (formField as? FormRuleWatcherFieldProtocol)?.setValidity(fieldValidity, rule: self) } + previousValidity[formKey] = valid + } return (valid: valid, fieldValidity: previousValidity) }