From 84a03573abb2757daf47edc5a01f8b4c14a2dad8 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 9 May 2024 14:33:27 -0500 Subject: [PATCH] updated linkmodel Signed-off-by: Matt Bruce --- .../TextFields/InputField/FieldTypes/FieldType.swift | 9 ++++++--- VDS/Components/TextFields/InputField/TextLinkModel.swift | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/VDS/Components/TextFields/InputField/FieldTypes/FieldType.swift b/VDS/Components/TextFields/InputField/FieldTypes/FieldType.swift index a69192f7..a52dcfae 100644 --- a/VDS/Components/TextFields/InputField/FieldTypes/FieldType.swift +++ b/VDS/Components/TextFields/InputField/FieldTypes/FieldType.swift @@ -68,7 +68,7 @@ extension InputField { inputField.actionTextLink.text = actionModel.text inputField.actionTextLink.onClick = { [weak self] _ in guard let self else { return } - actionModel.onClick(inputField.value) + actionModel.onClick(inputField) } inputField.actionTextLink.isHidden = false inputField.containerStackView.setCustomSpacing(VDSLayout.space2X, after: inputField.statusIcon) @@ -91,8 +91,11 @@ extension InputField { //placeholder inputField.textField.placeholder = placeholderText - //tooltip - inputField.tooltipModel = toolTipModel + //tooltip from Types take precedence + //if one was set, it would show as usual. + if let toolTipModel { + inputField.tooltipModel = toolTipModel + } } func appendRules(_ inputField: InputField) {} diff --git a/VDS/Components/TextFields/InputField/TextLinkModel.swift b/VDS/Components/TextFields/InputField/TextLinkModel.swift index 324ea6a0..a9c557a0 100644 --- a/VDS/Components/TextFields/InputField/TextLinkModel.swift +++ b/VDS/Components/TextFields/InputField/TextLinkModel.swift @@ -14,9 +14,9 @@ extension InputField { public var text: String ///Click event when you click on a tab - public var onClick: ((String?) -> Void) + public var onClick: ((InputField) -> Void) - public init(text: String = "Apply", onClick: @escaping (String?) -> Void) { + public init(text: String = "Apply", onClick: @escaping (InputField) -> Void) { self.text = text self.onClick = onClick }