diff --git a/VDS/Classes/Control.swift b/VDS/Classes/Control.swift index 13f50e7f..5296e599 100644 --- a/VDS/Classes/Control.swift +++ b/VDS/Classes/Control.swift @@ -15,7 +15,6 @@ open class Control: UIControl, Handlerable, ViewProtocol, Resettable, UserInfoab //-------------------------------------------------- // MARK: - Combine Properties //-------------------------------------------------- - public var subject = PassthroughSubject() public var subscribers = Set() public var onClickSubscriber: AnyCancellable? { willSet { @@ -30,13 +29,15 @@ open class Control: UIControl, Handlerable, ViewProtocol, Resettable, UserInfoab //-------------------------------------------------- private var initialSetupPerformed = false + open var shouldUpdateView: Bool = true + open var userInfo = [String: Primitive]() - open var surface: Surface = .light { didSet { didChange() } } + open var surface: Surface = .light { didSet { setNeedsUpdate() } } open var disabled: Bool = false { didSet { isEnabled = !disabled } } - open override var isSelected: Bool { didSet { didChange() } } + open override var isSelected: Bool { didSet { setNeedsUpdate() } } public var touchUpInsideCount: Int = 0 @@ -65,7 +66,7 @@ open class Control: UIControl, Handlerable, ViewProtocol, Resettable, UserInfoab disabled = !newValue } isUserInteractionEnabled = isEnabled - didChange() + setNeedsUpdate() } } @@ -95,8 +96,7 @@ open class Control: UIControl, Handlerable, ViewProtocol, Resettable, UserInfoab if !initialSetupPerformed { initialSetupPerformed = true setup() - setupDidChangeEvent() - updateView() + setNeedsUpdate() } } diff --git a/VDS/Classes/SelectorGroupHandlerBase.swift b/VDS/Classes/SelectorGroupHandlerBase.swift index d686f549..b2483461 100644 --- a/VDS/Classes/SelectorGroupHandlerBase.swift +++ b/VDS/Classes/SelectorGroupHandlerBase.swift @@ -48,7 +48,7 @@ open class SelectorGroupHandlerBase: Control, Changeable { } public func valueChanged() { - DispatchQueue.main.asyncAfter(deadline: .now() + Constants.StateDebounce) { [weak self] in + DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) { [weak self] in self?.sendActions(for: .valueChanged) } } diff --git a/VDS/Classes/View.swift b/VDS/Classes/View.swift index c48ff108..2372ed4b 100644 --- a/VDS/Classes/View.swift +++ b/VDS/Classes/View.swift @@ -16,7 +16,6 @@ open class View: UIView, Handlerable, ViewProtocol, Resettable, UserInfoable { //-------------------------------------------------- // MARK: - Combine Properties //-------------------------------------------------- - public var subject = PassthroughSubject() public var subscribers = Set() //-------------------------------------------------- @@ -24,9 +23,11 @@ open class View: UIView, Handlerable, ViewProtocol, Resettable, UserInfoable { //-------------------------------------------------- private var initialSetupPerformed = false + open var shouldUpdateView: Bool = true + open var userInfo = [String: Primitive]() - open var surface: Surface = .light { didSet { didChange() }} + open var surface: Surface = .light { didSet { setNeedsUpdate() }} open var disabled: Bool = false { didSet { isEnabled = !disabled } } @@ -37,7 +38,7 @@ open class View: UIView, Handlerable, ViewProtocol, Resettable, UserInfoable { disabled = !newValue } isUserInteractionEnabled = isEnabled - didChange() + setNeedsUpdate() } } @@ -67,8 +68,7 @@ open class View: UIView, Handlerable, ViewProtocol, Resettable, UserInfoable { if !initialSetupPerformed { initialSetupPerformed = true setup() - setupDidChangeEvent() - updateView() + setNeedsUpdate() } } diff --git a/VDS/Components/Badge/Badge.swift b/VDS/Components/Badge/Badge.swift index 65fc22b6..77f8d9ca 100644 --- a/VDS/Components/Badge/Badge.swift +++ b/VDS/Components/Badge/Badge.swift @@ -32,13 +32,13 @@ open class Badge: View { $0.textStyle = .boldBodySmall } - open var fillColor: FillColor = .red { didSet { didChange() }} + open var fillColor: FillColor = .red { didSet { setNeedsUpdate() }} - open var text: String = "" { didSet { didChange() }} + open var text: String = "" { didSet { setNeedsUpdate() }} - open var maxWidth: CGFloat? { didSet { didChange() }} + open var maxWidth: CGFloat? { didSet { setNeedsUpdate() }} - open var numberOfLines: Int = 1 { didSet { didChange() }} + open var numberOfLines: Int = 1 { didSet { setNeedsUpdate() }} //-------------------------------------------------- // MARK: - Constraints diff --git a/VDS/Components/Buttons/Button/Button.swift b/VDS/Components/Buttons/Button/Button.swift index 0b52e0fe..70d70ab6 100644 --- a/VDS/Components/Buttons/Button/Button.swift +++ b/VDS/Components/Buttons/Button/Button.swift @@ -32,11 +32,11 @@ open class Button: ButtonBase, Useable { //-------------------------------------------------- open override var availableSizes: [ButtonSize] { [.large, .small] } - open var use: Use = .primary { didSet { didChange() }} + open var use: Use = .primary { didSet { setNeedsUpdate() }} - open var size: ButtonSize = .large { didSet { didChange() }} + open var size: ButtonSize = .large { didSet { setNeedsUpdate() }} - open var width: CGFloat? { didSet { didChange() }} + open var width: CGFloat? { didSet { setNeedsUpdate() }} open override var textColor: UIColor { textColorConfiguration.getColor(self) diff --git a/VDS/Components/Buttons/Button/ButtonBase.swift b/VDS/Components/Buttons/Button/ButtonBase.swift index bd00e312..39c9f11a 100644 --- a/VDS/Components/Buttons/Button/ButtonBase.swift +++ b/VDS/Components/Buttons/Button/ButtonBase.swift @@ -28,7 +28,6 @@ open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettab //-------------------------------------------------- // MARK: - Combine Properties //-------------------------------------------------- - public var subject = PassthroughSubject() public var subscribers = Set() public var onClickSubscriber: AnyCancellable? { willSet { @@ -46,13 +45,15 @@ open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettab //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- + open var shouldUpdateView: Bool = true + open var availableSizes: [ButtonSize] { [] } - open var text: String? { didSet { didChange() } } + open var text: String? { didSet { setNeedsUpdate() } } open var attributes: [any LabelAttributeModel]? { nil } - open var surface: Surface = .light { didSet { didChange() }} + open var surface: Surface = .light { didSet { setNeedsUpdate() }} open var disabled: Bool = false { didSet { isEnabled = !disabled } } @@ -90,7 +91,7 @@ open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettab disabled = !newValue } isUserInteractionEnabled = isEnabled - didChange() + setNeedsUpdate() } } @@ -121,8 +122,7 @@ open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettab translatesAutoresizingMaskIntoConstraints = false accessibilityCustomActions = [] setup() - setupDidChangeEvent(true) - updateView() + setNeedsUpdate() } } diff --git a/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift b/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift index ff0b6152..9f845f96 100644 --- a/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift +++ b/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift @@ -25,16 +25,16 @@ open class ButtonGroup: View, UICollectionViewDataSource, UICollectionViewDelega // MARK: - Public Properties //-------------------------------------------------- //An object containing number of Button components per row, in each viewport - open var rowQuantityPhone: Int = 0 { didSet { didChange() } } + open var rowQuantityPhone: Int = 0 { didSet { setNeedsUpdate() } } - open var rowQuantityTablet: Int = 0 { didSet { didChange() } } + open var rowQuantityTablet: Int = 0 { didSet { setNeedsUpdate() } } public var rowQuantity: Int { UIDevice.isIPad ? rowQuantityTablet : rowQuantityPhone } //If provided, aligns TextLink/TextLinkCaret alignment when rowQuantity is set one. - open var buttonPosition: ButtonPosition = .center { didSet { didChange() }} + open var buttonPosition: ButtonPosition = .center { didSet { setNeedsUpdate() }} - open var buttons: [Buttonable] = [] { didSet { didChange() }} + open var buttons: [Buttonable] = [] { didSet { setNeedsUpdate() }} //If provided, width of Button components will be rendered based on this value. If omitted, default button widths are rendered. open var buttonWidth: CGFloat? { @@ -47,7 +47,7 @@ open class ButtonGroup: View, UICollectionViewDataSource, UICollectionViewDelega button.width = buttonWidth } } - didChange() + setNeedsUpdate() } } @@ -64,7 +64,7 @@ open class ButtonGroup: View, UICollectionViewDataSource, UICollectionViewDelega self.buttonWidth = nil } positionLayout.buttonPercentage = buttonPercentage - didChange() + setNeedsUpdate() } } diff --git a/VDS/Components/Buttons/TextLink/TextLink.swift b/VDS/Components/Buttons/TextLink/TextLink.swift index a253a406..6799126f 100644 --- a/VDS/Components/Buttons/TextLink/TextLink.swift +++ b/VDS/Components/Buttons/TextLink/TextLink.swift @@ -22,7 +22,7 @@ open class TextLink: ButtonBase { //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- - open var size: ButtonSize = .large { didSet { didChange() }} + open var size: ButtonSize = .large { didSet { setNeedsUpdate() }} open override var availableSizes: [ButtonSize] { [.large, .small] } diff --git a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift index f6ba09a0..58e8f9b1 100644 --- a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift +++ b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift @@ -44,7 +44,7 @@ open class TextLinkCaret: ButtonBase { //-------------------------------------------------- public override var availableSizes: [ButtonSize] { [.large] } - open var iconPosition: IconPosition = .right { didSet { didChange() } } + open var iconPosition: IconPosition = .right { didSet { setNeedsUpdate() } } private var height: CGFloat { 44 @@ -58,7 +58,7 @@ open class TextLinkCaret: ButtonBase { var updatedText = newValue ?? "" updatedText = iconPosition == .right ? "\(updatedText) " : " \(updatedText)" _text = updatedText - didChange() + setNeedsUpdate() } } @@ -152,11 +152,11 @@ internal class CaretView: View { //------------------------------------------------------ private var caretPath: UIBezierPath = UIBezierPath() - public var lineWidth: CGFloat = 1 { didSet{ didChange() } } + public var lineWidth: CGFloat = 1 { didSet{ setNeedsUpdate() } } - public var direction: Direction = .right { didSet{ didChange() } } + public var direction: Direction = .right { didSet{ setNeedsUpdate() } } - public var size: Size? { didSet{ didChange() } } + public var size: Size? { didSet{ setNeedsUpdate() } } public var colorConfiguration: AnyColorable = ViewColorConfiguration().with { $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forDisabled: true) diff --git a/VDS/Components/Checkbox/Checkbox.swift b/VDS/Components/Checkbox/Checkbox.swift index f0d690cd..ec083053 100644 --- a/VDS/Components/Checkbox/Checkbox.swift +++ b/VDS/Components/Checkbox/Checkbox.swift @@ -93,31 +93,31 @@ open class Checkbox: Control, Errorable, Changeable { $0.translatesAutoresizingMaskIntoConstraints = false } - open var isAnimated: Bool = true { didSet { didChange() }} + open var isAnimated: Bool = true { didSet { setNeedsUpdate() }} - open override var isSelected: Bool { didSet { didChange() }} + open override var isSelected: Bool { didSet { setNeedsUpdate() }} - open var labelText: String? { didSet { didChange() }} + open var labelText: String? { didSet { setNeedsUpdate() }} - open var labelTextAttributes: [any LabelAttributeModel]? { didSet { didChange() }} + open var labelTextAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} open var labelAttributedText: NSAttributedString? { didSet { label.useAttributedText = !(labelAttributedText?.string.isEmpty ?? true) label.attributedText = labelAttributedText - didChange() + setNeedsUpdate() } } - open var childText: String? { didSet { didChange() }} + open var childText: String? { didSet { setNeedsUpdate() }} - open var childTextAttributes: [any LabelAttributeModel]? { didSet { didChange() }} + open var childTextAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} open var childAttributedText: NSAttributedString? { didSet { childLabel.useAttributedText = !(childAttributedText?.string.isEmpty ?? true) childLabel.attributedText = childAttributedText - didChange() + setNeedsUpdate() } } @@ -127,7 +127,7 @@ open class Checkbox: Control, Errorable, Changeable { set { if !isSelected && _showError != newValue { _showError = newValue - didChange() + setNeedsUpdate() } } } @@ -142,11 +142,11 @@ open class Checkbox: Control, Errorable, Changeable { } } - open var errorText: String? { didSet { didChange() }} + open var errorText: String? { didSet { setNeedsUpdate() }} - open var inputId: String? { didSet { didChange() }} + open var inputId: String? { didSet { setNeedsUpdate() }} - open var value: AnyHashable? { didSet { didChange() }} + open var value: AnyHashable? { didSet { setNeedsUpdate() }} //-------------------------------------------------- // MARK: - Constraints diff --git a/VDS/Components/Icon/Icon.swift b/VDS/Components/Icon/Icon.swift index e6443eaa..54fe428f 100644 --- a/VDS/Components/Icon/Icon.swift +++ b/VDS/Components/Icon/Icon.swift @@ -28,10 +28,10 @@ open class Icon: View { $0.clipsToBounds = true } - open var color: Color = .black { didSet { didChange() }} - open var size: Size = .medium { didSet { didChange() }} - open var name: Name? { didSet { didChange() }} - open var customSize: Int? { didSet { didChange() }} + open var color: Color = .black { didSet { setNeedsUpdate() }} + open var size: Size = .medium { didSet { setNeedsUpdate() }} + open var name: Name? { didSet { setNeedsUpdate() }} + open var customSize: Int? { didSet { setNeedsUpdate() }} //functions //-------------------------------------------------- diff --git a/VDS/Components/Label/Attributes/TooltipLabelAttribute.swift b/VDS/Components/Label/Attributes/TooltipLabelAttribute.swift index 5c395970..5d5baa8d 100644 --- a/VDS/Components/Label/Attributes/TooltipLabelAttribute.swift +++ b/VDS/Components/Label/Attributes/TooltipLabelAttribute.swift @@ -72,7 +72,7 @@ public class TooltipLabelAttribute: ActionLabelAttributeModel, TooltipLaunchable addHandler(on: attributedString) } - public init(id: UUID = UUID(), action: PassthroughSubject = PassthroughSubject(), subscriber: AnyCancellable? = nil, surface: Surface, accessibleText: String? = nil, closeButtonText: String, title: String, content: String) { + public init(id: UUID = UUID(), action: PassthroughSubject = PassthroughSubject(), subscriber: AnyCancellable? = nil, surface: Surface, accessibleText: String? = nil, closeButtonText: String = "Close", title: String, content: String) { self.id = id self.action = action self.subscriber = subscriber diff --git a/VDS/Components/Label/Label.swift b/VDS/Components/Label/Label.swift index 762e9daa..3a554a63 100644 --- a/VDS/Components/Label/Label.swift +++ b/VDS/Components/Label/Label.swift @@ -16,26 +16,26 @@ open class Label: UILabel, Handlerable, ViewProtocol, Resettable, UserInfoable { //-------------------------------------------------- // MARK: - Combine Properties //-------------------------------------------------- - public var subject = PassthroughSubject() public var subscribers = Set() - public var hasChanged: Bool = false //-------------------------------------------------- // MARK: - Properties //-------------------------------------------------- private var initialSetupPerformed = false + open var shouldUpdateView: Bool = true + open var useAttributedText: Bool = false - open var surface: Surface = .light { didSet { didChange() }} + open var surface: Surface = .light { didSet { setNeedsUpdate() }} open var disabled: Bool = false { didSet { isEnabled = !disabled } } - open var attributes: [any LabelAttributeModel]? { didSet { didChange() }} + open var attributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} - open var textStyle: TextStyle = .defaultStyle { didSet { didChange() }} + open var textStyle: TextStyle = .defaultStyle { didSet { setNeedsUpdate() }} - open var textPosition: TextPosition = .left { didSet { didChange() }} + open var textPosition: TextPosition = .left { didSet { setNeedsUpdate() }} open var userInfo = [String: Primitive]() @@ -46,14 +46,14 @@ open class Label: UILabel, Handlerable, ViewProtocol, Resettable, UserInfoable { disabled = !newValue } isUserInteractionEnabled = isEnabled - didChange() + setNeedsUpdate() } } override open var text: String? { didSet { attributes = nil - didChange() + setNeedsUpdate() } } @@ -95,8 +95,7 @@ open class Label: UILabel, Handlerable, ViewProtocol, Resettable, UserInfoable { accessibilityCustomActions = [] accessibilityTraits = .staticText setup() - setupDidChangeEvent(true) - updateView() + setNeedsUpdate() } } diff --git a/VDS/Components/Line/Line.swift b/VDS/Components/Line/Line.swift index a25a1497..2e74f9c4 100644 --- a/VDS/Components/Line/Line.swift +++ b/VDS/Components/Line/Line.swift @@ -26,7 +26,7 @@ open class Line: View { $0.translatesAutoresizingMaskIntoConstraints = false } - open var style: Style = .primary { didSet { didChange() } } + open var style: Style = .primary { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Lifecycle diff --git a/VDS/Components/Notification/Notification.swift b/VDS/Components/Notification/Notification.swift index ce6f3260..734e0aad 100644 --- a/VDS/Components/Notification/Notification.swift +++ b/VDS/Components/Notification/Notification.swift @@ -117,18 +117,18 @@ open class Notification: View { } //Text - open var title: String = "" { didSet{didChange()}} + open var title: String = "" { didSet{setNeedsUpdate()}} - open var subTitle: String? { didSet{didChange()}} + open var subTitle: String? { didSet{setNeedsUpdate()}} //Buttons - open var primaryButtonModel: ButtonModel? { didSet{didChange()}} + open var primaryButtonModel: ButtonModel? { didSet{setNeedsUpdate()}} open var primaryButton = Button().with { $0.size = .small $0.use = .secondary } - open var secondaryButtonModel: ButtonModel? { didSet{didChange()}} + open var secondaryButtonModel: ButtonModel? { didSet{setNeedsUpdate()}} open var secondaryButton = Button().with { $0.size = .small $0.use = .secondary @@ -152,11 +152,11 @@ open class Notification: View { // MARK: - Properties //-------------------------------------------------- - open var hideCloseButton: Bool = false { didSet{didChange()}} + open var hideCloseButton: Bool = false { didSet{setNeedsUpdate()}} - open var type: Style = .info { didSet{didChange()}} + open var type: Style = .info { didSet{setNeedsUpdate()}} - open var fullBleed: Bool = false { didSet {didChange()}} + open var fullBleed: Bool = false { didSet {setNeedsUpdate()}} var _layout: Layout = .vertical open var layout: Layout { @@ -164,7 +164,7 @@ open class Notification: View { if !UIDevice.isIPad, newValue == .horizontal { return } _layout = newValue buttonsView.buttonPosition = _layout == .horizontal ? .center : .left - didChange() + setNeedsUpdate() } get { _layout } } diff --git a/VDS/Components/RadioBox/RadioBox.swift b/VDS/Components/RadioBox/RadioBox.swift index f5f8d9b9..71083a48 100644 --- a/VDS/Components/RadioBox/RadioBox.swift +++ b/VDS/Components/RadioBox/RadioBox.swift @@ -86,47 +86,47 @@ open class RadioBox: Control, Changeable { $0.translatesAutoresizingMaskIntoConstraints = false } - open var text: String = "Default Text" { didSet { didChange() }} + open var text: String = "Default Text" { didSet { setNeedsUpdate() }} - open var textAttributes: [any LabelAttributeModel]? { didSet { didChange() }} + open var textAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} open var textAttributedText: NSAttributedString? { didSet { textLabel.useAttributedText = !(textAttributedText?.string.isEmpty ?? true) textLabel.attributedText = textAttributedText - didChange() + setNeedsUpdate() } } - open var subText: String? { didSet { didChange() }} + open var subText: String? { didSet { setNeedsUpdate() }} - open var subTextAttributes: [any LabelAttributeModel]? { didSet { didChange() }} + open var subTextAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} open var subTextAttributedText: NSAttributedString? { didSet { subTextLabel.useAttributedText = !(subTextAttributedText?.string.isEmpty ?? true) subTextLabel.attributedText = subTextAttributedText - didChange() + setNeedsUpdate() } } - open var subTextRight: String? { didSet { didChange() }} + open var subTextRight: String? { didSet { setNeedsUpdate() }} - open var subTextRightAttributes: [any LabelAttributeModel]? { didSet { didChange() }} + open var subTextRightAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} open var subTextRightAttributedText: NSAttributedString? { didSet { subTextRightLabel.useAttributedText = !(subTextRightAttributedText?.string.isEmpty ?? true) subTextRightLabel.attributedText = subTextRightAttributedText - didChange() + setNeedsUpdate() } } - open var strikethrough: Bool = false { didSet { didChange() }} + open var strikethrough: Bool = false { didSet { setNeedsUpdate() }} - open var inputId: String? { didSet { didChange() }} + open var inputId: String? { didSet { setNeedsUpdate() }} - open var value: AnyHashable? { didSet { didChange() }} + open var value: AnyHashable? { didSet { setNeedsUpdate() }} //functions //-------------------------------------------------- diff --git a/VDS/Components/RadioButton/RadioButton.swift b/VDS/Components/RadioButton/RadioButton.swift index b3b35f3e..03d58855 100644 --- a/VDS/Components/RadioButton/RadioButton.swift +++ b/VDS/Components/RadioButton/RadioButton.swift @@ -92,31 +92,31 @@ open class RadioButton: Control, Errorable, Changeable { $0.translatesAutoresizingMaskIntoConstraints = false } - open var labelText: String? { didSet { didChange() }} + open var labelText: String? { didSet { setNeedsUpdate() }} - open var labelTextAttributes: [any LabelAttributeModel]? { didSet { didChange() }} + open var labelTextAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} open var labelAttributedText: NSAttributedString? { didSet { label.useAttributedText = !(labelAttributedText?.string.isEmpty ?? true) label.attributedText = labelAttributedText - didChange() + setNeedsUpdate() } } - open var childText: String? { didSet { didChange() }} + open var childText: String? { didSet { setNeedsUpdate() }} - open var childTextAttributes: [any LabelAttributeModel]? { didSet { didChange() }} + open var childTextAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} open var childAttributedText: NSAttributedString? { didSet { childLabel.useAttributedText = !(childAttributedText?.string.isEmpty ?? true) childLabel.attributedText = childAttributedText - didChange() + setNeedsUpdate() } } - open var showError: Bool = false { didSet { didChange() }} + open var showError: Bool = false { didSet { setNeedsUpdate() }} open override var state: UIControl.State { get { @@ -128,11 +128,11 @@ open class RadioButton: Control, Errorable, Changeable { } } - open var errorText: String? { didSet { didChange() }} + open var errorText: String? { didSet { setNeedsUpdate() }} - open var inputId: String? { didSet { didChange() }} + open var inputId: String? { didSet { setNeedsUpdate() }} - open var value: AnyHashable? { didSet { didChange() }} + open var value: AnyHashable? { didSet { setNeedsUpdate() }} //-------------------------------------------------- // MARK: - Constraints diff --git a/VDS/Components/RadioSwatch/RadioSwatch.swift b/VDS/Components/RadioSwatch/RadioSwatch.swift index 211a3ff5..2c556353 100644 --- a/VDS/Components/RadioSwatch/RadioSwatch.swift +++ b/VDS/Components/RadioSwatch/RadioSwatch.swift @@ -41,19 +41,19 @@ open class RadioSwatch: Control { $0.contentMode = .scaleAspectFit } - open var fillImage: UIImage? { didSet { didChange() }} + open var fillImage: UIImage? { didSet { setNeedsUpdate() }} - open var text: String = "" { didSet { didChange() }} + open var text: String = "" { didSet { setNeedsUpdate() }} - open var primaryColor: UIColor? { didSet { didChange() }} + open var primaryColor: UIColor? { didSet { setNeedsUpdate() }} - open var secondaryColor: UIColor? { didSet { didChange() }} + open var secondaryColor: UIColor? { didSet { setNeedsUpdate() }} - open var strikethrough: Bool = false { didSet { didChange() }} + open var strikethrough: Bool = false { didSet { setNeedsUpdate() }} - open var inputId: String? { didSet { didChange() }} + open var inputId: String? { didSet { setNeedsUpdate() }} - open var value: AnyHashable? { didSet { didChange() }} + open var value: AnyHashable? { didSet { setNeedsUpdate() }} //functions //-------------------------------------------------- diff --git a/VDS/Components/RadioSwatch/RadioSwatchGroup.swift b/VDS/Components/RadioSwatch/RadioSwatchGroup.swift index 0a5b15da..e5211163 100644 --- a/VDS/Components/RadioSwatch/RadioSwatchGroup.swift +++ b/VDS/Components/RadioSwatch/RadioSwatchGroup.swift @@ -183,7 +183,7 @@ open class RadioSwatchGroup: SelectorGroupSelectedHandlerBase, UICo selectedHandler?.toggle() selector.toggle() label.text = selector.text - didChange() + setNeedsUpdate() valueChanged() } } diff --git a/VDS/Components/TextFields/EntryField/EntryField.swift b/VDS/Components/TextFields/EntryField/EntryField.swift index ad31d7c2..b57b733b 100644 --- a/VDS/Components/TextFields/EntryField/EntryField.swift +++ b/VDS/Components/TextFields/EntryField/EntryField.swift @@ -106,11 +106,10 @@ open class EntryField: Control, Changeable { } } - open var titleLabel = TrailingTooltipLabel().with { + open var titleLabel = Label().with { $0.setContentCompressionResistancePriority(.required, for: .vertical) - $0.labelTextPosition = .left - $0.labelTextStyle = .bodySmall - $0.tooltipYOffset = -2 + $0.textPosition = .left + $0.textStyle = .bodySmall } open var errorLabel = Label().with { @@ -130,11 +129,11 @@ open class EntryField: Control, Changeable { $0.size = .small } - open var labelText: String? { didSet { didChange() }} + open var labelText: String? { didSet { setNeedsUpdate() }} - open var helperText: String? { didSet { didChange() }} + open var helperText: String? { didSet { setNeedsUpdate() }} - open var showError: Bool = false { didSet { didChange() }} + open var showError: Bool = false { didSet { setNeedsUpdate() }} open override var state: UIControl.State { get { @@ -146,27 +145,27 @@ open class EntryField: Control, Changeable { } } - open var errorText: String? { didSet { didChange() }} + open var errorText: String? { didSet { setNeedsUpdate() }} - open var tooltipTitle: String? { didSet { didChange() }} + open var tooltipTitle: String? { didSet { setNeedsUpdate() }} - open var tooltipContent: String? { didSet { didChange() }} + open var tooltipContent: String? { didSet { setNeedsUpdate() }} - open var transparentBackground: Bool = false { didSet { didChange() }} + open var transparentBackground: Bool = false { didSet { setNeedsUpdate() }} - open var width: CGFloat? { didSet { didChange() }} + open var width: CGFloat? { didSet { setNeedsUpdate() }} - open var maxLength: Int? { didSet { didChange() }} + open var maxLength: Int? { didSet { setNeedsUpdate() }} - open var inputId: String? { didSet { didChange() }} + open var inputId: String? { didSet { setNeedsUpdate() }} - open var value: AnyHashable? { didSet { didChange() }} + open var value: AnyHashable? { didSet { setNeedsUpdate() }} - open var defaultValue: AnyHashable? { didSet { didChange() }} + open var defaultValue: AnyHashable? { didSet { setNeedsUpdate() }} - open var required: Bool = false { didSet { didChange() }} + open var required: Bool = false { didSet { setNeedsUpdate() }} - open var readOnly: Bool = false { didSet { didChange() }} + open var readOnly: Bool = false { didSet { setNeedsUpdate() }} //-------------------------------------------------- // MARK: - Constraints @@ -234,8 +233,8 @@ open class EntryField: Control, Changeable { errorLabel.reset() helperLabel.reset() - titleLabel.labelTextPosition = .left - titleLabel.labelTextStyle = .bodySmall + titleLabel.textPosition = .left + titleLabel.textStyle = .bodySmall errorLabel.textPosition = .left errorLabel.textStyle = .bodySmall helperLabel.textPosition = .left @@ -283,19 +282,23 @@ open class EntryField: Control, Changeable { //dealing with the "Optional" addition to the text if let oldText = updatedLabelText, !required, !oldText.hasSuffix("Optional") { - let optionColorAttr = ColorLabelAttribute(location: oldText.count + 2, - length: 8, - color: .red) - - updatedLabelText = "\(oldText) Optional" - attributes.append(optionColorAttr) - } + if !disabled { + let optionColorAttr = ColorLabelAttribute(location: oldText.count + 2, + length: 8, + color: VDSColor.elementsSecondaryOnlight) + attributes.append(optionColorAttr) + } + updatedLabelText = "\(oldText) Optional" + } + + if let tooltipTitle, let tooltipContent { + attributes.append(TooltipLabelAttribute(surface: surface, title: tooltipTitle, content: tooltipContent)) + } + //set the titleLabel - titleLabel.labelText = updatedLabelText - titleLabel.labelAttributes = attributes - titleLabel.tooltipTitle = tooltipTitle ?? "" - titleLabel.tooltipContent = tooltipContent ?? "" + titleLabel.text = updatedLabelText + titleLabel.attributes = attributes titleLabel.surface = surface titleLabel.disabled = disabled diff --git a/VDS/Components/TextFields/InputField/InputField.swift b/VDS/Components/TextFields/InputField/InputField.swift index 9832810f..2257ca89 100644 --- a/VDS/Components/TextFields/InputField/InputField.swift +++ b/VDS/Components/TextFields/InputField/InputField.swift @@ -51,7 +51,7 @@ open class InputField: EntryField, UITextFieldDelegate { // MARK: - Public Properties //-------------------------------------------------- - open var type: FieldType = .text { didSet { didChange() }} + open var type: FieldType = .text { didSet { setNeedsUpdate() }} var _showError: Bool = false open override var showError: Bool { @@ -59,7 +59,7 @@ open class InputField: EntryField, UITextFieldDelegate { set { if !showSuccess && _showError != newValue { _showError = newValue - didChange() + setNeedsUpdate() } } } @@ -70,7 +70,7 @@ open class InputField: EntryField, UITextFieldDelegate { set { if !showError && _showSuccess != newValue { _showSuccess = newValue - didChange() + setNeedsUpdate() } } } @@ -85,9 +85,9 @@ open class InputField: EntryField, UITextFieldDelegate { } } - open var successText: String? { didSet { didChange() }} + open var successText: String? { didSet { setNeedsUpdate() }} - open var helperTextPlacement: HelperTextPlacement = .bottom { didSet { didChange() }} + open var helperTextPlacement: HelperTextPlacement = .bottom { didSet { setNeedsUpdate() }} //-------------------------------------------------- // MARK: - Private Properties diff --git a/VDS/Components/TileContainer/TileContainer.swift b/VDS/Components/TileContainer/TileContainer.swift index 79928baf..97b48967 100644 --- a/VDS/Components/TileContainer/TileContainer.swift +++ b/VDS/Components/TileContainer/TileContainer.swift @@ -77,7 +77,7 @@ open class TileContainer: Control { //-------------------------------------------------- // MARK: - Public Properties //-------------------------------------------------- - public var backgroundImage: UIImage? { didSet{ didChange() } } + public var backgroundImage: UIImage? { didSet{ setNeedsUpdate() } } public var containerView = View().with { $0.isUserInteractionEnabled = false @@ -87,13 +87,13 @@ open class TileContainer: Control { $0.isUserInteractionEnabled = false } - public var color: BackgroundColor = .white { didSet{ didChange() } } + public var color: BackgroundColor = .white { didSet{ setNeedsUpdate() } } - public var padding: Padding = .padding4X { didSet{ didChange() } } + public var padding: Padding = .padding4X { didSet{ setNeedsUpdate() } } - public var aspectRatio: AspectRatio = .ratio1x1 { didSet{ didChange() } } + public var aspectRatio: AspectRatio = .ratio1x1 { didSet{ setNeedsUpdate() } } - public var imageFallbackColor: Surface = .light { didSet{ didChange() } } + public var imageFallbackColor: Surface = .light { didSet{ setNeedsUpdate() } } private var _width: CGFloat? public var width: CGFloat? { @@ -104,7 +104,7 @@ open class TileContainer: Control { } else { _width = nil } - didChange() + setNeedsUpdate() } } @@ -117,13 +117,13 @@ open class TileContainer: Control { } else { _height = nil } - didChange() + setNeedsUpdate() } } - public var showBorder: Bool = false { didSet{ didChange() } } + public var showBorder: Bool = false { didSet{ setNeedsUpdate() } } - public var showDropShadows: Bool = false { didSet{ didChange() } } + public var showDropShadows: Bool = false { didSet{ setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Private Properties diff --git a/VDS/Components/Tilelet/Tilelet.swift b/VDS/Components/Tilelet/Tilelet.swift index c6d36858..70f2a06e 100644 --- a/VDS/Components/Tilelet/Tilelet.swift +++ b/VDS/Components/Tilelet/Tilelet.swift @@ -153,7 +153,7 @@ open class Tilelet: TileContainer { } else { _textWidth = nil } - didChange() + setNeedsUpdate() } } @@ -170,16 +170,16 @@ open class Tilelet: TileContainer { } else { _textPercentage = nil } - didChange() + setNeedsUpdate() } } - open var textPostion: TextPosition = .top { didSet { didChange() }} + open var textPostion: TextPosition = .top { didSet { setNeedsUpdate() }} //models - public var badgeModel: BadgeModel? { didSet { didChange() }} - public var titleModel: TitleModel? { didSet { didChange() }} - public var subTitleModel: SubTitleModel? { didSet { didChange() }} + public var badgeModel: BadgeModel? { didSet { setNeedsUpdate() }} + public var titleModel: TitleModel? { didSet { setNeedsUpdate() }} + public var subTitleModel: SubTitleModel? { didSet { setNeedsUpdate() }} //only 1 Icon can be active private var _descriptiveIconModel: DescriptiveIcon? @@ -188,7 +188,7 @@ open class Tilelet: TileContainer { set { _descriptiveIconModel = newValue; _directionalIconModel = nil - didChange() + setNeedsUpdate() } } @@ -198,7 +198,7 @@ open class Tilelet: TileContainer { set { _directionalIconModel = newValue; _descriptiveIconModel = nil - didChange() + setNeedsUpdate() } } //icons diff --git a/VDS/Components/TitleLockup/TitleLockup.swift b/VDS/Components/TitleLockup/TitleLockup.swift index ff48c217..7461938e 100644 --- a/VDS/Components/TitleLockup/TitleLockup.swift +++ b/VDS/Components/TitleLockup/TitleLockup.swift @@ -173,28 +173,28 @@ open class TitleLockup: View { //-------------------------------------------------- // MARK: - Public Properties //-------------------------------------------------- - open var textPosition: TextPosition = .left { didSet { didChange() }} + open var textPosition: TextPosition = .left { didSet { setNeedsUpdate() }} //style - open var otherTextStyle: OtherTextStyle = UIDevice.isIPad ? .bodyLarge : .bodyMedium { didSet { didChange() }} + open var otherTextStyle: OtherTextStyle = UIDevice.isIPad ? .bodyLarge : .bodyMedium { didSet { setNeedsUpdate() }} //first row open var eyebrowLabel = Label().with { $0.setContentCompressionResistancePriority(.required, for: .vertical) } - open var eyebrowModel: EyebrowModel? { didSet { didChange() }} + open var eyebrowModel: EyebrowModel? { didSet { setNeedsUpdate() }} //second row open var titleLabel = Label().with { $0.setContentCompressionResistancePriority(.required, for: .vertical) } - open var titleModel: TitleModel? { didSet { didChange() }} + open var titleModel: TitleModel? { didSet { setNeedsUpdate() }} //third row open var subTitleLabel = Label().with { $0.setContentCompressionResistancePriority(.required, for: .vertical) } - open var subTitleModel: SubTitleModel? { didSet { didChange() }} + open var subTitleModel: SubTitleModel? { didSet { setNeedsUpdate() }} //-------------------------------------------------- // MARK: - Lifecycle diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift index cd3e3e4e..4b3e8038 100644 --- a/VDS/Components/Toggle/Toggle.swift +++ b/VDS/Components/Toggle/Toggle.swift @@ -125,27 +125,27 @@ open class Toggle: Control, Changeable { if isSelected != newValue { isSelected = newValue } - didChange() + setNeedsUpdate() } } - open var isAnimated: Bool = true { didSet { didChange() }} + open var isAnimated: Bool = true { didSet { setNeedsUpdate() }} - open var showText: Bool = false { didSet { didChange() }} + open var showText: Bool = false { didSet { setNeedsUpdate() }} - open var onText: String = "On" { didSet { didChange() }} + open var onText: String = "On" { didSet { setNeedsUpdate() }} - open var offText: String = "Off" { didSet { didChange() }} + open var offText: String = "Off" { didSet { setNeedsUpdate() }} - open var textSize: TextSize = .small { didSet { didChange() }} + open var textSize: TextSize = .small { didSet { setNeedsUpdate() }} - open var textWeight: TextWeight = .regular { didSet { didChange() }} + open var textWeight: TextWeight = .regular { didSet { setNeedsUpdate() }} - open var textPosition: TextPosition = .left { didSet { didChange() }} + open var textPosition: TextPosition = .left { didSet { setNeedsUpdate() }} - open var inputId: String? { didSet { didChange() }} + open var inputId: String? { didSet { setNeedsUpdate() }} - open var value: AnyHashable? { didSet { didChange() }} + open var value: AnyHashable? { didSet { setNeedsUpdate() }} //-------------------------------------------------- // MARK: - Constraints diff --git a/VDS/Components/Tooltip/Tooltip.swift b/VDS/Components/Tooltip/Tooltip.swift index 316c87bb..7c4cf235 100644 --- a/VDS/Components/Tooltip/Tooltip.swift +++ b/VDS/Components/Tooltip/Tooltip.swift @@ -44,15 +44,15 @@ open class Tooltip: Control, TooltipLaunchable { $0.clipsToBounds = true } - open var closeButtonText: String = "Close" { didSet { didChange() }} + open var closeButtonText: String = "Close" { didSet { setNeedsUpdate() }} - open var fillColor: FillColor = .primary { didSet { didChange() }} + open var fillColor: FillColor = .primary { didSet { setNeedsUpdate() }} - open var size: Size = .medium { didSet { didChange() }} + open var size: Size = .medium { didSet { setNeedsUpdate() }} - open var title: String = "" { didSet { didChange() }} + open var title: String = "" { didSet { setNeedsUpdate() }} - open var content: String = "" { didSet { didChange() }} + open var content: String = "" { didSet { setNeedsUpdate() }} //-------------------------------------------------- // MARK: - Configuration diff --git a/VDS/Components/Tooltip/TrailingTooltipLabel.swift b/VDS/Components/Tooltip/TrailingTooltipLabel.swift index 5441d6eb..76555039 100644 --- a/VDS/Components/Tooltip/TrailingTooltipLabel.swift +++ b/VDS/Components/Tooltip/TrailingTooltipLabel.swift @@ -22,25 +22,25 @@ open class TrailingTooltipLabel: View, TooltipLaunchable { //-------------------------------------------------- open var label = Label() - open var labelText: String? { didSet { didChange() }} + open var labelText: String? { didSet { setNeedsUpdate() }} - open var labelAttributes: [any LabelAttributeModel]? { didSet { didChange() } } + open var labelAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() } } - open var labelTextStyle: TextStyle = .defaultStyle { didSet { didChange() } } + open var labelTextStyle: TextStyle = .defaultStyle { didSet { setNeedsUpdate() } } - open var labelTextPosition: TextPosition = .left { didSet { didChange() } } + open var labelTextPosition: TextPosition = .left { didSet { setNeedsUpdate() } } public lazy var textColorConfiguration: AnyColorable = { label.textColorConfiguration - }() { didSet { didChange() }} + }() { didSet { setNeedsUpdate() }} - open var tooltipCloseButtonText: String = "Close" { didSet { didChange() } } + open var tooltipCloseButtonText: String = "Close" { didSet { setNeedsUpdate() } } - open var tooltipTitle: String = "" { didSet { didChange() } } + open var tooltipTitle: String = "" { didSet { setNeedsUpdate() } } - open var tooltipContent: String = "" { didSet { didChange() } } + open var tooltipContent: String = "" { didSet { setNeedsUpdate() } } - open var tooltipYOffset: CGFloat = 0 { didSet { didChange() } } + open var tooltipYOffset: CGFloat = 0 { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Overrides //-------------------------------------------------- diff --git a/VDS/Protocols/Handlerable.swift b/VDS/Protocols/Handlerable.swift index cefb150f..14246735 100644 --- a/VDS/Protocols/Handlerable.swift +++ b/VDS/Protocols/Handlerable.swift @@ -10,38 +10,21 @@ import Combine import UIKit public protocol Handlerable: AnyObject, Initable, Disabling, Surfaceable { - var subject: PassthroughSubject { get set } var subscribers: Set { get set } + var shouldUpdateView: Bool { get set } func updateView() } extension Handlerable { - - public func setupDidChangeEvent(_ debounce: Bool = false) { - handlerPublisher(debounce) - .sink { [weak self] _ in - self?.updateView() - }.store(in: &subscribers) - } - - public func handlerPublisher(_ debounce: Bool = false) -> AnyPublisher { - if debounce { - return subject - .debounce(for: .seconds(Constants.StateDebounce), scheduler: RunLoop.main) - .eraseToAnyPublisher() - } else { - return subject - .eraseToAnyPublisher() + public func setNeedsUpdate() { + if shouldUpdateView { + shouldUpdateView = false + updateView() + shouldUpdateView = true } } } -extension Handlerable where Self: UIView { - public func didChange() { - subject.send() - } -} - extension Handlerable where Self: UIControl { public func addEvent(event: UIControl.Event, block: @escaping (Self)->()) { publisher(for: event)