diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift index 4d99a2d8..a1aca1ad 100644 --- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift +++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift @@ -10,7 +10,6 @@ import Foundation @objcMembers open class EntryFieldModel: MoleculeModelProtocol, FormFieldProtocol, FormRuleWatcherFieldProtocol, EnableableModelProtocol { - //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- diff --git a/MVMCoreUI/BaseClasses/TextView.swift b/MVMCoreUI/BaseClasses/TextView.swift index d83ba684..cdebcda4 100644 --- a/MVMCoreUI/BaseClasses/TextView.swift +++ b/MVMCoreUI/BaseClasses/TextView.swift @@ -227,7 +227,7 @@ extension TextView: MoleculeViewProtocol { layer.borderWidth = model.borderWidth text = model.text uiTextViewDelegate = delegateObject?.uiTextViewDelegate - isShowingPlaceholder = model.text.isEmpty + isShowingPlaceholder = model.text!.isEmpty if let accessibilityText = model.accessibilityText { accessibilityLabel = accessibilityText diff --git a/MVMCoreUI/BaseClasses/TextViewModel.swift b/MVMCoreUI/BaseClasses/TextViewModel.swift index 6662e360..5efa4b5a 100644 --- a/MVMCoreUI/BaseClasses/TextViewModel.swift +++ b/MVMCoreUI/BaseClasses/TextViewModel.swift @@ -14,16 +14,15 @@ open class TextViewModel: TextEntryFieldModel { // MARK: - Properties //-------------------------------------------------- - public override class var identifier: String { return "textView" } + public var accessibilityText: String? public var textColor: Color = Color(uiColor: .mvmBlack) public var fontStyle: Styler.Font = Styler.Font.RegularBodySmall public var textAlignment: NSTextAlignment = .left public var height: CGFloat? - public var placeholder: String = "" public var placeholderTextColor: Color = Color(uiColor: .mvmCoolGray3) public var placeholderFontStyle: Styler.Font = Styler.Font.RegularMicro public var showsPlaceholder: Bool = true @@ -53,30 +52,14 @@ open class TextViewModel: TextEntryFieldModel { case hideBlinkingCaret } - //-------------------------------------------------- - // MARK: - Initializer - //-------------------------------------------------- - - public init(height: CGFloat, text: String = "") { - self.height = height - self.text = text - } - //-------------------------------------------------- // MARK: - Codec //-------------------------------------------------- required public init(from decoder: Decoder) throws { + try super.init(from: decoder) let typeContainer = try decoder.container(keyedBy: CodingKeys.self) - if let text = try typeContainer.decodeIfPresent(String.self, forKey: .text) { - self.text = text - } - - if let placeholder = try typeContainer.decodeIfPresent(String.self, forKey: .placeholder) { - self.placeholder = placeholder - } - if let placeholderFontStyle = try typeContainer.decodeIfPresent(Styler.Font.self, forKey: .placeholderFontStyle) { self.placeholderFontStyle = placeholderFontStyle } @@ -103,11 +86,10 @@ open class TextViewModel: TextEntryFieldModel { borderColor = try typeContainer.decodeIfPresent(Color.self, forKey: .borderColor) accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText) - backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) height = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .height) } - public func encode(to encoder: Encoder) throws { + public override func encode(to encoder: Encoder) throws { var container = encoder.container(keyedBy: CodingKeys.self) try container.encodeIfPresent(moleculeName, forKey: .moleculeName) try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)