From 087691bc62d1509ed507b2d0a2d76e29be04ebe8 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 12 Oct 2022 08:16:29 -0500 Subject: [PATCH] update label within toggle Signed-off-by: Matt Bruce --- VDS/Components/Toggle/Toggle.swift | 4 ++-- VDS/Components/Toggle/ToggleModel.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift index 8babbace..389ec25f 100644 --- a/VDS/Components/Toggle/Toggle.swift +++ b/VDS/Components/Toggle/Toggle.swift @@ -237,7 +237,8 @@ open class ToggleBase: Control { private func updateLabel(_ viewModel: ModelType) { let showText = viewModel.showText stackView.spacing = showText ? 12 : 0 - + label.set(with: viewModel.labelModel) + if stackView.subviews.contains(label) { label.removeFromSuperview() } @@ -326,7 +327,6 @@ open class ToggleBase: Control { // MARK: - State //-------------------------------------------------- open override func updateView(viewModel: ModelType) { - label.set(with: viewModel.label) updateLabel(viewModel) updateToggle(viewModel) setAccessibilityHint() diff --git a/VDS/Components/Toggle/ToggleModel.swift b/VDS/Components/Toggle/ToggleModel.swift index 100b2e56..72b5eef4 100644 --- a/VDS/Components/Toggle/ToggleModel.swift +++ b/VDS/Components/Toggle/ToggleModel.swift @@ -18,7 +18,7 @@ public protocol ToggleModel: Modelable, FormFieldable, DataTrackable, Accessable extension ToggleModel { public var userTrueColor: Bool { return on } - public var label: DefaultLabelModel { + public var labelModel: DefaultLabelModel { var model = DefaultLabelModel() model.textPosition = textPosition model.typograpicalStyle = typograpicalStyle