diff --git a/VDS/Components/Tilet/TiletSubTitleModel.swift b/VDS/Components/Tilet/TiletSubTitleModel.swift index 530638ce..84932595 100644 --- a/VDS/Components/Tilet/TiletSubTitleModel.swift +++ b/VDS/Components/Tilet/TiletSubTitleModel.swift @@ -41,7 +41,7 @@ extension TitleLockup { subTitleModel = TitleLockupSubTitleModel(text: model.text, textColor: model.textColor, textAttributes: model.textAttributes) otherTypograpicalStyle = model.typographicalStyle.value } else { - reset() + subTitleModel = nil } } diff --git a/VDS/Components/Tilet/TiletTitleModel.swift b/VDS/Components/Tilet/TiletTitleModel.swift index 9e7be868..f2e1b131 100644 --- a/VDS/Components/Tilet/TiletTitleModel.swift +++ b/VDS/Components/Tilet/TiletTitleModel.swift @@ -39,7 +39,7 @@ extension TitleLockup { if let model, !model.text.isEmpty { titleModel = TitleLockupTitleModel(text: model.text, textAttributes: model.textAttributes, typographicalStyle: model.typographicalStyle.value) } else { - reset() + titleModel = nil } } } diff --git a/VDS/Components/TitleLockup/TitleLockup.swift b/VDS/Components/TitleLockup/TitleLockup.swift index 74865ac3..33633723 100644 --- a/VDS/Components/TitleLockup/TitleLockup.swift +++ b/VDS/Components/TitleLockup/TitleLockup.swift @@ -254,8 +254,10 @@ open class TitleLockup: View { eyebrowLabel.attributes = eyebrowModel.textAttributes eyebrowLabel.numberOfLines = eyebrowModel.numberOfLines eyebrowLabel.surface = surface + } else { + eyebrowLabel.reset() } - + if let titleModel, !titleModel.text.isEmpty { titleTextIsEmpty = false titleLabel.textPosition = allLabelsTextPosition @@ -264,6 +266,8 @@ open class TitleLockup: View { titleLabel.attributes = titleModel.textAttributes titleLabel.numberOfLines = titleModel.numberOfLines titleLabel.surface = surface + } else { + titleLabel.reset() } if let subTitleModel, !subTitleModel.text.isEmpty { @@ -275,6 +279,8 @@ open class TitleLockup: View { subTitleLabel.numberOfLines = subTitleModel.numberOfLines subTitleLabel.surface = surface subTitleLabel.disabled = subTitleModel.textColor == .secondary + } else { + subTitleLabel.reset() } //if both first 2 rows not empty set spacing @@ -291,6 +297,11 @@ open class TitleLockup: View { } else if (!eyebrowTextIsEmpty || !titleTextIsEmpty) && subTitleTextIsEmpty { stackView.setCustomSpacing(0.0, after: titleLabel) } + + //hide/show + eyebrowLabel.isHidden = eyebrowTextIsEmpty + titleLabel.isHidden = titleTextIsEmpty + subTitleLabel.isHidden = subTitleTextIsEmpty } }