diff --git a/VDS/Classes/Control.swift b/VDS/Classes/Control.swift index a41ec717..53b2f7f4 100644 --- a/VDS/Classes/Control.swift +++ b/VDS/Classes/Control.swift @@ -28,6 +28,12 @@ open class Control: UIControl, ModelHandlerable, ViewProto //-------------------------------------------------- private var initialSetupPerformed = false + @Proxy(\.model.surface) + open var surface: Surface + + @Proxy(\.model.disabled) + open var disabled: Bool + //-------------------------------------------------- // MARK: - Initializers //-------------------------------------------------- diff --git a/VDS/Classes/View.swift b/VDS/Classes/View.swift index 6c18736d..fc587d60 100644 --- a/VDS/Classes/View.swift +++ b/VDS/Classes/View.swift @@ -28,6 +28,11 @@ open class View: UIView, ModelHandlerable, ViewProtocol, R //-------------------------------------------------- private var initialSetupPerformed = false + @Proxy(\.model.surface) + open var surface: Surface + + @Proxy(\.model.disabled) + open var disabled: Bool //-------------------------------------------------- // MARK: - Initializers //-------------------------------------------------- diff --git a/VDS/Components/Checkbox/Checkbox.swift b/VDS/Components/Checkbox/Checkbox.swift index c183f094..460bfbaa 100644 --- a/VDS/Components/Checkbox/Checkbox.swift +++ b/VDS/Components/Checkbox/Checkbox.swift @@ -108,12 +108,6 @@ open class CheckboxBase: Control, Changable @Proxy(\.model.value) open var value: AnyHashable? - @Proxy(\.model.surface) - open var surface: Surface - - @Proxy(\.model.disabled) - open var disabled: Bool - @Proxy(\.model.dataAnalyticsTrack) open var dataAnalyticsTrack: String? diff --git a/VDS/Components/Label/Label.swift b/VDS/Components/Label/Label.swift index 3d2c89e3..80f70a9d 100644 --- a/VDS/Components/Label/Label.swift +++ b/VDS/Components/Label/Label.swift @@ -37,12 +37,6 @@ open class LabelBase: UILabel, ModelHandlerable, Initable @Proxy(\.model.textPosition) open var textPosition: TextPosition - - @Proxy(\.model.surface) - open var surface: Surface - - @Proxy(\.model.disabled) - open var disabled: Bool //can't use @Proxy here override open var text: String? { diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift index 47ccc718..4689d618 100644 --- a/VDS/Components/Toggle/Toggle.swift +++ b/VDS/Components/Toggle/Toggle.swift @@ -102,12 +102,6 @@ open class ToggleBase: Control, Changable { @Proxy(\.model.value) open var value: AnyHashable? - - @Proxy(\.model.surface) - public var surface: Surface - - @Proxy(\.model.disabled) - open var disabled: Bool @Proxy(\.model.dataAnalyticsTrack) open var dataAnalyticsTrack: String?