Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/vds_ios_sample into vasavk/listUnordered

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>

VDSSample.xcodeproj/project.pbxproj

@@ -35,10 +35,14 @@
 		180636CB2C29B12B00C92D86 /* InputStepperViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 180636CA2C29B12B00C92D86 /* InputStepperViewController.swift */; };
 		1808BEBE2BA4479500129230 /* CarouselScrollbarViewConttroller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1808BEBD2BA4479500129230 /* CarouselScrollbarViewConttroller.swift */; };
 		1832AC5B2BA1347B008AE476 /* BreadcrumbsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1832AC5A2BA1347B008AE476 /* BreadcrumbsViewController.swift */; };
+		183B16F52C80B27C00BA6A10 /* FootnoteGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183B16F42C80B27C00BA6A10 /* FootnoteGroupViewController.swift */; };
 		184023492C61E9E700A412C8 /* PriceLockupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 184023482C61E9E700A412C8 /* PriceLockupViewController.swift */; };
+		1859B3152CBF77B30031CD70 /* ListUnorderedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1859B3142CBF77B30031CD70 /* ListUnorderedViewController.swift */; };
 		186D13CD2BBA990800986B53 /* DropdownSelectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 186D13CC2BBA990800986B53 /* DropdownSelectViewController.swift */; };
+		18926F5F2C76185A00C55BF6 /* FootnoteItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18926F5E2C76185A00C55BF6 /* FootnoteItemViewController.swift */; };
 		18A3F1302BD9332500498E4A /* CalendarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A3F12F2BD9332500498E4A /* CalendarViewController.swift */; };
 		18AE87522C06FDD60075F181 /* CarouselViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18AE87512C06FDD60075F181 /* CarouselViewController.swift */; };
+		18C0F9482C98177F00E1DD71 /* ModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18C0F9472C98177F00E1DD71 /* ModalViewController.swift */; };
 		440B84CC2BD8E98B004A732A /* TableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 440B84CB2BD8E98B004A732A /* TableViewController.swift */; };
 		445BA07A29C088470036A7C5 /* NotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 445BA07929C088470036A7C5 /* NotificationViewController.swift */; };
 		44604AD929CE1CF900E62B51 /* LineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44604AD829CE1CF900E62B51 /* LineViewController.swift */; };
@@ -104,6 +108,7 @@
 		EAF7F0CC289DA24F00B287F5 /* DownloadArtifactoryItems.sh in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F0C8289DA24F00B287F5 /* DownloadArtifactoryItems.sh */; };
 		EAF7F0CD289DA24F00B287F5 /* Artifactory.sh in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F0C9289DA24F00B287F5 /* Artifactory.sh */; };
 		EAF7F11A28A14A0E00B287F5 /* RadioButtonGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F11928A14A0E00B287F5 /* RadioButtonGroupViewController.swift */; };
+		EAFD5A9D2CB4609900C87DE1 /* TokenColorPickerFormSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAFD5A9C2CB4609900C87DE1 /* TokenColorPickerFormSection.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -135,10 +140,14 @@
 		180636CA2C29B12B00C92D86 /* InputStepperViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputStepperViewController.swift; sourceTree = "<group>"; };
 		1808BEBD2BA4479500129230 /* CarouselScrollbarViewConttroller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselScrollbarViewConttroller.swift; sourceTree = "<group>"; };
 		1832AC5A2BA1347B008AE476 /* BreadcrumbsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BreadcrumbsViewController.swift; sourceTree = "<group>"; };
+		183B16F42C80B27C00BA6A10 /* FootnoteGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FootnoteGroupViewController.swift; sourceTree = "<group>"; };
 		184023482C61E9E700A412C8 /* PriceLockupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PriceLockupViewController.swift; sourceTree = "<group>"; };
+		1859B3142CBF77B30031CD70 /* ListUnorderedViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListUnorderedViewController.swift; sourceTree = "<group>"; };
 		186D13CC2BBA990800986B53 /* DropdownSelectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropdownSelectViewController.swift; sourceTree = "<group>"; };
+		18926F5E2C76185A00C55BF6 /* FootnoteItemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FootnoteItemViewController.swift; sourceTree = "<group>"; };
 		18A3F12F2BD9332500498E4A /* CalendarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarViewController.swift; sourceTree = "<group>"; };
 		18AE87512C06FDD60075F181 /* CarouselViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselViewController.swift; sourceTree = "<group>"; };
+		18C0F9472C98177F00E1DD71 /* ModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalViewController.swift; sourceTree = "<group>"; };
 		440B84CB2BD8E98B004A732A /* TableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewController.swift; sourceTree = "<group>"; };
 		445BA07929C088470036A7C5 /* NotificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationViewController.swift; sourceTree = "<group>"; };
 		44604AD829CE1CF900E62B51 /* LineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineViewController.swift; sourceTree = "<group>"; };
@@ -207,6 +216,7 @@
 		EAF7F0C8289DA24F00B287F5 /* DownloadArtifactoryItems.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = DownloadArtifactoryItems.sh; sourceTree = "<group>"; };
 		EAF7F0C9289DA24F00B287F5 /* Artifactory.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = Artifactory.sh; sourceTree = "<group>"; };
 		EAF7F11928A14A0E00B287F5 /* RadioButtonGroupViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadioButtonGroupViewController.swift; sourceTree = "<group>"; };
+		EAFD5A9C2CB4609900C87DE1 /* TokenColorPickerFormSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenColorPickerFormSection.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -285,6 +295,7 @@
 				EAB5FEF22928153D00998C17 /* Helper.swift */,
 				EAD062A42A3B5CDF0015965D /* Slider.swift */,
 				EA89205028B68307006B9984 /* TextField.swift */,
+				EAFD5A9C2CB4609900C87DE1 /* TokenColorPickerFormSection.swift */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -341,12 +352,16 @@
 				EA0D1C2E2A66CFE900E5C127 /* CheckboxViewController.swift */,
 				EA1758452BC8893700A5C0D9 /* DatePickerViewController.swift */,
 				186D13CC2BBA990800986B53 /* DropdownSelectViewController.swift */,
+				18926F5E2C76185A00C55BF6 /* FootnoteItemViewController.swift */,
+				183B16F42C80B27C00BA6A10 /* FootnoteGroupViewController.swift */,
 				EA985C00296CC21C00F2FF2E /* IconViewController.swift */,
-				180636CA2C29B12B00C92D86 /* InputStepperViewController.swift */,
 				EAA5EEAC28EB6924003B3210 /* InputFieldViewController.swift */,
+				180636CA2C29B12B00C92D86 /* InputStepperViewController.swift */,
 				EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */,
 				44604AD829CE1CF900E62B51 /* LineViewController.swift */,
+				1859B3142CBF77B30031CD70 /* ListUnorderedViewController.swift */,
 				EAD0688F2A55FC11002E3A2D /* LoaderViewController.swift */,
+				18C0F9472C98177F00E1DD71 /* ModalViewController.swift */,
 				445BA07929C088470036A7C5 /* NotificationViewController.swift */,
 				71B23C302B921D730027F7D9 /* PaginationViewController.swift */,
 				184023482C61E9E700A412C8 /* PriceLockupViewController.swift */,
@@ -358,8 +373,8 @@
 				EA5F86CD2A1E863F00BC83E4 /* TabsContainerViewController.swift */,
 				EA596AB92A16B2ED00300C4B /* TabsViewController.swift */,
 				EA985C24296E06EA00F2FF2E /* TextAreaViewController.swift */,
-				EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */,
 				EAC9257F29119FC400091998 /* TextLinkViewController.swift */,
+				EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */,
 				EA5E304F294D11540082B959 /* TileContainerViewController.swift */,
 				EA5E305B295111050082B959 /* TileletViewController.swift */,
 				EA5E30542950EA6E0082B959 /* TitleLockupViewController.swift */,
@@ -546,9 +561,12 @@
 				EAD062A32A3913920015965D /* DropShawdowViewController.swift in Sources */,
 				EA6642972BD1B2E700D81DC4 /* ColorPickerView.swift in Sources */,
 				EA0D1C312A673F3500E5C127 /* RadioButtonViewController.swift in Sources */,
+				EAFD5A9D2CB4609900C87DE1 /* TokenColorPickerFormSection.swift in Sources */,
 				EAB5FEF32928153D00998C17 /* Helper.swift in Sources */,
 				EA89204728B66CE2006B9984 /* KeyboardFrameChangeListener.swift in Sources */,
 				EA4DB30428DCD25B00103EE3 /* BadgeViewController.swift in Sources */,
+				1859B3152CBF77B30031CD70 /* ListUnorderedViewController.swift in Sources */,
+				18C0F9482C98177F00E1DD71 /* ModalViewController.swift in Sources */,
 				EAB2376029E88D5D00AABE9A /* TooltipViewController.swift in Sources */,
 				EA89204828B66CE2006B9984 /* ScrollViewKeyboardAvoiding.swift in Sources */,
 				EA0FC2C12912DC5500DF80B4 /* TextLinkCaretViewController.swift in Sources */,
@@ -559,6 +577,7 @@
 				18AE87522C06FDD60075F181 /* CarouselViewController.swift in Sources */,
 				EA596ABA2A16B2ED00300C4B /* TabsViewController.swift in Sources */,
 				EA89204E28B67332006B9984 /* CheckBoxGroupViewController.swift in Sources */,
+				183B16F52C80B27C00BA6A10 /* FootnoteGroupViewController.swift in Sources */,
 				EAA5EEAD28EB6924003B3210 /* InputFieldViewController.swift in Sources */,
 				440B84CC2BD8E98B004A732A /* TableViewController.swift in Sources */,
 				EA985C25296E06EA00F2FF2E /* TextAreaViewController.swift in Sources */,
@@ -567,6 +586,7 @@
 				EA985C20296DECF600F2FF2E /* IconName.swift in Sources */,
 				EA89204928B66CE2006B9984 /* KeyboardFrameChangeListening.swift in Sources */,
 				EA5F86CE2A1E863F00BC83E4 /* TabsContainerViewController.swift in Sources */,
+				18926F5F2C76185A00C55BF6 /* FootnoteItemViewController.swift in Sources */,
 				EA985C01296CC21C00F2FF2E /* IconViewController.swift in Sources */,
 				184023492C61E9E700A412C8 /* PriceLockupViewController.swift in Sources */,
 				EAC9258029119FC400091998 /* TextLinkViewController.swift in Sources */,
@@ -725,7 +745,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 71;
+				CURRENT_PROJECT_VERSION = 75;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -761,7 +781,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 71;
+				CURRENT_PROJECT_VERSION = 75;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77;
 				GENERATE_INFOPLIST_FILE = YES;

VDSSample/Classes/ColorPickerView.swift

@@ -9,14 +9,18 @@ import Foundation
 import UIKit
 import VDS
 
-public class ColorPickerView<EnumType>: UIStackView {
-    public var pickerType: EnumType
+public class ColorPickerView: UIStackView, UIColorPickerViewControllerDelegate {
     public var selectedColor: UIColor? {
         didSet {
             selectedColorView.backgroundColor = selectedColor
         }
     }
-    
+   
+    private var colorPicker: UIColorPickerViewController = {
+        let picker = UIColorPickerViewController()
+        return picker
+    }()
+
     var selectedColorView: UIView = {
         let view = UIView()
         view.translatesAutoresizingMaskIntoConstraints = false
@@ -31,25 +35,30 @@ public class ColorPickerView<EnumType>: UIStackView {
         $0.text = "Select"
     }
 
-    public init(with pickerType: EnumType, color: UIColor? = nil, onClick: @escaping (ColorPickerView)->Void) {
-        self.pickerType = pickerType
+    /// Callback once the user picks a color from the picker.
+    public var onColorSelected: ((UIColor) -> Void)?
+
+    public init(color: UIColor? = nil) {
         super.init(frame: .zero)
         if let color {
             selectedColor = color
         }
+        colorPicker.delegate = self
         setup()
-        button.onClick = { _ in onClick(self) }
+        button.onClick = { _ in
+            UIApplication.topViewController()?.present(self.colorPicker, animated: true)
+        }
     }
-    
+
     required init(coder: NSCoder) {
-        fatalError()
+        fatalError("init(coder:) has not been implemented")
     }
-    
+   
     private func setup() {
         distribution = .fillEqually
         alignment = .fill
         spacing = 10
-        
+
         let indicatorWrapper = View()
         indicatorWrapper.addSubview(selectedColorView)
         indicatorWrapper.height(32)
@@ -57,8 +66,9 @@ public class ColorPickerView<EnumType>: UIStackView {
         indicatorWrapper.pinLeading()
         indicatorWrapper.pinBottom()
         indicatorWrapper.pinTrailingGreaterThanOrEqualTo(anchor: indicatorWrapper.trailingAnchor)
-        
+       
         addArrangedSubview(indicatorWrapper)
+
         let buttonWrapper = View()
         buttonWrapper.addSubview(button)
         buttonWrapper.height(32)
@@ -68,4 +78,15 @@ public class ColorPickerView<EnumType>: UIStackView {
         button.pinLeadingGreaterThanOrEqualTo(anchor: buttonWrapper.leadingAnchor)
         addArrangedSubview(buttonWrapper)
     }
+   
+    // MARK: - UIColorPickerViewControllerDelegate
+
+    public func colorPickerViewControllerDidSelectColor(_ viewController: UIColorPickerViewController) {
+        selectedColor = viewController.selectedColor
+        onColorSelected?(viewController.selectedColor)
+    }
+   
+    public func colorPickerViewControllerDidFinish(_ viewController: UIColorPickerViewController) {
+        UIApplication.topViewController()?.dismiss(animated: true)
+    }
 }

VDSSample/Classes/Helper.swift

@@ -10,15 +10,15 @@ import VDS
 import UIKit
 
 extension UIView {
-    public func makeWrapper(edgeSpacing: CGFloat = 0.0, isTrailing: Bool = true) -> View {
-        UIView.makeWrapper(for: self, edgeSpacing: edgeSpacing, isTrailing: isTrailing)
+    public func makeWrapper(edgeSpacing: CGFloat = 0.0, isTrailing: Bool = true, isBottom: Bool = false) -> View {
+        UIView.makeWrapper(for: self, edgeSpacing: edgeSpacing, isTrailing: isTrailing, isBottom: isBottom)
     }
     
-    public static func makeWrapper(for view: UIView, edgeSpacing: CGFloat = 0.0, isTrailing: Bool = true) -> View {
-        makeWrapperWithConstraints(for: view, edgeSpacing: edgeSpacing, isTrailing: isTrailing).view
+    public static func makeWrapper(for view: UIView, edgeSpacing: CGFloat = 0.0, isTrailing: Bool = true, isBottom: Bool = false) -> View {
+        makeWrapperWithConstraints(for: view, edgeSpacing: edgeSpacing, isTrailing: isTrailing, isBottom: isBottom).view
     }
     
-    public static func makeWrapperWithConstraints(for view: UIView, edgeSpacing: CGFloat = 0.0, isTrailing: Bool = true) -> (view: View, container: NSLayoutConstraint.Container) {
+    public static func makeWrapperWithConstraints(for view: UIView, edgeSpacing: CGFloat = 0.0, isTrailing: Bool = true, isBottom: Bool = false) -> (view: View, container: NSLayoutConstraint.Container) {
         let container = NSLayoutConstraint.Container()
         let wrapper = View().with {
             $0.translatesAutoresizingMaskIntoConstraints = false
@@ -26,7 +26,11 @@ extension UIView {
         wrapper.addSubview(view)
         
         container.topConstraint = view.pinTop(anchor: wrapper.topAnchor, constant: edgeSpacing)
-        container.bottomConstraint = view.pinBottom(anchor: wrapper.bottomAnchor, constant: edgeSpacing)
+        if isBottom {
+            container.bottomConstraint = view.pinBottomLessThanOrEqualTo(anchor: wrapper.bottomAnchor, constant: edgeSpacing)
+        } else {
+            container.bottomConstraint = view.pinBottom(anchor: wrapper.bottomAnchor, constant: edgeSpacing)
+        }
         container.leadingConstraint = view.pinLeading(anchor: wrapper.leadingAnchor, constant: edgeSpacing)
         if isTrailing {
             container.trailingConstraint = view.pinTrailingLessThanOrEqualTo(anchor: wrapper.trailingAnchor, constant: edgeSpacing)

VDSSample/Classes/TokenColorPickerFormSection.swift

@@ -0,0 +1,107 @@
+//
+//  TokenColorPickerFormSection.swift
+//  VDSSample
+//
+//  Created by Matt Bruce on 10/7/24.
+//
+
+import Foundation
+import UIKit
+import VDS
+
+public class TokenColorPickerSection<EnumType: RawRepresentable & CaseIterable>: FormSection where EnumType.RawValue == String {
+   
+    //--------------------------------------------------
+    // MARK: - Private Properties
+    //--------------------------------------------------
+    private var picker: UIPickerView
+    private var rowTitle: String = "Color"   
+    private var rowToolTip: Tooltip.TooltipModel?
+
+    ///Handles VDS Color Selections
+    private var tokenColorRow: UIView?
+    private lazy var tokenColorView = {
+        PickerSelectorView(title: "",
+                           picker: self.picker,
+                           items: UIColor.VDSColor.allCases)
+        .with { $0.text = UIColor.VDSColor.paletteBlack.rawValue }
+    }()
+   
+    ///Handles Custom Color picker selections
+    private var customColorRow: UIView?
+    private lazy var customColorView: ColorPickerView = {
+        .init(color: .black).with {
+            $0.onColorSelected =  { [weak self] color in
+                guard let self else { return }
+                onColorSelected?(color)
+            }
+        }
+    }()
+
+    //--------------------------------------------------
+    // MARK: - Public Properties
+    //--------------------------------------------------
+   
+    /// This is the 1st row that the user will pick from, again this enum has to contain "token" and "custom" otherwise it won't work well.
+    public lazy var pickerSelectorView = {
+        PickerSelectorView<EnumType>(title: "",
+                                     picker: picker,
+                                     items: EnumType.allCases as! [EnumType])
+    }()
+
+    public var selectedItem: EnumType { pickerSelectorView.selectedItem }
+   
+    /// Callback for a non-token/non-color selection
+    public var onSelected: ((EnumType) -> Void)?
+    /// Callback after "token" is selected from the VDSColor array
+    public var onTokenSelected: ((UIColor.VDSColor) -> Void)?
+    /// Callback once the user picks a color from the picker.
+    public var onColorSelected: ((UIColor) -> Void)?
+    
+    ///Pass in a title and the reference for the picker
+    public init(title: String? = nil, rowTitle: String = "Color", rowTooltip: Tooltip.TooltipModel? = nil, picker: UIPickerView) {
+        self.picker = picker
+        super.init(frame: .zero)
+        self.title = title
+        self.rowTitle = rowTitle
+        self.rowToolTip = rowTooltip
+        setup()
+    }
+   
+    required init(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    public func setup() {
+        addFormRow(label: rowTitle, tooltip: rowToolTip, view: pickerSelectorView)
+        tokenColorRow = addFormRow(label: "Token", view: tokenColorView)
+        customColorRow = addFormRow(label: "Custom", view: customColorView)
+       
+        tokenColorRow?.isHidden = true
+        customColorRow?.isHidden = true
+       
+        pickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            guard let self else { return }
+            let isToken =  item.rawValue == "token"
+            let isCustom =  item.rawValue == "custom"
+            if isToken {
+                self.onTokenSelected?(self.tokenColorView.selectedItem)
+            } else if let selectedItem = self.customColorView.selectedColor, isCustom {
+                self.onColorSelected?(selectedItem)
+            } else {
+                self.onSelected?(item)
+            }
+            self.tokenColorRow?.isHidden = !isToken
+            self.customColorRow?.isHidden = !isCustom
+        }
+       
+        tokenColorView.onPickerDidSelect = { [weak self] item in
+            guard let self else { return }
+            self.onTokenSelected?(item)
+        }
+    }
+   
+    public func setDefault(value: EnumType) {
+        pickerSelectorView.set(item: value)
+    }
+}

VDSSample/Supporting Files/Artifactory/Artifactory.sh

@@ -4,10 +4,10 @@
 VERSION="2.0"
 #Update onces stable
 #APITOKEN=AKCp5cbwXBA2Rarq6WagmFFxQxcxsARGxSq5g1H8NaGm7837KTgwdWPqsp7FdgRa13B7AcpGN
-#URL=https://oneartifactorycloud.verizon.com/artifactory
+#URL=https://oneartifactorycloud.verizon.com/artifactory/
 
 APITOKEN=AKCp5ZmHP8B1dkLtdSh23bMcWHtrWzoB3SfhoCNpEC5e3dKNhiKsn8TPMZQafXzm2qkeXFXE6
-URL=https://oneartifactoryprod.verizon.com/artifactory
+URL=https://oneartifactoryci.verizon.com/artifactory
 
 LOCALPATH="${1}"
 REMOTEPATH="${2}"

VDSSample/ViewControllers/BadgeIndicatorViewController.swift

@@ -37,18 +37,45 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
                            items: BadgeIndicator.MaximumDigits.allCases)
     }()
     
-    lazy var borderColorLightPickerSelectorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
+    enum BorderColor: String, CaseIterable {
+        case `default`, token, custom
+    }
+    
+    lazy var borderColorLightPickerSelectorView: TokenColorPickerSection  = {
+        TokenColorPickerSection<BorderColor>(rowTitle: "Border Light",
+                                                 picker: self.picker).with {
+            $0.onSelected = { [weak self] color in
+                guard let self else { return }
+                component.borderColorLight = nil
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                component.borderColorLight = color.uiColor
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                component.borderColorLight = color
+            }
+        }
     }()
 
-    lazy var borderColorDarkPickerSelectorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
+    lazy var borderColorDarkPickerSelectorView : TokenColorPickerSection  = {
+        TokenColorPickerSection<BorderColor>(rowTitle: "Border Dark",
+                                                 picker: self.picker).with {
+            $0.onSelected = { [weak self] color in
+                guard let self else { return }
+                component.borderColorDark = nil
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                component.borderColorDark = color.uiColor
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                component.borderColorDark = color
+            }
+        }
     }()
-
     
     var textField = NumericField()
     var leadingCharacterTextField = TextField()
@@ -59,7 +86,7 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
@@ -82,13 +109,13 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
         addFormRow(label: "Vertical Padding", view: verticalPaddingTextField)
         addFormRow(label: "Fill Color", view: fillColorPickerSelectorView)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Hide Border", view: hideBorderSwitch)
-        addFormRow(label: "Border Light", view: borderColorLightPickerSelectorView)
-        addFormRow(label: "Border Dark", view: borderColorDarkPickerSelectorView)
+        addFormRow(label: "Hide Border", view: hideBorderSwitch, pinTrailing: false)
+        append(section: borderColorLightPickerSelectorView)
+        append(section: borderColorDarkPickerSelectorView)
         addFormRow(label: "Size", view: textSizePickerSelectorView)
         addFormRow(label: "Accessiblity Text", view: accessibilityTextField)
         
-        dotForm.addFormRow(label: "Hide Dot", view: hideDotSwitch)
+        dotForm.addFormRow(label: "Hide Dot", view: hideDotSwitch, pinTrailing: false)
         dotForm.addFormRow(label: "Dot Size", view: dotSizeTextField)
         numberedForm.addFormRow(label: "Leading Character", view: leadingCharacterTextField)
         numberedForm.addFormRow(label: "Trailing Text", view: trailingTextField)
@@ -173,8 +200,6 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
         fillColorPickerSelectorView.text = component.fillColor.rawValue
         textSizePickerSelectorView.text = component.size.rawValue
         maxDigitsPickerSelectorView.text = component.maximumDigits.rawValue
-        borderColorDarkPickerSelectorView.text = component.borderColorDark?.toVDSColor()?.rawValue ?? ""
-        borderColorLightPickerSelectorView.text = component.borderColorLight?.toVDSColor()?.rawValue ?? ""
         textField.text = "\(component.number!)"
         visibleForms()
     }
@@ -207,14 +232,6 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
         maxDigitsPickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.maximumDigits = item
         }
-        
-        borderColorDarkPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.component.borderColorDark = item.uiColor
-        }
-        
-        borderColorLightPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.component.borderColorLight = item.uiColor
-        }
     }
 }
 

VDSSample/ViewControllers/BadgeViewController.swift

@@ -36,12 +36,14 @@ class  BadgeViewController: BaseViewController<Badge> {
             }
         }
     }
-    
-    lazy var fillColorPickerSelectorView = {
-        PickerSelectorView(title: "red",
-                            picker: self.picker,
-                           items: Badge.FillColor.allCases)
-    }()
+        
+    enum FillColor: String, CaseIterable {
+        case red, yellow, green, orange, blue, black, white, token, custom
+    }
+
+    enum TextColor: String, CaseIterable {
+        case `default`, token, custom
+    }
     
     lazy var numberOfLinesPickerSelectorView = {
         PickerSelectorView(title: "one",
@@ -51,18 +53,74 @@ class  BadgeViewController: BaseViewController<Badge> {
     
     var textField = TextField()
     var maxWidthTextField = NumericField()
-        
+    
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
+        
+    lazy var fillColorSection = {
+        TokenColorPickerSection<FillColor>(rowTitle: "Fill Color", picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                var fillColor: Badge.FillColor = .red
+                switch item {
+                case .red:
+                    fillColor = .red
+                case .yellow:
+                    fillColor = .yellow
+                case .green:
+                    fillColor = .green
+                case .orange:
+                    fillColor = .orange
+                case .blue:
+                    fillColor = .blue
+                case .black:
+                    fillColor = .black
+                case .white:
+                    fillColor = .white
+                default:
+                    break
+                }
+                component.fillColor = fillColor
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                component.fillColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                component.fillColor = .custom(color)
+            }
+        }
+    }()
+    
+    lazy var textColorSection = {
+        TokenColorPickerSection<TextColor>(rowTitle: "Text Color", picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                component.textColor = nil
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                component.textColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                component.textColor = .custom(color)
+            }
+        }
+    }()
     
     override func setupForm(){
         super.setupForm()  
-        addFormRow(label: "Fill Color", view: fillColorPickerSelectorView)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
+        
+        append(section: fillColorSection)
+        append(section: textColorSection)
+        
         addFormRow(label: "Text", view: textField)
         addFormRow(label: "Max Width", view: maxWidthTextField)
         addFormRow(label: "Number of Lines", view: numberOfLinesPickerSelectorView)
@@ -89,6 +147,8 @@ class  BadgeViewController: BaseViewController<Badge> {
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
         textField.text = component.text
+        fillColorSection.setDefault(value: .red)
+        textColorSection.setDefault(value: .default)
     }
     
     func setupPicker(){
@@ -97,24 +157,13 @@ class  BadgeViewController: BaseViewController<Badge> {
             self?.component.surface = item
             self?.contentTopView.backgroundColor = item.color
         }        
-        
-        fillColorPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.component.fillColor = item
-        }
-        
-        numberOfLinesPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.component.numberOfLines = item.intValue
-        }
     }
 }
 
 extension BadgeViewController: ComponentSampleable {
     static func makeSample() -> ComponentSample {
-        let component = Self.makeComponent()
-        component.fillColor = .red
-        component.text = "Terms and conditions"
-        component.maxWidth = 70
-        component.numberOfLines = 3
-        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
+        let c = Self()
+        c.setupModel()
+        return ComponentSample(component: c.component, trailingPinningType: .lessThanOrEqual)
     }
 }

VDSSample/ViewControllers/BaseViewController.swift

@@ -43,7 +43,7 @@ public class FormSection: UIStackView {
     }
     
     @discardableResult
-    open func addFormRow(label: String, tooltip: Tooltip.TooltipModel? = nil, view: UIView) -> UIView {
+    open func addFormRow(label: String, tooltip: Tooltip.TooltipModel? = nil, view: UIView, pinTrailing: Bool = true) -> UIView {
         let formRow = UIStackView().with {
             $0.translatesAutoresizingMaskIntoConstraints = false
             $0.alignment = .fill
@@ -63,7 +63,7 @@ public class FormSection: UIStackView {
         }
         
         formRow.addArrangedSubview(label)
-        formRow.addArrangedSubview(view)
+        formRow.addArrangedSubview(pinTrailing ? view : .makeWrapper(for: view))
 
         addArrangedSubview(formRow)
         return formRow
@@ -311,7 +311,7 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable ,
     }
 
     public func setupForm() {
-        addFormRow(label: "Show Bounds", view: debugViewSwitch)
+        addFormRow(label: "Show Bounds", view: debugViewSwitch, pinTrailing: false)
     }
     
     let actionLabel = Label()
@@ -334,10 +334,34 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable ,
         viewController.didMove(toParent: self)
     }
     
-    open func addContentTopView(view: UIView, edgeSpacing: CGFloat = 16.0) {
+    var componentTrailingEqualConstraint: NSLayoutConstraint?
+    var componentTrailingLessThanEqualConstraint: NSLayoutConstraint?
+    open func addContentTopView(view: UIView, edgeSpacing: CGFloat = 16.0, pinTrailing: Bool = true) {
         view.translatesAutoresizingMaskIntoConstraints = false
         contentTopView.addSubview(view)
-        view.pinToSuperView(.uniform(edgeSpacing))
+        componentTrailingEqualConstraint = view.pinTrailing(anchor: contentTopView.trailingAnchor, constant: edgeSpacing)?.deactivate()
+        componentTrailingLessThanEqualConstraint = view.pinTrailingLessThanOrEqualTo(anchor: contentTopView.trailingAnchor, constant: edgeSpacing)?.deactivate()
+        view
+            .pinTop(edgeSpacing)
+            .pinLeading(edgeSpacing)
+            .pinBottom(edgeSpacing)
+        
+        if pinTrailing {
+            componentTrailingEqualConstraint?.activate()
+        } else {
+            componentTrailingLessThanEqualConstraint?.activate()
+        }
+    }
+    
+    open func updateComponentConstraint(pinTrailing: Bool = true) {
+        componentTrailingEqualConstraint?.deactivate()
+        componentTrailingLessThanEqualConstraint?.deactivate()
+        
+        if pinTrailing {
+            componentTrailingEqualConstraint?.activate()
+        } else {
+            componentTrailingLessThanEqualConstraint?.activate()
+        }
     }
 
     open func append(section: FormSection) {
@@ -345,8 +369,8 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable ,
     }
        
     @discardableResult
-    open func addFormRow(label: String, tooltip: Tooltip.TooltipModel? = nil, view: UIView) -> UIView {
-        return formStackView.addFormRow(label: label,tooltip: tooltip, view: view)
+    open func addFormRow(label: String, tooltip: Tooltip.TooltipModel? = nil, view: UIView, pinTrailing: Bool = true) -> UIView {
+        return formStackView.addFormRow(label: label,tooltip: tooltip, view: view, pinTrailing: pinTrailing)
     }
     
     var activeTextField: UITextField?

VDSSample/ViewControllers/BreadcrumbsViewController.swift

@@ -48,8 +48,8 @@ class  BreadcrumbsViewController: BaseViewController<Breadcrumbs> {
     override func setupForm(){
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Last Crumb Selected", view: selectedSwitch)
-        addFormRow(label: "No Long Breadcrumbs", view: sampleSwitch)
+        addFormRow(label: "Last Crumb Selected", view: selectedSwitch, pinTrailing: false)
+        addFormRow(label: "No Long Breadcrumbs", view: sampleSwitch, pinTrailing: false)
 
         selectedSwitch.onChange = { [weak self] sender in
             guard let self else { return }

VDSSample/ViewControllers/ButtonGroupViewController.swift

@@ -111,7 +111,7 @@ class ButtonGroupViewController: BaseViewController<ButtonGroup> {
         super.setupForm()
         addActionRow()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Alignment", view: buttonAlignmentSelectorView)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "Row Quantity", view: rowQuantitySelectorView)

VDSSample/ViewControllers/ButtonIconViewController.swift

@@ -71,61 +71,67 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)      
         setupPicker()
         setupModel()
     }
     
-    var badgeIndicatorFormStackView = FormSection().with { $0.isHidden = true }
+    var badgeIndicatorFormStackView = FormSection().with { $0.isHidden = true; $0.title = "Badge Indicator" }
     
     ///ColorPicker
-    var colorPickerType: ColorPickerType = .light
-    enum ColorPickerType {
-        case light, dark
-    }
-    
-    lazy var colorPicker: UIColorPickerViewController = {
-        let picker = UIColorPickerViewController()
-        picker.delegate = self
-        return picker
-    }()
-    
-    lazy var lightColorPicker: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.light) {[weak self] picker in
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    lazy var lightColorPicker: ColorPickerView = {
+        return .init().with {
+            $0.onColorSelected =  { [weak self] _ in
+                guard let self else { return }
+                updateColors()
+            }
         }
     }()
-    
+           
     lazy var darkColorPicker: ColorPickerView = {
-        return .init(with: ColorPickerType.dark) {[weak self] picker in
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+        return .init().with {
+            $0.onColorSelected =  { [weak self] _ in
+                guard let self else { return }
+                updateColors()
+            }
         }
     }()
     
+    func updateColors() {
+        if let selectedLightColor = lightColorPicker.selectedColor {
+            component.selectedIconColorConfiguration = .init(selectedLightColor, selectedLightColor)
+        } else if let selectedDarkColor = darkColorPicker.selectedColor,
+           let selectedLightColor = lightColorPicker.selectedColor {
+            component.selectedIconColorConfiguration = .init(selectedLightColor, selectedDarkColor)
+        }
+    }
+    
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Surface Type", view: surfaceTypePickerSelectorView)
         addFormRow(label: "Size", view: sizePickerSelectorView)
         addFormRow(label: "Kind", view: kindPickerSelectorView)
-        addFormRow(label: "Selected Light", view: lightColorPicker)
-        addFormRow(label: "Selected Dark", view: darkColorPicker)
-        addFormRow(label: "Floating", view: floating)
-        addFormRow(label: "Hide Border", view: hideBorder)
-        addFormRow(label: "Fit To Icon", view: fitToIcon)
+        addFormRow(label: "Floating", view: floating, pinTrailing: false)
+        addFormRow(label: "Hide Border", view: hideBorder, pinTrailing: false)
+        addFormRow(label: "Fit To Icon", view: fitToIcon, pinTrailing: false)
         addFormRow(label: "Name", view: namePickerSelectorView)
-        addFormRow(label: "Selected Icon Name", view: selectedIconNamePickerSelectorView)
-        addFormRow(label: "Selectable", view: selectableSwitch)
         addFormRow(label: "X Offset", view: centerX)
         addFormRow(label: "Y Offset", view: centerY)
+
+        append(section: .init().with {
+            $0.title = "Select State"
+            $0.addFormRow(label: "Selectable", view: selectableSwitch, pinTrailing: false)
+            $0.addFormRow(label: "Selected Icon Name", view: selectedIconNamePickerSelectorView)
+            $0.addFormRow(label: "Selected Light", view: lightColorPicker)
+            $0.addFormRow(label: "Selected Dark", view: darkColorPicker)
+        })
         
+        addFormRow(label: "Show Badge Indicator", view: badgeIndicatorSwitch, pinTrailing: false)
         //badgeIndicator section
-        addFormRow(label: "Show Badge Indicator", view: badgeIndicatorSwitch)
         badgeIndicatorFormStackView.addFormRow(label: "Expand Direction", view: badgeIndicatorExpandDirectionPickerSelectorView)
-        badgeIndicatorFormStackView.addFormRow(label: "Badge Variants", view: variantOneSwitch)
+        badgeIndicatorFormStackView.addFormRow(label: "Badge Variants", view: variantOneSwitch, pinTrailing: false)
         badgeIndicatorFormStackView.addFormRow(label: "Custom X offset", view: customBadgeIndicatorXField)
         badgeIndicatorFormStackView.addFormRow(label: "Custom Y offset", view: customBadgeIndicatorYField)
 
@@ -218,7 +224,8 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
     
     func setupModel() {
         let name = Icon.Name.addToFavorite
-        
+        let selectedName = Icon.Name.addedToFavorite
+        component.selectedIconName = selectedName
         component.iconName = name
         component.onChange = { c in print("changed: \(c.isSelected)") }
         //setup UI
@@ -227,6 +234,7 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
         kindPickerSelectorView.text = component.kind.rawValue
         sizePickerSelectorView.text = component.size.rawValue
         namePickerSelectorView.text = name.rawValue
+        selectedIconNamePickerSelectorView.text = selectedName.rawValue
         disabledSwitch.isOn = !component.isEnabled
         badgeIndicatorExpandDirectionPickerSelectorView.text = ButtonIcon.BadgeIndicatorModel.ExpandDirection.right.rawValue
     }
@@ -308,27 +316,3 @@ extension ButtonIconViewController: ComponentSampleable {
         return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
-
-extension ButtonIconViewController: UIColorPickerViewControllerDelegate {
-    
-    func selectedColorTapped(_ picker: ColorPickerView<ColorPickerType>) {
-        let selectedColor = picker.selectedColor
-        if let selectedColor {
-            colorPicker.selectedColor = selectedColor
-        }
-        present(colorPicker, animated: true)
-    }
-
-    func colorPickerViewControllerDidFinish(_ viewController: UIColorPickerViewController) {
-        dismiss(animated: true)
-    }
-    
-    func colorPickerViewControllerDidSelectColor(_ viewController: UIColorPickerViewController) {
-        let color = viewController.selectedColor
-        let selectedColorPickerView = colorPickerType == .dark ? darkColorPicker : lightColorPicker
-        selectedColorPickerView.selectedColor = color
-        if let selectedDarkColor = darkColorPicker.selectedColor, let selectedLightColor = lightColorPicker.selectedColor {
-            component.selectedIconColorConfiguration = .init(selectedLightColor, selectedDarkColor)
-        }
-    }
-}

VDSSample/ViewControllers/ButtonViewController.swift

@@ -32,7 +32,7 @@ class ButtonViewController: BaseViewController<Button> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)
         
         setupPicker()
         setupModel()
@@ -43,7 +43,7 @@ class ButtonViewController: BaseViewController<Button> {
         addFormRow(label: "Action", view: label)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Use", view: usePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Text", view: textField)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "Percentage (1-100)", view: percentageTextField)

VDSSample/ViewControllers/CalendarViewController.swift

@@ -47,13 +47,6 @@ class CalendarViewController: BaseViewController<CalendarBase> {
     override func viewDidLoad() {
         super.viewDidLoad()
         addContentTopView(view: component)
-        component.minDate = Date().startOfMonth
-        component.maxDate = Date().endOfMonth
-        component.onChange = { [weak self] control in
-            self?.label.text = DateFormatter.localizedString(from: control.selectedDate, dateStyle: .short, timeStyle: .none)
-        }
-        minDatePicker.date = component.minDate
-        maxDatePicker.date = component.maxDate
         setupPicker()
         setupModel()
     }
@@ -83,20 +76,20 @@ class CalendarViewController: BaseViewController<CalendarBase> {
         //add form rows
         addFormRow(label: "onChange", view: label)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Hide Container Border", view: containerBorderSwitch)
-        addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch)
+        addFormRow(label: "Hide Container Border", view: containerBorderSwitch, pinTrailing: false)
+        addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch, pinTrailing: false)
         addFormRow(label: "Min Date", view: minDatePicker)
         addFormRow(label: "Max Date", view: maxDatePicker)
-        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
+        addFormRow(label: "Transparent Background", view: transparentBgSwitch, pinTrailing: false)
         addFormRow(label: "Active Dates", view: activeDatesField)
         addFormRow(label: "Select ActiveDate", view: activeDatePicker)
-        addFormRow(label: "Clear Active Dates", view: clearActiveDatesSwitch)
+        addFormRow(label: "Clear Active Dates", view: clearActiveDatesSwitch, pinTrailing: false)
         addFormRow(label: "Inactive Dates", view: inactiveDatesField)
         addFormRow(label: "Select InActiveDate", view: inactiveDatePicker)
-        addFormRow(label: "Clear Inactive Dates", view: clearInactiveDatesSwitch)
-        addFormRow(label: "Indicator One", view: indicatorOneSwitch)
-        addFormRow(label: "Indicator Two", view: indicatorTwoSwitch)
-        addFormRow(label: "Indicator Three", view: indicatorThreeSwitch)
+        addFormRow(label: "Clear Inactive Dates", view: clearInactiveDatesSwitch, pinTrailing: false)
+        addFormRow(label: "Indicator One", view: indicatorOneSwitch, pinTrailing: false)
+        addFormRow(label: "Indicator Two", view: indicatorTwoSwitch, pinTrailing: false)
+        addFormRow(label: "Indicator Three", view: indicatorThreeSwitch, pinTrailing: false)
         addFormRow(label: "Legend One", view: legendOneField)
         addFormRow(label: "Legend Two", view: legendTwoField)
         addFormRow(label: "Legend Three", view: legendThreeField)
@@ -206,6 +199,13 @@ class CalendarViewController: BaseViewController<CalendarBase> {
     func setupModel() {
         let calendar = Calendar.current
         let indicatorDate = calendar.startOfDay(for: calendar.date(byAdding: .day, value: 1, to: Date())!)
+        component.minDate = Date().startOfMonth
+        component.maxDate = Date().endOfMonth
+        component.onChange = { [weak self] control in
+            self?.label.text = DateFormatter.localizedString(from: control.selectedDate, dateStyle: .short, timeStyle: .none)
+        }
+        minDatePicker.date = component.minDate
+        maxDatePicker.date = component.maxDate
         component.indicators = indicators
         legendOneField.text = "Due Date"
         legendTwoField.text = "Auto Pay"
@@ -303,3 +303,11 @@ class CalendarViewController: BaseViewController<CalendarBase> {
         return day
     }
 }
+
+extension CalendarViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
+        let c = Self()
+        c.viewDidLoad()
+        return ComponentSample(component: c.component, edgeInset: .init(top: 16, left: 0, bottom: 16, right: 0))
+    }
+}

VDSSample/ViewControllers/CarouselViewController.swift

@@ -80,7 +80,7 @@ class CarouselViewController: BaseViewController<Carousel> {
         addFormRow(label: "Layout", view: layoutPickerSelectorView)
 //        addFormRow(label: "Selected Group Index", view: selectedIndexField)
         addFormRow(label: "Pagination Kind", view: paginationKindPickerSelectorView)
-        addFormRow(label: "Pagination Float", view: paginationFloatingSwitch)
+        addFormRow(label: "Pagination Float", view: paginationFloatingSwitch, pinTrailing: false)
         addFormRow(label: "Pagination Inset", view: paginationInsetField)
         addFormRow(label: "Slot Horizontal Alignment", view: horizAlignmtPickerSelectorView)
         addFormRow(label: "Slot Vertical Alignment", view: vertAlignmtPickerSelectorView)
@@ -132,18 +132,13 @@ class CarouselViewController: BaseViewController<Carousel> {
         rows.append(Button().with{ $0.use = .secondary; $0.text = "Shop"; $0.onClick =  onClick})
         rows.append(Button().with{ $0.use = .secondary; $0.text = "Buy"; $0.onClick =  onClick})
         rows.append(Button().with{ $0.use = .secondary; $0.text = "Offer"; $0.onClick =  onClick})
-        component.views = rows.compactMap({ view in
-              return TileContainer().with { instance in
-                instance.aspectRatio = .none
-                instance.addContentView(view)
-                instance.color = .custom(.lightGray)
-              }
-            })
+       
         label.text = "0"
-        
         component.slotAlignment = .init(vertical: Carousel.Vertical.top, horizontal: Carousel.Horizontal.left)
         horizAlignmtPickerSelectorView.text = Carousel.Horizontal.left.rawValue
         vertAlignmtPickerSelectorView.text = Carousel.Vertical.top.rawValue
+       
+        updateCarousel()
         
         // Callback when moving the carousel. Returns selectedGroupIndex.
         component.onChange = { [weak self] selectedGroupIndex in
@@ -152,6 +147,16 @@ class CarouselViewController: BaseViewController<Carousel> {
         }
     }
     
+    func updateCarousel() {
+        component.views = rows.compactMap({ view in
+            return TileContainer().with { instance in
+                instance.aspectRatio = .none
+                instance.addContentView(view)
+                instance.color = .custom(.lightGray)
+            }
+        })
+    }
+    
     func setupPicker() {
         surfacePickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.surface = item
@@ -184,6 +189,7 @@ class CarouselViewController: BaseViewController<Carousel> {
         
         gutterPickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.gutter = item
+            self?.updateCarousel()
         }
         
         layoutPickerSelectorView.onPickerDidSelect = {  [weak self] item in
@@ -194,6 +200,7 @@ class CarouselViewController: BaseViewController<Carousel> {
             }
             self?.component.layout = item
             self?.label.text = "0"
+            self?.updateCarousel()
         }
         
         paginationKindPickerSelectorView.onPickerDidSelect = {  [weak self] item in
@@ -212,3 +219,11 @@ class CarouselViewController: BaseViewController<Carousel> {
         }
     }
 }
+
+extension CarouselViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
+        let c = Self()
+        c.setupModel()
+        return ComponentSample(component: c.component)
+    }
+}

VDSSample/ViewControllers/CheckBoxGroupViewController.swift

@@ -31,11 +31,11 @@ class  CheckboxGroupViewController: BaseViewController<CheckboxGroup> {
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Child Text", view: childTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         
         showErrorSwitch.onChange = { [weak self] sender in
             self?.component.showError = sender.isOn
@@ -138,6 +138,6 @@ extension CheckboxGroupViewController: ComponentSampleable {
 
         component.selectorModels = [checkbox1, checkbox2]
 
-        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
+        return ComponentSample(component: component)
     }
 }

VDSSample/ViewControllers/CheckboxItemViewController.swift

@@ -30,11 +30,11 @@ class  CheckboxItemViewController: BaseViewController<CheckboxItem> {
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Child Text", view: childTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         
         showErrorSwitch.onChange = { [weak self] sender in
@@ -110,6 +110,6 @@ extension CheckboxItemViewController: ComponentSampleable {
         component.childText = "I agree to Verizon's terms and conditions click here"
         component.errorText = "Error Text"
 
-        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
+        return ComponentSample(component: component)
     }
 }

VDSSample/ViewControllers/CheckboxViewController.swift

@@ -18,7 +18,7 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
     let toggle = UISwitch()
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
@@ -26,9 +26,9 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         addFormRow(label: "Calendar", view: VDS.DatePicker().with {
             $0.calendarModel = .init(minDate: Date().startOfMonth, maxDate: Calendar.current.date(byAdding: .month, value: 2, to: Date())!)
         })

VDSSample/ViewControllers/DatePickerViewController.swift

@@ -80,14 +80,14 @@ class DatePickerViewController: BaseViewController<DatePicker> {
     override func setupForm(){
         addFormRow(label: "onChange", view: label)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Read Only", view: readonlySwitch)
-        addFormRow(label: "Required", view: requiredSwitch)
-        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Read Only", view: readonlySwitch, pinTrailing: false)
+        addFormRow(label: "Required", view: requiredSwitch, pinTrailing: false)
+        addFormRow(label: "Transparent Background", view: transparentBgSwitch, pinTrailing: false)
         addFormRow(label: "Date Format", view: dateFormatPickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Helper Text", view: helperTextField)
-        addFormRow(label: "Error", view: .makeWrapper(for: errorSwitch))
+        addFormRow(label: "Error", view: errorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
@@ -171,6 +171,7 @@ class DatePickerViewController: BaseViewController<DatePicker> {
         widthTextField
             .numberPublisher
             .sink { [weak self] number in
+                self?.updateComponentConstraint(pinTrailing: number == nil)
                 self?.component.width = number?.cgFloatValue
             }.store(in: &subscribers)
 
@@ -238,19 +239,19 @@ extension DatePickerViewController {
     func getCalendarSection() -> FormSection {
         let section = FormSection()
         section.title = "Calendar Options"
-        section.addFormRow(label: "Hide Container Border", view: containerBorderSwitch)
-        section.addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch)
+        section.addFormRow(label: "Hide Container Border", view: containerBorderSwitch, pinTrailing: false)
+        section.addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch, pinTrailing: false)
         section.addFormRow(label: "Min Date", view: minDatePicker)
         section.addFormRow(label: "Max Date", view: maxDatePicker)
         section.addFormRow(label: "Active Dates", view: activeDatesField)
         section.addFormRow(label: "Select ActiveDate", view: activeDatePicker)
-        section.addFormRow(label: "Clear Active Dates", view: clearActiveDatesSwitch)
+        section.addFormRow(label: "Clear Active Dates", view: clearActiveDatesSwitch, pinTrailing: false)
         section.addFormRow(label: "Inactive Dates", view: inactiveDatesField)
         section.addFormRow(label: "Select InActiveDate", view: inactiveDatePicker)
-        section.addFormRow(label: "Clear Inactive Dates", view: clearInactiveDatesSwitch)
-        section.addFormRow(label: "Indicator One", view: indicatorOneSwitch)
-        section.addFormRow(label: "Indicator Two", view: indicatorTwoSwitch)
-        section.addFormRow(label: "Indicator Three", view: indicatorThreeSwitch)
+        section.addFormRow(label: "Clear Inactive Dates", view: clearInactiveDatesSwitch, pinTrailing: false)
+        section.addFormRow(label: "Indicator One", view: indicatorOneSwitch, pinTrailing: false)
+        section.addFormRow(label: "Indicator Two", view: indicatorTwoSwitch, pinTrailing: false)
+        section.addFormRow(label: "Indicator Three", view: indicatorThreeSwitch, pinTrailing: false)
         section.addFormRow(label: "Legend One", view: legendOneField)
         section.addFormRow(label: "Legend Two", view: legendTwoField)
         section.addFormRow(label: "Legend Three", view: legendThreeField)
@@ -479,3 +480,12 @@ extension DatePickerViewController {
     }
 
 }
+
+extension DatePickerViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
+        let c = Self()
+        c.setupModel()
+        c.setupCalendar()
+        return ComponentSample(component: c.component)
+    }
+}

VDSSample/ViewControllers/DropdownSelectViewController.swift

@@ -64,20 +64,20 @@ class DropdownSelectViewController: BaseViewController<DropdownSelect> {
         
     override func setupForm(){
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Read Only", view: readonlySwitch)
-        addFormRow(label: "Required", view: requiredSwitch)
-        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Read Only", view: readonlySwitch, pinTrailing: false)
+        addFormRow(label: "Required", view: requiredSwitch, pinTrailing: false)
+        addFormRow(label: "Transparent Background", view: transparentBgSwitch, pinTrailing: false)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView)
         addFormRow(label: "Helper Text", view: helperTextField)
-        addFormRow(label: "Inline Label", view: .makeWrapper(for: inlineLabelSwitch))
-        addFormRow(label: "Error", view: .makeWrapper(for: errorSwitch))
+        addFormRow(label: "Inline Label", view: inlineLabelSwitch, pinTrailing: false)
+        addFormRow(label: "Error", view: errorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
         addFormRow(label: "ToolTip Content", view: tooltipContentTextField)
-        addFormRow(label: "More Options", view: optionsSwitch)
+        addFormRow(label: "More Options", view: optionsSwitch, pinTrailing: false)
 
         disabledSwitch.onChange = { [weak self] sender in
             self?.component.isEnabled = !sender.isOn
@@ -131,6 +131,7 @@ class DropdownSelectViewController: BaseViewController<DropdownSelect> {
         widthTextField
             .numberPublisher
             .sink { [weak self] number in
+                self?.updateComponentConstraint(pinTrailing: number == nil)
                 self?.component.width = number?.cgFloatValue
             }.store(in: &subscribers)
 

VDSSample/ViewControllers/FootnoteGroupViewController.swift

@@ -0,0 +1,79 @@
+//
+//  FootnoteGroupViewController.swift
+//  VDSSample
+//
+//  Created by Kanamarlapudi, Vasavi on 29/08/24.
+//
+
+import Foundation
+import UIKit
+import VDS
+
+class FootnoteGroupViewController: BaseViewController<FootnoteGroup> {
+  
+    var widthTextField = NumericField()
+    var percentageTextField = NumericField()
+    var footnotes: [FootnoteItem] = []
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        addContentTopView(view: component)
+        setupPicker()
+        setupModel()
+    }
+    
+    override func setupForm() {
+        super.setupForm()
+        addFormRow(label: "Surface", view: surfacePickerSelectorView)
+        addFormRow(label: "Width", view: widthTextField)
+        addFormRow(label: "Percentage (1-100)", view: percentageTextField)
+        
+        widthTextField
+            .numberPublisher
+            .sink { [weak self] number in
+                self?.updateComponentConstraint(pinTrailing: number == nil)
+                if let number {
+                    self?.component.width = .value(number.cgFloatValue)
+                    self?.percentageTextField.text = ""
+                } else {
+                    self?.component.width = nil
+                }
+            }.store(in: &subscribers)
+        
+        percentageTextField
+            .numberPublisher
+            .sink { [weak self] number in
+                self?.updateComponentConstraint(pinTrailing: number == nil)
+                if let number, number.intValue > 9 {
+                    self?.component.width = .percentage(number.cgFloatValue)
+                    self?.widthTextField.text = ""
+                } else {
+                    self?.component.width = nil
+                }
+            }.store(in: &subscribers)
+        
+    }
+    
+    func setupModel() {        
+        let toolTipModel = Tooltip.TooltipModel.init(title: "Check your item.", content:"Here is the content for your item.")
+        footnotes.append(.init().with { $0.text = "Offer you best deals on phones, tablets, home, internet and more. Pre order the new version mobiles and get off *T&C apply."; $0.symbolType = "*"; $0.kind = .primary; $0.tooltipModel = toolTipModel})
+        footnotes.append(.init().with { $0.text = "The display has rounded corners. When measured as a standard rectangular shape, the screen is 6.68 inches diagonally. Actual viewable area is less."; $0.symbolType = "**"; $0.kind = .primary})
+        footnotes.append(.init().with { $0.text = "Some features may not be available for all countries or all areas."; $0.symbolType = "1."; $0.kind = .primary})
+        component.footnoteItems = footnotes
+    }
+    
+    func setupPicker() {
+        surfacePickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.surface = item
+            self?.contentTopView.backgroundColor = item.color
+        }
+    }
+}
+
+extension FootnoteGroupViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
+        let c = Self()
+        c.setupModel()
+        return ComponentSample(component: c.component)
+    }
+}

VDSSample/ViewControllers/FootnoteItemViewController.swift

@@ -0,0 +1,176 @@
+//
+//  FootnoteViewController.swift
+//  VDSSample
+//
+//  Created by Kanamarlapudi, Vasavi on 21/08/24.
+//
+
+import Foundation
+import UIKit
+import VDS
+
+class FootnoteItemViewController: BaseViewController<FootnoteItem> {
+    
+    internal enum SymbolType: String, DefaultValuing, CaseIterable {
+            case asterisk
+            case doubleAsterisk
+            case character
+            case none
+    
+            public static var defaultValue: Self { .asterisk }
+    
+            /// TextStyle relative to Size.
+            public var text: String {
+                switch self {
+                case .asterisk:
+                    return "*"
+                case .doubleAsterisk:
+                    return  "**"
+                case .character:
+                    return "1."
+                case .none:
+                    return ""
+                }
+            }
+        }
+    
+    lazy var kindPickerSelectorView = {
+        PickerSelectorView(title: "secondary",
+                           picker: self.picker,
+                           items: FootnoteItem.Kind.allCases)
+    }()
+    
+    lazy var symbolTypePickerSelectorView = {
+        PickerSelectorView(title: "asterisk",
+                           picker: self.picker,
+                           items: SymbolType.allCases)
+    }()
+
+    lazy var sizePickerSelectorView = {
+        PickerSelectorView(title: "micro",
+                           picker: self.picker,
+                           items: FootnoteItem.Size.allCases)
+    }()
+
+    var hideSymbolSwitch = Toggle()
+    var footnoteTextField = TextField()
+    var widthTextField = NumericField()
+    var percentageTextField = NumericField()
+    var tooltipTitleTextField = TextField()
+    var tooltipContentTextField = TextField()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        addContentTopView(view: component)
+        setupPicker()
+        setupModel()
+    }
+    
+    override func setupForm() {
+        super.setupForm()
+        addFormRow(label: "Surface", view: surfacePickerSelectorView)
+        addFormRow(label: "Kind", view: kindPickerSelectorView)
+        addFormRow(label: "Size", view: sizePickerSelectorView)
+        addFormRow(label: "Symbol Type", view: symbolTypePickerSelectorView)
+        addFormRow(label: "Hide Symbol", view: hideSymbolSwitch, pinTrailing: false)
+        addFormRow(label: "Text", view: footnoteTextField)
+        addFormRow(label: "Width", view: widthTextField)
+        addFormRow(label: "Percentage (1-100)", view: percentageTextField)
+        addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
+        addFormRow(label: "ToolTip Content", view: tooltipContentTextField)
+                
+        hideSymbolSwitch.publisher(for: .valueChanged).sink { [weak self] control in
+            self?.component.hideSymbol = control.isOn
+        }.store(in: &subscribers)
+        
+        footnoteTextField
+            .textPublisher
+            .sink { [weak self] text in
+                self?.component.text = text
+            }.store(in: &subscribers)
+        
+        widthTextField
+            .numberPublisher
+            .sink { [weak self] number in
+                self?.updateComponentConstraint(pinTrailing: number == nil)
+                if let number {
+                    self?.component.width = .value(number.cgFloatValue)
+                    self?.percentageTextField.text = ""
+                } else {
+                    self?.component.width = nil
+                }
+            }.store(in: &subscribers)
+        
+        percentageTextField
+            .numberPublisher
+            .sink { [weak self] number in
+                self?.updateComponentConstraint(pinTrailing: number == nil)
+                if let number, number.intValue > 9 {
+                    self?.component.width = .percentage(number.cgFloatValue)
+                    self?.widthTextField.text = ""
+                } else {
+                    self?.component.width = nil
+                }
+            }.store(in: &subscribers)
+        
+        tooltipTitleTextField
+            .textPublisher
+            .sink { [weak self] text in
+                self?.updateTooltip()
+            }.store(in: &subscribers)
+
+        tooltipContentTextField
+            .textPublisher
+            .sink { [weak self] text in
+                self?.updateTooltip()
+            }.store(in: &subscribers)
+    }
+    
+    func setupModel() {
+        component.text = "Service is included for free for two years with activation of any iPhone15 model. Connection and response times vary based on location, site conditions, and other factors. See support.apple.com/en-us/HT213885 for more information."
+        component.tooltipModel = nil
+
+        footnoteTextField.text = component.text
+        sizePickerSelectorView.text = component.size.rawValue
+        kindPickerSelectorView.text = component.kind.rawValue
+        symbolTypePickerSelectorView.text = SymbolType.defaultValue.text
+        tooltipTitleTextField.text = component.tooltipModel?.title
+        tooltipContentTextField.text = component.tooltipModel?.content
+    }
+    
+    func setupPicker() {
+        surfacePickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.surface = item
+            self?.contentTopView.backgroundColor = item.color
+        }
+        
+        kindPickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.kind = item
+        }
+        
+        sizePickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.size = item
+        }
+        
+        symbolTypePickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.symbolType = item.text
+        }
+    }
+    
+    func updateTooltip() {
+        let title = tooltipTitleTextField.text ?? ""
+        let content = tooltipContentTextField.text ?? ""
+        
+        component.tooltipModel = !title.isEmpty || !content.isEmpty ? .init(title: title,
+                                                                            content: content) : nil
+    }
+    
+}
+
+extension FootnoteItemViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
+        let c = Self()
+        c.setupModel()
+        return ComponentSample(component: c.component)
+    }
+}

VDSSample/ViewControllers/IconViewController.swift

@@ -12,19 +12,52 @@ import VDSCoreTokens
 import Combine
 
 class IconViewController: BaseViewController<Icon> {
+    enum IconColor: String, CaseIterable {
+        case `default`, token, custom
+    }
     
-    lazy var lightColorPickerSelectorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
+    lazy var lightColorPickerSelectorView : TokenColorPickerSection  = {
+        TokenColorPickerSection<IconColor>(rowTitle: "Light Color",
+                                picker: self.picker).with {
+            $0.onSelected = { [weak self] color in
+                guard let self else { return }
+                light = .black
+                setColorConfiguration()
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                light = color.uiColor
+                setColorConfiguration()
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                light = color
+                setColorConfiguration()
+            }
+        }
     }()
 
-    lazy var darkColorPickerSelectorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
+    lazy var darkColorPickerSelectorView: TokenColorPickerSection  = {
+        TokenColorPickerSection<IconColor>(rowTitle: "Dark Color",
+                                picker: self.picker).with {
+            $0.onSelected = { [weak self] color in
+                guard let self else { return }
+                dark = .white
+                setColorConfiguration()
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                dark = color.uiColor
+                setColorConfiguration()
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                dark = color
+                setColorConfiguration()
+            }
+        }
     }()
-
+    
     lazy var namePickerSelectorView = {
         PickerSelectorView(title: "",
                            picker: self.picker,
@@ -41,7 +74,7 @@ class IconViewController: BaseViewController<Icon> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
@@ -51,8 +84,8 @@ class IconViewController: BaseViewController<Icon> {
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Size", view: sizePickerSelectorView)
         addFormRow(label: "Custom Size", view: customSizeField)
-        addFormRow(label: "Light Color", view: lightColorPickerSelectorView)
-        addFormRow(label: "Dark Color", view: darkColorPickerSelectorView)
+        append(section: lightColorPickerSelectorView)
+        append(section: darkColorPickerSelectorView)
         addFormRow(label: "Name", view: namePickerSelectorView)
         
         customSizeField
@@ -69,8 +102,6 @@ class IconViewController: BaseViewController<Icon> {
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
         sizePickerSelectorView.text = component.size.rawValue
-        lightColorPickerSelectorView.text = UIColor.VDSColor.elementsPrimaryOnlight.rawValue
-        darkColorPickerSelectorView.text = UIColor.VDSColor.elementsPrimaryOndark.rawValue
         namePickerSelectorView.text = name.rawValue
     }
     func setupPicker(){
@@ -83,23 +114,15 @@ class IconViewController: BaseViewController<Icon> {
         sizePickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.size = item
         }
-        
-        lightColorPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.setColorConfiguration()
-        }
-        
-        darkColorPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.setColorConfiguration()
-        }
-        
+                
         namePickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.name = item
         }
     }
     
+    var light: UIColor = .black
+    var dark: UIColor = .white
     func setColorConfiguration() {
-        let light = lightColorPickerSelectorView.selectedItem.uiColor
-        let dark = darkColorPickerSelectorView.selectedItem.uiColor
         component.colorConfiguration = .init(light, dark)
     }
 

VDSSample/ViewControllers/InputFieldViewController.swift

@@ -106,16 +106,16 @@ class  InputFieldViewController: BaseViewController<InputField> {
         }
         
         general.addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        general.addFormRow(label: "Disabled", view: disabledSwitch)
-        general.addFormRow(label: "Read Only", view: readonlySwitch)
-        general.addFormRow(label: "Required", view: requiredSwitch)
-        general.addFormRow(label: "Transparent Background", view: transparentBgSwitch)
+        general.addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        general.addFormRow(label: "Read Only", view: readonlySwitch, pinTrailing: false)
+        general.addFormRow(label: "Required", view: requiredSwitch, pinTrailing: false)
+        general.addFormRow(label: "Transparent Background", view: transparentBgSwitch, pinTrailing: false)
         general.addFormRow(label: "Label Text", view: labelTextField)
         general.addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView)
         general.addFormRow(label: "Helper Text", view: helperTextField)
-        general.addFormRow(label: "Error", view: showErrorSwitch)
+        general.addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         general.addFormRow(label: "Error Text", view: errorTextField)
-        general.addFormRow(label: "Success", view: showSuccessSwitch)
+        general.addFormRow(label: "Success", view: showSuccessSwitch, pinTrailing: false)
         general.addFormRow(label: "Success Text", view: successTextField)
         general.addFormRow(label: "Width", view: widthTextField)
         general.addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
@@ -181,6 +181,7 @@ class  InputFieldViewController: BaseViewController<InputField> {
         widthTextField
             .numberPublisher
             .sink { [weak self] number in
+                self?.updateComponentConstraint(pinTrailing: number == nil)
                 self?.component.width = number?.cgFloatValue
             }.store(in: &subscribers)
         
@@ -329,14 +330,8 @@ class  InputFieldViewController: BaseViewController<InputField> {
 
 extension InputFieldViewController: ComponentSampleable {
     static func makeSample() -> ComponentSample {
-        let component = Self.makeComponent()
-        component.fieldType = .text
-        component.width = 328
-        component.labelText = "Street Address"
-        component.helperText = "For example: 123 Verizon St"
-        component.errorText = "Enter a valid address."
-        component.successText = "Good job entering a valid address!"
-        component.tooltipModel = .init(title: "Check the formatting of your address", content: "House/Building number then street name")
-        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
+        let c = Self()
+        c.setupModel()
+        return ComponentSample(component: c.component)
     }
 }

VDSSample/ViewControllers/InputStepperViewController.swift

@@ -62,11 +62,11 @@ class InputStepperViewController: BaseViewController<InputStepper> {
 
         addFormRow(label: "Width Value", view: widthTextField)
         addFormRow(label: "Width Percentage", view: widthPercentageTextField)
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Read Only", view: readOnlySwitch)
-        addFormRow(label: "Required", view: requiredSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Read Only", view: readOnlySwitch, pinTrailing: false)
+        addFormRow(label: "Required", view: requiredSwitch, pinTrailing: false)
         addFormRow(label: "Label Text", view: labelTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView)
         addFormRow(label: "Helper Text", view: helperTextField)
@@ -163,6 +163,7 @@ class InputStepperViewController: BaseViewController<InputStepper> {
         widthTextField
             .numberPublisher
             .sink { [weak self] number in
+                self?.updateComponentConstraint(pinTrailing: number == nil)
                 if let number {
                 self?.component.widthPercentage = nil
                 self?.component.width = number.cgFloatValue
@@ -175,6 +176,7 @@ class InputStepperViewController: BaseViewController<InputStepper> {
         widthPercentageTextField
             .numberPublisher
             .sink { [weak self] number in
+                self?.updateComponentConstraint(pinTrailing: number == nil)
                 if let number, number.intValue > 10 {
                     self?.component.width = nil
                     self?.component.widthPercentage = number.cgFloatValue
@@ -253,3 +255,11 @@ class InputStepperViewController: BaseViewController<InputStepper> {
         helperTextPlacementPickerSelectorView.text = component.helperTextPlacement.rawValue
     }
 }
+
+extension InputStepperViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
+        let c = Self()
+        c.setupModel()
+        return ComponentSample(component: c.component)
+    }
+}

VDSSample/ViewControllers/LabelViewController.swift

@@ -145,8 +145,9 @@ class LabelViewController: BaseViewController<Label> {
         
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Bold", view: boldSwitch)
+        addFormRow(label: "Current Language", view: Label().with { $0.text = LanguageManager.currentLanguage.description })
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Bold", view: boldSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
 
         //Scaled Fonts implementation

VDSSample/ViewControllers/ListUnorderedViewController.swift

@@ -0,0 +1,138 @@
+//
+//  ListUnorderedViewController.swift
+//  VDSSample
+//
+//  Created by Vasavi Kanamarlapudi on 16/10/24.
+//
+
+import Foundation
+import VDS
+
+class ListUnorderedViewController: BaseViewController<ListUnordered> {
+    
+    lazy var sizePickerView = {
+        PickerSelectorView(title: "Large",
+                           picker: self.picker,
+                           items: ListUnordered.Size.allCases)
+    }()
+    
+    lazy var spacingPickerView = {
+        PickerSelectorView(title:"Standard",
+                           picker: self.picker,
+                           items: ListUnordered.Spacing.allCases)
+    }()
+    
+    var leadInTextField = TextField()
+    var itemLevelTwoTextOne = TextField()
+    var itemLevelTwoTextTwo = TextField()
+    
+    var unorderedList: [ListUnordered.ListUnorderedItemModel]?
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        addContentTopView(view: component)
+        setupPicker()
+        setupModel()
+    }
+    
+    override func setupForm() {
+        super.setupForm()
+        addFormRow(label: "Surface", view: surfacePickerSelectorView)
+        addFormRow(label: "Size", view: sizePickerView)
+        addFormRow(label: "Spacing", view: spacingPickerView)
+        
+        let form1 = FormSection()
+        form1.title = "Lead-In Text (optional)"
+        form1.addFormRow(label: "Lead In Text", view: leadInTextField)
+        
+        let form2 = FormSection()
+        form2.title = "List Item Level 2 (Optional)"
+        form2.addFormRow(label: "Subtext 1", view: itemLevelTwoTextOne)
+        form2.addFormRow(label: "Subtext 2", view: itemLevelTwoTextTwo)
+        
+        append(section: form1)
+        append(section: form2)
+        
+        leadInTextField
+            .textPublisher
+            .sink { [weak self] text in
+                self?.component.leadInText = text
+            }.store(in: &subscribers)
+        
+        itemLevelTwoTextOne
+            .textPublisher
+            .sink { [weak self] text in
+                guard let self else { return }
+                self.updateUnorderList()
+                self.component.unorderedList = unorderedList ?? []
+            }.store(in: &subscribers)
+        
+        itemLevelTwoTextTwo
+            .textPublisher
+            .sink { [weak self] text in
+                guard let self else { return }
+                self.updateUnorderList()
+                self.component.unorderedList = unorderedList ?? []
+            }.store(in: &subscribers)
+    }
+    
+    func setupPicker() {
+        surfacePickerSelectorView.onPickerDidSelect = { [weak self] item in
+            self?.component.surface = item
+            self?.contentTopView.backgroundColor = item.color
+        }
+        
+        sizePickerView.onPickerDidSelect = { [weak self] item in
+            self?.component.size = item
+        }
+        
+        spacingPickerView.onPickerDidSelect = { [weak self] item in
+            self?.component.spacing = item
+        }
+    }
+    
+    func setupModel() {
+        sizePickerView.text = component.size.rawValue
+        spacingPickerView.text = component.spacing.rawValue
+        leadInTextField.text = "To manage your existing Call Intercept calling feature:"
+        self.component.leadInText = leadInTextField.text
+        itemLevelTwoTextOne.text = "Priority callers can bypass Call Intercept by entering your 4 digit Call Intercept Override Code."
+        itemLevelTwoTextTwo.text = "Your phone will alert you with a short-short-long ring and \"Priority Caller\" will appear on your display."
+        updateUnorderList()
+        self.component.unorderedList = self.unorderedList ?? []
+    }
+    
+    // Update test data
+    func updateUnorderList() {
+        if (itemLevelTwoTextOne.text?.isEmpty == true) {
+            itemLevelTwoTextOne.text = nil
+        }
+        if (itemLevelTwoTextTwo.text?.isEmpty == true) {
+            itemLevelTwoTextTwo.text = nil
+        }
+        var levelTwoSubTexts : [String?]? = nil
+        if let subtextOneEmpty = itemLevelTwoTextOne.text?.isEmpty, let subtextTwoEmpty = itemLevelTwoTextTwo.text?.isEmpty {
+            if !subtextOneEmpty && !subtextTwoEmpty {
+                levelTwoSubTexts = [itemLevelTwoTextOne.text, itemLevelTwoTextTwo.text]
+            } else if !subtextOneEmpty || !subtextTwoEmpty {
+                if subtextOneEmpty {
+                    levelTwoSubTexts = [itemLevelTwoTextTwo.text]
+                } else if subtextTwoEmpty {
+                    levelTwoSubTexts = [itemLevelTwoTextOne.text]
+                }
+            }
+            unorderedList = [
+                .init(itemLevelOneText: "Call 800-435-7986 to have your PIN reset."),
+                .init(itemLevelOneText: "To bypass Call Intercept",
+                      itemLevelTwoTexts: levelTwoSubTexts)
+            ]
+        }
+    }
+}
+
+extension ListUnorderedViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
+        let component = Self.makeComponent()
+        return ComponentSample(component: component)
+    }
+}

VDSSample/ViewControllers/LoaderViewController.swift

@@ -23,10 +23,10 @@ class LoaderViewController: BaseViewController<Loader>, LoaderLaunchable {
     override func setupForm() {
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Active", view: isActive)
+        addFormRow(label: "Active", view: isActive, pinTrailing: false)
         
         let fullScreen = FormSection().with { $0.title = "LoaderLaunchable (separate from Loader)" }
-        fullScreen.addFormRow(label: "presentLoader", view: isFullscreen)
+        fullScreen.addFormRow(label: "presentLoader", view: isFullscreen, pinTrailing: false)
         append(section: fullScreen)
         
         isActive

VDSSample/ViewControllers/MenuViewController.swift

@@ -82,12 +82,16 @@ class MenuViewController: UITableViewController, TooltipLaunchable {
         MenuComponent(title: "CheckboxGroup", completed: true, viewController: CheckboxGroupViewController.self),
         MenuComponent(title: "DatePicker", completed: true, viewController: DatePickerViewController.self),
         MenuComponent(title: "DropdownSelect", completed: true, viewController: DropdownSelectViewController.self),
+        MenuComponent(title: "FootnoteItem", completed: true, viewController: FootnoteItemViewController.self),
+        MenuComponent(title: "FootnoteGroup", completed: true, viewController: FootnoteGroupViewController.self),
         MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self),
         MenuComponent(title: "InputField", completed: true, viewController: InputFieldViewController.self),
         MenuComponent(title: "InputStepper", completed: true, viewController: InputStepperViewController.self),
         MenuComponent(title: "Label", completed: true, viewController: LabelViewController.self),
         MenuComponent(title: "Line", completed: true, viewController: LineViewController.self),
+        MenuComponent(title: "List Unordered", completed: false, viewController: ListUnorderedViewController.self),
         MenuComponent(title: "Loader", completed: true, viewController: LoaderViewController.self),
+        MenuComponent(title: "Modal", completed: true, viewController: ModalViewController.self),
         MenuComponent(title: "Notification", completed: true, viewController: NotificationViewController.self),
         MenuComponent(title: "Pagination", completed: true, viewController: PaginationViewController.self),
         MenuComponent(title: "PriceLockup", completed: true, viewController: PriceLockupViewController.self),
@@ -125,6 +129,20 @@ class MenuViewController: UITableViewController, TooltipLaunchable {
             navigationItem.rightBarButtonItem = UIBarButtonItem(customView: tooltip)
         }
         
+        var useSpanish = Toggle().with {
+            $0.offText = "English"
+            $0.onText = "Spanish"
+            $0.showText = true
+            $0.textPosition = .right
+        }
+
+        useSpanish.isOn = LanguageManager.currentLanguage == .spanish
+        useSpanish.onChange = { control in
+            LanguageManager.currentLanguage = control.isOn ? .spanish : .english
+        }
+        navigationItem.leftBarButtonItem = UIBarButtonItem(customView: useSpanish)
+
+        
         super.viewDidLoad()
         overrideUserInterfaceStyle = .light
         tableView.register(MenuCell.self, forCellReuseIdentifier: "cell")

VDSSample/ViewControllers/ModalViewController.swift

@@ -0,0 +1,127 @@
+//
+//  ModalViewController.swift
+//  VDSSample
+//
+//  Created by Kanamarlapudi, Vasavi on 05/09/24.
+//
+
+import Foundation
+import UIKit
+import VDS
+import VDSCoreTokens
+import Combine
+
+class  ModalViewController: BaseViewController<Modal> {
+
+    var showFooterSwitch = Toggle()
+    var fullScreenDialogSwitch = Toggle()
+    var singleButtonSwitch = Toggle()
+    var hideCloseSwitch = Toggle()
+    var titleTextField = TextField()
+    var bodyTextField = TextField()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        
+        setupPicker()
+        setupModel()
+    }
+    
+    override func setupForm(){
+        super.setupForm()
+        addFormRow(label: "Surface", view: surfacePickerSelectorView)
+        addFormRow(label: "Show Modal Footer", view: showFooterSwitch, pinTrailing: false)
+        addFormRow(label: "Full Screen Dialog", view: fullScreenDialogSwitch, pinTrailing: false)
+        addFormRow(label: "Single Button", view: singleButtonSwitch, pinTrailing: false)
+        addFormRow(label: "Hide Close Button", view: hideCloseSwitch, pinTrailing: false)
+        addFormRow(label: "Modal Title", view: titleTextField)
+        addFormRow(label: "Modal Body", view: bodyTextField)
+        
+        fullScreenDialogSwitch.publisher(for: .valueChanged).sink { [weak self] control in
+            self?.component.fullScreenDialog = control.isOn
+        }.store(in: &subscribers)
+
+        showFooterSwitch.publisher(for: .valueChanged).sink { [weak self] control in
+            guard let self else { return }
+            if control.isOn {
+                showFooter(with: singleButtonSwitch.isOn)
+            } else {
+                self.component.buttonData = nil
+            }
+        }.store(in: &subscribers)
+
+        singleButtonSwitch.publisher(for: .valueChanged).sink { [weak self] control in
+            guard let self else { return }
+            if control.isOn {
+                showFooterSwitch.isOn = true
+            }
+            showFooter(with: control.isOn)
+        }.store(in: &subscribers)
+
+        hideCloseSwitch.publisher(for: .valueChanged).sink { [weak self] control in
+            self?.component.hideCloseButton = control.isOn
+        }.store(in: &subscribers)
+        
+        titleTextField
+            .textPublisher
+            .sink { [weak self] text in
+                self?.component.title = text
+            }.store(in: &subscribers)
+        
+        bodyTextField
+            .textPublisher
+            .sink { [weak self] text in
+                self?.component.content = text
+            }.store(in: &subscribers)
+        
+    }
+    
+    func showFooter(with singleButton: Bool) {
+        if singleButton {
+            component.buttonData = [
+                Button().with{ $0.use = .secondary; $0.text = "Close"; $0.onClick =  { button in self.dismiss(animated: true); print("\(button.text!) clicked")} ; $0.size = .large }
+            ]
+        } else {
+            component.buttonData = [
+                Button().with{ $0.use = .primary; $0.text = "In-store Pickup"; $0.onClick =  { button in print("\(button.text!) clicked")}; $0.size = .large },
+                Button().with{ $0.use = .secondary; $0.text = "Close"; $0.onClick =  { button in self.dismiss(animated: true); print("\(button.text!) clicked")} ; $0.size = .large }
+            ]
+        }
+    }
+    
+    func setupModel() {
+        component.title = "Choose free 2-day shipping or In-store Pickup"
+        component.content = "Order online, pickup in store, or get free 2-day shipping. Free 2-day shipping available for device and accessory orders of $49 or more. Free 2-day shipping when you order online M-F by 8PM EST. In-Store Pickup is available across the U.S. at participating Verizon Wireless stores. Please bring photo ID and credit/debit card only if used as payment. Order will be held for 3 days from the time if was placed. \n \n Order online, pickup in store, or get free 2-day shipping. Free 2-day shipping available for device and accessory orders of $49 or more. Free 2-day shipping when you order online M-F by 8PM EST. In-Store Pickup is available across the U.S. at participating Verizon Wireless stores. Please bring photo ID and credit/debit card only if used as payment. Order will be held for 3 days from the time if was placed. \n \n Order online, pickup in store, or get free 2-day shipping. Free 2-day shipping available for device and accessory orders of $49 or more. Free 2-day shipping when you order online M-F by 8PM EST. In-Store Pickup is available across the U.S. at participating Verizon Wireless stores. Please bring photo ID and credit/debit card only if used as payment. Order will be held for 3 days from the time if was placed. \n \n Order online, pickup in store, or get free 2-day shipping. Free 2-day shipping available for device and accessory orders of $49 or more. Free 2-day shipping when you order online M-F by 8PM EST. In-Store Pickup is available across the U.S. at participating Verizon Wireless stores. Please bring photo ID and credit/debit card only if used as payment. Order will be held for 3 days from the time if was placed. \n \n Order online, pickup in store, or get free 2-day shipping. Free 2-day shipping available for device and accessory orders of $49 or more. Free 2-day shipping when you order online M-F by 8PM EST. In-Store Pickup is available across the U.S. at participating Verizon Wireless stores. Please bring photo ID and credit/debit card only if used as payment. Order will be held for 3 days from the time if was placed. \n \n Order online, pickup in store, or get free 2-day shipping. Free 2-day shipping available for device and accessory orders of $49 or more. Free 2-day shipping when you order online M-F by 8PM EST. In-Store Pickup is available across the U.S. at participating Verizon Wireless stores. Please bring photo ID and credit/debit card only if used as payment. Order will be held for 3 days from the time if was placed."
+        component.contentView = Icon().with { $0.name = .addFolder; $0.size = .medium }
+        let onClick: (ButtonBase) -> Void = { button in print("\(button.text!) clicked")}
+        component.buttonData = [
+            Button().with{ $0.use = .primary; $0.text = "In-store Pickup"; $0.onClick =  onClick; $0.size = .large },
+            Button().with{ $0.use = .secondary; $0.text = "Close"; $0.onClick =  { button in self.dismiss(animated: true); print("\(button.text!) clicked")} ; $0.size = .large }
+        ]
+        
+        //setup UI
+        surfacePickerSelectorView.text = component.surface.rawValue
+        titleTextField.text = component.title
+        bodyTextField.text = component.content
+        showFooterSwitch.isOn = true
+    }
+            
+    //Picker
+    func setupPicker(){
+        surfacePickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.surface = item
+            self?.contentTopView.backgroundColor = item.color
+        }
+    }
+}
+
+extension ModalViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
+        let component = Self.makeComponent()
+        component.title = "Choose free 2-day shipping or In-store Pickup"
+        component.content = "Order online, pickup in store, or get free 2-day shipping. Free 2-day shipping available for device and accessory orders of $49 or more. Free 2-day shipping when you order online M-F by 8PM EST. In-Store Pickup is available across the U.S. at participating Verizon Wireless stores. Please bring photo ID and credit/debit card only if used as payment. Order will be held for 3 days from the time if was placed."
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual, bottomPinningType: .lessThanOrEqual)
+    }
+}
+

VDSSample/ViewControllers/NotificationViewController.swift

@@ -52,8 +52,8 @@ class NotificationViewController: BaseViewController<VDS.Notification> {
         addFormRow(label: "Style", view: notificationTypePickerSelectorView)
         addFormRow(label: "Title", view: titleTextField)
         addFormRow(label: "SubTitle", view: subTitleTextField)
-        addFormRow(label: "Hide Button Group", view: buttonGroupToggle)
-        addFormRow(label: "Hide Close Button", view: hideCloseButtonToggle)
+        addFormRow(label: "Hide Button Group", view: buttonGroupToggle, pinTrailing: false)
+        addFormRow(label: "Hide Close Button", view: hideCloseButtonToggle, pinTrailing: false)
         addFormRow(label: "Action", view: label)
         addFormRow(label: "First Button Text", view: firstButtonTextField)
         addFormRow(label: "Second Button Text", view: secondButtonTextField)

VDSSample/ViewControllers/PriceLockupViewController.swift

@@ -51,14 +51,14 @@ class PriceLockupViewController: BaseViewController<PriceLockup> {
     override func setupForm() {
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Bold", view: boldSwitch)
+        addFormRow(label: "Bold", view: boldSwitch, pinTrailing: false)
         addFormRow(label: "Kind", view: kindPickerSelectorView)
         addFormRow(label: "Size", view: sizePickerSelectorView)
-        addFormRow(label: "Hide Currency", view: hideCurrencySwitch)
+        addFormRow(label: "Hide Currency", view: hideCurrencySwitch, pinTrailing: false)
         addFormRow(label: "Price", view: priceTextField)
         addFormRow(label: "Leading Text", view: leadingTextField)
-        addFormRow(label: "Strikethrough", view: strikethroughSwitch)
-        addFormRow(label: "Uniform Size", view: uniformSizeSwitch)
+        addFormRow(label: "Strikethrough", view: strikethroughSwitch, pinTrailing: false)
+        addFormRow(label: "Uniform Size", view: uniformSizeSwitch, pinTrailing: false)
         addFormRow(label: "Term", view: termPickerSelectorView)
         addFormRow(label: "Trailing Text", view: trailingTextField)
         addFormRow(label: "Superscript", view: superscriptTextField)
@@ -142,3 +142,11 @@ class PriceLockupViewController: BaseViewController<PriceLockup> {
         }
     }
 }
+
+extension PriceLockupViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
+        let c = Self()
+        c.setupModel()
+        return ComponentSample(component: c.component)
+    }
+}

VDSSample/ViewControllers/RadioBoxGroupViewController.swift

@@ -31,9 +31,9 @@ class  RadioBoxGroupViewController: BaseViewController<RadioBoxGroup>{
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Strikethrough", view: strikeThroughSwitch)
+        addFormRow(label: "Strikethrough", view: strikeThroughSwitch, pinTrailing: false)
         addFormRow(label: "Text", view: textField)
         addFormRow(label: "Sub Text", view: subTextField)
         addFormRow(label: "Sub Text Right", view: subTextRightField)
@@ -140,6 +140,6 @@ extension RadioBoxGroupViewController: ComponentSampleable {
 
         component.selectorModels = [radioBox1, radioBox2]
 
-        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
+        return ComponentSample(component: component)
     }
 }

VDSSample/ViewControllers/RadioButtonGroupViewController.swift

@@ -29,11 +29,11 @@ class  RadioButtonGroupViewController: BaseViewController<RadioButtonGroup> {
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Child Text", view: childTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         
         showErrorSwitch.onChange = { [weak self] sender in
             self?.component.showError = sender.isOn
@@ -133,6 +133,6 @@ extension RadioButtonGroupViewController: ComponentSampleable {
         
         component.selectorModels = [radioButton1, radioButton2, radioButton3]
         
-        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
+        return ComponentSample(component: component)
     }
 }

VDSSample/ViewControllers/RadioButtonItemViewController.swift

@@ -30,11 +30,11 @@ class  RadioButtonItemViewController: BaseViewController<RadioButtonItem> {
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Child Text", view: childTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         
         showErrorSwitch.onChange = { [weak self] sender in
@@ -105,6 +105,6 @@ extension RadioButtonItemViewController: ComponentSampleable {
         component.childText = "I agree to Verizon's terms and conditions click here"
         component.errorText = "Error Text"
 
-        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
+        return ComponentSample(component: component)
     }
 }

VDSSample/ViewControllers/RadioButtonViewController.swift

@@ -18,16 +18,16 @@ class  RadioButtonViewController: BaseViewController<RadioButton> {
     let toggle = UISwitch()
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         
         showErrorSwitch.onChange = { [weak self] sender in
             guard let self else { return }

VDSSample/ViewControllers/TableViewController.swift

@@ -59,10 +59,10 @@ class TableViewController: BaseViewController<Table> {
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Padding", view: paddingPicker)
-        addFormRow(label: "Striped", view: striped)
+        addFormRow(label: "Striped", view: striped, pinTrailing: false)
         addFormRow(label: "Header line style", view: headerLineStylePicker)
         addFormRow(label: "Row line style", view: rowLineStylePicker)
-        addFormRow(label: "Fill container", view: fillContainer)
+        addFormRow(label: "Fill container", view: fillContainer, pinTrailing: false)
         addFormRow(label: "Custom column size", view: customColumnWidthSize)
         
         fillContainer.isOn = component.fillContainer
@@ -147,7 +147,11 @@ class TableViewController: BaseViewController<Table> {
     func setupModel() {
         ///Header row
         
-        self.component.tableHeader = [TableRowModel(columns: [TableItemModel(bottomLine: .primary, component: nil),
+        let tableInfoLabel = Label().with({
+            $0.text = ""
+            $0.accessibilityLabel = "Verizon Plan compare, table, with 3 Rows, 3 Columns, Empty"
+        })
+        self.component.tableHeader = [TableRowModel(columns: [TableItemModel(bottomLine: .primary, component: tableInfoLabel),
                                                               TableItemModel(bottomLine: .primary, component: Label().with { $0.text = "Verizon smart family"; $0.textStyle = .boldTitleSmall; $0.lineBreakMode = .byWordWrapping}),
                                                               TableItemModel(bottomLine: .primary, component: Label().with { $0.text = "Call filter"; $0.textStyle = .boldTitleSmall; $0.lineBreakMode = .byWordWrapping })], isHeader: true)]
         
@@ -202,11 +206,12 @@ class TableViewController: BaseViewController<Table> {
             trailingToolTip.labelText = "5G Ultra Wideband is available in your area"
             trailingToolTip.tooltipModel = .init(title: "Check the formatting of your address",
                                            content:"House/Building number then street name")
-            let image = UIImage(named: "clean-surface")
-            let imageView = UIImageView(image: image)
+            
+            let iconView = Icon()
+            iconView.name = .cleanSurface
             
             rows.append(TableRowModel(columns: [TableItemModel(bottomLine: .secondary, component:textArea),
-                         TableItemModel(bottomLine: .secondary, component:imageView),
+                         TableItemModel(bottomLine: .secondary, component:iconView),
                          TableItemModel(bottomLine: .secondary, component:trailingToolTip)]))
         }
         
@@ -217,3 +222,11 @@ class TableViewController: BaseViewController<Table> {
         self.component.tableRows = rows
     }
 }
+
+extension TableViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
+        let c = Self()
+        c.setupModel()
+        return ComponentSample(component: c.component)
+    }
+}

VDSSample/ViewControllers/TableViewTestController.swift

@@ -20,7 +20,7 @@ public struct ComponentSample {
     public enum LessThanPinningType: String {
         case none, equalTo, lessThanOrEqual
     }
-    
+    public var edgeInset: UIEdgeInsets = .uniform(16)
     public var top: GreaterThanPinningType = .equalTo
     public var leading: GreaterThanPinningType = .equalTo
     public var trailing: LessThanPinningType = .equalTo
@@ -30,16 +30,18 @@ public struct ComponentSample {
                 topPinningType: GreaterThanPinningType = .equalTo,
                 leadingPinningType: GreaterThanPinningType = .equalTo,
                 trailingPinningType: LessThanPinningType = .equalTo,
-                bottomPinningType: LessThanPinningType = .equalTo) {
+                bottomPinningType: LessThanPinningType = .equalTo,
+                edgeInset: UIEdgeInsets = .uniform(16)) {
         
         self.component = component
         self.top = topPinningType
         self.leading = leadingPinningType
         self.trailing = trailingPinningType
         self.bottom = bottomPinningType
+        self.edgeInset = edgeInset
     }
     
-    public func pin(edgeInset: UIEdgeInsets = .zero) {
+    public func pin() {
         
         guard let superview = component.superview else { return }
         switch top {
@@ -126,10 +128,10 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
             }
         }
 
-        let toggleSample = ComponentSample(component: toggle, leadingPinningType: .none)
+        let toggleSample = ComponentSample(component: toggle, leadingPinningType: .none, edgeInset: .init(top: 5, left: 0, bottom: 5, right: 16))
         let wrapper = UIView().with { $0.translatesAutoresizingMaskIntoConstraints = false }
         wrapper.addSubview(toggle)
-        toggleSample.pin(edgeInset: .init(top: 5, left: 0, bottom: 5, right: 16))
+        toggleSample.pin()
         
         let stackView = UIStackView(arrangedSubviews: [wrapper, tableView]).with {
             $0.translatesAutoresizingMaskIntoConstraints = false
@@ -193,7 +195,7 @@ extension TableViewTestController : UITableViewDelegate, UITableViewDataSource {
         
         let cell = UITableViewCell()
         cell.contentView.addSubview(component)
-        sample.pin(edgeInset: .uniform(16))
+        sample.pin()
         cell.backgroundColor = surface.color
         cell.layoutIfNeeded()
         return cell

VDSSample/ViewControllers/TabsContainerViewController.swift

@@ -59,8 +59,8 @@ class TabsContainerViewController: BaseViewController<TabsContainer> {
     
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Large Sample", view: sampleSwitch)
-        addFormRow(label: "Show Borderline", view: borderlineSwitch)
+        addFormRow(label: "Large Sample", view: sampleSwitch, pinTrailing: false)
+        addFormRow(label: "Show Borderline", view: borderlineSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Size", view: sizePickerSelectorView)
         
@@ -72,7 +72,7 @@ class TabsContainerViewController: BaseViewController<TabsContainer> {
         }
         
         //only in horizontal mode
-        horizontalOrientationFormStackView.addFormRow(label: "Fill Container", view: fillContainerSwitch)
+        horizontalOrientationFormStackView.addFormRow(label: "Fill Container", view: fillContainerSwitch, pinTrailing: false)
         horizontalOrientationFormStackView.addFormRow(label: "Indicator Position", view: indicatorPositionPickerSelectorView)
         overflowRow = horizontalOrientationFormStackView.addFormRow(label: "Overflow", view: overflowPickerSelectorView)
         

VDSSample/ViewControllers/TabsViewController.swift

@@ -59,8 +59,8 @@ class TabsViewController: BaseViewController<Tabs> {
     
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Large Sample", view: sampleSwitch)
-        addFormRow(label: "Show Borderline", view: borderlineSwitch)
+        addFormRow(label: "Large Sample", view: sampleSwitch, pinTrailing: false)
+        addFormRow(label: "Show Borderline", view: borderlineSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Size", view: sizePickerSelectorView)
         
@@ -69,7 +69,7 @@ class TabsViewController: BaseViewController<Tabs> {
         }
 
         //only in horizontal mode
-        horizontalOrientationFormStackView.addFormRow(label: "Fill Container", view: fillContainerSwitch)
+        horizontalOrientationFormStackView.addFormRow(label: "Fill Container", view: fillContainerSwitch, pinTrailing: false)
         horizontalOrientationFormStackView.addFormRow(label: "Indicator Position", view: indicatorPositionPickerSelectorView)
         //overflowRow = horizontalOrientationFormStackView.addFormRow(label: "Overflow", view: overflowPickerSelectorView)
 

VDSSample/ViewControllers/TextAreaViewController.swift

@@ -42,13 +42,13 @@ class  TextAreaViewController: BaseViewController<TextArea> {
     override func setupForm(){
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Read Only", view: readOnlySwitch)
-        addFormRow(label: "Required", view: requiredSwitch)
-        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Read Only", view: readOnlySwitch, pinTrailing: false)
+        addFormRow(label: "Required", view: requiredSwitch, pinTrailing: false)
+        addFormRow(label: "Transparent Background", view: transparentBgSwitch, pinTrailing: false)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Helper Text", view: helperTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
@@ -101,11 +101,8 @@ class  TextAreaViewController: BaseViewController<TextArea> {
         widthTextField
             .numberPublisher
             .sink { [weak self] number in
-                guard let number else {
-                    self?.component.width = nil
-                    return
-                }
-                self?.component.width = number.cgFloatValue
+                self?.updateComponentConstraint(pinTrailing: number == nil)
+                self?.component.width = number?.cgFloatValue
             }.store(in: &subscribers)
         
         tooltipTitleTextField
@@ -182,13 +179,8 @@ class  TextAreaViewController: BaseViewController<TextArea> {
 
 extension TextAreaViewController: ComponentSampleable {
     static func makeSample() -> ComponentSample {
-        let component = Self.makeComponent()
-        component.width = 328
-        component.labelText = "Street Address"
-        component.helperText = "For example: 123 Verizon St"
-        component.errorText = "Enter a valid address."
-        component.tooltipModel = .init(title: "Check the formatting of your address",
-                                       content:"House/Building number then street name")
-        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
+        let c = Self()
+        c.setupModel()
+        return ComponentSample(component: c.component)
     }
 }

VDSSample/ViewControllers/TextLinkCaretViewController.swift

@@ -34,7 +34,7 @@ class TextLinkCaretViewController: BaseViewController<TextLinkCaret> {
         super.setupForm()  
         addFormRow(label: "Action", view: label)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Label", view: textField)
         addFormRow(label: "Caret Position", view: caretPositionPickerSelectorView)
         

VDSSample/ViewControllers/TextLinkViewController.swift

@@ -36,7 +36,7 @@ class TextLinkViewController: BaseViewController<TextLink> {
         super.setupForm()  
         addFormRow(label: "Action", view: label)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Label", view: textField)
         addFormRow(label: "Size", view: buttonSizePickerSelectorView)
         

VDSSample/ViewControllers/TileContainerViewController.swift

@@ -13,12 +13,6 @@ import Combine
 
 class TileContainerViewController: BaseViewController<TileContainer> {
     
-    lazy var colorPicker: UIColorPickerViewController = {
-        let picker = UIColorPickerViewController()
-        picker.delegate = self
-        return picker
-    }()
-    
     lazy var imageFallbackColorPickerSelectorView = {
         SurfacePickerSelectorView(picker: self.picker)
     }()
@@ -53,12 +47,6 @@ class TileContainerViewController: BaseViewController<TileContainer> {
     var customPaddingRowView: UIView?
     var anyCancellable: AnyCancellable?
     
-    var contentAreaBackgroundColorButton = Button().with { instance in
-        instance.size = .small
-        instance.use = .secondary
-        instance.text = "Select"
-    }
-    
     var paddingTextField = NumericField().with {
         $0.placeholder = "Custom Padding"
     }
@@ -70,46 +58,50 @@ class TileContainerViewController: BaseViewController<TileContainer> {
         $0.placeholder = "Minimum 100px else it will occupy full container"
     }
     
-    var colorPickerType: ColorPickerType = .gradientColor1
-    enum ColorPickerType {
-        case custom, gradientColor1, gradientColor2, contentViewBackgroundColor
-    }
-    
-    lazy var gradientColorView1: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.gradientColor1) { [weak self] picker in
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    lazy var backgroundColorPickerSelectorView: TokenColorPickerSection  = {
+        TokenColorPickerSection<BackgroundColor>(rowTitle: "Background Color",
+                                picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                switch item {
+                case .primary:
+                    component.color = .primary
+                case .secondary:
+                    component.color = .secondary
+                case .white:
+                    component.color = .white
+                case .black:
+                    component.color = .black
+                default: break;
+                }
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                component.color = .custom(color.uiColor)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                component.color = .custom(color)
+
+            }
         }
     }()
     
-    lazy var gradientColorView2: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.gradientColor2) { [weak self] picker in
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    lazy var gradientColorView1: ColorPickerView = {
+        return .init().with {
+            $0.onColorSelected =  { [weak self] _ in
+                guard let self else { return }
+                updateGradientColors()
+            }
         }
     }()
     
-    var backgroundColorTokenFormStackView = FormSection().with { $0.isHidden = true }
-    var backgroundColorFormStackView = FormSection().with { $0.isHidden = true }
-    
-    lazy var backgroundColorPickerSelectorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: BackgroundColor.allCases)
-        .with { $0.text = BackgroundColor.white.rawValue }
-    }()
-
-    lazy var backgroundColorTokenColorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
-        .with { $0.text = UIColor.VDSColor.paletteWhite.rawValue }
-    }()
-
-    lazy var backgroundColorCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom, color: .white) { [weak self] picker in
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    lazy var gradientColorView2: ColorPickerView = {
+        return .init().with {
+            $0.onColorSelected =  { [weak self] _ in
+                guard let self else { return }
+                updateGradientColors()
+            }
         }
     }()
     
@@ -186,7 +178,7 @@ class TileContainerViewController: BaseViewController<TileContainer> {
         component.color = .secondary
         component.accessibilityLabel = "Tile Container"
 
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component)
         component.addContentView(mainView)
         setupPicker()
         setupModel()
@@ -202,29 +194,18 @@ class TileContainerViewController: BaseViewController<TileContainer> {
             $0.text = "For testing max width is limited to 85% of view's width & 65% view's height."
         })
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Is Link", view: isLinkSwitch)
-        addFormRow(label: "Clickable", view: clickableSwitch)
+        addFormRow(label: "Is Link", view: isLinkSwitch, pinTrailing: false)
+        addFormRow(label: "Clickable", view: clickableSwitch, pinTrailing: false)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "Height", view: heightTextField)
-        addFormRow(label: "Show Border", view: showBorderSwitch)
-        addFormRow(label: "Show Drop Shadow", view: showDropShadowSwitch)
-        addFormRow(label: "Background Color", view: backgroundColorPickerSelectorView)
-        
-        backgroundColorTokenFormStackView.addFormRow(label: "Token", view: backgroundColorTokenColorView)
-        backgroundColorFormStackView.addFormRow(label: "Custom", view: backgroundColorCustomColorView)
-        append(section: backgroundColorTokenFormStackView)
-        append(section: backgroundColorFormStackView)
-
-        
+        addFormRow(label: "Show Border", view: showBorderSwitch, pinTrailing: false)
+        addFormRow(label: "Show Drop Shadow", view: showDropShadowSwitch, pinTrailing: false)
+        append(section: backgroundColorPickerSelectorView)
         addFormRow(label: "Padding", view: paddingPickerSelectorView)
         customPaddingRowView = addFormRow(label: "Custom Padding", view: paddingTextField)
         customPaddingRowView?.isHidden = true
-        let rowView = addFormRow(label: "Content area BG color(only for padding validation)", view: contentAreaBackgroundColorButton)
-        if let rowView = rowView as? UIStackView {
-            rowView.alignment = .top
-        }
         addFormRow(label: "Aspect Ratio", view: scalingTypePickerSelectorView)
-        addFormRow(label: "Background Image", view: showBackgroundImageSwitch)
+        addFormRow(label: "Background Image", view: showBackgroundImageSwitch, pinTrailing: false)
         addFormRow(label: "Image Fallback Color", view: imageFallbackColorPickerSelectorView)
         addFormRow(label: "Background Effect", view: backgroundEffectSelectorView)
         //Gradient Section
@@ -290,6 +271,7 @@ class TileContainerViewController: BaseViewController<TileContainer> {
         widthTextField
             .numberPublisher
             .sink { [weak self] number in
+                self?.updateComponentConstraint(pinTrailing: number == nil)
                 guard let self, let number = number?.cgFloatValue else {
                     self?.widthTextField.text = ""
                     return
@@ -308,7 +290,7 @@ class TileContainerViewController: BaseViewController<TileContainer> {
     func setupModel() {
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        backgroundColorPickerSelectorView.text = backgroundColor.rawValue
+        backgroundColorPickerSelectorView.setDefault(value: backgroundColor)
         paddingPickerSelectorView.text = padding.rawValue
         scalingTypePickerSelectorView.text = component.aspectRatio.rawValue
         widthTextField.text = component.width != nil ? "\(component.width!)" : ""
@@ -321,21 +303,7 @@ class TileContainerViewController: BaseViewController<TileContainer> {
             self?.component.surface = item
             self?.contentTopView.backgroundColor = item.color
         }
-        
-        backgroundColorPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            guard let self else { return }
-            if let color = item.color {
-                self.component.color = color
-            } else {
-                backgroundColorTokenFormStackView.isHidden = item != .token
-                backgroundColorFormStackView.isHidden = item != .custom
-            }
-        }
-        
-        backgroundColorTokenColorView.onPickerDidSelect  = {  [weak self] item in
-            self?.component.color = .token(item)
-        }
-        
+                
         backgroundEffectSelectorView.onPickerDidSelect = { [weak self] in
             guard let self else { return }
             if let effect = $0.effect {
@@ -344,7 +312,6 @@ class TileContainerViewController: BaseViewController<TileContainer> {
                 self.gradientColorView1.selectedColor = nil
                 self.gradientColorView2.selectedColor = nil
             } else {
-                self.colorPickerType = .gradientColor1
                 self.gradientColorsFormStackView.isHidden = false
             }
         }
@@ -368,12 +335,12 @@ class TileContainerViewController: BaseViewController<TileContainer> {
         imageFallbackColorPickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.imageFallbackColor = item
         }
-        
-        contentAreaBackgroundColorButton.onClick = { [weak self] _ in
-            guard let self else { return }
-            self.colorPickerType = .contentViewBackgroundColor
-            self.colorPicker.selectedColor = self.component.contentView.backgroundColor ?? .white
-            self.present(self.colorPicker, animated: true)
+    }
+    
+    func updateGradientColors(){
+        if let selectedGradient1Color = gradientColorView1.selectedColor,
+           let selectedGradient2Color = gradientColorView2.selectedColor{
+            component.backgroundEffect = .gradient(selectedGradient1Color, selectedGradient2Color)
         }
     }
     
@@ -388,45 +355,6 @@ extension TileContainerViewController: ComponentSampleable {
     }
 }
 
-extension TileContainerViewController: UIColorPickerViewControllerDelegate {
-    
-    func selectedColorTapped(_ picker: ColorPickerView<ColorPickerType>) {
-        let selectedColor = picker.selectedColor
-        if let selectedColor {
-            colorPicker.selectedColor = selectedColor
-        }
-        present(colorPicker, animated: true)
-    }
-    
-    func colorPickerViewControllerDidFinish(_ viewController: UIColorPickerViewController) {
-        dismiss(animated: true)
-    }
-    
-    func colorPickerViewControllerDidSelectColor(_ viewController: UIColorPickerViewController) {
-        let color = viewController.selectedColor
-        switch colorPickerType {
-        case .contentViewBackgroundColor:
-            component.contentView.backgroundColor = color
-        case .gradientColor1:
-            gradientColorView1.selectedColor = viewController.selectedColor
-            updateGradientColors()
-        case .gradientColor2:
-            gradientColorView2.selectedColor = viewController.selectedColor
-            updateGradientColors()
-        case .custom:
-            backgroundColorCustomColorView.selectedColor = color
-            component.color = .custom(color)
-        }
-    }
-    
-    func updateGradientColors(){
-        if let selectedGradient1Color = gradientColorView1.selectedColor,
-           let selectedGradient2Color = gradientColorView2.selectedColor{
-            component.backgroundEffect = .gradient(selectedGradient1Color, selectedGradient2Color)
-        }
-    }
-}
-
 extension TileContainerViewController {
     
     //Created new BackgroundEffect enum for sample app only. Since we defined enum with associated value color defined in TileContainer cannot be RawRepresentable & CaseIterable

VDSSample/ViewControllers/TileletViewController.swift

@@ -39,7 +39,7 @@ class TileletViewController: BaseViewController<Tilelet> {
     lazy var badgeFillColorPickerSelectorView = {
         PickerSelectorView(title: "red",
                            picker: self.picker,
-                           items: Badge.FillColor.allCases)
+                           items: BadgeViewController.FillColor.allCases)
     }()
     lazy var badgeNumberOfLinesPickerSelectorView = {
         PickerSelectorView(title: "one",
@@ -61,63 +61,125 @@ class TileletViewController: BaseViewController<Tilelet> {
                            items: TileContainerViewController.BackgroundEffect.allCases)
     }()
     
-    lazy var colorPicker: UIColorPickerViewController = {
-        let picker = UIColorPickerViewController()
-        picker.delegate = self
-        return picker
+    lazy var backgroundColorPickerSelectorView: TokenColorPickerSection  = {
+        TokenColorPickerSection<BackgroundColor>(
+            rowTitle: "Background Color",
+            rowTooltip: .init(title:"Background Color", content: "This color takes precedence over surface and will set all children's surface property to this value."),
+            picker: self.picker).with {
+                $0.onSelected = { [weak self] item in
+                    guard let self else { return }
+                    switch item {
+                    case .primary:
+                        component.color = .primary
+                    case .secondary:
+                        component.color = .secondary
+                    case .white:
+                        component.color = .white
+                    case .black:
+                        component.color = .black
+                    default: break;
+                    }
+                }
+                $0.onTokenSelected = { [weak self] color in
+                    guard let self else { return }
+                    component.color = .custom(color.uiColor)
+                }
+                $0.onColorSelected = { [weak self] color in
+                    guard let self else { return }
+                    component.color = .custom(color)
+                    
+                }
+            }
     }()
     
-    var colorPickerType: ColorPickerType = .custom
-    enum ColorPickerType {
-        case gradientColor1, gradientColor2
-        case contentViewBackgroundColor, token, custom
-    }
-    
-    lazy var gradientColorView1: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.gradientColor1) { [weak self] picker in
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    lazy var gradientColorView1: ColorPickerView = {
+        return .init().with {
+            $0.onColorSelected =  { [weak self] _ in
+                guard let self else { return }
+                updateGradientColors()
+            }
         }
     }()
     
-    lazy var gradientColorView2: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.gradientColor2) { [weak self] picker in
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    lazy var gradientColorView2: ColorPickerView = {
+        return .init().with {
+            $0.onColorSelected =  { [weak self] _ in
+                guard let self else { return }
+                updateGradientColors()
+            }
         }
     }()
     
-    var backgroundColorTokenFormStackView = FormSection().with { $0.isHidden = true }
-    var backgroundColorFormStackView = FormSection().with { $0.isHidden = true }
-    lazy var backgroundColorPickerSelectorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: BackgroundColor.allCases)
-        .with { $0.text = BackgroundColor.white.rawValue }
-    }()
-    
-    lazy var backgroundColorCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom, color: .white) { [weak self] picker in
-            self?.currentSurfaceColorType = .background
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
-        }
-    }()
-    
-    lazy var backgroundColorTokenColorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
-        .with { $0.text = UIColor.VDSColor.paletteWhite.rawValue }
-    }()
-
-    
     lazy var textAlignmentPickerSelectorView = {
         PickerSelectorView(title: "left",
                            picker: self.picker,
                            items: TitleLockup.TextAlignment.allCases)
     }()
     
+    /// Badge
+    enum BadgeFillColor: String, CaseIterable {
+        case red, yellow, green, orange, blue, black, white, token, custom
+    }
+    
+    enum BadgeTextColor: String, CaseIterable {
+        case `default`, token, custom
+    }
+
+    var badgeFillColor: Badge.FillColor = .red { didSet { setBadgeModel() } }
+    lazy var badgeFillColorSection = {
+        TokenColorPickerSection<BadgeFillColor>(rowTitle: "Fill Color", picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                var fillColor: Badge.FillColor = .red
+                switch item {
+                case .red:
+                    fillColor = .red
+                case .yellow:
+                    fillColor = .yellow
+                case .green:
+                    fillColor = .green
+                case .orange:
+                    fillColor = .orange
+                case .blue:
+                    fillColor = .blue
+                case .black:
+                    fillColor = .black
+                case .white:
+                    fillColor = .white
+                default:
+                    break
+                }
+                badgeFillColor = fillColor
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                badgeFillColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                badgeFillColor = .custom(color)
+            }
+        }
+    }()
+    
+    var badgeTextColor: Badge.TextColor? { didSet { setBadgeModel() } }
+    lazy var badgeTextColorSection = {
+        TokenColorPickerSection<BadgeTextColor>(rowTitle: "Text Color", picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                badgeTextColor = nil
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                badgeTextColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                badgeTextColor = .custom(color)
+            }
+        }
+    }()
+    
     /// titleLockup
     var currentSurfaceColorType: SurfaceColorType = .title
     enum SurfaceColorType {
@@ -135,81 +197,80 @@ class TileletViewController: BaseViewController<Tilelet> {
     enum IconColor: String, CaseIterable {
         case `default`, token, custom
     }
-    
+        
     /// eyebrow
-    var eyebrowTokenFormStackView = FormSection().with { $0.isHidden = true }
-    var eyebrowColorFormStackView = FormSection().with { $0.isHidden = true }
-    lazy var eyebrowColorPickerSelectorView = {
-        PickerSelectorView(title: "primary",
-                           picker: self.picker,
-                           items: TextColor.allCases)
-    }()
-
-    lazy var eyebrowTokenColorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
-        .with { $0.text = UIColor.VDSColor.paletteWhite.rawValue }
-    }()
-
-    lazy var eyebrowCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom, color: .white) { [weak self] picker in
-            self?.currentSurfaceColorType = .eyebrow
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    var eyeBrowTextColor: TitleLockup.TextColor = .primary { didSet { setEyebrowModel() } }
+    lazy var eyebrowTextColorFormSection = {
+        TokenColorPickerSection<TextColor>(rowTitle: "Text Color", picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                switch item {
+                case .primary:
+                    eyeBrowTextColor = .primary
+                case .secondary:
+                    eyeBrowTextColor = .secondary
+                default: break
+                }
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                eyeBrowTextColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                eyeBrowTextColor = .custom(color)
+            }
         }
     }()
     
-    /// title
-    var titleTokenFormStackView = FormSection().with { $0.isHidden = true }
-    var titleColorFormStackView = FormSection().with { $0.isHidden = true }
-    lazy var titleColorPickerSelectorView = {
-        PickerSelectorView(title: "primary",
-                           picker: self.picker,
-                           items: TitleTextColor.allCases)
-    }()
-    lazy var titleTokenColorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
-        .with { $0.text = UIColor.VDSColor.paletteWhite.rawValue }
-
-    }()
-
-    lazy var titleCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom, color: .white) { [weak self] picker in
-            self?.currentSurfaceColorType = .title
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    var subtitleTextColor: TitleLockup.TextColor = .primary { didSet { setSubTitleModel() } }
+    lazy var subTitleTextColorFormSection = {
+        TokenColorPickerSection<TextColor>(rowTitle: "Text Color", picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                switch item {
+                case .primary:
+                    subtitleTextColor = .primary
+                case .secondary:
+                    subtitleTextColor = .secondary
+                default: break
+                }
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                subtitleTextColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                subtitleTextColor = .custom(color)
+            }
         }
     }()
     
-    /// subtitle
-    var subtitleTokenFormStackView = FormSection().with { $0.isHidden = true }
-    var subtitleColorFormStackView = FormSection().with { $0.isHidden = true }
-    lazy var subtitleColorPickerSelectorView = {
-        PickerSelectorView(title: "primary",
-                           picker: self.picker,
-                           items: TextColor.allCases)
-    }()
-    lazy var subtitleTokenColorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
-        .with { $0.text = UIColor.VDSColor.paletteWhite.rawValue }
-    }()
-
-    lazy var subtitleCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom, color: .white) { [weak self] picker in
-            self?.currentSurfaceColorType = .subtitle
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    var titleTextColor: TitleLockup.TitleTextColor = .primary { didSet { setTitleModel() } }
+    lazy var titleTextColorFormSection = {
+        TokenColorPickerSection<TitleTextColor>(rowTitle: "Text Color", picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                switch item {
+                case .primary:
+                    titleTextColor = .primary
+                default: break
+                }
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                titleTextColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                titleTextColor = .custom(color)
+            }
         }
     }()
-
+    
+    ///Icons
     var descriptionIconFormStackView = FormSection().with { $0.isHidden = true }
-    var descriptionIconTokenFormStackView = FormSection().with { $0.isHidden = true }
-    var descriptionIconColorFormStackView = FormSection().with { $0.isHidden = true }
     lazy var descriptionNamePickerSelectorView = {
         PickerSelectorView(title: "",
                            picker: self.picker,
@@ -222,61 +283,32 @@ class TileletViewController: BaseViewController<Tilelet> {
                            items: Icon.Size.allCases)
     }()
 
-    lazy var descriptionIconColorPickerSelectorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: IconColor.allCases)
-        .with { $0.text = IconColor.default.rawValue }
-    }()
-
-    lazy var descriptionIconTokenColorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
-        .with { $0.text = UIColor.VDSColor.paletteWhite.rawValue }
-    }()
-
-    lazy var descriptionIconCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom) { [weak self] picker in
-            self?.currentSurfaceColorType = .descriptionIcon
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
-        }
-    }()
-        
-    var directionalIconFormStackView = FormSection().with { $0.isHidden = true }
-    var directionalIconTokenFormStackView = FormSection().with { $0.isHidden = true }
-    var directionalIconColorFormStackView = FormSection().with { $0.isHidden = true }
-
-    lazy var directionalIconSizePickerSelectorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: Icon.Size.allCases)
-    }()
-
-
-    lazy var directionalIconColorPickerSelectorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: IconColor.allCases)
-        .with { $0.text = IconColor.default.rawValue }
-    }()
-
-    lazy var directionalIconTokenColorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
-        .with { $0.text = UIColor.VDSColor.paletteWhite.rawValue }
-    }()
-
-    lazy var directionalIconCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom) { [weak self] picker in
-            self?.currentSurfaceColorType = .directionalIcon
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    var descriptionIconColor: Tilelet.IconColor? = .token(.paletteWhite) { didSet { setDescriptiveIconModel() } }
+    lazy var descriptionIconColorFormSection = {
+        TokenColorPickerSection<IconColor>(picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                switch item {
+                case .default:
+                    descriptionIconColor = nil
+                default: break
+                }
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                descriptionIconColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                descriptionIconColor = .custom(color)
+            }
+            $0.isHidden = true
         }
     }()
     
+
+    var directionalIconFormStackView = FormSection().with { $0.isHidden = true }
+
     lazy var directionIconPickerSelectorView = {
         PickerSelectorView(title: "",
                            picker: self.picker,
@@ -288,7 +320,29 @@ class TileletViewController: BaseViewController<Tilelet> {
                            picker: self.picker,
                            items: Tilelet.DirectionalIcon.IconSize.allCases.sorted{ $0.rawValue < $1.rawValue })
     }()
-
+    var directionIconColor: Tilelet.IconColor? = .token(.paletteWhite) { didSet { setDirectionalIconModel() } }
+    lazy var directionIconColorFormSection = {
+        TokenColorPickerSection<IconColor>(picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                switch item {
+                case .default:
+                    directionIconColor = nil
+                default: break
+                }
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                directionIconColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                directionIconColor = .custom(color)
+            }
+            $0.isHidden = true
+        }
+    }()
+    
     let backgroundImage = UIImage(named: "backgroundTest")!
     var clickableSwitch = Toggle()
     var eyebrowTextField = TextField()
@@ -317,7 +371,7 @@ class TileletViewController: BaseViewController<Tilelet> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component)
         setupPicker()
         setupModel()
     }
@@ -326,8 +380,8 @@ class TileletViewController: BaseViewController<Tilelet> {
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addActionRow()
-        addFormRow(label: "Is Link", view: isLinkSwitch)
-        addFormRow(label: "Clickable", view: clickableSwitch)
+        addFormRow(label: "Is Link", view: isLinkSwitch, pinTrailing: false)
+        addFormRow(label: "Clickable", view: clickableSwitch, pinTrailing: false)
                 
         addFormRow(label: "Aspect Ratio", view: scalingTypePickerSelectorView)
         addFormRow(label: "Padding", view: paddingPickerSelectorView)
@@ -337,16 +391,9 @@ class TileletViewController: BaseViewController<Tilelet> {
         addFormRow(label: "Text Width", view: textWidthTextField)
         addFormRow(label: "Text Percentage", view: textPercentageTextField)
         addFormRow(label: "Text Position", tooltip: .init(title:"Text Position", content: "Minimum height is configurable"), view: textPositionPickerSelectorView)
-        addFormRow(label: "Background Color", tooltip: .init(title:"Background Color", content: "This color takes precedence over surface and will set all children's surface property to this value."), view: backgroundColorPickerSelectorView)
-        
-        backgroundColorTokenFormStackView.addFormRow(label: "Token", view: backgroundColorTokenColorView)
-        backgroundColorFormStackView.addFormRow(label: "Custom", view: backgroundColorCustomColorView)
-        append(section: backgroundColorTokenFormStackView)
-        append(section: backgroundColorFormStackView)
-
-        
-        addFormRow(label: "Background Image", view: showBackgroundImageSwitch)
-        addFormRow(label: "Show Drop Shadow", view: showDropShadowSwitch)
+        append(section: backgroundColorPickerSelectorView)
+        addFormRow(label: "Background Image", view: showBackgroundImageSwitch, pinTrailing: false)
+        addFormRow(label: "Show Drop Shadow", view: showDropShadowSwitch, pinTrailing: false)
         addFormRow(label: "Image Fallback Color", view: imageFallbackColorPickerSelectorView)
         addFormRow(label: "Background Effect", view: backgroundEffectSelectorView)
         //Gradient Section
@@ -357,74 +404,57 @@ class TileletViewController: BaseViewController<Tilelet> {
         append(section: .init().with({
             $0.title = "Badge"
             $0.addFormRow(label: "Text", view: badgeTextField)
-            $0.addFormRow(label: "Fill Color", view: badgeFillColorPickerSelectorView)
             $0.addFormRow(label: "Number of Lines", view: badgeNumberOfLinesPickerSelectorView)
             $0.addFormRow(label: "Max Width", view: maxWidthTextField)
         }))
+        append(section: badgeFillColorSection)
+        append(section: badgeTextColorSection)
 
         append(section: .init().with({
-            $0.title = "Eyebrow"
-            $0.addFormRow(label: "Text Style", tooltip: .init(title: "Text Style", content: "Eyebrow and Subtitle will share the same textStyle."), view: otherStandardStylePickerSelectorView)
-            $0.addFormRow(label: "is Bold", view: eyebrowIsBold)
-            $0.addFormRow(label: "Text", view: eyebrowTextField)
-            $0.addFormRow(label: "Color", view: eyebrowColorPickerSelectorView)
+            $0.title = "Text Styles"
+            $0.addFormRow(label: "Title", view: titleStandardStylePickerSelectorView)
+            $0.addFormRow(label: "Eyebrow/Subtitle", view: otherStandardStylePickerSelectorView)
         }))
         
-        eyebrowTokenFormStackView.addFormRow(label: "Token", view: eyebrowTokenColorView)
-        eyebrowColorFormStackView.addFormRow(label: "Custom", view: eyebrowCustomColorView)
-        append(section: eyebrowTokenFormStackView)
-        append(section: eyebrowColorFormStackView)
+        append(section: .init().with({
+            $0.title = "Eyebrow"
+            $0.addFormRow(label: "is Bold", view: eyebrowIsBold, pinTrailing: false)
+            $0.addFormRow(label: "Text", view: eyebrowTextField)
+        }))
+        append(section: eyebrowTextColorFormSection)
 
         append(section: .init().with({
             $0.title = "Title"
-            $0.addFormRow(label: "Text Style", view: titleStandardStylePickerSelectorView)
-            $0.addFormRow(label: "is Bold", view: titleIsBold)
+            $0.addFormRow(label: "is Bold", view: titleIsBold, pinTrailing: false)
             $0.addFormRow(label: "Text", view: titleTextField)
-            $0.addFormRow(label: "Color", view: titleColorPickerSelectorView)
         }))
-        titleTokenFormStackView.addFormRow(label: "Token", view: titleTokenColorView)
-        titleColorFormStackView.addFormRow(label: "Custom", view: titleCustomColorView)
-        append(section: titleTokenFormStackView)
-        append(section: titleColorFormStackView)
+        append(section: titleTextColorFormSection)
 
         append(section: .init().with({
             $0.title = "Subtitle"
             $0.addFormRow(label: "Text", view: subTitleTextField)
-            $0.addFormRow(label: "Color", view: subtitleColorPickerSelectorView)
         }))
-        subtitleTokenFormStackView.addFormRow(label: "Token", view: subtitleTokenColorView)
-        subtitleColorFormStackView.addFormRow(label: "Custom", view: subtitleCustomColorView)
-        append(section: subtitleTokenFormStackView)
-        append(section: subtitleColorFormStackView)
+        append(section: subTitleTextColorFormSection)
 
         append(section: .init().with({
             $0.title = "Description Icon "
-            $0.addFormRow(label: "Show", view: showDescriptionIconSwitch)
+            $0.addFormRow(label: "Show", view: showDescriptionIconSwitch, pinTrailing: false)
         }))
         append(section: descriptionIconFormStackView)
         descriptionIconFormStackView.addFormRow(label: "Icon", view: descriptionNamePickerSelectorView)
         descriptionIconFormStackView.addFormRow(label: "Accessibility", view: descriptionIconAccessibilityTextField)
         descriptionIconFormStackView.addFormRow(label: "Size", view: descriptionIconSizePickerSelectorView)
-        descriptionIconFormStackView.addFormRow(label: "Color", view: descriptionIconColorPickerSelectorView)
-        descriptionIconTokenFormStackView.addFormRow(label: "Token", view: descriptionIconTokenColorView)
-        descriptionIconColorFormStackView.addFormRow(label: "Custom", view: descriptionIconCustomColorView)
-        append(section: descriptionIconTokenFormStackView)
-        append(section: descriptionIconColorFormStackView)
-
+        append(section: descriptionIconColorFormSection)
         
         append(section: .init().with({
             $0.title = "Directional Icon"
-            $0.addFormRow(label: "Show", view: showDirectionalIconSwitch)
+            $0.addFormRow(label: "Show", view: showDirectionalIconSwitch, pinTrailing: false)
         }))
         append(section: directionalIconFormStackView)
         directionalIconFormStackView.addFormRow(label: "Icon", view: directionIconPickerSelectorView)
         directionalIconFormStackView.addFormRow(label: "Size", view: directionIconSizePickerSelectorView)
-        directionalIconFormStackView.addFormRow(label: "Color", view: directionalIconColorPickerSelectorView)
-        directionalIconTokenFormStackView.addFormRow(label: "Token", view: directionalIconTokenColorView)
-        directionalIconColorFormStackView.addFormRow(label: "Custom", view: directionalIconCustomColorView)
-        append(section: directionalIconTokenFormStackView)
-        append(section: directionalIconColorFormStackView)
-
+        append(section: directionIconColorFormSection)
+        
         clickableSwitch.onChange = { [weak self] sender in
             guard let self else { return }
             if sender.isOn {
@@ -459,6 +489,7 @@ class TileletViewController: BaseViewController<Tilelet> {
         widthTextField
             .numberPublisher
             .sink { [weak self] number in
+                self?.updateComponentConstraint(pinTrailing: number == nil)
                 guard let self, let number = number?.cgFloatValue else {
                     self?.widthTextField.text = ""
                     return
@@ -569,12 +600,58 @@ class TileletViewController: BaseViewController<Tilelet> {
                 self?.component.badgeModel?.maxWidth = number.cgFloatValue
             }.store(in: &subscribers)
     }
+
+    func setupModel() {
+        let titleModel = Tilelet.TitleModel(text: "Save $XX on your monthly bill.")
+        let subTitleModel = Tilelet.SubTitleModel(text: "Enroll in Auto Pay & paper-free billing to save on your monthly bill.")
+        component.color = .black
+        component.surface = .light
+        component.titleModel = titleModel
+        component.subTitleModel = subTitleModel
+        component.padding = .small
+        //setup UI
+        backgroundColorPickerSelectorView.setDefault(value: backgroundColor)
+        textAlignmentPickerSelectorView.text = TextAlignment.left.rawValue
+        surfacePickerSelectorView.text = component.surface.rawValue
+        otherStandardStylePickerSelectorView.text = subTitleModel.otherStandardStyle.rawValue
+        titleStandardStylePickerSelectorView.text = titleModel.standardStyle.rawValue
+        titleTextField.text = titleModel.text
+        subTitleTextField.text = subTitleModel.text
+        widthTextField.text = component.width != nil ? "\(component.width!)" : ""
+        textPositionPickerSelectorView.text = component.textPostion.rawValue
+        scalingTypePickerSelectorView.text = component.aspectRatio.rawValue
+        updateOtherTextStyles()
+        
+        descriptionNamePickerSelectorView.text = Icon.Name.multipleDocuments.rawValue
+        descriptionIconSizePickerSelectorView.text = Icon.Size.medium.rawValue
+        
+        directionIconPickerSelectorView.text = Tilelet.DirectionalIcon.IconType.rightArrow.rawValue
+        directionIconSizePickerSelectorView.text = Tilelet.DirectionalIcon.IconSize.medium.rawValue
+        
+        badgeFillColorSection.setDefault(value: .red)
+        badgeTextColorSection.setDefault(value: .default)
+
+        eyebrowTextColorFormSection.setDefault(value: .primary)
+        titleTextColorFormSection.setDefault(value: .primary)
+        subTitleTextColorFormSection.setDefault(value: .primary)
+        
+        descriptionIconColorFormSection.setDefault(value: .token)
+        directionIconColorFormSection.setDefault(value: .token)
+    }
     
     func setIconColorForms() {
         setDirectionalIconColorForm()
         setDescriptionIconColorForm()
     }
     
+    func setDirectionalIconColorForm() {
+        directionIconColorFormSection.isHidden = !showDirectionalIconSwitch.isOn
+    }
+    
+    func setDescriptionIconColorForm() {
+        descriptionIconColorFormSection.isHidden = !showDescriptionIconSwitch.isOn
+    }
+    
     func setDescriptionIconForm() {
         let showForm = showDescriptionIconSwitch.isOn
         descriptionIconFormStackView.isHidden = !showForm
@@ -601,62 +678,10 @@ class TileletViewController: BaseViewController<Tilelet> {
         setIconColorForms()
     }
     
-    func setDirectionalIconColorForm() {
-        let selectedItem = directionalIconColorPickerSelectorView.selectedItem
-        if showDirectionalIconSwitch.isOn && selectedItem != .default  {
-            directionalIconTokenFormStackView.isHidden = selectedItem != .token
-            directionalIconColorFormStackView.isHidden = selectedItem != .custom
-        } else {
-            directionalIconTokenFormStackView.isHidden = true
-            directionalIconColorFormStackView.isHidden = true
-        }
-    }
-    
-    func setDescriptionIconColorForm() {
-        let selectedItem = descriptionIconColorPickerSelectorView.selectedItem
-        if showDescriptionIconSwitch.isOn && selectedItem != .default {
-            descriptionIconTokenFormStackView.isHidden = selectedItem != .token
-            descriptionIconColorFormStackView.isHidden = selectedItem != .custom
-        } else {
-            descriptionIconTokenFormStackView.isHidden = true
-            descriptionIconColorFormStackView.isHidden = true
-        }
-    }
-    
-    func setupModel() {
-        let titleModel = Tilelet.TitleModel(text: "Save $XX on your monthly bill.")
-        let subTitleModel = Tilelet.SubTitleModel(text: "Enroll in Auto Pay & paper-free billing to save on your monthly bill.")
-        component.color = .black
-        component.surface = .light
-        component.titleModel = titleModel
-        component.subTitleModel = subTitleModel
-        component.padding = .small
-        //setup UI
-        backgroundColorPickerSelectorView.text = backgroundColor.rawValue
-        textAlignmentPickerSelectorView.text = TextAlignment.left.rawValue
-        surfacePickerSelectorView.text = component.surface.rawValue
-        otherStandardStylePickerSelectorView.text = subTitleModel.otherStandardStyle.rawValue
-        titleStandardStylePickerSelectorView.text = titleModel.standardStyle.rawValue
-        titleTextField.text = titleModel.text
-        subTitleTextField.text = subTitleModel.text
-        widthTextField.text = component.width != nil ? "\(component.width!)" : ""
-        textPositionPickerSelectorView.text = component.textPostion.rawValue
-        scalingTypePickerSelectorView.text = component.aspectRatio.rawValue
-        updateOtherTextStyles()
-        
-        descriptionIconCustomColorView.selectedColor = VDSColor.elementsPrimaryOnlight
-        descriptionNamePickerSelectorView.text = Icon.Name.multipleDocuments.rawValue
-        descriptionIconSizePickerSelectorView.text = Icon.Size.medium.rawValue
-
-        directionalIconCustomColorView.selectedColor = VDSColor.elementsPrimaryOnlight
-        directionIconPickerSelectorView.text = Tilelet.DirectionalIcon.IconType.rightArrow.rawValue
-        directionIconSizePickerSelectorView.text = Tilelet.DirectionalIcon.IconSize.medium.rawValue
-    }
-    
     //sub models
     func setBadgeModel() {
         if let text = badgeTextField.text, !text.isEmpty {
-            component.badgeModel = Tilelet.BadgeModel(text: text, fillColor: badgeFillColorPickerSelectorView.selectedItem, numberOfLines: badgeNumberOfLinesPickerSelectorView.selectedItem.intValue)
+            component.badgeModel = Tilelet.BadgeModel(text: text, textColor: badgeTextColor, fillColor: badgeFillColor, numberOfLines: badgeNumberOfLinesPickerSelectorView.selectedItem.intValue)
         } else {
             component.badgeModel = nil
         }
@@ -664,21 +689,7 @@ class TileletViewController: BaseViewController<Tilelet> {
     
     func setTitleModel() {
         if let text = titleTextField.text, !text.isEmpty {
-            var textColor: TitleLockup.TitleTextColor
-            switch titleColorPickerSelectorView.selectedItem {
-            case .primary:
-                textColor = .primary
-            case .token:
-                textColor = .token(titleTokenColorView.selectedItem)
-            case .custom:
-                if let color = titleCustomColorView.selectedColor {
-                    textColor = .custom(color)
-                } else {
-                    textColor = .custom(VDSColor.elementsPrimaryOnlight)
-                }
-            }
-            
-            component.titleModel = Tilelet.TitleModel(text: text, textColor: textColor, isBold: titleIsBold.isOn, standardStyle: titleStandardStylePickerSelectorView.selectedItem)
+            component.titleModel = Tilelet.TitleModel(text: text, textColor: titleTextColor, isBold: titleIsBold.isOn, standardStyle: titleStandardStylePickerSelectorView.selectedItem)
         } else {
             component.titleModel = nil
         }
@@ -686,23 +697,7 @@ class TileletViewController: BaseViewController<Tilelet> {
     
     func setSubTitleModel() {
         if let text = subTitleTextField.text, !text.isEmpty {
-            var textColor: TitleLockup.TextColor
-            switch subtitleColorPickerSelectorView.selectedItem {
-            case .primary:
-                textColor = .primary
-            case .secondary:
-                textColor = .secondary
-            case .token:
-                textColor = .token(subtitleTokenColorView.selectedItem)
-            case .custom:
-                if let color = subtitleCustomColorView.selectedColor {
-                    textColor = .custom(color)
-                } else {
-                    textColor = .custom(VDSColor.elementsPrimaryOnlight)
-                }
-            }
-
-            component.subTitleModel = Tilelet.SubTitleModel(text: text, otherStandardStyle: otherStandardStylePickerSelectorView.selectedItem, textColor: textColor)
+            component.subTitleModel = Tilelet.SubTitleModel(text: text, otherStandardStyle: otherStandardStylePickerSelectorView.selectedItem, textColor: subtitleTextColor)
         } else {
             component.subTitleModel = nil
         }
@@ -710,22 +705,7 @@ class TileletViewController: BaseViewController<Tilelet> {
     
     func setEyebrowModel() {
         if let text = eyebrowTextField.text, !text.isEmpty {
-            var textColor: TitleLockup.TextColor
-            switch eyebrowColorPickerSelectorView.selectedItem {
-            case .primary:
-                textColor = .primary
-            case .secondary:
-                textColor = .secondary
-            case .token:
-                textColor = .token(eyebrowTokenColorView.selectedItem)
-            case .custom:
-                if let color = eyebrowCustomColorView.selectedColor {
-                    textColor = .custom(color)
-                } else {
-                    textColor = .custom(VDSColor.elementsPrimaryOnlight)
-                }
-            }
-            component.eyebrowModel = Tilelet.EyebrowModel(text: text, textColor: textColor, isBold: eyebrowIsBold.isOn, standardStyle: otherStandardStylePickerSelectorView.selectedItem)
+            component.eyebrowModel = Tilelet.EyebrowModel(text: text, textColor: eyeBrowTextColor, isBold: eyebrowIsBold.isOn, standardStyle: otherStandardStylePickerSelectorView.selectedItem)
         } else {
             component.eyebrowModel = nil
         }
@@ -734,36 +714,26 @@ class TileletViewController: BaseViewController<Tilelet> {
     func setDescriptiveIconModel() {
         let iconSize = descriptionIconSizePickerSelectorView.selectedItem
         let iconName = descriptionNamePickerSelectorView.selectedItem
-        var iconColor: Tilelet.IconColor? = nil
         var accessibleText: String?
         if let at = descriptionIconAccessibilityTextField.text, !at.isEmpty {
             accessibleText = at
         }
         
-        switch descriptionIconColorPickerSelectorView.selectedItem {
-        case .token:
-            iconColor = .token(descriptionIconTokenColorView.selectedItem)
-        case .custom:
-            iconColor = .custom(descriptionIconCustomColorView.selectedColor ?? .white)
-        default:
-            break
-        }
-        component.descriptiveIconModel = .init(name: iconName, iconColor: iconColor, size: iconSize, accessibleText: accessibleText ?? nil )
+        component.descriptiveIconModel = .init(name: iconName, iconColor: descriptionIconColor, size: iconSize, accessibleText: accessibleText ?? nil )
     }
     
     func setDirectionalIconModel() {
         let iconType = directionIconPickerSelectorView.selectedItem
         let iconSize = directionIconSizePickerSelectorView.selectedItem
-        var iconColor: Tilelet.IconColor? = nil
-        switch directionalIconColorPickerSelectorView.selectedItem {
-        case .token:
-            iconColor = .token(directionalIconTokenColorView.selectedItem)
-        case .custom:
-            iconColor = .custom(directionalIconCustomColorView.selectedColor ?? .white)
-        default:
-            break
+
+        component.directionalIconModel = .init(iconType: iconType, iconColor: directionIconColor, size: iconSize)
+    }
+    
+    func updateGradientColors(){
+        if let selectedGradient1Color = gradientColorView1.selectedColor,
+           let selectedGradient2Color = gradientColorView2.selectedColor{
+            component.backgroundEffect = .gradient(selectedGradient1Color, selectedGradient2Color)
         }
-        component.directionalIconModel = .init(iconType: iconType, iconColor: iconColor, size: iconSize)
     }
     
     func updateOtherTextStyles() {
@@ -796,10 +766,6 @@ class TileletViewController: BaseViewController<Tilelet> {
             self.component.textPostion = item
         }
         
-        badgeFillColorPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.component.badgeModel?.fillColor = item
-        }
-        
         badgeNumberOfLinesPickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.badgeModel?.numberOfLines = item.intValue
         }
@@ -818,7 +784,6 @@ class TileletViewController: BaseViewController<Tilelet> {
                 self.gradientColorView1.selectedColor = nil
                 self.gradientColorView2.selectedColor = nil
             } else {
-                self.colorPickerType = .gradientColor1
                 self.gradientColorsFormStackView.isHidden = false
             }
         }
@@ -826,59 +791,7 @@ class TileletViewController: BaseViewController<Tilelet> {
         textAlignmentPickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.titleLockup.textAlignment = item
         }
-        
-        backgroundColorPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            guard let self else { return }
-            if let color = getTilelet(backgroundColor: item) {
-                component.color = color
-            } else {
-                backgroundColorTokenFormStackView.isHidden = item != .token
-                backgroundColorFormStackView.isHidden = item != .custom
-            }
-        }
-        
-        backgroundColorTokenColorView.onPickerDidSelect  = {  [weak self] item in
-            self?.component.color = .token(item)
-        }
-                
-        eyebrowColorPickerSelectorView.onPickerDidSelect  = {  [weak self] item in
-            self?.currentSurfaceColorType = .eyebrow
-            self?.eyebrowTokenFormStackView.isHidden = item != .token
-            self?.eyebrowColorFormStackView.isHidden = item != .custom
-            self?.setEyebrowModel()
-        }
-        
-        eyebrowTokenColorView.onPickerDidSelect  = {  [weak self] item in
-            self?.setEyebrowModel()
-        }
-
-        titleColorPickerSelectorView.onPickerDidSelect  = {  [weak self] item in
-            self?.currentSurfaceColorType = .title
-            self?.titleTokenFormStackView.isHidden = item != .token
-            self?.titleColorFormStackView.isHidden = item != .custom
-            self?.setTitleModel()
-        }
-        
-        titleTokenColorView.onPickerDidSelect  = {  [weak self] item in
-            self?.setTitleModel()
-        }
-        
-        subtitleColorPickerSelectorView.onPickerDidSelect  = {  [weak self] item in
-            self?.currentSurfaceColorType = .subtitle
-            self?.subtitleTokenFormStackView.isHidden = item != .token
-            self?.subtitleColorFormStackView.isHidden = item != .custom
-            self?.setSubTitleModel()
-        }
-        
-        subtitleTokenColorView.onPickerDidSelect  = {  [weak self] item in
-            self?.setSubTitleModel()
-        }
-
-        descriptionIconColorPickerSelectorView.onPickerDidSelect  = {  [weak self] item in
-            self?.setIconColorForms()
-            self?.setDescriptiveIconModel()
-        }
-        
+                    
         descriptionNamePickerSelectorView.onPickerDidSelect  = {  [weak self] item in
             self?.setDescriptiveIconModel()
         }
@@ -886,17 +799,7 @@ class TileletViewController: BaseViewController<Tilelet> {
         descriptionIconSizePickerSelectorView.onPickerDidSelect  = {  [weak self] item in
             self?.setDescriptiveIconModel()
         }
-        
-        descriptionIconTokenColorView.onPickerDidSelect = {  [weak self] item in
-            self?.colorPickerType = .token
-            self?.setDescriptiveIconModel()
-        }
-        
-        directionalIconColorPickerSelectorView.onPickerDidSelect  = {  [weak self] item in
-            self?.setIconColorForms()
-            self?.setDirectionalIconModel()
-        }
-        
+
         directionIconPickerSelectorView.onPickerDidSelect  = {  [weak self] item in
             self?.setDirectionalIconModel()
         }
@@ -904,11 +807,7 @@ class TileletViewController: BaseViewController<Tilelet> {
         directionIconSizePickerSelectorView.onPickerDidSelect  = {  [weak self] item in
             self?.setDirectionalIconModel()
         }
-        
-        directionalIconTokenColorView.onPickerDidSelect = {  [weak self] item in
-            self?.colorPickerType = .token
-            self?.setDirectionalIconModel()
-        }
+
     }
     
     func getTilelet(effect: TileContainer.BackgroundEffect) -> Tilelet.BackgroundEffect {
@@ -954,79 +853,6 @@ extension TileletViewController: ComponentSampleable {
     }
 }
 
-extension TileletViewController: UIColorPickerViewControllerDelegate {
-    
-    func selectedColorTapped(_ picker: ColorPickerView<ColorPickerType>) {
-        let selectedColor = picker.selectedColor
-        if let selectedColor {
-            colorPicker.selectedColor = selectedColor
-        }
-        present(colorPicker, animated: true)
-    }
-    
-    func colorPickerViewControllerDidFinish(_ viewController: UIColorPickerViewController) {
-        dismiss(animated: true)
-    }
-    
-    func colorPickerViewControllerDidSelectColor(_ viewController: UIColorPickerViewController) {
-        let color = viewController.selectedColor 
-        var lightColorView: ColorPickerView<ColorPickerType>
-        var darkColorView: ColorPickerView<ColorPickerType>
-        switch colorPickerType {
-        case .contentViewBackgroundColor:
-            component.contentView.backgroundColor = color
-        case .gradientColor1:
-            gradientColorView1.selectedColor = viewController.selectedColor
-            updateGradientColors()
-        case .gradientColor2:
-            gradientColorView2.selectedColor = viewController.selectedColor
-            updateGradientColors()
-        case .custom:
-            var colorView: ColorPickerView<ColorPickerType>
-            
-            switch currentSurfaceColorType {
-            case .background:
-                colorView = backgroundColorCustomColorView
-            case .eyebrow:
-                colorView = eyebrowCustomColorView
-            case .title:
-                colorView = titleCustomColorView
-            case .subtitle:
-                colorView = subtitleCustomColorView
-            case .directionalIcon:
-                colorView = directionalIconCustomColorView
-            case .descriptionIcon:
-                colorView = descriptionIconCustomColorView
-            }
-            colorView.selectedColor = viewController.selectedColor
-            
-            switch currentSurfaceColorType {
-            case .background:
-                component.color = .custom(color)
-            case .eyebrow:
-                setEyebrowModel()
-            case .title:
-                setTitleModel()
-            case .subtitle:
-                setSubTitleModel()
-            case .directionalIcon:
-                setDirectionalIconModel()
-            case .descriptionIcon:
-                setDescriptiveIconModel()
-            }            
-        default:
-            break
-        }
-    }
-    
-    func updateGradientColors(){
-        if let selectedGradient1Color = gradientColorView1.selectedColor,
-           let selectedGradient2Color = gradientColorView2.selectedColor{
-            component.backgroundEffect = .gradient(selectedGradient1Color, selectedGradient2Color)
-        }
-    }
-}
-
 extension TileletViewController {
     
     enum BackgroundColor: String, CaseIterable {

VDSSample/ViewControllers/TitleLockupViewController.swift

@@ -36,21 +36,6 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
     var titleTextField = TextField()
     var subTitleTextField = TextField()
 
-    /// **********************************************
-    /// Text Color
-    lazy var colorPicker: UIColorPickerViewController = {
-        let picker = UIColorPickerViewController()
-        picker.delegate = self
-        return picker
-    }()
-    
-    var currentLabelType: LabelType = .title
-    var colorPickerType: ColorPickerType = .custom
-    
-    enum LabelType {
-        case eyebrow, title, subtitle
-    }
-    
     enum TitleTextColor: String, CaseIterable {
         case primary, token, custom
     }
@@ -58,81 +43,81 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
     enum TextColor: String, CaseIterable {
         case primary, secondary, token, custom
     }
-    
-    enum ColorPickerType {
-        case custom
-    }
-    
+        
     /// eyebrow
-    var eyebrowTokenFormStackView = FormSection().with { $0.isHidden = true }
-    var eyebrowColorFormStackView = FormSection().with { $0.isHidden = true }
-    lazy var eyebrowColorPickerSelectorView = {
-        PickerSelectorView(title: "primary",
-                           picker: self.picker,
-                           items: TextColor.allCases)
-    }()
-
-    lazy var eyebrowTokenColorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
-        .with { $0.text = UIColor.VDSColor.paletteBlack.rawValue }
-    }()
-
-    lazy var eyebrowCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom, color: .black) { [weak self] picker in
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    var eyeBrowTextColor: TitleLockup.TextColor = .primary { didSet { setOtherModels() } }
+    lazy var eyebrowTextColorFormSection = {
+        TokenColorPickerSection<TextColor>(rowTitle: "Text Color",
+                                picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                switch item {
+                case .primary:
+                    eyeBrowTextColor = .primary
+                case .secondary:
+                    eyeBrowTextColor = .secondary
+                default: break
+                }
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                eyeBrowTextColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                eyeBrowTextColor = .custom(color)
+            }
         }
     }()
     
-    /// title
-    var titleTokenFormStackView = FormSection().with { $0.isHidden = true }
-    var titleColorFormStackView = FormSection().with { $0.isHidden = true }
-    lazy var titleColorPickerSelectorView = {
-        PickerSelectorView(title: "primary",
-                           picker: self.picker,
-                           items: TitleTextColor.allCases)
-    }()
-    
-    lazy var titleTokenColorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
-        .with { $0.text = UIColor.VDSColor.paletteBlack.rawValue }
-    }()
-
-    lazy var titleCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom, color: .black) { [weak self] picker in
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    var subtitleTextColor: TitleLockup.TextColor = .primary { didSet { setOtherModels() } }
+    lazy var subTitleTextColorFormSection = {
+        TokenColorPickerSection<TextColor>(rowTitle: "Text Color",
+                                picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                switch item {
+                case .primary:
+                    subtitleTextColor = .primary
+                case .secondary:
+                    subtitleTextColor = .secondary
+                default: break
+                }
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                subtitleTextColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                subtitleTextColor = .custom(color)
+            }
         }
     }()
     
-    /// subtitle
-    var subtitleTokenFormStackView = FormSection().with { $0.isHidden = true }
-    var subtitleColorFormStackView = FormSection().with { $0.isHidden = true }
-    lazy var subtitleColorPickerSelectorView = {
-        PickerSelectorView(title: "primary",
-                           picker: self.picker,
-                           items: TextColor.allCases)
-    }()
-    
-    lazy var subtitleTokenColorView = {
-        PickerSelectorView(title: "",
-                           picker: self.picker,
-                           items: UIColor.VDSColor.allCases)
-        .with { $0.text = UIColor.VDSColor.paletteBlack.rawValue }
-    }()
-
-    lazy var subtitleCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom, color: .black) { [weak self] picker in
-            self?.colorPickerType = picker.pickerType
-            self?.selectedColorTapped(picker)
+    var titleTextColor: TitleLockup.TitleTextColor = .primary { didSet { setTitleModel() } }
+    lazy var titleTextColorFormSection = {
+        TokenColorPickerSection<TitleTextColor>(rowTitle: "Text Color",
+                                picker: self.picker).with {
+            $0.onSelected = { [weak self] item in
+                guard let self else { return }
+                switch item {
+                case .primary:
+                    titleTextColor = .primary
+                default: break
+                }
+            }
+            $0.onTokenSelected = { [weak self] color in
+                guard let self else { return }
+                titleTextColor = .token(color)
+            }
+            $0.onColorSelected = { [weak self] color in
+                guard let self else { return }
+                titleTextColor = .custom(color)
+            }
         }
     }()
-
-
+        
     override func viewDidLoad() {
         super.viewDidLoad()
         addContentTopView(view: component)
@@ -146,40 +131,32 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Text Alignment", view: textAlignmentPickerSelectorView)
 
+        append(section: .init().with({
+            $0.title = "Text Styles"
+            $0.addFormRow(label: "Title", view: titleStandardStylePickerSelectorView)
+            $0.addFormRow(label: "Eyebrow/Subtitle", view: otherStandardStylePickerSelectorView)
+        }))
+
         append(section: .init().with({
             $0.title = "\nEyebrow"
-            $0.addFormRow(label: "TextStyle (Subtitle)", view: otherStandardStylePickerSelectorView)
-            $0.addFormRow(label: "is Bold", view: eyebrowIsBold)
+            $0.addFormRow(label: "is Bold", view: eyebrowIsBold, pinTrailing: false)
             $0.addFormRow(label: "Text", view: eyebrowTextField)
-            $0.addFormRow(label: "Color", view: eyebrowColorPickerSelectorView)
         }))
         
-        eyebrowTokenFormStackView.addFormRow(label: "Token", view: eyebrowTokenColorView)
-        eyebrowColorFormStackView.addFormRow(label: "Custom", view: eyebrowCustomColorView)
-        append(section: eyebrowTokenFormStackView)
-        append(section: eyebrowColorFormStackView)
+        append(section: eyebrowTextColorFormSection)
 
         append(section: .init().with({
             $0.title = "\nTitle"
-            $0.addFormRow(label: "TextStyle", view: titleStandardStylePickerSelectorView)
-            $0.addFormRow(label: "is Bold", view: titleIsBold)
+            $0.addFormRow(label: "is Bold", view: titleIsBold, pinTrailing: false)
             $0.addFormRow(label: "Text", view: titleTextField)
-            $0.addFormRow(label: "Color", view: titleColorPickerSelectorView)
         }))
-        titleTokenFormStackView.addFormRow(label: "Token", view: titleTokenColorView)
-        titleColorFormStackView.addFormRow(label: "Custom", view: titleCustomColorView)
-        append(section: titleTokenFormStackView)
-        append(section: titleColorFormStackView)
+        append(section: titleTextColorFormSection)
 
         append(section: .init().with({
             $0.title = "\nSubtitle"
             $0.addFormRow(label: "Subtitle Text", view: subTitleTextField)
-            $0.addFormRow(label: "Subtitle Color", view: subtitleColorPickerSelectorView)
         }))
-        subtitleTokenFormStackView.addFormRow(label: "Token", view: subtitleTokenColorView)
-        subtitleColorFormStackView.addFormRow(label: "Custom", view: subtitleCustomColorView)
-        append(section: subtitleTokenFormStackView)
-        append(section: subtitleColorFormStackView)
+        append(section: subTitleTextColorFormSection)
         
         eyebrowIsBold.publisher(for: .valueChanged).sink { [weak self] toggle in
             self?.setOtherModels()
@@ -226,6 +203,10 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
         titleTextField.text = titleModel.text
         subTitleTextField.text = subTitleModel.text
         
+        eyebrowTextColorFormSection.setDefault(value: .primary)
+        titleTextColorFormSection.setDefault(value: .primary)
+        subTitleTextColorFormSection.setDefault(value: .primary)
+        
         setTitleModel()
         updateOtherTextStyles()
     }
@@ -234,21 +215,7 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
         var titleTextStyle: TextStyle?
         if let text = titleTextField.text, !text.isEmpty {
             
-            var textColor: TitleLockup.TitleTextColor
-            switch titleColorPickerSelectorView.selectedItem {
-            case .primary:
-                textColor = .primary
-            case .token:
-                textColor = .token(titleTokenColorView.selectedItem)
-            case .custom:
-                if let color = titleCustomColorView.selectedColor {
-                    textColor = .custom(color)
-                } else {
-                    textColor = .custom(VDSColor.elementsPrimaryOnlight)
-                }
-            }
-
-            component.titleModel = TitleLockup.TitleModel(text: text, textColor: textColor, isBold: titleIsBold.isOn, standardStyle: titleStandardStylePickerSelectorView.selectedItem)
+            component.titleModel = TitleLockup.TitleModel(text: text, textColor: titleTextColor, isBold: titleIsBold.isOn, standardStyle: titleStandardStylePickerSelectorView.selectedItem)
             titleTextStyle = titleIsBold.isOn ? titleStandardStylePickerSelectorView.selectedItem.value.bold : titleStandardStylePickerSelectorView.selectedItem.value.regular
         } else {
             component.titleModel = nil
@@ -267,44 +234,14 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
         let style = otherStandardStylePickerSelectorView.selectedItem
     
         if let text = subTitleTextField.text, !text.isEmpty {
-            var textColor: TitleLockup.TextColor
-            switch subtitleColorPickerSelectorView.selectedItem {
-            case .primary:
-                textColor = .primary
-            case .secondary:
-                textColor = .secondary
-            case .token:
-                textColor = .token(subtitleTokenColorView.selectedItem)
-            case .custom:
-                if let color = subtitleCustomColorView.selectedColor {
-                    textColor = .custom(color)
-                } else {
-                    textColor = .custom(VDSColor.elementsPrimaryOnlight)
-                }
-            }
-            component.subTitleModel = TitleLockup.SubTitleModel(text: text, otherStandardStyle: style, textColor: textColor)
+            component.subTitleModel = TitleLockup.SubTitleModel(text: text, otherStandardStyle: style, textColor: subtitleTextColor)
             debug(type: "SubTitle", textStyle: style.value.regular)
         } else {
             component.subTitleModel = nil
         }
         
         if let text = eyebrowTextField.text, !text.isEmpty {
-            var textColor: TitleLockup.TextColor
-            switch eyebrowColorPickerSelectorView.selectedItem {
-            case .primary:
-                textColor = .primary
-            case .secondary:
-                textColor = .secondary
-            case .token:
-                textColor = .token(eyebrowTokenColorView.selectedItem)
-            case .custom:
-                if let color = eyebrowCustomColorView.selectedColor {
-                    textColor = .custom(color)
-                } else {
-                    textColor = .custom(VDSColor.elementsPrimaryOnlight)
-                }           
-            }
-            component.eyebrowModel = TitleLockup.EyebrowModel(text: text, textColor: textColor, isBold: eyebrowIsBold.isOn, standardStyle: style)
+            component.eyebrowModel = TitleLockup.EyebrowModel(text: text, textColor: eyeBrowTextColor, isBold: eyebrowIsBold.isOn, standardStyle: style)
             debug(type: "EyeBrow", textStyle: eyebrowIsBold.isOn ? style.value.bold : style.value.regular)
             
         } else {
@@ -336,40 +273,6 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
         otherStandardStylePickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.setOtherModels()
         }
-
-        
-        eyebrowColorPickerSelectorView.onPickerDidSelect  = {  [weak self] item in
-            self?.currentLabelType = .eyebrow
-            self?.eyebrowTokenFormStackView.isHidden = item != .token
-            self?.eyebrowColorFormStackView.isHidden = item != .custom
-            self?.setOtherModels()
-        }
-        
-        eyebrowTokenColorView.onPickerDidSelect  = {  [weak self] item in
-            self?.setOtherModels()
-        }
-        
-        titleColorPickerSelectorView.onPickerDidSelect  = {  [weak self] item in
-            self?.currentLabelType = .title
-            self?.titleTokenFormStackView.isHidden = item != .token
-            self?.titleColorFormStackView.isHidden = item != .custom
-            self?.setTitleModel()
-        }
-        
-        titleTokenColorView.onPickerDidSelect  = {  [weak self] item in
-            self?.setTitleModel()
-        }
-        
-        subtitleColorPickerSelectorView.onPickerDidSelect  = {  [weak self] item in
-            self?.currentLabelType = .subtitle
-            self?.subtitleTokenFormStackView.isHidden = item != .token
-            self?.subtitleColorFormStackView.isHidden = item != .custom
-            self?.setOtherModels()
-        }
-        
-        subtitleTokenColorView.onPickerDidSelect  = {  [weak self] item in
-            self?.setOtherModels()
-        }
     }
 }
 
@@ -386,40 +289,3 @@ extension TitleLockupViewController: ComponentSampleable {
         return ComponentSample(component: component)
     }
 }
-
-extension TitleLockupViewController: UIColorPickerViewControllerDelegate {
-    
-    func selectedColorTapped(_ picker: ColorPickerView<ColorPickerType>) {
-        let selectedColor = picker.selectedColor
-        if let selectedColor {
-            colorPicker.selectedColor = selectedColor
-        }
-        present(colorPicker, animated: true)
-    }
-    
-    func colorPickerViewControllerDidFinish(_ viewController: UIColorPickerViewController) {
-        dismiss(animated: true)
-    }
-    
-    func colorPickerViewControllerDidSelectColor(_ viewController: UIColorPickerViewController) {
-        guard let hexString = viewController.selectedColor.hexString else { return }
-        var colorView: ColorPickerView<ColorPickerType>
-        
-        switch currentLabelType {
-        case .eyebrow:
-            colorView = eyebrowCustomColorView
-        case .title:
-            colorView = titleCustomColorView
-        case .subtitle:
-            colorView = subtitleCustomColorView
-        }
-
-        colorView.selectedColor = viewController.selectedColor
-        
-        if currentLabelType == .title {
-            setTitleModel()
-        } else {
-            setOtherModels()
-        }
-    }
-}

VDSSample/ViewControllers/ToggleViewController.swift

@@ -36,7 +36,7 @@ class ToggleViewController: BaseViewController<Toggle> {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: component.makeWrapper(edgeSpacing: 16.0), edgeSpacing: 0)
+        addContentTopView(view: component, pinTrailing: false)
 
         setupPicker()
     }
@@ -44,12 +44,12 @@ class ToggleViewController: BaseViewController<Toggle> {
     override func setupForm() {
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Show Text", view: showTextSwitch)
+        addFormRow(label: "Show Text", view: showTextSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         
         //add the hidden elements to textFormStackView
-        textFormStackView.addFormRow(label: "Bold", view: boldSwitch)
+        textFormStackView.addFormRow(label: "Bold", view: boldSwitch, pinTrailing: false)
         textFormStackView.addFormRow(label: "Text Size", view: textSizePickerSelectorView)
         textFormStackView.addFormRow(label: "Text Position", view: textPositionPickerSelectorView)
         textFormStackView.addFormRow(label: "On Text", view: onTextField)

VDSSample/ViewControllers/TooltipViewController.swift

@@ -32,15 +32,14 @@ class  TooltipViewController: BaseViewController<Tooltip> {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
-        
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
     
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Size", view: sizePickerSelectorView)
         addFormRow(label: "FillColor", view: fillColorPickerSelectorView)

VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift

@@ -40,16 +40,15 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
-
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
     
     override func setupForm(){
         super.setupForm()  
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Bold", view: boldSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Bold", view: boldSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Text Alignment", view: textAlignmentPickerSelectorView)
         addFormRow(label: "Font Category", view: fontCategoryPickerSelectorView)