From 3e702ec0f5526695ef70b875513999d60c25c4ed Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 30 Jul 2024 13:44:19 -0500 Subject: [PATCH] removed properties that were pushed down Signed-off-by: Matt Bruce --- .../ItemDropdownEntryFieldModel.swift | 12 ----------- .../TextFields/TextViewEntryFieldModel.swift | 21 ++----------------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift index eb83a48a..f6f20b9f 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift @@ -18,9 +18,6 @@ import VDS public var selectedIndex: Int? public var showInlineLabel: Bool = false public var feedbackTextPlacement: VDS.EntryFieldBase.HelperTextPlacement = .bottom - public var tooltip: TooltipModel? - public var transparentBackground: Bool = false - public var width: CGFloat? public init(with options: [String], selectedIndex: Int? = nil) { self.options = options @@ -51,9 +48,6 @@ import VDS case action case showInlineLabel case feedbackTextPlacement - case tooltip - case transparentBackground - case width } //-------------------------------------------------- @@ -73,9 +67,6 @@ import VDS showInlineLabel = try typeContainer.decodeIfPresent(Bool.self, forKey: .showInlineLabel) ?? false feedbackTextPlacement = try typeContainer.decodeIfPresent(VDS.EntryFieldBase.HelperTextPlacement.self, forKey: .feedbackTextPlacement) ?? .bottom action = try typeContainer.decodeModelIfPresent(codingKey: .action) - tooltip = try typeContainer.decodeIfPresent(TooltipModel.self, forKey: .tooltip) - transparentBackground = try typeContainer.decodeIfPresent(Bool.self, forKey: .transparentBackground) ?? false - width = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .width) } public override func encode(to encoder: Encoder) throws { @@ -86,8 +77,5 @@ import VDS try container.encode(showInlineLabel, forKey: .showInlineLabel) try container.encode(feedbackTextPlacement, forKey: .feedbackTextPlacement) try container.encodeModelIfPresent(action, forKey: .action) - try container.encodeIfPresent(tooltip, forKey: .tooltip) - try container.encode(transparentBackground, forKey: .transparentBackground) - try container.encodeIfPresent(width, forKey: .width) } } diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryFieldModel.swift index 338f276c..2f47b2a6 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryFieldModel.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryFieldModel.swift @@ -9,7 +9,7 @@ import UIKit import VDS -public class TextViewEntryFieldModel: TextEntryFieldModel, FormFieldInternalValidatableProtocol { +public class TextViewEntryFieldModel: TextEntryFieldModel { //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- @@ -19,17 +19,9 @@ public class TextViewEntryFieldModel: TextEntryFieldModel, FormFieldInternalVali public var accessibilityText: String? public var editable: Bool = true public var showsPlaceholder: Bool = false - public var tooltip: TooltipModel? public var minHeight: VDS.TextArea.Height = .twoX public var maxLength: Int? - public var transparentBackground: Bool = false - public var width: CGFloat? - - //-------------------------------------------------- - // MARK: - FormFieldInternalValidatableProtocol - //-------------------------------------------------- - open var rules: [AnyRule]? - + //-------------------------------------------------- // MARK: - Keys //-------------------------------------------------- @@ -39,9 +31,6 @@ public class TextViewEntryFieldModel: TextEntryFieldModel, FormFieldInternalVali case editable case minHeight case maxLength - case tooltip - case transparentBackground - case width } //-------------------------------------------------- @@ -56,9 +45,6 @@ public class TextViewEntryFieldModel: TextEntryFieldModel, FormFieldInternalVali minHeight = try typeContainer.decodeIfPresent(VDS.TextArea.Height.self, forKey: .minHeight) ?? .twoX maxLength = try typeContainer.decodeIfPresent(Int.self, forKey: .maxLength) accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText) - tooltip = try typeContainer.decodeIfPresent(TooltipModel.self, forKey: .tooltip) - transparentBackground = try typeContainer.decodeIfPresent(Bool.self, forKey: .transparentBackground) ?? false - width = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .width) } public override func encode(to encoder: Encoder) throws { @@ -68,8 +54,5 @@ public class TextViewEntryFieldModel: TextEntryFieldModel, FormFieldInternalVali try container.encode(editable, forKey: .editable) try container.encode(minHeight, forKey: .minHeight) try container.encodeIfPresent(maxLength, forKey: .maxLength) - try container.encodeIfPresent(tooltip, forKey: .tooltip) - try container.encode(transparentBackground, forKey: .transparentBackground) - try container.encodeIfPresent(width, forKey: .width) } }