diff --git a/MVMCoreUI/Atoms/TextFields/ItemDropdownEntryField.swift b/MVMCoreUI/Atoms/TextFields/ItemDropdownEntryField.swift index 1c48c7c7..71a3b35b 100644 --- a/MVMCoreUI/Atoms/TextFields/ItemDropdownEntryField.swift +++ b/MVMCoreUI/Atoms/TextFields/ItemDropdownEntryField.swift @@ -14,10 +14,10 @@ open class ItemDropdownEntryField: BaseDropdownEntryField { // MARK: - Properties //-------------------------------------------------- - public var pickerData: [String] = [] - public var pickerView: UIPickerView? + open var pickerData: [String] = [] + open var pickerView: UIPickerView? - public var componentsCount = 1 + open var componentsCount = 1 /// When selecting for first responder, allow initial selected value to appear in empty text field. public var setInitialValueInTextField = true @@ -120,6 +120,7 @@ extension ItemDropdownEntryField { if let options = dictionary["options"] as? [String] { pickerData = options + setPickerDelegates(delegate: self) } } } diff --git a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift index 67361313..5392c636 100644 --- a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift +++ b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift @@ -24,7 +24,7 @@ import UIKit // MARK: - Outlets //-------------------------------------------------- - public private(set) var textField: TextField = { + open private(set) var textField: TextField = { let textField = TextField(frame: .zero) textField.isAccessibilityElement = true textField.setContentCompressionResistancePriority(.required, for: .vertical) @@ -71,7 +71,7 @@ import UIKit } /// The text of this TextField. - public override var text: String? { + open override var text: String? { get { return textField.text } set { textField.text = newValue diff --git a/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift b/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift index 4769b7e5..f5094508 100644 --- a/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift +++ b/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift @@ -11,7 +11,7 @@ import UIKit @objcMembers open class MoleculeTableViewCell: TableViewCell { // MARK: - MVMCoreUIMoleculeViewProtocol - public override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) { + open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) { super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData) guard molecule == nil, let json = json, let moleculeJSON = json.optionalDictionaryForKey(KeyMolecule), let moleculeView = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject, constrainIfNeeded: true) else { return } diff --git a/MVMCoreUI/Molecules/Items/TableViewCell.swift b/MVMCoreUI/Molecules/Items/TableViewCell.swift index 0e303228..b74743b0 100644 --- a/MVMCoreUI/Molecules/Items/TableViewCell.swift +++ b/MVMCoreUI/Molecules/Items/TableViewCell.swift @@ -110,7 +110,7 @@ import UIKit } // MARK: - MFViewProtocol - public func updateView(_ size: CGFloat) { + open func updateView(_ size: CGFloat) { MFStyler.setMarginsFor(self, size: size, defaultHorizontal: updateViewHorizontalDefaults, top: topMarginPadding, bottom: bottomMarginPadding) if accessoryView != nil { @@ -133,7 +133,7 @@ import UIKit molecule?.updateView(size) } - public func setupView() { + open func setupView() { selectionStyle = .none insetsLayoutMarginsFromSafeArea = false contentView.insetsLayoutMarginsFromSafeArea = false @@ -141,7 +141,7 @@ import UIKit } // MARK: - MVMCoreUIMoleculeViewProtocol - public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) { + open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) { self.json = json guard let json = json else { return } @@ -186,7 +186,7 @@ import UIKit } } - public func reset() { + open func reset() { molecule?.reset?() updateViewHorizontalDefaults = true styleStandard() diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m index 51defe42..a092f214 100644 --- a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m +++ b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m @@ -37,6 +37,7 @@ @"caretButton": CaretButton.class, @"textField": TextEntryField.class, @"digitEntryField": DigitEntryField.class, + @"dropDown": ItemDropdownEntryField.class, @"itemDropdownEntryField": ItemDropdownEntryField.class, @"dateDropdownEntryField": DateDropdownEntryField.class, @"mdnEntryField" : MdnEntryField.class,