From 6f86f8755bc811f1da33191e53615e4ddcae4bf7 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Sat, 12 Aug 2023 10:03:33 -0500
Subject: [PATCH 01/22] component tester

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../ButtonViewController.swift                | 11 +++++
 .../TableViewTestController.swift             | 46 ++++++++++++++-----
 .../TextLinkCaretViewController.swift         |  9 ++++
 .../TextLinkViewController.swift              |  9 ++++
 .../TileletViewController.swift               | 14 ++++++
 5 files changed, 77 insertions(+), 12 deletions(-)

diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift
index e6ba980..29b6440 100644
--- a/VDSSample/ViewControllers/ButtonViewController.swift
+++ b/VDSSample/ViewControllers/ButtonViewController.swift
@@ -98,3 +98,14 @@ class ButtonViewController: BaseViewController<Button> {
         }
     }
 }
+
+extension ButtonViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.text = "Try me"
+        component.onClick = { c in print("\(c.text!) Click")}
+        component.use = .primary
+        component.size = .large
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/TableViewTestController.swift b/VDSSample/ViewControllers/TableViewTestController.swift
index e8be50c..460f8c1 100644
--- a/VDSSample/ViewControllers/TableViewTestController.swift
+++ b/VDSSample/ViewControllers/TableViewTestController.swift
@@ -10,16 +10,20 @@ import UIKit
 import VDS
 import VDSColorTokens
 
-public typealias TestView = UIView
+public typealias TestView = UIView & Surfaceable
 public typealias TestViewWrapper = (component: TestView, isTrailing: Bool)
 protocol Componentable {
     static func getComponent() -> TestViewWrapper
 }
 
-public class TableViewTestController: UITableViewController, Initable {
+public class TableViewTestController: UITableViewController, Initable, Surfaceable {
 
     var components:[TestViewWrapper] = []
-
+    public var surface: Surface = .light {
+        didSet {
+            tableView.reloadData()
+        }
+    }
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------
@@ -44,12 +48,27 @@ public class TableViewTestController: UITableViewController, Initable {
         tableView.separatorStyle = .none
         tableView.rowHeight = UITableView.automaticDimension
         tableView.reloadData()
+        let view = View(frame: .init(origin: .zero, size: .init(width: tableView.bounds.width, height: 100)))
+        let toggle = Toggle().with {
+            $0.showText = true
+            $0.textPosition = .right
+            $0.offText = "Light"
+            $0.onText = "Dark"
+            $0.onChange = { [weak self] toggle in
+                self?.surface = toggle.isOn ? .dark : .light
+            }
+        }
+        view.addSubview(toggle)
+        toggle.pinToSuperView(.init(top: 5, left: 16, bottom: 5, right: 16))
+        tableView.tableHeaderView = view
+        tableView.tableHeaderView?.frame.size.height = 40
     }
 
     public override func numberOfSections(in tableView: UITableView) -> Int {
         components.count
     }
 
+    
     public override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         let header =  UIView().with { $0.backgroundColor = VDSColor.paletteGray44 }
         let label = Label().with {
@@ -74,7 +93,9 @@ public class TableViewTestController: UITableViewController, Initable {
 
     public override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "cell") as? VDSCell else { return UITableViewCell() }
-        let wrapper = components[indexPath.row]
+        cell.prepareForReuse()
+        cell.surface = surface
+        let wrapper = components[indexPath.section]
         cell.component = wrapper.component
         cell.isTrailing = wrapper.isTrailing
         return cell
@@ -82,12 +103,18 @@ public class TableViewTestController: UITableViewController, Initable {
     
 }
 
-public class VDSCell: UITableViewCell, AppleGuidlinesTouchable {
+public class VDSCell: UITableViewCell, AppleGuidlinesTouchable, Surfaceable {
     public var isTrailing: Bool = true
+    public var surface: Surface = .light
     public var component: TestView? {
         didSet {
-            guard let component else { return }
-            contentView.addSubview(.makeWrapper(for: component, edgeSpacing: 16, isTrailing: isTrailing))
+            contentView.subviews.forEach { $0.removeFromSuperview() }
+            guard var component else { return }
+            let wrapper = UIView.makeWrapper(for: component, isTrailing: isTrailing)
+            contentView.addSubview(wrapper)
+            wrapper.pinToSuperView(.init(top: 16, left: 16, bottom: 16, right: 16))
+            backgroundColor = surface.color
+            component.surface = surface
         }
     }
     
@@ -100,10 +127,5 @@ public class VDSCell: UITableViewCell, AppleGuidlinesTouchable {
         return component.intrinsicContentSize
     }
     
-    public override func prepareForReuse() {
-        super.prepareForReuse()
-        contentView.subviews.forEach { $0.removeFromSuperview() }
-    }
-    
 }
 
diff --git a/VDSSample/ViewControllers/TextLinkCaretViewController.swift b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
index b7c8159..cd8c41e 100644
--- a/VDSSample/ViewControllers/TextLinkCaretViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
@@ -72,3 +72,12 @@ class TextLinkCaretViewController: BaseViewController<TextLinkCaret> {
         }
     }
 }
+
+extension TextLinkCaretViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.text = "Text Link Caret"
+        component.onClick = { c in print("\(c.text!) Click")}
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/TextLinkViewController.swift b/VDSSample/ViewControllers/TextLinkViewController.swift
index 968da4e..fd97620 100644
--- a/VDSSample/ViewControllers/TextLinkViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkViewController.swift
@@ -74,3 +74,12 @@ class TextLinkViewController: BaseViewController<TextLink> {
         }
     }
 }
+
+extension TextLinkViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.text = "Text Link"
+        component.onClick = { c in print("\(c.text!) Click")}
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/TileletViewController.swift b/VDSSample/ViewControllers/TileletViewController.swift
index 7e75dc8..b9375ee 100644
--- a/VDSSample/ViewControllers/TileletViewController.swift
+++ b/VDSSample/ViewControllers/TileletViewController.swift
@@ -229,3 +229,17 @@ class TileletViewController: BaseViewController<Tilelet> {
         }
     }
 }
+
+extension TileletViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        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.surface = .light
+        component.titleModel = titleModel
+        component.subTitleModel = subTitleModel
+        component.width = 250
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}

From 20689203c8083bb3d9b66775894d37e0c05a7ce0 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Mon, 14 Aug 2023 11:26:36 -0500
Subject: [PATCH 02/22] added component sample

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../BadgeIndicatorViewController.swift        | 11 ++++
 .../ButtonGroupViewController.swift           | 15 ++++++
 .../ButtonIconViewController.swift            |  9 ++++
 .../CheckBoxGroupViewController.swift         | 25 +++++++++
 .../CheckboxItemViewController.swift          | 10 ++++
 .../CheckboxViewController.swift              |  7 +++
 .../ViewControllers/IconViewController.swift  | 12 +++++
 .../InputFieldViewController.swift            | 15 ++++++
 .../ViewControllers/LabelViewController.swift |  9 ++++
 .../ViewControllers/LineViewController.swift  |  7 +++
 .../LoaderViewController.swift                |  7 +++
 .../NotificationViewController.swift          | 18 +++++++
 .../RadioBoxGroupViewController.swift         | 24 +++++++++
 .../RadioButtonGroupViewController.swift      | 29 +++++++++++
 .../RadioButtonItemViewController.swift       | 10 ++++
 .../RadioButtonViewController.swift           |  7 +++
 .../RadioSwatchGroupViewController.swift      | 52 +++++++++++++++++++
 .../TableViewTestController.swift             | 32 +++++-------
 .../ViewControllers/TabsViewController.swift  | 14 +++++
 .../TextAreaViewController.swift              | 12 +++++
 .../TileContainerViewController.swift         |  9 ++++
 .../TitleLockupViewController.swift           | 15 ++++++
 .../ToggleViewController.swift                |  7 +++
 .../TooltipViewController.swift               | 10 ++++
 .../TrailingTooltipLabelViewController.swift  | 13 ++++-
 25 files changed, 360 insertions(+), 19 deletions(-)

diff --git a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
index 20ef79c..abaeeb0 100644
--- a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
+++ b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
@@ -211,3 +211,14 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
         }
     }
 }
+
+extension BadgeIndicatorViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.fillColor = .red
+        component.number = 23
+        component.kind = .simple
+        component.size = .medium
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift
index 7a63b3f..154b05d 100644
--- a/VDSSample/ViewControllers/ButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift
@@ -198,3 +198,18 @@ class ButtonGroupViewController: BaseViewController<ButtonGroup> {
         }
     }
 }
+
+extension ButtonGroupViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.buttons = [
+            Button().with{ $0.use = .secondary; $0.text = "Secondary" },
+            Button().with{ $0.use = .primary; $0.text = "Primary" },
+            TextLink().with { $0.size = .large; $0.text = "Large Text Link" },
+            TextLink().with { $0.text = "Widge Label Button" },
+            TextLinkCaret().with { $0.text = "Text Link Caret" }
+        ]
+
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift
index 6f31c6b..eb13fed 100644
--- a/VDSSample/ViewControllers/ButtonIconViewController.swift
+++ b/VDSSample/ViewControllers/ButtonIconViewController.swift
@@ -169,3 +169,12 @@ extension UITextField {
         return CGFloat(double)
     }
 }
+
+extension ButtonIconViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.iconName = .addToFavorite
+        component.size = .large
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
index 10245e5..d2a34a0 100644
--- a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
@@ -115,4 +115,29 @@ class  CheckboxGroupViewController: BaseViewController<CheckboxGroup> {
         }
     }
 
+    
+}
+
+extension CheckboxGroupViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+
+        var checkbox1 = CheckboxGroup.CheckboxModel()
+        checkbox1.inputId = "model1"
+        checkbox1.value = "model 1 Value"
+        checkbox1.labelText = "iPhone 11 Bundle 1"
+        checkbox1.childText = "Apple iPhone 11 - 64 GB\nOtterbox Case Red\nScreen Protector"
+        checkbox1.errorText = "Please Choose 1"
+
+        var checkbox2 = CheckboxGroup.CheckboxModel()
+        checkbox2.inputId = "model2"
+        checkbox2.value = "model 2 Value"
+        checkbox2.labelText = "iPhone 11 Bundle 2"
+        checkbox2.childText = "Apple iPhone 11 - 128 GB\nOtterbox Case Black\nScreen Protector"
+        checkbox2.errorText = "Please Choose 2"
+
+        component.selectorModels = [checkbox1, checkbox2]
+
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
 }
diff --git a/VDSSample/ViewControllers/CheckboxItemViewController.swift b/VDSSample/ViewControllers/CheckboxItemViewController.swift
index 58b45f9..cbbfdae 100644
--- a/VDSSample/ViewControllers/CheckboxItemViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxItemViewController.swift
@@ -94,3 +94,13 @@ class  CheckboxItemViewController: BaseViewController<CheckboxItem> {
     }
 }
 
+extension CheckboxItemViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.labelText = "Terms and conditions"
+        component.childText = "I agree to Verizon's terms and conditions click here"
+        component.errorText = "Error Text"
+
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift
index f61bcf1..0ad8e7a 100644
--- a/VDSSample/ViewControllers/CheckboxViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxViewController.swift
@@ -61,3 +61,10 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
         }
     }
 }
+
+extension CheckboxViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/IconViewController.swift b/VDSSample/ViewControllers/IconViewController.swift
index 9b4387b..6a98907 100644
--- a/VDSSample/ViewControllers/IconViewController.swift
+++ b/VDSSample/ViewControllers/IconViewController.swift
@@ -87,3 +87,15 @@ class IconViewController: BaseViewController<Icon> {
         }
     }
 }
+
+extension IconViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        let name = Icon.Name.accessibility
+        let color = UIColor.VDSColor.paletteBlack
+        component.color = color.uiColor
+        component.name = name
+        component.size = .XLarge
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift
index b96cc2d..9b065c2 100644
--- a/VDSSample/ViewControllers/InputFieldViewController.swift
+++ b/VDSSample/ViewControllers/InputFieldViewController.swift
@@ -167,3 +167,18 @@ class  InputFieldViewController: BaseViewController<InputField> {
     }
 }
 
+
+extension InputFieldViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.type = .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.tooltipTitle = "Check the formatting of your address"
+        component.tooltipContent = "House/Building number then street name"
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift
index 1910a2e..4d3ca90 100644
--- a/VDSSample/ViewControllers/LabelViewController.swift
+++ b/VDSSample/ViewControllers/LabelViewController.swift
@@ -340,3 +340,12 @@ extension Slider {
         CGFloat((value * 100).rounded() / 100)
     }
 }
+
+
+extension LabelViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.text = "Helg¹ worldg Hell¹ worldg"
+        return TestViewWrapper(component: component, isTrailing: false)
+    }
+}
diff --git a/VDSSample/ViewControllers/LineViewController.swift b/VDSSample/ViewControllers/LineViewController.swift
index 5444fe7..27ee2f9 100644
--- a/VDSSample/ViewControllers/LineViewController.swift
+++ b/VDSSample/ViewControllers/LineViewController.swift
@@ -40,3 +40,10 @@ class LineViewController: BaseViewController<Line> {
         }
     }
 }
+
+extension LineViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/LoaderViewController.swift b/VDSSample/ViewControllers/LoaderViewController.swift
index 4fa488c..667a34c 100644
--- a/VDSSample/ViewControllers/LoaderViewController.swift
+++ b/VDSSample/ViewControllers/LoaderViewController.swift
@@ -82,3 +82,10 @@ class LoaderViewController: BaseViewController<Loader>, LoaderLaunchable {
         }
     }
 }
+
+extension LoaderViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/NotificationViewController.swift b/VDSSample/ViewControllers/NotificationViewController.swift
index f80e5c0..f56287a 100644
--- a/VDSSample/ViewControllers/NotificationViewController.swift
+++ b/VDSSample/ViewControllers/NotificationViewController.swift
@@ -145,3 +145,21 @@ class NotificationViewController: BaseViewController<VDS.Notification> {
         }
     }
 }
+
+extension NotificationViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        
+        let titleDefaultText =  "This is title"
+        let subtitleDefaultText = "This is subtitle"
+        let firstButtonDefaultText = "Button 1"
+        let secondButtonDefaultText = "Button 2"
+
+        component.title = titleDefaultText
+        component.subTitle = subtitleDefaultText
+        component.primaryButtonModel = .init(text: firstButtonDefaultText, onClick: {b in print("\(b.text!) click")})
+        component.secondaryButtonModel = .init(text: secondButtonDefaultText, onClick: {b in print("\(b.text!) click")})
+        component.onCloseClick = {_ in print("notification on close click")}
+        return TestViewWrapper(component: component, isTrailing: false)
+    }
+}
diff --git a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
index 0307fbc..3dee0af 100644
--- a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
@@ -110,3 +110,27 @@ class  RadioBoxGroupViewController: BaseViewController<RadioBoxGroup>{
         
     }
 }
+
+extension RadioBoxGroupViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+
+        var radioBox1 = RadioBoxGroup.RadioBoxModel()
+        radioBox1.inputId = "model1"
+        radioBox1.selected = true
+        radioBox1.value = "model 1 Value"
+        radioBox1.text = "iPhone 11 Bundle 1"
+        radioBox1.subText = "Apple iPhone 11 - 64 GB\nOtterbox Case Red\nScreen Protector"
+        radioBox1.subTextRight = "Right Text"
+
+        var radioBox2 = RadioBoxGroup.RadioBoxModel()
+        radioBox2.inputId = "model2"
+        radioBox2.value = "model 2 Value"
+        radioBox2.text = "iPhone 11 Bundle 2"
+        radioBox2.subText = "Apple iPhone 11 - 128 GB\nOtterbox Case Black\nScreen Protector"
+
+        component.selectorModels = [radioBox1, radioBox2]
+
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
index 52c7c17..4625dac 100644
--- a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
@@ -107,3 +107,32 @@ class  RadioButtonGroupViewController: BaseViewController<RadioButtonGroup> {
 
     }
 }
+
+
+extension RadioButtonGroupViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+
+        var radioButton1 = RadioButtonGroup.RadioButtonModel()
+        radioButton1.inputId = "model1"
+        radioButton1.value = "model 1 Value"
+        radioButton1.labelText = "iPhone 11 Bundle 1"
+        radioButton1.childText = "Apple iPhone 11 - 64 GB\nOtterbox Case Red\nScreen Protector"
+        
+        var radioButton2 = RadioButtonGroup.RadioButtonModel()
+        radioButton2.inputId = "model2"
+        radioButton2.value = "model 2 Value"
+        radioButton2.labelText = "iPhone 11 Bundle 2"
+        radioButton2.childText = "Apple iPhone 11 - 128 GB\nOtterbox Case Black\nScreen Protector"
+        
+        var radioButton3 = RadioButtonGroup.RadioButtonModel()
+        radioButton3.inputId = "model3"
+        radioButton3.value = "model 3 Value"
+        radioButton3.labelText = "iPhone 11 Bundle 3"
+        radioButton3.childText = "Apple iPhone 11 - 256 GB\nOtterbox Case Black\nScreen Protector"
+        
+        component.selectorModels = [radioButton1, radioButton2, radioButton3]
+        
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/RadioButtonItemViewController.swift b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
index 35c603d..39d6776 100644
--- a/VDSSample/ViewControllers/RadioButtonItemViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
@@ -98,3 +98,13 @@ class  RadioButtonItemViewController: BaseViewController<RadioButtonItem> {
     }
 }
 
+extension RadioButtonItemViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.labelText = "Terms and conditions"
+        component.childText = "I agree to Verizon's terms and conditions click here"
+        component.errorText = "Error Text"
+
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/RadioButtonViewController.swift b/VDSSample/ViewControllers/RadioButtonViewController.swift
index 9b74a3c..dd99570 100644
--- a/VDSSample/ViewControllers/RadioButtonViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonViewController.swift
@@ -65,3 +65,10 @@ class  RadioButtonViewController: BaseViewController<RadioButton> {
         }
     }
 }
+
+extension RadioButtonViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
index 796c4c0..7416a78 100644
--- a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
@@ -104,3 +104,55 @@ class  RadioSwatchGroupViewController: BaseViewController<RadioSwatchGroup> {
         
     }
 }
+
+extension RadioSwatchGroupViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+
+        var radioSwatch1 = RadioSwatchGroup.RadioSwatchModel()
+        radioSwatch1.fillImage = UIImage(named: "imageSwatch")
+        radioSwatch1.text = "Image"
+        radioSwatch1.inputId = "radioSwatch1"
+                
+        var radioSwatch2 = RadioSwatchGroup.RadioSwatchModel()
+        radioSwatch2.primaryColor = .red
+        radioSwatch2.secondaryColor = .blue
+        radioSwatch2.text = "Red/Blue"
+        radioSwatch2.inputId = "radioSwatch2"
+        
+        var radioSwatch3 = RadioSwatchGroup.RadioSwatchModel()
+        radioSwatch3.primaryColor = .green
+        radioSwatch3.text = "Green"
+        radioSwatch3.inputId = "radioSwatch3"
+
+        var radioSwatch4 = RadioSwatchGroup.RadioSwatchModel()
+        radioSwatch4.primaryColor = .orange
+        radioSwatch4.text = "Orange"
+        radioSwatch4.inputId = "radioSwatch4"
+
+        var radioSwatch5 = RadioSwatchGroup.RadioSwatchModel()
+        radioSwatch5.primaryColor = .brown
+        radioSwatch5.text = "Brown"
+        radioSwatch5.inputId = "radioSwatch5"
+        
+        var radioSwatch6 = RadioSwatchGroup.RadioSwatchModel()
+        radioSwatch6.primaryColor = .yellow
+        radioSwatch6.text = "Yellow"
+        radioSwatch6.inputId = "radioSwatch6"
+
+        var radioSwatch7 = RadioSwatchGroup.RadioSwatchModel()
+        radioSwatch7.primaryColor = .purple
+        radioSwatch7.text = "Puple"
+        radioSwatch7.inputId = "radioSwatch7"
+
+        var radioSwatch8 = RadioSwatchGroup.RadioSwatchModel()
+        radioSwatch8.primaryColor = .systemPink
+        radioSwatch8.text = "Pink"
+        radioSwatch8.inputId = "radioSwatch8"
+        
+        component.selectorModels = [radioSwatch1, radioSwatch2, radioSwatch3, radioSwatch4, radioSwatch5, radioSwatch6, radioSwatch7, radioSwatch8]
+        
+        return TestViewWrapper(component: component, isTrailing: false)
+
+    }
+}
diff --git a/VDSSample/ViewControllers/TableViewTestController.swift b/VDSSample/ViewControllers/TableViewTestController.swift
index 460f8c1..bc19d63 100644
--- a/VDSSample/ViewControllers/TableViewTestController.swift
+++ b/VDSSample/ViewControllers/TableViewTestController.swift
@@ -44,7 +44,7 @@ public class TableViewTestController: UITableViewController, Initable, Surfaceab
         }
         tableView.register(VDSCell.self, forCellReuseIdentifier: "cell")
         tableView.allowsSelection = false
-        tableView.estimatedRowHeight = 100
+        tableView.estimatedRowHeight = 45
         tableView.separatorStyle = .none
         tableView.rowHeight = UITableView.automaticDimension
         tableView.reloadData()
@@ -67,20 +67,9 @@ public class TableViewTestController: UITableViewController, Initable, Surfaceab
     public override func numberOfSections(in tableView: UITableView) -> Int {
         components.count
     }
-
     
-    public override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        let header =  UIView().with { $0.backgroundColor = VDSColor.paletteGray44 }
-        let label = Label().with {
-            $0.text = "\(type(of: components[section].component))"
-            $0.surface = .dark
-            $0.textStyle = .boldTitleSmall
-        }
-        header.addSubview(label)
-        label.pinTrailing(16)
-        label.pinLeading(16)
-        label.centerYAnchor.constraint(equalTo: header.centerYAnchor).activate()
-        return header
+    public override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+        "\(type(of: components[section].component))"
     }
     
     public override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
@@ -96,8 +85,8 @@ public class TableViewTestController: UITableViewController, Initable, Surfaceab
         cell.prepareForReuse()
         cell.surface = surface
         let wrapper = components[indexPath.section]
-        cell.component = wrapper.component
         cell.isTrailing = wrapper.isTrailing
+        cell.component = wrapper.component
         return cell
     }
     
@@ -106,13 +95,20 @@ public class TableViewTestController: UITableViewController, Initable, Surfaceab
 public class VDSCell: UITableViewCell, AppleGuidlinesTouchable, Surfaceable {
     public var isTrailing: Bool = true
     public var surface: Surface = .light
+    public var shouldWrap: Bool = true
     public var component: TestView? {
         didSet {
             contentView.subviews.forEach { $0.removeFromSuperview() }
+            let edges: UIEdgeInsets = .init(top: 16, left: 16, bottom: 16, right: 16)
             guard var component else { return }
-            let wrapper = UIView.makeWrapper(for: component, isTrailing: isTrailing)
-            contentView.addSubview(wrapper)
-            wrapper.pinToSuperView(.init(top: 16, left: 16, bottom: 16, right: 16))
+            if shouldWrap {
+                let wrapper = UIView.makeWrapper(for: component, isTrailing: isTrailing)
+                contentView.addSubview(wrapper)
+                wrapper.pinToSuperView(edges)
+            } else {
+                contentView.addSubview(component)
+                component.pinToSuperView(edges)
+            }
             backgroundColor = surface.color
             component.surface = surface
         }
diff --git a/VDSSample/ViewControllers/TabsViewController.swift b/VDSSample/ViewControllers/TabsViewController.swift
index b06743d..96ee76f 100644
--- a/VDSSample/ViewControllers/TabsViewController.swift
+++ b/VDSSample/ViewControllers/TabsViewController.swift
@@ -142,3 +142,17 @@ class TabsViewController: BaseViewController<Tabs> {
 //        }
     }
 }
+
+extension TabsViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.tabModels =  [
+            .init(text: "Accessories"),
+            .init(text: "Internet and TV"),
+            .init(text: "Customer Service"),
+            .init(text: "Contact Us")
+        ]
+        
+        return TestViewWrapper(component: component, isTrailing: false)
+    }
+}
diff --git a/VDSSample/ViewControllers/TextAreaViewController.swift b/VDSSample/ViewControllers/TextAreaViewController.swift
index 0c6af3c..a84c2fd 100644
--- a/VDSSample/ViewControllers/TextAreaViewController.swift
+++ b/VDSSample/ViewControllers/TextAreaViewController.swift
@@ -139,3 +139,15 @@ class  TextAreaViewController: BaseViewController<TextArea> {
     }
 }
 
+extension TextAreaViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        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.tooltipTitle = "Check the formatting of your address"
+        component.tooltipContent = "House/Building number then street name"
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/TileContainerViewController.swift b/VDSSample/ViewControllers/TileContainerViewController.swift
index 921b234..b9c3fb7 100644
--- a/VDSSample/ViewControllers/TileContainerViewController.swift
+++ b/VDSSample/ViewControllers/TileContainerViewController.swift
@@ -147,3 +147,12 @@ class TileContainerViewController: BaseViewController<TileContainer> {
         }
     }
 }
+
+extension TileContainerViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.width = 150
+        component.color = .black
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift
index 0162db0..30f7a79 100644
--- a/VDSSample/ViewControllers/TitleLockupViewController.swift
+++ b/VDSSample/ViewControllers/TitleLockupViewController.swift
@@ -172,3 +172,18 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
         }
     }
 }
+
+extension TitleLockupViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        let eyebrowModel = TitleLockup.EyebrowModel(text: "Today only.")
+        let titleModel = TitleLockup.TitleModel(text: "Get more of our best")
+        let subTitleModel = TitleLockup.SubTitleModel(text: "Get both of our best and pay less. Pair 5G Home Internet with Verizon mobile to save every month.")
+        
+        component.eyebrowModel = eyebrowModel
+        component.titleModel = titleModel
+        component.subTitleModel = subTitleModel
+        component.debugBorder(show: true)
+        return TestViewWrapper(component: component, isTrailing: false)
+    }
+}
diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index 7831770..bb63d47 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -115,3 +115,10 @@ class ToggleViewController: BaseViewController<Toggle> {
         
     }
 }
+
+extension ToggleViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
diff --git a/VDSSample/ViewControllers/TooltipViewController.swift b/VDSSample/ViewControllers/TooltipViewController.swift
index 0543664..b577e9b 100644
--- a/VDSSample/ViewControllers/TooltipViewController.swift
+++ b/VDSSample/ViewControllers/TooltipViewController.swift
@@ -100,3 +100,13 @@ class  TooltipViewController: BaseViewController<Tooltip> {
         }
     }
 }
+
+extension TooltipViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.title = "5G Ultra Wideband is available in your area."
+        component.content = "$799.99 (128 GB only) "
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
+
diff --git a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
index 0ffec92..2b7de9a 100644
--- a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
+++ b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
@@ -165,6 +165,17 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
         fontCategoryPickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.fontCategory = item
         }
-        
     }
 }
+
+extension TrailingTooltipLabelViewController: Componentable {
+    static func getComponent() -> TestViewWrapper {
+        let component = Self.makeComponent()
+        component.labelText = "5G Ultra Wideband is available in your area"
+        component.tooltipTitle = "5G Ultra Wideband is available in your area."
+        component.tooltipContent = "$799.99 (128 GB only)"
+        return TestViewWrapper(component: component, isTrailing: true)
+    }
+}
+
+

From c6e578f2701aabb8a6b2a9282c8ded08548416e7 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Mon, 14 Aug 2023 12:48:57 -0500
Subject: [PATCH 03/22] udpated to pin

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDSSample/ViewControllers/ButtonGroupViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift
index 154b05d..49ab07b 100644
--- a/VDSSample/ViewControllers/ButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift
@@ -210,6 +210,6 @@ extension ButtonGroupViewController: Componentable {
             TextLinkCaret().with { $0.text = "Text Link Caret" }
         ]
 
-        return TestViewWrapper(component: component, isTrailing: true)
+        return TestViewWrapper(component: component, isTrailing: false)
     }
 }

From c742fbab357e2bf8549f1263eee98de1c487e4f4 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Mon, 14 Aug 2023 14:41:59 -0500
Subject: [PATCH 04/22] refactored to sample

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../BadgeIndicatorViewController.swift        |  6 +-
 .../ViewControllers/BadgeViewController.swift |  6 +-
 .../ButtonGroupViewController.swift           |  6 +-
 .../ButtonIconViewController.swift            |  6 +-
 .../ButtonViewController.swift                |  6 +-
 .../CheckBoxGroupViewController.swift         |  6 +-
 .../CheckboxItemViewController.swift          |  6 +-
 .../CheckboxViewController.swift              |  6 +-
 .../ViewControllers/IconViewController.swift  |  6 +-
 .../InputFieldViewController.swift            |  6 +-
 .../ViewControllers/LabelViewController.swift |  6 +-
 .../ViewControllers/LineViewController.swift  |  6 +-
 .../LoaderViewController.swift                |  6 +-
 .../NotificationViewController.swift          |  6 +-
 .../RadioBoxGroupViewController.swift         |  6 +-
 .../RadioButtonGroupViewController.swift      |  6 +-
 .../RadioButtonItemViewController.swift       |  6 +-
 .../RadioButtonViewController.swift           |  6 +-
 .../RadioSwatchGroupViewController.swift      |  6 +-
 .../TableViewTestController.swift             | 89 +++++++++++++------
 .../ViewControllers/TabsViewController.swift  |  6 +-
 .../TextAreaViewController.swift              |  6 +-
 .../TextLinkCaretViewController.swift         |  6 +-
 .../TextLinkViewController.swift              |  6 +-
 .../TileContainerViewController.swift         |  6 +-
 .../TileletViewController.swift               |  6 +-
 .../TitleLockupViewController.swift           |  6 +-
 .../ToggleViewController.swift                |  6 +-
 .../TooltipViewController.swift               |  6 +-
 .../TrailingTooltipLabelViewController.swift  |  6 +-
 30 files changed, 147 insertions(+), 116 deletions(-)

diff --git a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
index abaeeb0..624a733 100644
--- a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
+++ b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
@@ -212,13 +212,13 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
     }
 }
 
-extension BadgeIndicatorViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension BadgeIndicatorViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.fillColor = .red
         component.number = 23
         component.kind = .simple
         component.size = .medium
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift
index 7025673..712bd9f 100644
--- a/VDSSample/ViewControllers/BadgeViewController.swift
+++ b/VDSSample/ViewControllers/BadgeViewController.swift
@@ -108,13 +108,13 @@ class  BadgeViewController: BaseViewController<Badge> {
     }
 }
 
-extension BadgeViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+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 TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift
index 49ab07b..67ad873 100644
--- a/VDSSample/ViewControllers/ButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift
@@ -199,8 +199,8 @@ class ButtonGroupViewController: BaseViewController<ButtonGroup> {
     }
 }
 
-extension ButtonGroupViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension ButtonGroupViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.buttons = [
             Button().with{ $0.use = .secondary; $0.text = "Secondary" },
@@ -210,6 +210,6 @@ extension ButtonGroupViewController: Componentable {
             TextLinkCaret().with { $0.text = "Text Link Caret" }
         ]
 
-        return TestViewWrapper(component: component, isTrailing: false)
+        return ComponentSample(component: component, canPinTrailing: true)
     }
 }
diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift
index eb13fed..7a0275a 100644
--- a/VDSSample/ViewControllers/ButtonIconViewController.swift
+++ b/VDSSample/ViewControllers/ButtonIconViewController.swift
@@ -170,11 +170,11 @@ extension UITextField {
     }
 }
 
-extension ButtonIconViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension ButtonIconViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.iconName = .addToFavorite
         component.size = .large
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift
index 29b6440..4fbccb3 100644
--- a/VDSSample/ViewControllers/ButtonViewController.swift
+++ b/VDSSample/ViewControllers/ButtonViewController.swift
@@ -99,13 +99,13 @@ class ButtonViewController: BaseViewController<Button> {
     }
 }
 
-extension ButtonViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension ButtonViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.text = "Try me"
         component.onClick = { c in print("\(c.text!) Click")}
         component.use = .primary
         component.size = .large
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
index d2a34a0..b3df8c4 100644
--- a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
@@ -118,8 +118,8 @@ class  CheckboxGroupViewController: BaseViewController<CheckboxGroup> {
     
 }
 
-extension CheckboxGroupViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension CheckboxGroupViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
 
         var checkbox1 = CheckboxGroup.CheckboxModel()
@@ -138,6 +138,6 @@ extension CheckboxGroupViewController: Componentable {
 
         component.selectorModels = [checkbox1, checkbox2]
 
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/CheckboxItemViewController.swift b/VDSSample/ViewControllers/CheckboxItemViewController.swift
index cbbfdae..f95720a 100644
--- a/VDSSample/ViewControllers/CheckboxItemViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxItemViewController.swift
@@ -94,13 +94,13 @@ class  CheckboxItemViewController: BaseViewController<CheckboxItem> {
     }
 }
 
-extension CheckboxItemViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension CheckboxItemViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.labelText = "Terms and conditions"
         component.childText = "I agree to Verizon's terms and conditions click here"
         component.errorText = "Error Text"
 
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift
index 0ad8e7a..8a9f10e 100644
--- a/VDSSample/ViewControllers/CheckboxViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxViewController.swift
@@ -62,9 +62,9 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
     }
 }
 
-extension CheckboxViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension CheckboxViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/IconViewController.swift b/VDSSample/ViewControllers/IconViewController.swift
index 6a98907..38bcb45 100644
--- a/VDSSample/ViewControllers/IconViewController.swift
+++ b/VDSSample/ViewControllers/IconViewController.swift
@@ -88,14 +88,14 @@ class IconViewController: BaseViewController<Icon> {
     }
 }
 
-extension IconViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension IconViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         let name = Icon.Name.accessibility
         let color = UIColor.VDSColor.paletteBlack
         component.color = color.uiColor
         component.name = name
         component.size = .XLarge
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift
index 9b065c2..8b5ee88 100644
--- a/VDSSample/ViewControllers/InputFieldViewController.swift
+++ b/VDSSample/ViewControllers/InputFieldViewController.swift
@@ -168,8 +168,8 @@ class  InputFieldViewController: BaseViewController<InputField> {
 }
 
 
-extension InputFieldViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension InputFieldViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.type = .text
         component.width = 328
@@ -179,6 +179,6 @@ extension InputFieldViewController: Componentable {
         component.successText = "Good job entering a valid address!"
         component.tooltipTitle = "Check the formatting of your address"
         component.tooltipContent = "House/Building number then street name"
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift
index 4d3ca90..65c9687 100644
--- a/VDSSample/ViewControllers/LabelViewController.swift
+++ b/VDSSample/ViewControllers/LabelViewController.swift
@@ -342,10 +342,10 @@ extension Slider {
 }
 
 
-extension LabelViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension LabelViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.text = "Helg¹ worldg Hell¹ worldg"
-        return TestViewWrapper(component: component, isTrailing: false)
+        return ComponentSample(component: component, canPinTrailing: true)
     }
 }
diff --git a/VDSSample/ViewControllers/LineViewController.swift b/VDSSample/ViewControllers/LineViewController.swift
index 27ee2f9..21cf988 100644
--- a/VDSSample/ViewControllers/LineViewController.swift
+++ b/VDSSample/ViewControllers/LineViewController.swift
@@ -41,9 +41,9 @@ class LineViewController: BaseViewController<Line> {
     }
 }
 
-extension LineViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension LineViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/LoaderViewController.swift b/VDSSample/ViewControllers/LoaderViewController.swift
index 667a34c..62a8fc7 100644
--- a/VDSSample/ViewControllers/LoaderViewController.swift
+++ b/VDSSample/ViewControllers/LoaderViewController.swift
@@ -83,9 +83,9 @@ class LoaderViewController: BaseViewController<Loader>, LoaderLaunchable {
     }
 }
 
-extension LoaderViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension LoaderViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/NotificationViewController.swift b/VDSSample/ViewControllers/NotificationViewController.swift
index f56287a..03a1199 100644
--- a/VDSSample/ViewControllers/NotificationViewController.swift
+++ b/VDSSample/ViewControllers/NotificationViewController.swift
@@ -146,8 +146,8 @@ class NotificationViewController: BaseViewController<VDS.Notification> {
     }
 }
 
-extension NotificationViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension NotificationViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         
         let titleDefaultText =  "This is title"
@@ -160,6 +160,6 @@ extension NotificationViewController: Componentable {
         component.primaryButtonModel = .init(text: firstButtonDefaultText, onClick: {b in print("\(b.text!) click")})
         component.secondaryButtonModel = .init(text: secondButtonDefaultText, onClick: {b in print("\(b.text!) click")})
         component.onCloseClick = {_ in print("notification on close click")}
-        return TestViewWrapper(component: component, isTrailing: false)
+        return ComponentSample(component: component, canPinTrailing: true)
     }
 }
diff --git a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
index 3dee0af..e5fc2fb 100644
--- a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
@@ -111,8 +111,8 @@ class  RadioBoxGroupViewController: BaseViewController<RadioBoxGroup>{
     }
 }
 
-extension RadioBoxGroupViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension RadioBoxGroupViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
 
         var radioBox1 = RadioBoxGroup.RadioBoxModel()
@@ -131,6 +131,6 @@ extension RadioBoxGroupViewController: Componentable {
 
         component.selectorModels = [radioBox1, radioBox2]
 
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
index 4625dac..57afab3 100644
--- a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
@@ -109,8 +109,8 @@ class  RadioButtonGroupViewController: BaseViewController<RadioButtonGroup> {
 }
 
 
-extension RadioButtonGroupViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension RadioButtonGroupViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
 
         var radioButton1 = RadioButtonGroup.RadioButtonModel()
@@ -133,6 +133,6 @@ extension RadioButtonGroupViewController: Componentable {
         
         component.selectorModels = [radioButton1, radioButton2, radioButton3]
         
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/RadioButtonItemViewController.swift b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
index 39d6776..f211c02 100644
--- a/VDSSample/ViewControllers/RadioButtonItemViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
@@ -98,13 +98,13 @@ class  RadioButtonItemViewController: BaseViewController<RadioButtonItem> {
     }
 }
 
-extension RadioButtonItemViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension RadioButtonItemViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.labelText = "Terms and conditions"
         component.childText = "I agree to Verizon's terms and conditions click here"
         component.errorText = "Error Text"
 
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/RadioButtonViewController.swift b/VDSSample/ViewControllers/RadioButtonViewController.swift
index dd99570..19b9eb4 100644
--- a/VDSSample/ViewControllers/RadioButtonViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonViewController.swift
@@ -66,9 +66,9 @@ class  RadioButtonViewController: BaseViewController<RadioButton> {
     }
 }
 
-extension RadioButtonViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension RadioButtonViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
index 7416a78..42e020b 100644
--- a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
@@ -105,8 +105,8 @@ class  RadioSwatchGroupViewController: BaseViewController<RadioSwatchGroup> {
     }
 }
 
-extension RadioSwatchGroupViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension RadioSwatchGroupViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
 
         var radioSwatch1 = RadioSwatchGroup.RadioSwatchModel()
@@ -152,7 +152,7 @@ extension RadioSwatchGroupViewController: Componentable {
         
         component.selectorModels = [radioSwatch1, radioSwatch2, radioSwatch3, radioSwatch4, radioSwatch5, radioSwatch6, radioSwatch7, radioSwatch8]
         
-        return TestViewWrapper(component: component, isTrailing: false)
+        return ComponentSample(component: component, canPinTrailing: true)
 
     }
 }
diff --git a/VDSSample/ViewControllers/TableViewTestController.swift b/VDSSample/ViewControllers/TableViewTestController.swift
index bc19d63..ff8457b 100644
--- a/VDSSample/ViewControllers/TableViewTestController.swift
+++ b/VDSSample/ViewControllers/TableViewTestController.swift
@@ -10,15 +10,31 @@ import UIKit
 import VDS
 import VDSColorTokens
 
-public typealias TestView = UIView & Surfaceable
-public typealias TestViewWrapper = (component: TestView, isTrailing: Bool)
-protocol Componentable {
-    static func getComponent() -> TestViewWrapper
+public typealias ComponentSampleView = UIView & Surfaceable
+
+public struct ComponentSample {
+    public var component: ComponentSampleView
+    public var canPinLeading: Bool
+    public var canPinTrailing: Bool
+    public var canPinTop: Bool
+    public var canPinBottom: Bool
+    
+    public init(component: ComponentSampleView, canPinLeading: Bool = true, canPinTrailing: Bool = true, canPinTop: Bool = true, canPinBottom: Bool = true) {
+        self.component = component
+        self.canPinLeading = canPinLeading
+        self.canPinTrailing = canPinTrailing
+        self.canPinTop = canPinTop
+        self.canPinBottom = canPinBottom
+    }
+}
+
+protocol ComponentSampleable {
+    static func makeSample() -> ComponentSample
 }
 
 public class TableViewTestController: UITableViewController, Initable, Surfaceable {
 
-    var components:[TestViewWrapper] = []
+    var components:[ComponentSample] = []
     public var surface: Surface = .light {
         didSet {
             tableView.reloadData()
@@ -38,8 +54,8 @@ public class TableViewTestController: UITableViewController, Initable, Surfaceab
     public override func viewDidLoad() {
         super.viewDidLoad()
         MenuViewController.items.forEach { menuItem in
-            if let componentable = menuItem.viewController as? Componentable.Type {
-                components.append(componentable.getComponent())
+            if let componentable = menuItem.viewController as? ComponentSampleable.Type {
+                components.append(componentable.makeSample())
             }
         }
         tableView.register(VDSCell.self, forCellReuseIdentifier: "cell")
@@ -84,44 +100,59 @@ public class TableViewTestController: UITableViewController, Initable, Surfaceab
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "cell") as? VDSCell else { return UITableViewCell() }
         cell.prepareForReuse()
         cell.surface = surface
-        let wrapper = components[indexPath.section]
-        cell.isTrailing = wrapper.isTrailing
-        cell.component = wrapper.component
+        cell.sample = components[indexPath.section]
         return cell
     }
     
 }
 
 public class VDSCell: UITableViewCell, AppleGuidlinesTouchable, Surfaceable {
-    public var isTrailing: Bool = true
     public var surface: Surface = .light
-    public var shouldWrap: Bool = true
-    public var component: TestView? {
+    public var sample: ComponentSample? {
         didSet {
             contentView.subviews.forEach { $0.removeFromSuperview() }
             let edges: UIEdgeInsets = .init(top: 16, left: 16, bottom: 16, right: 16)
-            guard var component else { return }
-            if shouldWrap {
-                let wrapper = UIView.makeWrapper(for: component, isTrailing: isTrailing)
-                contentView.addSubview(wrapper)
-                wrapper.pinToSuperView(edges)
-            } else {
-                contentView.addSubview(component)
-                component.pinToSuperView(edges)
-            }
-            backgroundColor = surface.color
+            guard let sample else { return }
+            var component = sample.component
             component.surface = surface
+
+            
+            let wrapper = View()
+            wrapper.addSubview(component)
+            if sample.canPinTop {
+                component.pinTop(anchor: wrapper.topAnchor, constant: edges.top)
+            } else {
+                component.pinTopGreaterThanOrEqualTo(anchor: wrapper.topAnchor, constant: edges.top)
+            }
+
+            if sample.canPinLeading {
+                component.pinLeading(anchor: wrapper.leadingAnchor, constant: edges.left)
+            } else {
+                component.pinLeadingGreaterThanOrEqualTo(anchor: wrapper.leadingAnchor, constant: edges.left)
+            }
+                        
+            if sample.canPinTrailing {
+                component.pinTrailing(anchor: wrapper.trailingAnchor, constant: edges.right)
+            } else {
+                component.pinTrailingLessThanOrEqualTo(anchor: wrapper.trailingAnchor, constant: edges.right)
+            }
+            
+            if sample.canPinBottom {
+                component.pinBottom(anchor: wrapper.bottomAnchor, constant: edges.bottom)
+            } else {
+                component.pinBottomLessThanOrEqualTo(anchor: wrapper.bottomAnchor, constant: edges.bottom)
+            }
+            
+            contentView.addSubview(wrapper)
+            wrapper.pinToSuperView(edges)
+            
+            backgroundColor = .systemYellow //surface.color
         }
     }
     
     override open func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
         Self.acceptablyOutsideBounds(point: point, bounds: bounds)
     }
-    
-    public override var intrinsicContentSize: CGSize {
-        guard let component else { return .zero }
-        return component.intrinsicContentSize
-    }
-    
+
 }
 
diff --git a/VDSSample/ViewControllers/TabsViewController.swift b/VDSSample/ViewControllers/TabsViewController.swift
index 96ee76f..ef13e68 100644
--- a/VDSSample/ViewControllers/TabsViewController.swift
+++ b/VDSSample/ViewControllers/TabsViewController.swift
@@ -143,8 +143,8 @@ class TabsViewController: BaseViewController<Tabs> {
     }
 }
 
-extension TabsViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension TabsViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.tabModels =  [
             .init(text: "Accessories"),
@@ -153,6 +153,6 @@ extension TabsViewController: Componentable {
             .init(text: "Contact Us")
         ]
         
-        return TestViewWrapper(component: component, isTrailing: false)
+        return ComponentSample(component: component, canPinTrailing: true)
     }
 }
diff --git a/VDSSample/ViewControllers/TextAreaViewController.swift b/VDSSample/ViewControllers/TextAreaViewController.swift
index a84c2fd..c919552 100644
--- a/VDSSample/ViewControllers/TextAreaViewController.swift
+++ b/VDSSample/ViewControllers/TextAreaViewController.swift
@@ -139,8 +139,8 @@ class  TextAreaViewController: BaseViewController<TextArea> {
     }
 }
 
-extension TextAreaViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension TextAreaViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.width = 328
         component.labelText = "Street Address"
@@ -148,6 +148,6 @@ extension TextAreaViewController: Componentable {
         component.errorText = "Enter a valid address."
         component.tooltipTitle = "Check the formatting of your address"
         component.tooltipContent = "House/Building number then street name"
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/TextLinkCaretViewController.swift b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
index cd8c41e..8f689e9 100644
--- a/VDSSample/ViewControllers/TextLinkCaretViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
@@ -73,11 +73,11 @@ class TextLinkCaretViewController: BaseViewController<TextLinkCaret> {
     }
 }
 
-extension TextLinkCaretViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension TextLinkCaretViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.text = "Text Link Caret"
         component.onClick = { c in print("\(c.text!) Click")}
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/TextLinkViewController.swift b/VDSSample/ViewControllers/TextLinkViewController.swift
index fd97620..ffc26a2 100644
--- a/VDSSample/ViewControllers/TextLinkViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkViewController.swift
@@ -75,11 +75,11 @@ class TextLinkViewController: BaseViewController<TextLink> {
     }
 }
 
-extension TextLinkViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension TextLinkViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.text = "Text Link"
         component.onClick = { c in print("\(c.text!) Click")}
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/TileContainerViewController.swift b/VDSSample/ViewControllers/TileContainerViewController.swift
index b9c3fb7..77a7022 100644
--- a/VDSSample/ViewControllers/TileContainerViewController.swift
+++ b/VDSSample/ViewControllers/TileContainerViewController.swift
@@ -148,11 +148,11 @@ class TileContainerViewController: BaseViewController<TileContainer> {
     }
 }
 
-extension TileContainerViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension TileContainerViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.width = 150
         component.color = .black
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/TileletViewController.swift b/VDSSample/ViewControllers/TileletViewController.swift
index b9375ee..59177f1 100644
--- a/VDSSample/ViewControllers/TileletViewController.swift
+++ b/VDSSample/ViewControllers/TileletViewController.swift
@@ -230,8 +230,8 @@ class TileletViewController: BaseViewController<Tilelet> {
     }
 }
 
-extension TileletViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension TileletViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         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.")
@@ -240,6 +240,6 @@ extension TileletViewController: Componentable {
         component.titleModel = titleModel
         component.subTitleModel = subTitleModel
         component.width = 250
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift
index 30f7a79..9d424f2 100644
--- a/VDSSample/ViewControllers/TitleLockupViewController.swift
+++ b/VDSSample/ViewControllers/TitleLockupViewController.swift
@@ -173,8 +173,8 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
     }
 }
 
-extension TitleLockupViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension TitleLockupViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         let eyebrowModel = TitleLockup.EyebrowModel(text: "Today only.")
         let titleModel = TitleLockup.TitleModel(text: "Get more of our best")
@@ -184,6 +184,6 @@ extension TitleLockupViewController: Componentable {
         component.titleModel = titleModel
         component.subTitleModel = subTitleModel
         component.debugBorder(show: true)
-        return TestViewWrapper(component: component, isTrailing: false)
+        return ComponentSample(component: component, canPinTrailing: true)
     }
 }
diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index bb63d47..5978d86 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -116,9 +116,9 @@ class ToggleViewController: BaseViewController<Toggle> {
     }
 }
 
-extension ToggleViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension ToggleViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
diff --git a/VDSSample/ViewControllers/TooltipViewController.swift b/VDSSample/ViewControllers/TooltipViewController.swift
index b577e9b..d73e818 100644
--- a/VDSSample/ViewControllers/TooltipViewController.swift
+++ b/VDSSample/ViewControllers/TooltipViewController.swift
@@ -101,12 +101,12 @@ class  TooltipViewController: BaseViewController<Tooltip> {
     }
 }
 
-extension TooltipViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension TooltipViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.title = "5G Ultra Wideband is available in your area."
         component.content = "$799.99 (128 GB only) "
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
 
diff --git a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
index 2b7de9a..6534535 100644
--- a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
+++ b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
@@ -168,13 +168,13 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
     }
 }
 
-extension TrailingTooltipLabelViewController: Componentable {
-    static func getComponent() -> TestViewWrapper {
+extension TrailingTooltipLabelViewController: ComponentSampleable {
+    static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.labelText = "5G Ultra Wideband is available in your area"
         component.tooltipTitle = "5G Ultra Wideband is available in your area."
         component.tooltipContent = "$799.99 (128 GB only)"
-        return TestViewWrapper(component: component, isTrailing: true)
+        return ComponentSample(component: component, canPinTrailing: false)
     }
 }
 

From 056954ddccad99e4e2791709ee3e166c4e1b7395 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Mon, 14 Aug 2023 15:18:33 -0500
Subject: [PATCH 05/22] updated line

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDSSample/ViewControllers/LineViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VDSSample/ViewControllers/LineViewController.swift b/VDSSample/ViewControllers/LineViewController.swift
index 21cf988..d98c44a 100644
--- a/VDSSample/ViewControllers/LineViewController.swift
+++ b/VDSSample/ViewControllers/LineViewController.swift
@@ -44,6 +44,6 @@ class LineViewController: BaseViewController<Line> {
 extension LineViewController: ComponentSampleable {
     static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component)
     }
 }

From ea9e5dd55bd8f1af342b9b99e6b5c12bf297a852 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Thu, 17 Aug 2023 14:18:30 -0500
Subject: [PATCH 06/22] fixed issues for tableview sample

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDSSample/ViewControllers/IconViewController.swift    | 4 ++--
 VDSSample/ViewControllers/LoaderViewController.swift  | 2 +-
 VDSSample/ViewControllers/TooltipViewController.swift | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/VDSSample/ViewControllers/IconViewController.swift b/VDSSample/ViewControllers/IconViewController.swift
index 38bcb45..d621e49 100644
--- a/VDSSample/ViewControllers/IconViewController.swift
+++ b/VDSSample/ViewControllers/IconViewController.swift
@@ -95,7 +95,7 @@ extension IconViewController: ComponentSampleable {
         let color = UIColor.VDSColor.paletteBlack
         component.color = color.uiColor
         component.name = name
-        component.size = .XLarge
-        return ComponentSample(component: component, canPinTrailing: false)
+        component.customSize = 50
+        return ComponentSample(component: component, canPinTrailing: false, canPinBottom: false)
     }
 }
diff --git a/VDSSample/ViewControllers/LoaderViewController.swift b/VDSSample/ViewControllers/LoaderViewController.swift
index 62a8fc7..840b337 100644
--- a/VDSSample/ViewControllers/LoaderViewController.swift
+++ b/VDSSample/ViewControllers/LoaderViewController.swift
@@ -86,6 +86,6 @@ class LoaderViewController: BaseViewController<Loader>, LoaderLaunchable {
 extension LoaderViewController: ComponentSampleable {
     static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component)
     }
 }
diff --git a/VDSSample/ViewControllers/TooltipViewController.swift b/VDSSample/ViewControllers/TooltipViewController.swift
index d73e818..44f1667 100644
--- a/VDSSample/ViewControllers/TooltipViewController.swift
+++ b/VDSSample/ViewControllers/TooltipViewController.swift
@@ -106,7 +106,7 @@ extension TooltipViewController: ComponentSampleable {
         let component = Self.makeComponent()
         component.title = "5G Ultra Wideband is available in your area."
         component.content = "$799.99 (128 GB only) "
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, canPinTrailing: false, canPinBottom: false)
     }
 }
 

From 02315048fdc600bb196b7d1ce78a295b4f528b6b Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Fri, 18 Aug 2023 09:00:25 -0500
Subject: [PATCH 07/22] refactored table content sample

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../BadgeIndicatorViewController.swift        |   2 +-
 .../ViewControllers/BadgeViewController.swift |   2 +-
 .../ButtonGroupViewController.swift           |   2 +-
 .../ButtonIconViewController.swift            |   2 +-
 .../ButtonViewController.swift                |   2 +-
 .../CheckBoxGroupViewController.swift         |   2 +-
 .../CheckboxItemViewController.swift          |   2 +-
 .../CheckboxViewController.swift              |   2 +-
 .../ViewControllers/IconViewController.swift  |   2 +-
 .../InputFieldViewController.swift            |   2 +-
 .../ViewControllers/LabelViewController.swift |   2 +-
 .../NotificationViewController.swift          |   2 +-
 .../RadioBoxGroupViewController.swift         |   2 +-
 .../RadioButtonGroupViewController.swift      |   2 +-
 .../RadioButtonItemViewController.swift       |   2 +-
 .../RadioButtonViewController.swift           |   2 +-
 .../RadioSwatchGroupViewController.swift      |   2 +-
 .../TableViewTestController.swift             | 236 ++++++++++++------
 .../ViewControllers/TabsViewController.swift  |   2 +-
 .../TextAreaViewController.swift              |   2 +-
 .../TextLinkCaretViewController.swift         |   2 +-
 .../TextLinkViewController.swift              |   2 +-
 .../TileContainerViewController.swift         |   2 +-
 .../TileletViewController.swift               |   2 +-
 .../TitleLockupViewController.swift           |   2 +-
 .../ToggleViewController.swift                |   2 +-
 .../TooltipViewController.swift               |   2 +-
 .../TrailingTooltipLabelViewController.swift  |   2 +-
 28 files changed, 181 insertions(+), 109 deletions(-)

diff --git a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
index 624a733..b9336a5 100644
--- a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
+++ b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
@@ -219,6 +219,6 @@ extension BadgeIndicatorViewController: ComponentSampleable {
         component.number = 23
         component.kind = .simple
         component.size = .medium
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift
index 712bd9f..3e37bd9 100644
--- a/VDSSample/ViewControllers/BadgeViewController.swift
+++ b/VDSSample/ViewControllers/BadgeViewController.swift
@@ -115,6 +115,6 @@ extension BadgeViewController: ComponentSampleable {
         component.text = "Terms and conditions"
         component.maxWidth = 70
         component.numberOfLines = 3
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift
index 67ad873..60bc010 100644
--- a/VDSSample/ViewControllers/ButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift
@@ -210,6 +210,6 @@ extension ButtonGroupViewController: ComponentSampleable {
             TextLinkCaret().with { $0.text = "Text Link Caret" }
         ]
 
-        return ComponentSample(component: component, canPinTrailing: true)
+        return ComponentSample(component: component)
     }
 }
diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift
index 7a0275a..35ca693 100644
--- a/VDSSample/ViewControllers/ButtonIconViewController.swift
+++ b/VDSSample/ViewControllers/ButtonIconViewController.swift
@@ -175,6 +175,6 @@ extension ButtonIconViewController: ComponentSampleable {
         let component = Self.makeComponent()
         component.iconName = .addToFavorite
         component.size = .large
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift
index 4fbccb3..7f10d8c 100644
--- a/VDSSample/ViewControllers/ButtonViewController.swift
+++ b/VDSSample/ViewControllers/ButtonViewController.swift
@@ -106,6 +106,6 @@ extension ButtonViewController: ComponentSampleable {
         component.onClick = { c in print("\(c.text!) Click")}
         component.use = .primary
         component.size = .large
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
index b3df8c4..c329a6a 100644
--- a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
@@ -138,6 +138,6 @@ extension CheckboxGroupViewController: ComponentSampleable {
 
         component.selectorModels = [checkbox1, checkbox2]
 
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/CheckboxItemViewController.swift b/VDSSample/ViewControllers/CheckboxItemViewController.swift
index f95720a..22da3a0 100644
--- a/VDSSample/ViewControllers/CheckboxItemViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxItemViewController.swift
@@ -101,6 +101,6 @@ extension CheckboxItemViewController: ComponentSampleable {
         component.childText = "I agree to Verizon's terms and conditions click here"
         component.errorText = "Error Text"
 
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift
index 8a9f10e..cb07f63 100644
--- a/VDSSample/ViewControllers/CheckboxViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxViewController.swift
@@ -65,6 +65,6 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
 extension CheckboxViewController: ComponentSampleable {
     static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/IconViewController.swift b/VDSSample/ViewControllers/IconViewController.swift
index d621e49..692663c 100644
--- a/VDSSample/ViewControllers/IconViewController.swift
+++ b/VDSSample/ViewControllers/IconViewController.swift
@@ -96,6 +96,6 @@ extension IconViewController: ComponentSampleable {
         component.color = color.uiColor
         component.name = name
         component.customSize = 50
-        return ComponentSample(component: component, canPinTrailing: false, canPinBottom: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual, bottomPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift
index 8b5ee88..8642dfd 100644
--- a/VDSSample/ViewControllers/InputFieldViewController.swift
+++ b/VDSSample/ViewControllers/InputFieldViewController.swift
@@ -179,6 +179,6 @@ extension InputFieldViewController: ComponentSampleable {
         component.successText = "Good job entering a valid address!"
         component.tooltipTitle = "Check the formatting of your address"
         component.tooltipContent = "House/Building number then street name"
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift
index 65c9687..f2b484a 100644
--- a/VDSSample/ViewControllers/LabelViewController.swift
+++ b/VDSSample/ViewControllers/LabelViewController.swift
@@ -346,6 +346,6 @@ extension LabelViewController: ComponentSampleable {
     static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
         component.text = "Helg¹ worldg Hell¹ worldg"
-        return ComponentSample(component: component, canPinTrailing: true)
+        return ComponentSample(component: component)
     }
 }
diff --git a/VDSSample/ViewControllers/NotificationViewController.swift b/VDSSample/ViewControllers/NotificationViewController.swift
index 03a1199..3c8737e 100644
--- a/VDSSample/ViewControllers/NotificationViewController.swift
+++ b/VDSSample/ViewControllers/NotificationViewController.swift
@@ -160,6 +160,6 @@ extension NotificationViewController: ComponentSampleable {
         component.primaryButtonModel = .init(text: firstButtonDefaultText, onClick: {b in print("\(b.text!) click")})
         component.secondaryButtonModel = .init(text: secondButtonDefaultText, onClick: {b in print("\(b.text!) click")})
         component.onCloseClick = {_ in print("notification on close click")}
-        return ComponentSample(component: component, canPinTrailing: true)
+        return ComponentSample(component: component)
     }
 }
diff --git a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
index e5fc2fb..ebb0abe 100644
--- a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
@@ -131,6 +131,6 @@ extension RadioBoxGroupViewController: ComponentSampleable {
 
         component.selectorModels = [radioBox1, radioBox2]
 
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
index 57afab3..f5bf1ad 100644
--- a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
@@ -133,6 +133,6 @@ extension RadioButtonGroupViewController: ComponentSampleable {
         
         component.selectorModels = [radioButton1, radioButton2, radioButton3]
         
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/RadioButtonItemViewController.swift b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
index f211c02..28ebc74 100644
--- a/VDSSample/ViewControllers/RadioButtonItemViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
@@ -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, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/RadioButtonViewController.swift b/VDSSample/ViewControllers/RadioButtonViewController.swift
index 19b9eb4..0325c28 100644
--- a/VDSSample/ViewControllers/RadioButtonViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonViewController.swift
@@ -69,6 +69,6 @@ class  RadioButtonViewController: BaseViewController<RadioButton> {
 extension RadioButtonViewController: ComponentSampleable {
     static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
index 42e020b..80bcda1 100644
--- a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
@@ -152,7 +152,7 @@ extension RadioSwatchGroupViewController: ComponentSampleable {
         
         component.selectorModels = [radioSwatch1, radioSwatch2, radioSwatch3, radioSwatch4, radioSwatch5, radioSwatch6, radioSwatch7, radioSwatch8]
         
-        return ComponentSample(component: component, canPinTrailing: true)
+        return ComponentSample(component: component)
 
     }
 }
diff --git a/VDSSample/ViewControllers/TableViewTestController.swift b/VDSSample/ViewControllers/TableViewTestController.swift
index ff8457b..191791b 100644
--- a/VDSSample/ViewControllers/TableViewTestController.swift
+++ b/VDSSample/ViewControllers/TableViewTestController.swift
@@ -1,4 +1,3 @@
-//
 //  TableViewTestController.swift
 //  VDSSample
 //
@@ -14,17 +13,76 @@ public typealias ComponentSampleView = UIView & Surfaceable
 
 public struct ComponentSample {
     public var component: ComponentSampleView
-    public var canPinLeading: Bool
-    public var canPinTrailing: Bool
-    public var canPinTop: Bool
-    public var canPinBottom: Bool
+    public enum GreaterThanPinningType: String {
+        case none, equalTo, greaterThanOrEqual
+    }
     
-    public init(component: ComponentSampleView, canPinLeading: Bool = true, canPinTrailing: Bool = true, canPinTop: Bool = true, canPinBottom: Bool = true) {
+    public enum LessThanPinningType: String {
+        case none, equalTo, lessThanOrEqual
+    }
+    
+    public var top: GreaterThanPinningType = .equalTo
+    public var leading: GreaterThanPinningType = .equalTo
+    public var trailing: LessThanPinningType = .equalTo
+    public var bottom: LessThanPinningType = .equalTo
+    
+    public init(component: ComponentSampleView,
+                topPinningType: GreaterThanPinningType = .equalTo,
+                leadingPinningType: GreaterThanPinningType = .equalTo,
+                trailingPinningType: LessThanPinningType = .equalTo,
+                bottomPinningType: LessThanPinningType = .equalTo) {
+        
         self.component = component
-        self.canPinLeading = canPinLeading
-        self.canPinTrailing = canPinTrailing
-        self.canPinTop = canPinTop
-        self.canPinBottom = canPinBottom
+        self.top = topPinningType
+        self.leading = leadingPinningType
+        self.trailing = trailingPinningType
+        self.bottom = bottomPinningType
+    }
+    
+    public func pin(edgeInset: UIEdgeInsets = .zero) {
+        
+        guard let superview = component.superview else { return }
+        switch top {
+        case .equalTo:
+            component.pinTop(anchor: superview.topAnchor, constant: edgeInset.top)
+            
+        case .greaterThanOrEqual:
+            component.pinTopGreaterThanOrEqualTo(anchor: superview.topAnchor, constant: edgeInset.top)
+            
+        case .none: break
+        }
+        
+        switch leading {
+        case .equalTo:
+            component.pinLeading(anchor: superview.leadingAnchor, constant: edgeInset.left)
+            
+        case .greaterThanOrEqual:
+            component.pinLeadingGreaterThanOrEqualTo(anchor: superview.leadingAnchor, constant: edgeInset.left)
+            
+        case .none: break
+
+        }
+        
+        switch trailing {
+        case .equalTo:
+            component.pinTrailing(anchor: superview.trailingAnchor, constant: edgeInset.right)
+            
+        case .lessThanOrEqual:
+            component.pinTrailingLessThanOrEqualTo(anchor: superview.trailingAnchor, constant: edgeInset.right)
+            
+        case .none: break
+        }
+        
+        switch bottom {
+        case .equalTo:
+            component.pinBottom(anchor: superview.bottomAnchor, constant: edgeInset.bottom)
+            
+        case .lessThanOrEqual:
+            component.pinBottomLessThanOrEqualTo(anchor: superview.bottomAnchor, constant: edgeInset.bottom)
+            
+        case .none: break
+        }
+        
     }
 }
 
@@ -32,9 +90,15 @@ protocol ComponentSampleable {
     static func makeSample() -> ComponentSample
 }
 
-public class TableViewTestController: UITableViewController, Initable, Surfaceable {
-
+public class TableViewTestController: UIViewController, Initable, Surfaceable {
+    
     var components:[ComponentSample] = []
+    lazy var tableView = UITableView().with {
+        $0.translatesAutoresizingMaskIntoConstraints = false
+        $0.delegate = self
+        $0.dataSource = self
+    }
+    
     public var surface: Surface = .light {
         didSet {
             tableView.reloadData()
@@ -46,113 +110,121 @@ public class TableViewTestController: UITableViewController, Initable, Surfaceab
     required public init() {
         super.init(nibName: nil, bundle: nil)
     }
-
+    
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-
+    
     public override func viewDidLoad() {
         super.viewDidLoad()
-        MenuViewController.items.forEach { menuItem in
-            if let componentable = menuItem.viewController as? ComponentSampleable.Type {
-                components.append(componentable.makeSample())
-            }
-        }
-        tableView.register(VDSCell.self, forCellReuseIdentifier: "cell")
-        tableView.allowsSelection = false
-        tableView.estimatedRowHeight = 45
-        tableView.separatorStyle = .none
-        tableView.rowHeight = UITableView.automaticDimension
-        tableView.reloadData()
-        let view = View(frame: .init(origin: .zero, size: .init(width: tableView.bounds.width, height: 100)))
+        
         let toggle = Toggle().with {
             $0.showText = true
-            $0.textPosition = .right
+            //$0.textPosition = .right
             $0.offText = "Light"
             $0.onText = "Dark"
             $0.onChange = { [weak self] toggle in
                 self?.surface = toggle.isOn ? .dark : .light
             }
         }
-        view.addSubview(toggle)
-        toggle.pinToSuperView(.init(top: 5, left: 16, bottom: 5, right: 16))
-        tableView.tableHeaderView = view
-        tableView.tableHeaderView?.frame.size.height = 40
+        
+        let toggleSample = ComponentSample(component: toggle,  leadingPinningType: .none)
+        let wrapper = UIView().with { $0.translatesAutoresizingMaskIntoConstraints = false }
+        wrapper.addSubview(toggle)
+        toggleSample.pin(edgeInset: .init(top: 5, left: 5, bottom: 5, right: 5))
+        
+        let stackView = UIStackView(arrangedSubviews: [wrapper, tableView]).with {
+            $0.translatesAutoresizingMaskIntoConstraints = false
+            $0.axis = .vertical
+            $0.spacing = 4
+            $0.distribution = .fill
+        }
+        view.backgroundColor = Surface.light.color
+        view.addSubview(stackView)
+        
+        NSLayoutConstraint.activate([
+            stackView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
+            stackView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            stackView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            stackView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor)
+        ])
+        
+        //var items = MenuViewController.items
+        let items = [
+            MenuComponent(title: "Badge", completed: true, viewController: BadgeViewController.self),
+            MenuComponent(title: "Button", completed: true, viewController: ButtonViewController.self),
+            MenuComponent(title: "ButtonGroup", completed: true, viewController: ButtonGroupViewController.self),
+            MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self),
+            MenuComponent(title: "Line", completed: true, viewController: LineViewController.self),
+            MenuComponent(title: "Loader", completed: true, viewController: LoaderViewController.self),
+            MenuComponent(title: "Tabs", completed: true, viewController: TabsViewController.self),
+            MenuComponent(title: "TextLink", completed: true, viewController: TextLinkViewController.self),
+            MenuComponent(title: "TextLinkCaret", completed: true, viewController: TextLinkCaretViewController.self),
+            MenuComponent(title: "TitleLockup", completed: true, viewController: TitleLockupViewController.self),
+            MenuComponent(title: "Tooltip", completed: true, viewController: TooltipViewController.self)
+        ]
+        
+        items.forEach { menuItem in
+            if let componentable = menuItem.viewController as? ComponentSampleable.Type {
+                components.append(componentable.makeSample())
+            }
+        }
+        
+        tableView.register(VDSCell.self, forCellReuseIdentifier: "cell")
+        tableView.allowsSelection = false
+        tableView.estimatedRowHeight = 45
+        tableView.separatorStyle = .singleLine
+    }
+    
+    public override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        tableView.reloadData()
     }
 
-    public override func numberOfSections(in tableView: UITableView) -> Int {
-        components.count
+    public func refresh() {
+        DispatchQueue.main.async { [self] in
+            tableView.beginUpdates()
+            tableView.endUpdates()
+        }
     }
+}
+
+extension TableViewTestController : UITableViewDelegate, UITableViewDataSource {
     
-    public override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        "\(type(of: components[section].component))"
-    }
-    
-    public override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        40
-    }
-    
-    public override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    public func numberOfSections(in tableView: UITableView) -> Int {
         1
     }
+    
+    public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        components.count
+    }
 
-    public override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "cell") as? VDSCell else { return UITableViewCell() }
         cell.prepareForReuse()
         cell.surface = surface
-        cell.sample = components[indexPath.section]
+        cell.sample = components[indexPath.row]
         return cell
     }
-    
 }
 
-public class VDSCell: UITableViewCell, AppleGuidlinesTouchable, Surfaceable {
+public class VDSCell: UITableViewCell, Surfaceable {
     public var surface: Surface = .light
     public var sample: ComponentSample? {
         didSet {
             contentView.subviews.forEach { $0.removeFromSuperview() }
-            let edges: UIEdgeInsets = .init(top: 16, left: 16, bottom: 16, right: 16)
+            
             guard let sample else { return }
+            
             var component = sample.component
             component.surface = surface
-
             
-            let wrapper = View()
-            wrapper.addSubview(component)
-            if sample.canPinTop {
-                component.pinTop(anchor: wrapper.topAnchor, constant: edges.top)
-            } else {
-                component.pinTopGreaterThanOrEqualTo(anchor: wrapper.topAnchor, constant: edges.top)
-            }
-
-            if sample.canPinLeading {
-                component.pinLeading(anchor: wrapper.leadingAnchor, constant: edges.left)
-            } else {
-                component.pinLeadingGreaterThanOrEqualTo(anchor: wrapper.leadingAnchor, constant: edges.left)
-            }
-                        
-            if sample.canPinTrailing {
-                component.pinTrailing(anchor: wrapper.trailingAnchor, constant: edges.right)
-            } else {
-                component.pinTrailingLessThanOrEqualTo(anchor: wrapper.trailingAnchor, constant: edges.right)
-            }
+            contentView.addSubview(component)
+            sample.pin(edgeInset: .init(top: 16, left: 16, bottom: 16, right: 16))
             
-            if sample.canPinBottom {
-                component.pinBottom(anchor: wrapper.bottomAnchor, constant: edges.bottom)
-            } else {
-                component.pinBottomLessThanOrEqualTo(anchor: wrapper.bottomAnchor, constant: edges.bottom)
-            }
-            
-            contentView.addSubview(wrapper)
-            wrapper.pinToSuperView(edges)
-            
-            backgroundColor = .systemYellow //surface.color
+            backgroundColor = surface.color
         }
     }
-    
-    override open func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
-        Self.acceptablyOutsideBounds(point: point, bounds: bounds)
-    }
-
 }
 
+
diff --git a/VDSSample/ViewControllers/TabsViewController.swift b/VDSSample/ViewControllers/TabsViewController.swift
index ef13e68..97c3ddd 100644
--- a/VDSSample/ViewControllers/TabsViewController.swift
+++ b/VDSSample/ViewControllers/TabsViewController.swift
@@ -153,6 +153,6 @@ extension TabsViewController: ComponentSampleable {
             .init(text: "Contact Us")
         ]
         
-        return ComponentSample(component: component, canPinTrailing: true)
+        return ComponentSample(component: component)
     }
 }
diff --git a/VDSSample/ViewControllers/TextAreaViewController.swift b/VDSSample/ViewControllers/TextAreaViewController.swift
index c919552..6ddb8ed 100644
--- a/VDSSample/ViewControllers/TextAreaViewController.swift
+++ b/VDSSample/ViewControllers/TextAreaViewController.swift
@@ -148,6 +148,6 @@ extension TextAreaViewController: ComponentSampleable {
         component.errorText = "Enter a valid address."
         component.tooltipTitle = "Check the formatting of your address"
         component.tooltipContent = "House/Building number then street name"
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/TextLinkCaretViewController.swift b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
index 8f689e9..05b1903 100644
--- a/VDSSample/ViewControllers/TextLinkCaretViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
@@ -78,6 +78,6 @@ extension TextLinkCaretViewController: ComponentSampleable {
         let component = Self.makeComponent()
         component.text = "Text Link Caret"
         component.onClick = { c in print("\(c.text!) Click")}
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/TextLinkViewController.swift b/VDSSample/ViewControllers/TextLinkViewController.swift
index ffc26a2..ab5516e 100644
--- a/VDSSample/ViewControllers/TextLinkViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkViewController.swift
@@ -80,6 +80,6 @@ extension TextLinkViewController: ComponentSampleable {
         let component = Self.makeComponent()
         component.text = "Text Link"
         component.onClick = { c in print("\(c.text!) Click")}
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/TileContainerViewController.swift b/VDSSample/ViewControllers/TileContainerViewController.swift
index 77a7022..ec374ad 100644
--- a/VDSSample/ViewControllers/TileContainerViewController.swift
+++ b/VDSSample/ViewControllers/TileContainerViewController.swift
@@ -153,6 +153,6 @@ extension TileContainerViewController: ComponentSampleable {
         let component = Self.makeComponent()
         component.width = 150
         component.color = .black
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/TileletViewController.swift b/VDSSample/ViewControllers/TileletViewController.swift
index 59177f1..e6872ac 100644
--- a/VDSSample/ViewControllers/TileletViewController.swift
+++ b/VDSSample/ViewControllers/TileletViewController.swift
@@ -240,6 +240,6 @@ extension TileletViewController: ComponentSampleable {
         component.titleModel = titleModel
         component.subTitleModel = subTitleModel
         component.width = 250
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift
index 9d424f2..2e2c686 100644
--- a/VDSSample/ViewControllers/TitleLockupViewController.swift
+++ b/VDSSample/ViewControllers/TitleLockupViewController.swift
@@ -184,6 +184,6 @@ extension TitleLockupViewController: ComponentSampleable {
         component.titleModel = titleModel
         component.subTitleModel = subTitleModel
         component.debugBorder(show: true)
-        return ComponentSample(component: component, canPinTrailing: true)
+        return ComponentSample(component: component)
     }
 }
diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index 5978d86..b95471f 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -119,6 +119,6 @@ class ToggleViewController: BaseViewController<Toggle> {
 extension ToggleViewController: ComponentSampleable {
     static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
diff --git a/VDSSample/ViewControllers/TooltipViewController.swift b/VDSSample/ViewControllers/TooltipViewController.swift
index 44f1667..5e80f57 100644
--- a/VDSSample/ViewControllers/TooltipViewController.swift
+++ b/VDSSample/ViewControllers/TooltipViewController.swift
@@ -106,7 +106,7 @@ extension TooltipViewController: ComponentSampleable {
         let component = Self.makeComponent()
         component.title = "5G Ultra Wideband is available in your area."
         component.content = "$799.99 (128 GB only) "
-        return ComponentSample(component: component, canPinTrailing: false, canPinBottom: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual, bottomPinningType: .lessThanOrEqual)
     }
 }
 
diff --git a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
index 6534535..4398884 100644
--- a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
+++ b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
@@ -174,7 +174,7 @@ extension TrailingTooltipLabelViewController: ComponentSampleable {
         component.labelText = "5G Ultra Wideband is available in your area"
         component.tooltipTitle = "5G Ultra Wideband is available in your area."
         component.tooltipContent = "$799.99 (128 GB only)"
-        return ComponentSample(component: component, canPinTrailing: false)
+        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
     }
 }
 

From b7ef70820d7789afd6b6919ae18d9fa9bfad4aa4 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Fri, 18 Aug 2023 09:16:50 -0500
Subject: [PATCH 08/22] refactored method into base

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../ViewControllers/LabelViewController.swift | 68 +++++++++++--------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift
index f2b484a..a4615c7 100644
--- a/VDSSample/ViewControllers/LabelViewController.swift
+++ b/VDSSample/ViewControllers/LabelViewController.swift
@@ -52,35 +52,12 @@ class LabelViewController: BaseViewController<Label> {
     var scaledMode: Bool { component.useScaledFont && TextStyle.canScaleFonts }
     var baseStyle: TextStyle! {
         didSet {
-            baseStyleLabel.text = descriptionFor(style: baseStyle)
+            baseStyleLabel.text = descriptionFor(style: baseStyle,
+                                                 useScaledLineHeight: useScaledLineHeight.isOn,
+                                                 scaledMode: scaledMode)
         }
     }
-    
-    func descriptionFor(style: TextStyle) -> String {
-        let scaledFont = style.font.scaledFont
-        var customizedDesc: String = "Name: \(style.rawValue) \nFont Face-Weight: \(style.font.fontName)"
-        customizedDesc += "\nVDS LetterSpacing: \(style.letterSpacing)"
-        if scaledMode {
-            customizedDesc += "\nVDS PointSize: \(style.pointSize.rounded())"
-            customizedDesc += "\n* iOS PointSize: \(scaledFont.pointSize.rounded())"
-        } else {
-            customizedDesc += "\n* VDS PointSize: \(style.pointSize.rounded())"
-        }
-        if scaledMode {
-            if useScaledLineHeight.isOn {
-                customizedDesc += "\nVDS LineHeight: \(style.lineHeight)"
-                customizedDesc += "\n* VDS Ratio LineHeight: \(style.scaledLineHeight)"
-            } else {
-                customizedDesc += "\n* VDS LineHeight: \(style.lineHeight)"
-            }
-            customizedDesc += "\niOS LineHeight: \(scaledFont.lineHeight.rounded())"
-        } else {
-            customizedDesc += "\n* VDS LineHeight: \(style.lineHeight)"
-            customizedDesc += "\niOS LineHeight: \(style.font.lineHeight.rounded())"
-        }
-        return customizedDesc
-    }
-        
+            
     var currentStyle: TextStyle! {
         didSet {
             //--------------------------------------------------------------
@@ -106,8 +83,13 @@ class LabelViewController: BaseViewController<Label> {
     private var isBold: Bool = false
     
     fileprivate func updateStyleLabel() {
-        baseStyleLabel.text = descriptionFor(style: baseStyle)
-        currentStyleLabel.text = descriptionFor(style: currentStyle)
+        baseStyleLabel.text = descriptionFor(style: baseStyle,
+                                             useScaledLineHeight: useScaledLineHeight.isOn,
+                                             scaledMode: scaledMode)
+                                             
+        currentStyleLabel.text = descriptionFor(style: currentStyle,
+                                                useScaledLineHeight: useScaledLineHeight.isOn,
+                                                scaledMode: scaledMode)
     }
 
     override func setup() {
@@ -349,3 +331,31 @@ extension LabelViewController: ComponentSampleable {
         return ComponentSample(component: component)
     }
 }
+
+extension BaseViewController {
+    func descriptionFor(style: TextStyle, useScaledLineHeight: Bool = false, scaledMode: Bool) -> String {
+        let scaledFont = style.font.scaledFont
+        var customizedDesc: String = "Name: \(style.rawValue) \nFont Face-Weight: \(style.font.fontName)"
+        customizedDesc += "\nVDS LetterSpacing: \(style.letterSpacing)"
+        if scaledMode {
+            customizedDesc += "\nVDS PointSize: \(style.pointSize.rounded())"
+            customizedDesc += "\n* iOS PointSize: \(scaledFont.pointSize.rounded())"
+        } else {
+            customizedDesc += "\n* VDS PointSize: \(style.pointSize.rounded())"
+        }
+        if scaledMode {
+            if useScaledLineHeight {
+                customizedDesc += "\nVDS LineHeight: \(style.lineHeight)"
+                customizedDesc += "\n* VDS Ratio LineHeight: \(style.scaledLineHeight)"
+            } else {
+                customizedDesc += "\n* VDS LineHeight: \(style.lineHeight)"
+            }
+            customizedDesc += "\niOS LineHeight: \(scaledFont.lineHeight.rounded())"
+        } else {
+            customizedDesc += "\n* VDS LineHeight: \(style.lineHeight)"
+            customizedDesc += "\niOS LineHeight: \(style.font.lineHeight.rounded())"
+        }
+        return customizedDesc
+    }
+
+}

From df91effafb736f9a29f25e0984e8b871b68fd3e1 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Fri, 18 Aug 2023 13:45:22 -0500
Subject: [PATCH 09/22] updates for debugging

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDSSample/ViewControllers/LabelViewController.swift  |  2 +-
 .../ViewControllers/TitleLockupViewController.swift  | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift
index a4615c7..9f523d5 100644
--- a/VDSSample/ViewControllers/LabelViewController.swift
+++ b/VDSSample/ViewControllers/LabelViewController.swift
@@ -333,7 +333,7 @@ extension LabelViewController: ComponentSampleable {
 }
 
 extension BaseViewController {
-    func descriptionFor(style: TextStyle, useScaledLineHeight: Bool = false, scaledMode: Bool) -> String {
+    func descriptionFor(style: TextStyle, useScaledLineHeight: Bool = false, scaledMode: Bool = false) -> String {
         let scaledFont = style.font.scaledFont
         var customizedDesc: String = "Name: \(style.rawValue) \nFont Face-Weight: \(style.font.fontName)"
         customizedDesc += "\nVDS LetterSpacing: \(style.letterSpacing)"
diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift
index 2e2c686..5ef509f 100644
--- a/VDSSample/ViewControllers/TitleLockupViewController.swift
+++ b/VDSSample/ViewControllers/TitleLockupViewController.swift
@@ -113,15 +113,19 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
         titleTextField.text = titleModel.text
         subTitleTextField.text = subTitleModel.text
         
+        setTitleModel()
         updateOtherTextStyles()
     }
 
     func setTitleModel() {
+        var titleTextStyle: TextStyle?
         if let text = titleTextField.text, !text.isEmpty {
             component.titleModel = TitleLockup.TitleModel(text: text, isBold: titleIsBold.isOn, standardStyle: titleStandardStylePickerSelectorView.selectedItem)
+            titleTextStyle = titleIsBold.isOn ? titleStandardStylePickerSelectorView.selectedItem.value.bold : titleStandardStylePickerSelectorView.selectedItem.value.regular
         } else {
             component.titleModel = nil
         }
+        debug(type: "Title", textStyle: titleTextStyle)
     }
     
     func updateOtherTextStyles() {
@@ -136,17 +140,25 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
     
         if let text = subTitleTextField.text, !text.isEmpty {
             component.subTitleModel = TitleLockup.SubTitleModel(text: text, standardStyle: style, textColor: subtitleColorPickerSelectorView.selectedItem)
+            debug(type: "SubTitle", textStyle: style.value.regular)
         } else {
             component.subTitleModel = nil
         }
         
         if let text = eyebrowTextField.text, !text.isEmpty {
             component.eyebrowModel = TitleLockup.EyebrowModel(text: text, isBold: eyebrowIsBold.isOn, standardStyle: style)
+            debug(type: "EyeBrow", textStyle: eyebrowIsBold.isOn ? style.value.bold : style.value.regular)
+
         } else {
             component.eyebrowModel = nil
         }
     }
     
+    func debug(type: String, textStyle: TextStyle?) {
+        guard let textStyle else { return }
+        DebugLog("\n\(type)\n\(descriptionFor(style: textStyle))\n\n")
+    }
+    
     //Picker
     func setupPicker(){
         surfacePickerSelectorView.onPickerDidSelect = {  [weak self] item in

From 17f074b9497eb01644aee5bba57f37efede7475a Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Fri, 18 Aug 2023 16:50:52 -0500
Subject: [PATCH 10/22] Signed-off-by: Matt Bruce <matt.bruce@verizon.com>

---
 VDSSample/ViewControllers/ToggleViewController.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index b95471f..0dd9dfa 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -119,6 +119,8 @@ class ToggleViewController: BaseViewController<Toggle> {
 extension ToggleViewController: ComponentSampleable {
     static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
-        return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual)
+        component.showText = true
+        component.textPosition = .right
+        return ComponentSample(component: component)
     }
 }

From 7f649ba5e6e0536f2d3e285450c8cd95ce721bf7 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Mon, 21 Aug 2023 17:36:59 -0500
Subject: [PATCH 11/22] made simple

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../TableViewTestController.swift             | 54 ++++++-------------
 1 file changed, 16 insertions(+), 38 deletions(-)

diff --git a/VDSSample/ViewControllers/TableViewTestController.swift b/VDSSample/ViewControllers/TableViewTestController.swift
index 191791b..d5bff3a 100644
--- a/VDSSample/ViewControllers/TableViewTestController.swift
+++ b/VDSSample/ViewControllers/TableViewTestController.swift
@@ -95,8 +95,6 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
     var components:[ComponentSample] = []
     lazy var tableView = UITableView().with {
         $0.translatesAutoresizingMaskIntoConstraints = false
-        $0.delegate = self
-        $0.dataSource = self
     }
     
     public var surface: Surface = .light {
@@ -127,11 +125,11 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
                 self?.surface = toggle.isOn ? .dark : .light
             }
         }
-        
-        let toggleSample = ComponentSample(component: toggle,  leadingPinningType: .none)
+
+        let toggleSample = ComponentSample(component: toggle, leadingPinningType: .none)
         let wrapper = UIView().with { $0.translatesAutoresizingMaskIntoConstraints = false }
         wrapper.addSubview(toggle)
-        toggleSample.pin(edgeInset: .init(top: 5, left: 5, bottom: 5, right: 5))
+        toggleSample.pin(edgeInset: .init(top: 5, left: 0, bottom: 5, right: 16))
         
         let stackView = UIStackView(arrangedSubviews: [wrapper, tableView]).with {
             $0.translatesAutoresizingMaskIntoConstraints = false
@@ -161,7 +159,7 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
             MenuComponent(title: "TextLink", completed: true, viewController: TextLinkViewController.self),
             MenuComponent(title: "TextLinkCaret", completed: true, viewController: TextLinkCaretViewController.self),
             MenuComponent(title: "TitleLockup", completed: true, viewController: TitleLockupViewController.self),
-            MenuComponent(title: "Tooltip", completed: true, viewController: TooltipViewController.self)
+            MenuComponent(title: "Tooltip", completed: true, viewController: TooltipViewController.self),
         ]
         
         items.forEach { menuItem in
@@ -170,17 +168,14 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
             }
         }
         
-        tableView.register(VDSCell.self, forCellReuseIdentifier: "cell")
         tableView.allowsSelection = false
-        tableView.estimatedRowHeight = 45
+        tableView.estimatedRowHeight = 20
+        tableView.rowHeight = UITableView.automaticDimension
         tableView.separatorStyle = .singleLine
+        tableView.delegate = self
+        tableView.dataSource = self
     }
     
-    public override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        tableView.reloadData()
-    }
-
     public func refresh() {
         DispatchQueue.main.async { [self] in
             tableView.beginUpdates()
@@ -200,31 +195,14 @@ extension TableViewTestController : UITableViewDelegate, UITableViewDataSource {
     }
 
     public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        guard let cell = tableView.dequeueReusableCell(withIdentifier: "cell") as? VDSCell else { return UITableViewCell() }
-        cell.prepareForReuse()
-        cell.surface = surface
-        cell.sample = components[indexPath.row]
+        let cell = UITableViewCell()
+        let sample = components[indexPath.row]
+        var component = sample.component
+        component.surface = surface
+        cell.contentView.addSubview(component)
+        sample.pin(edgeInset: .init(top: 16, left: 16, bottom: 16, right: 16))
+        cell.backgroundColor = surface.color
         return cell
     }
+
 }
-
-public class VDSCell: UITableViewCell, Surfaceable {
-    public var surface: Surface = .light
-    public var sample: ComponentSample? {
-        didSet {
-            contentView.subviews.forEach { $0.removeFromSuperview() }
-            
-            guard let sample else { return }
-            
-            var component = sample.component
-            component.surface = surface
-            
-            contentView.addSubview(component)
-            sample.pin(edgeInset: .init(top: 16, left: 16, bottom: 16, right: 16))
-            
-            backgroundColor = surface.color
-        }
-    }
-}
-
-

From c32e45d0bb85ffb9b9860f0daed99517022d3b73 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Mon, 21 Aug 2023 17:50:35 -0500
Subject: [PATCH 12/22] updated table

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../ViewControllers/TableViewTestController.swift  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/VDSSample/ViewControllers/TableViewTestController.swift b/VDSSample/ViewControllers/TableViewTestController.swift
index d5bff3a..5c818e0 100644
--- a/VDSSample/ViewControllers/TableViewTestController.swift
+++ b/VDSSample/ViewControllers/TableViewTestController.swift
@@ -174,12 +174,15 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
         tableView.separatorStyle = .singleLine
         tableView.delegate = self
         tableView.dataSource = self
+        tableView.reloadData()
     }
     
     public func refresh() {
         DispatchQueue.main.async { [self] in
-            tableView.beginUpdates()
-            tableView.endUpdates()
+            UIView.performWithoutAnimation {
+                tableView.beginUpdates()
+                tableView.endUpdates()
+            }            
         }
     }
 }
@@ -202,6 +205,13 @@ extension TableViewTestController : UITableViewDelegate, UITableViewDataSource {
         cell.contentView.addSubview(component)
         sample.pin(edgeInset: .init(top: 16, left: 16, bottom: 16, right: 16))
         cell.backgroundColor = surface.color
+        
+        if var refreshable = component as? Refreshablable {
+            refreshable.onRefresh = { [weak self] in
+                self?.refresh()
+            }
+        }
+        
         return cell
     }
 

From 5636660422dace1a2bdb4d0797280ef3302aad11 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Tue, 22 Aug 2023 08:59:34 -0500
Subject: [PATCH 13/22] updated sample

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../ViewControllers/ButtonGroupViewController.swift   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift
index 60bc010..6e7a062 100644
--- a/VDSSample/ViewControllers/ButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift
@@ -202,12 +202,13 @@ class ButtonGroupViewController: BaseViewController<ButtonGroup> {
 extension ButtonGroupViewController: ComponentSampleable {
     static func makeSample() -> ComponentSample {
         let component = Self.makeComponent()
+        let onClick: (ButtonBase) -> Void = { button in print("\(button.text!) clicked")}
         component.buttons = [
-            Button().with{ $0.use = .secondary; $0.text = "Secondary" },
-            Button().with{ $0.use = .primary; $0.text = "Primary" },
-            TextLink().with { $0.size = .large; $0.text = "Large Text Link" },
-            TextLink().with { $0.text = "Widge Label Button" },
-            TextLinkCaret().with { $0.text = "Text Link Caret" }
+            Button().with{ $0.use = .secondary; $0.text = "Secondary"; $0.onClick =  onClick},
+            Button().with{ $0.use = .primary; $0.text = "Primary"; $0.onClick =  onClick },
+            TextLink().with { $0.size = .large; $0.text = "Large Text Link"; $0.onClick =  onClick },
+            TextLink().with { $0.text = "Widge Label Button"; $0.onClick =  onClick },
+            TextLinkCaret().with { $0.text = "Text Link Caret"; $0.onClick =  onClick}
         ]
 
         return ComponentSample(component: component)

From 0a4560cffc4051d8c59c5aabf3aa2e72718e1067 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Tue, 22 Aug 2023 08:59:39 -0500
Subject: [PATCH 14/22] updated test

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../TableViewTestController.swift             | 53 ++++++++++---------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/VDSSample/ViewControllers/TableViewTestController.swift b/VDSSample/ViewControllers/TableViewTestController.swift
index 5c818e0..12eef86 100644
--- a/VDSSample/ViewControllers/TableViewTestController.swift
+++ b/VDSSample/ViewControllers/TableViewTestController.swift
@@ -147,21 +147,6 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
             stackView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor)
         ])
         
-        //var items = MenuViewController.items
-        let items = [
-            MenuComponent(title: "Badge", completed: true, viewController: BadgeViewController.self),
-            MenuComponent(title: "Button", completed: true, viewController: ButtonViewController.self),
-            MenuComponent(title: "ButtonGroup", completed: true, viewController: ButtonGroupViewController.self),
-            MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self),
-            MenuComponent(title: "Line", completed: true, viewController: LineViewController.self),
-            MenuComponent(title: "Loader", completed: true, viewController: LoaderViewController.self),
-            MenuComponent(title: "Tabs", completed: true, viewController: TabsViewController.self),
-            MenuComponent(title: "TextLink", completed: true, viewController: TextLinkViewController.self),
-            MenuComponent(title: "TextLinkCaret", completed: true, viewController: TextLinkCaretViewController.self),
-            MenuComponent(title: "TitleLockup", completed: true, viewController: TitleLockupViewController.self),
-            MenuComponent(title: "Tooltip", completed: true, viewController: TooltipViewController.self),
-        ]
-        
         items.forEach { menuItem in
             if let componentable = menuItem.viewController as? ComponentSampleable.Type {
                 components.append(componentable.makeSample())
@@ -169,7 +154,7 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
         }
         
         tableView.allowsSelection = false
-        tableView.estimatedRowHeight = 20
+        tableView.estimatedRowHeight = 32
         tableView.rowHeight = UITableView.automaticDimension
         tableView.separatorStyle = .singleLine
         tableView.delegate = self
@@ -185,6 +170,31 @@ public class TableViewTestController: UIViewController, Initable, Surfaceable {
             }            
         }
     }
+    
+    var items: [MenuComponent] {
+        batch1
+    }
+    
+    var all: [MenuComponent] {
+        MenuViewController.items
+    }
+    
+    var batch1: [MenuComponent] {
+        [
+            MenuComponent(title: "Badge", completed: true, viewController: BadgeViewController.self),
+            MenuComponent(title: "Button", completed: true, viewController: ButtonViewController.self),
+            MenuComponent(title: "ButtonGroup", completed: true, viewController: ButtonGroupViewController.self),
+            MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self),
+            MenuComponent(title: "Label", completed: true, viewController: LabelViewController.self),
+            MenuComponent(title: "Line", completed: true, viewController: LineViewController.self),
+            MenuComponent(title: "Loader", completed: true, viewController: LoaderViewController.self),
+            MenuComponent(title: "Tabs", completed: true, viewController: TabsViewController.self),
+            MenuComponent(title: "TextLink", completed: true, viewController: TextLinkViewController.self),
+            MenuComponent(title: "TextLinkCaret", completed: true, viewController: TextLinkCaretViewController.self),
+            MenuComponent(title: "TitleLockup", completed: true, viewController: TitleLockupViewController.self),
+            MenuComponent(title: "Tooltip", completed: true, viewController: TooltipViewController.self),
+        ]
+    }
 }
 
 extension TableViewTestController : UITableViewDelegate, UITableViewDataSource {
@@ -198,20 +208,15 @@ extension TableViewTestController : UITableViewDelegate, UITableViewDataSource {
     }
 
     public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = UITableViewCell()
         let sample = components[indexPath.row]
         var component = sample.component
         component.surface = surface
+        
+        let cell = UITableViewCell()
         cell.contentView.addSubview(component)
         sample.pin(edgeInset: .init(top: 16, left: 16, bottom: 16, right: 16))
         cell.backgroundColor = surface.color
-        
-        if var refreshable = component as? Refreshablable {
-            refreshable.onRefresh = { [weak self] in
-                self?.refresh()
-            }
-        }
-        
+        cell.layoutIfNeeded()
         return cell
     }
 

From 0777898e8ad7c356cc66c961bc5e9c0f33c88048 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Thu, 24 Aug 2023 11:34:22 -0500
Subject: [PATCH 15/22] added custom rotor

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDSSample/ViewControllers/BaseViewController.swift | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/VDSSample/ViewControllers/BaseViewController.swift b/VDSSample/ViewControllers/BaseViewController.swift
index 3aadef4..f268703 100644
--- a/VDSSample/ViewControllers/BaseViewController.swift
+++ b/VDSSample/ViewControllers/BaseViewController.swift
@@ -66,7 +66,7 @@ public class FormSection: UIStackView {
     }
 }
 
-public class BaseViewController<Component: UIView>: UIViewController, Initable {
+public class BaseViewController<Component: UIView>: UIViewController, Initable , CustomRotorable {
     deinit {
         print("\(Self.self) deinit")
     }
@@ -81,6 +81,12 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable {
     // MARK: - Combine Properties
     //--------------------------------------------------
     public var subscribers = Set<AnyCancellable>()
+    
+    public var customRotorCache: [String: [UIView]] = [:]
+    public var customRotors: [CustomRotorType] = [
+        CustomRotorType(name: "Links", trait: .link),
+        CustomRotorType(name: "Buttons", trait: .button)
+    ]
 
     //--------------------------------------------------
     // MARK: - Properties
@@ -117,6 +123,7 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable {
             setup()
             contentTopView.backgroundColor = Surface.light.color
         }
+        
     }
     
     public lazy var surfacePickerSelectorView = {
@@ -229,6 +236,8 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable {
                 self?.activeTextField?.resignFirstResponder()
                 self?.activeTextField = nil
         }.store(in: &subscribers)
+        
+        loadCustomRotors()
     }
     
     func isViewHiddenByKeyboard(view: UIView, keyboardFrame: CGRect) -> Bool {

From ab16fb4642733e330a374bfb7a4bf52edc59a831 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Thu, 24 Aug 2023 14:19:46 -0500
Subject: [PATCH 16/22] added rotor

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDSSample.xcodeproj/project.pbxproj       |   4 +
 VDSSample/Protocols/CustomRotorable.swift | 107 ++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 VDSSample/Protocols/CustomRotorable.swift

diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj
index 6bb1d06..42d240b 100644
--- a/VDSSample.xcodeproj/project.pbxproj
+++ b/VDSSample.xcodeproj/project.pbxproj
@@ -48,6 +48,7 @@
 		EA3C3BB528996775000CA526 /* StoryboardInitable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3BB128996775000CA526 /* StoryboardInitable.swift */; };
 		EA3C3BB628996775000CA526 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3BB228996775000CA526 /* MenuViewController.swift */; };
 		EA3C3BB728996775000CA526 /* ToggleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3BB328996775000CA526 /* ToggleViewController.swift */; };
+		EA471F402A97BEAA00CE9E58 /* CustomRotorable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA471F3F2A97BEAA00CE9E58 /* CustomRotorable.swift */; };
 		EA4DB30428DCD25B00103EE3 /* BadgeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */; };
 		EA596ABA2A16B2ED00300C4B /* TabsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA596AB92A16B2ED00300C4B /* TabsViewController.swift */; };
 		EA5E3050294D11540082B959 /* TileContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E304F294D11540082B959 /* TileContainerViewController.swift */; };
@@ -144,6 +145,7 @@
 		EA3C3BB128996775000CA526 /* StoryboardInitable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryboardInitable.swift; sourceTree = "<group>"; };
 		EA3C3BB228996775000CA526 /* MenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = "<group>"; };
 		EA3C3BB328996775000CA526 /* ToggleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ToggleViewController.swift; sourceTree = "<group>"; };
+		EA471F3F2A97BEAA00CE9E58 /* CustomRotorable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomRotorable.swift; sourceTree = "<group>"; };
 		EA4DB30328DCD25B00103EE3 /* BadgeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeViewController.swift; sourceTree = "<group>"; };
 		EA596AB92A16B2ED00300C4B /* TabsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsViewController.swift; sourceTree = "<group>"; };
 		EA5E304F294D11540082B959 /* TileContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileContainerViewController.swift; sourceTree = "<group>"; };
@@ -294,6 +296,7 @@
 		EAF7F07E28996A0700B287F5 /* Protocols */ = {
 			isa = PBXGroup;
 			children = (
+				EA471F3F2A97BEAA00CE9E58 /* CustomRotorable.swift */,
 				EA3C3BB028996775000CA526 /* PickerBase.swift */,
 				EA3C3BB128996775000CA526 /* StoryboardInitable.swift */,
 			);
@@ -498,6 +501,7 @@
 				445BA07A29C088470036A7C5 /* NotificationViewController.swift in Sources */,
 				EAF7F11A28A14A0E00B287F5 /* RadioButtonGroupViewController.swift in Sources */,
 				EA89204628B66CE2006B9984 /* ScrollViewController.swift in Sources */,
+				EA471F402A97BEAA00CE9E58 /* CustomRotorable.swift in Sources */,
 				EA3C3B9F289966EF000CA526 /* SceneDelegate.swift in Sources */,
 				EA0D1C332A673FD400E5C127 /* RadioButtonItemViewController.swift in Sources */,
 				5FC35BE928D5235A004EBEAC /* ButtonViewController.swift in Sources */,
diff --git a/VDSSample/Protocols/CustomRotorable.swift b/VDSSample/Protocols/CustomRotorable.swift
new file mode 100644
index 0000000..6b303d3
--- /dev/null
+++ b/VDSSample/Protocols/CustomRotorable.swift
@@ -0,0 +1,107 @@
+//
+//  AccessibilityCustomRotorable.swift
+//  VDS
+//
+//  Created by Matt Bruce on 8/24/23.
+//
+
+import Foundation
+import UIKit
+
+public protocol CustomRotorable: UIViewController {
+    var customRotorCache: [String: [UIView]] { get set }
+    var customRotors: [CustomRotorType] { get set }
+}
+
+extension CustomRotorable {
+    
+    /// Adds CustomRotor to the accessibilityCustomRotors array.
+    /// - Parameters:
+    ///   - name: Name that will show up in the Rotor picker.
+    ///   - trait: Any UIView that has this traits will be added to this Name.
+    internal func addCustomRotor(with name: String, for trait: UIAccessibilityTraits) {
+        //filter out old rotors with same name
+        accessibilityCustomRotors = (accessibilityCustomRotors ?? []).filter { $0.name != name }
+        
+        //create new rotor
+        let newRotor = UIAccessibilityCustomRotor(name: name) { [weak self] predicate in
+            guard let self else { return nil }
+            
+            //create the view accessibleElements cache if it doesn't exist
+            if self.customRotorCache[name] == nil {
+                self.customRotorCache[name] = self.view.accessibleElements(with: trait)
+            }
+            
+            guard let views = self.customRotorCache[name], !views.isEmpty else { return nil }
+
+            let currentIndex = views.firstIndex(where: { $0 === predicate.currentItem.targetElement })
+            let count = views.count
+            
+            //find the nextIndex
+            let nextIndex: Int
+            switch predicate.searchDirection {
+            case .next:
+                if let currentIndex, currentIndex != count - 1{
+                    //go forwards
+                    nextIndex = currentIndex + 1
+                } else {
+                    //get the first
+                    nextIndex = 0
+                }
+            case .previous:
+                if let currentIndex, currentIndex != 0 {
+                    //go backwards
+                    nextIndex = currentIndex - 1
+                } else {
+                    //get the last
+                    nextIndex = count - 1
+                }
+            @unknown default:
+                //get the first
+                nextIndex = 0
+            }
+            
+            return UIAccessibilityCustomRotorItemResult(targetElement: views[nextIndex], targetRange: nil)
+        }
+        
+        //append rotor
+        accessibilityCustomRotors?.append(newRotor)
+    }
+        
+    /// Loads all of the custom rotors for the screen.
+    public func loadCustomRotors() {
+        customRotorCache.removeAll()
+        UIAccessibility.post(notification: .screenChanged, argument: nil)
+        customRotors.forEach { addCustomRotor(with: $0.name, for: $0.trait) }
+    }
+}
+
+public extension UIView {
+    
+    /// Gets all of the Views that has the matching accessibilityTrait.
+    /// - Parameter trait: This is the trailt for the accessibilityTrait property of a view.
+    /// - Returns: An array of RotorItemResult
+    func accessibleElements(with trait: UIAccessibilityTraits) -> [UIView] {
+        var elements: [UIView] = []
+        
+        //add your self if you meet the requirements
+        if isAccessibilityElement, accessibilityTraits.contains(trait) {
+            elements.append(self)
+        }
+        
+        //loop through your subviews
+        subviews.forEach { elements.append(contentsOf: $0.accessibleElements(with: trait)) }
+        
+        return elements
+    }
+}
+
+public struct CustomRotorType {
+    public var name: String
+    public var trait: UIAccessibilityTraits
+
+    public init(name: String, trait: UIAccessibilityTraits) {
+        self.name = name
+        self.trait = trait
+    }
+}

From a528dc291b138ef851598d46bfa89b07aeadf38f Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Thu, 24 Aug 2023 14:20:25 -0500
Subject: [PATCH 17/22] added label inline link sample

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../ViewControllers/LabelViewController.swift | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift
index 9f523d5..5c3dcd8 100644
--- a/VDSSample/ViewControllers/LabelViewController.swift
+++ b/VDSSample/ViewControllers/LabelViewController.swift
@@ -104,7 +104,29 @@ class LabelViewController: BaseViewController<Label> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: component)
+        
+
+        let fullText = "Here is a sample of text that has an inline text link that you can click on!"
+        let linkText = "inline text link"
+
+        let sampleLabel = Label()
+        sampleLabel.textStyle = .titleLarge
+        sampleLabel.text = fullText
+        
+        if let link = ActionLabelAttribute(text: fullText, linkText: linkText) {
+            link.action.sink { [weak self] in
+                print("Clicked \(linkText)")
+                self?.present(UIAlertController(title: "TextLink", message: "Clicked \(linkText)", preferredStyle: .alert).with{ $0.addAction(.init(title: "OK", style: .default)) }, animated: true)
+            }.store(in: &subscribers)
+            sampleLabel.attributes = [link]
+        }
+        
+        let stack = UIStackView(arrangedSubviews: [component, sampleLabel])
+        stack.spacing = 10
+        stack.axis = .vertical
+        
+        
+        addContentTopView(view: stack)
         setupPicker()
         setupModel()
     }
@@ -136,6 +158,7 @@ class LabelViewController: BaseViewController<Label> {
         addFormRow(label: "Text Size", view: textSizePickerSelectorView)
         addFormRow(label: "Text", view: textField)
         
+        
         disabledSwitch.onChange = { [weak self] sender in
             self?.component.disabled = sender.isOn
         }
@@ -235,6 +258,7 @@ class LabelViewController: BaseViewController<Label> {
             self?.calculatedLabel.text = "Actual height (* LineHeight x Text Lines): \(rect.height)"
         }.store(in: &subscribers)
         
+    
         //------------------------------------
     }
         

From 883f9fffb4d87cbec1abf8a26425ddadd7075eec Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Thu, 24 Aug 2023 16:02:20 -0500
Subject: [PATCH 18/22] updated rotor logic

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDSSample/Protocols/CustomRotorable.swift     | 47 ++++++++++++-------
 .../ViewControllers/BaseViewController.swift  |  1 -
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/VDSSample/Protocols/CustomRotorable.swift b/VDSSample/Protocols/CustomRotorable.swift
index 6b303d3..acecd19 100644
--- a/VDSSample/Protocols/CustomRotorable.swift
+++ b/VDSSample/Protocols/CustomRotorable.swift
@@ -9,7 +9,6 @@ import Foundation
 import UIKit
 
 public protocol CustomRotorable: UIViewController {
-    var customRotorCache: [String: [UIView]] { get set }
     var customRotors: [CustomRotorType] { get set }
 }
 
@@ -24,15 +23,41 @@ extension CustomRotorable {
         accessibilityCustomRotors = (accessibilityCustomRotors ?? []).filter { $0.name != name }
         
         //create new rotor
-        let newRotor = UIAccessibilityCustomRotor(name: name) { [weak self] predicate in
-            guard let self else { return nil }
+        let newRotor = AccessibilityCustomRotor(with: name, for: trait, rootView: self.view)
+        
+        //append rotor
+        accessibilityCustomRotors?.append(newRotor)
+    }
+        
+    /// Loads all of the custom rotors for the screen.
+    public func loadCustomRotors() {
+        customRotors.forEach { addCustomRotor(with: $0.name, for: $0.trait) }
+    }
+}
+
+private class AccessibilityCustomRotor: UIAccessibilityCustomRotor {
+    var views: [UIView]?
+    var trait: UIAccessibilityTraits
+    weak var rootView: UIView?
+    
+    init (with name: String, for trait: UIAccessibilityTraits, rootView: UIView){
+        self.rootView = rootView
+        self.trait = trait
+        super.init(name: name, itemSearch: { _ in return nil })
+        self.updateSearch()
+    }
+    
+    func updateSearch() {
+        itemSearchBlock = { [weak self] predicate in
+            
+            guard let self, let rootView = self.rootView else { return nil }
             
             //create the view accessibleElements cache if it doesn't exist
-            if self.customRotorCache[name] == nil {
-                self.customRotorCache[name] = self.view.accessibleElements(with: trait)
+            if self.views == nil {
+                self.views = rootView.accessibleElements(with: trait)
             }
             
-            guard let views = self.customRotorCache[name], !views.isEmpty else { return nil }
+            guard let views = self.views, !views.isEmpty else { return nil }
 
             let currentIndex = views.firstIndex(where: { $0 === predicate.currentItem.targetElement })
             let count = views.count
@@ -63,16 +88,6 @@ extension CustomRotorable {
             
             return UIAccessibilityCustomRotorItemResult(targetElement: views[nextIndex], targetRange: nil)
         }
-        
-        //append rotor
-        accessibilityCustomRotors?.append(newRotor)
-    }
-        
-    /// Loads all of the custom rotors for the screen.
-    public func loadCustomRotors() {
-        customRotorCache.removeAll()
-        UIAccessibility.post(notification: .screenChanged, argument: nil)
-        customRotors.forEach { addCustomRotor(with: $0.name, for: $0.trait) }
     }
 }
 
diff --git a/VDSSample/ViewControllers/BaseViewController.swift b/VDSSample/ViewControllers/BaseViewController.swift
index f268703..1449e03 100644
--- a/VDSSample/ViewControllers/BaseViewController.swift
+++ b/VDSSample/ViewControllers/BaseViewController.swift
@@ -82,7 +82,6 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable ,
     //--------------------------------------------------
     public var subscribers = Set<AnyCancellable>()
     
-    public var customRotorCache: [String: [UIView]] = [:]
     public var customRotors: [CustomRotorType] = [
         CustomRotorType(name: "Links", trait: .link),
         CustomRotorType(name: "Buttons", trait: .button)

From d8a8caa95757be8b3de2e854beb7dac7b1d84a94 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Fri, 25 Aug 2023 15:07:54 -0500
Subject: [PATCH 19/22] converted to use isEnabled

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../ViewControllers/ButtonGroupViewController.swift    | 10 +++++-----
 .../ViewControllers/ButtonIconViewController.swift     |  4 ++--
 VDSSample/ViewControllers/ButtonViewController.swift   |  4 ++--
 .../ViewControllers/CheckBoxGroupViewController.swift  |  4 ++--
 .../ViewControllers/CheckboxItemViewController.swift   |  4 ++--
 VDSSample/ViewControllers/CheckboxViewController.swift |  4 ++--
 .../ViewControllers/InputFieldViewController.swift     |  4 ++--
 VDSSample/ViewControllers/LabelViewController.swift    |  4 ++--
 .../ViewControllers/RadioBoxGroupViewController.swift  |  4 ++--
 .../RadioButtonGroupViewController.swift               |  4 ++--
 .../RadioButtonItemViewController.swift                |  4 ++--
 .../ViewControllers/RadioButtonViewController.swift    |  4 ++--
 .../RadioSwatchGroupViewController.swift               |  4 ++--
 .../ViewControllers/TabsContainerViewController.swift  |  4 ++--
 VDSSample/ViewControllers/TabsViewController.swift     |  4 ++--
 VDSSample/ViewControllers/TextAreaViewController.swift |  4 ++--
 .../ViewControllers/TextLinkCaretViewController.swift  |  4 ++--
 VDSSample/ViewControllers/TextLinkViewController.swift |  4 ++--
 VDSSample/ViewControllers/ToggleViewController.swift   |  2 +-
 VDSSample/ViewControllers/TooltipViewController.swift  |  4 ++--
 .../TrailingTooltipLabelViewController.swift           |  6 +++---
 21 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift
index 6e7a062..ce8325e 100644
--- a/VDSSample/ViewControllers/ButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift
@@ -118,10 +118,10 @@ class ButtonGroupViewController: BaseViewController<ButtonGroup> {
         addFormRow(label: "Percentage (1-100)", view: percentageTextField)
         
         disabledSwitch.onChange = { [weak self] sender in
-            self?.largeLabel.disabled = sender.isOn
-            self?.smallLabel.disabled = sender.isOn
-            self?.component.disabled = sender.isOn
-            self?.smallButtonGroup.disabled = sender.isOn
+            self?.largeLabel.isEnabled = !sender.isOn
+            self?.smallLabel.isEnabled = !sender.isOn
+            self?.component.isEnabled = !sender.isOn
+            self?.smallButtonGroup.isEnabled = !sender.isOn
         }
 
         widthTextField
@@ -156,7 +156,7 @@ class ButtonGroupViewController: BaseViewController<ButtonGroup> {
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
         buttonPositionSelectorView.text = component.buttonPosition.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         rowQuantitySelectorView.text = RowQuantity(quantity: component.rowQuantity).rawValue
         widthTextField.text = ""
     }
diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift
index 35ca693..e055285 100644
--- a/VDSSample/ViewControllers/ButtonIconViewController.swift
+++ b/VDSSample/ViewControllers/ButtonIconViewController.swift
@@ -75,7 +75,7 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
         addFormRow(label: "Y Offset", view: centerY)
         
         disabledSwitch.onChange =  { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         component.onClickActionPublisher("ButtonIcon", label: actionLabel)
@@ -121,7 +121,7 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
         kindPickerSelectorView.text = component.kind.rawValue
         sizePickerSelectorView.text = component.size.rawValue
         namePickerSelectorView.text = name.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
     }
     
     func updateOffset() {
diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift
index 7f10d8c..d43f9ec 100644
--- a/VDSSample/ViewControllers/ButtonViewController.swift
+++ b/VDSSample/ViewControllers/ButtonViewController.swift
@@ -49,7 +49,7 @@ class ButtonViewController: BaseViewController<Button> {
         
         
         disabledSwitch.onChange =  { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         textField
@@ -73,7 +73,7 @@ class ButtonViewController: BaseViewController<Button> {
         component.labelPublisher(label)
         
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         textField.text = component.text
         usePickerSelectorView.text = component.use.rawValue
         widthTextField.text = ""
diff --git a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
index c329a6a..4255972 100644
--- a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
@@ -42,7 +42,7 @@ class  CheckboxGroupViewController: BaseViewController<CheckboxGroup> {
         }
         
         disabledSwitch.onChange = { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         labelTextField
@@ -96,7 +96,7 @@ class  CheckboxGroupViewController: BaseViewController<CheckboxGroup> {
 
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         labelTextField.text = checkbox1.labelText
         childTextField.text = checkbox1.childText
         showErrorSwitch.isOn = component.showError
diff --git a/VDSSample/ViewControllers/CheckboxItemViewController.swift b/VDSSample/ViewControllers/CheckboxItemViewController.swift
index 22da3a0..a25c6f3 100644
--- a/VDSSample/ViewControllers/CheckboxItemViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxItemViewController.swift
@@ -46,7 +46,7 @@ class  CheckboxItemViewController: BaseViewController<CheckboxItem> {
         }
         
         disabledSwitch.onChange =  { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         labelTextField
@@ -77,7 +77,7 @@ class  CheckboxItemViewController: BaseViewController<CheckboxItem> {
                 
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         labelTextField.text = component.labelText
         childTextField.text = component.childText
         showErrorSwitch.isOn = component.showError
diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift
index cb07f63..f11f4c1 100644
--- a/VDSSample/ViewControllers/CheckboxViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxViewController.swift
@@ -39,7 +39,7 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
         }
         
         disabledSwitch.onChange =  { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         component.onChangeActionPublisher("Checkbox", label: actionLabel)
@@ -48,7 +48,7 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
     func setupModel() {
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         showErrorSwitch.isOn = component.showError
         
     }
diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift
index 8642dfd..e1e81b7 100644
--- a/VDSSample/ViewControllers/InputFieldViewController.swift
+++ b/VDSSample/ViewControllers/InputFieldViewController.swift
@@ -75,7 +75,7 @@ class  InputFieldViewController: BaseViewController<InputField> {
         }
         
         disabledSwitch.onChange = { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         labelTextField
@@ -139,7 +139,7 @@ class  InputFieldViewController: BaseViewController<InputField> {
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
         helperTextPlacementPickerSelectorView.text = component.helperTextPlacement.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         requiredSwitch.isOn = component.required
         labelTextField.text = component.labelText
         helperTextField.text = component.helperText
diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift
index 5c3dcd8..adcc1d9 100644
--- a/VDSSample/ViewControllers/LabelViewController.swift
+++ b/VDSSample/ViewControllers/LabelViewController.swift
@@ -160,7 +160,7 @@ class LabelViewController: BaseViewController<Label> {
         
         
         disabledSwitch.onChange = { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         boldSwitch
@@ -267,7 +267,7 @@ class LabelViewController: BaseViewController<Label> {
         
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         boldSwitch.isOn = isBold
         textField.text = component.text
         
diff --git a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
index ebb0abe..1c0b939 100644
--- a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
@@ -39,7 +39,7 @@ class  RadioBoxGroupViewController: BaseViewController<RadioBoxGroup>{
         addFormRow(label: "Sub Text Right", view: subTextRightField)
 
         disabledSwitch.onChange = { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         strikeThroughSwitch.onChange = { [weak self] sender in
@@ -90,7 +90,7 @@ class  RadioBoxGroupViewController: BaseViewController<RadioBoxGroup>{
         
         //set UI values
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         textField.text = radioBox1.text
         subTextField.text = radioBox1.subText
         subTextRightField.text = radioBox1.subTextRight
diff --git a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
index f5bf1ad..c1131ba 100644
--- a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
@@ -40,7 +40,7 @@ class  RadioButtonGroupViewController: BaseViewController<RadioButtonGroup> {
         }
         
         disabledSwitch.onChange = { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
         
         labelTextField
@@ -86,7 +86,7 @@ class  RadioButtonGroupViewController: BaseViewController<RadioButtonGroup> {
 
         //set UI values
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         showErrorSwitch.isOn = component.showError
         labelTextField.text = radioButton1.labelText
         childTextField.text = radioButton1.childText
diff --git a/VDSSample/ViewControllers/RadioButtonItemViewController.swift b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
index 28ebc74..e7620fd 100644
--- a/VDSSample/ViewControllers/RadioButtonItemViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
@@ -46,7 +46,7 @@ class  RadioButtonItemViewController: BaseViewController<RadioButtonItem> {
         }
         
         disabledSwitch.onChange =  { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         labelTextField
@@ -81,7 +81,7 @@ class  RadioButtonItemViewController: BaseViewController<RadioButtonItem> {
         
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         labelTextField.text = component.labelText
         childTextField.text = component.childText
         showErrorSwitch.isOn = component.showError
diff --git a/VDSSample/ViewControllers/RadioButtonViewController.swift b/VDSSample/ViewControllers/RadioButtonViewController.swift
index 0325c28..55aa4ae 100644
--- a/VDSSample/ViewControllers/RadioButtonViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonViewController.swift
@@ -38,7 +38,7 @@ class  RadioButtonViewController: BaseViewController<RadioButton> {
         }
         
         disabledSwitch.onChange =  { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
     }
@@ -52,7 +52,7 @@ class  RadioButtonViewController: BaseViewController<RadioButton> {
         
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         showErrorSwitch.isOn = component.showError
         
     }
diff --git a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
index 80bcda1..2158657 100644
--- a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift
@@ -31,7 +31,7 @@ class  RadioSwatchGroupViewController: BaseViewController<RadioSwatchGroup> {
         addFormRow(label: "Strikethrough", view: strikeThroughSwitch)
         
         disabledSwitch.onChange = { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
         
         strikeThroughSwitch.onChange = { [weak self] sender in
@@ -91,7 +91,7 @@ class  RadioSwatchGroupViewController: BaseViewController<RadioSwatchGroup> {
         
         //set UI values
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
     }
     
     //Picker
diff --git a/VDSSample/ViewControllers/TabsContainerViewController.swift b/VDSSample/ViewControllers/TabsContainerViewController.swift
index f7d6ab4..4809da7 100644
--- a/VDSSample/ViewControllers/TabsContainerViewController.swift
+++ b/VDSSample/ViewControllers/TabsContainerViewController.swift
@@ -80,7 +80,7 @@ class TabsContainerViewController: BaseViewController<TabsContainer> {
         append(section: horizontalOrientationFormStackView)
         
         disabledSwitch.onChange =  { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
         
         borderlineSwitch.onChange =  { [weak self] sender in
@@ -144,7 +144,7 @@ class TabsContainerViewController: BaseViewController<TabsContainer> {
         orientationPickerSelectorView.text = component.orientation.rawValue
         indicatorPositionPickerSelectorView.text = component.indicatorPosition.rawValue
         overflowPickerSelectorView.text = component.overflow.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         borderlineSwitch.isOn = component.borderLine
         fillContainerSwitch.isOn = component.fillContainer
         sampleSwitch.isOn = true
diff --git a/VDSSample/ViewControllers/TabsViewController.swift b/VDSSample/ViewControllers/TabsViewController.swift
index 97c3ddd..6a13831 100644
--- a/VDSSample/ViewControllers/TabsViewController.swift
+++ b/VDSSample/ViewControllers/TabsViewController.swift
@@ -71,7 +71,7 @@ class TabsViewController: BaseViewController<Tabs> {
         append(section: horizontalOrientationFormStackView)
         
         disabledSwitch.onChange =  { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
         
         borderlineSwitch.onChange =  { [weak self] sender in
@@ -112,7 +112,7 @@ class TabsViewController: BaseViewController<Tabs> {
         orientationPickerSelectorView.text = component.orientation.rawValue
         indicatorPositionPickerSelectorView.text = component.indicatorPosition.rawValue
         //overflowPickerSelectorView.text = component.overflow.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         borderlineSwitch.isOn = component.borderLine
         fillContainerSwitch.isOn = component.fillContainer
         sampleSwitch.isOn = true
diff --git a/VDSSample/ViewControllers/TextAreaViewController.swift b/VDSSample/ViewControllers/TextAreaViewController.swift
index 6ddb8ed..a532633 100644
--- a/VDSSample/ViewControllers/TextAreaViewController.swift
+++ b/VDSSample/ViewControllers/TextAreaViewController.swift
@@ -58,7 +58,7 @@ class  TextAreaViewController: BaseViewController<TextArea> {
         }
         
         disabledSwitch.onChange = { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         labelTextField
@@ -120,7 +120,7 @@ class  TextAreaViewController: BaseViewController<TextArea> {
  
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         requiredSwitch.isOn = component.required
         labelTextField.text = component.labelText
         helperTextField.text = component.helperText
diff --git a/VDSSample/ViewControllers/TextLinkCaretViewController.swift b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
index 05b1903..2e54406 100644
--- a/VDSSample/ViewControllers/TextLinkCaretViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
@@ -39,7 +39,7 @@ class TextLinkCaretViewController: BaseViewController<TextLinkCaret> {
         addFormRow(label: "Caret Position", view: caretPositionPickerSelectorView)
         
         disabledSwitch.onChange = { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         textField
@@ -55,7 +55,7 @@ class TextLinkCaretViewController: BaseViewController<TextLinkCaret> {
         
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         textField.text = component.text
         caretPositionPickerSelectorView.text = component.iconPosition.rawValue
     }
diff --git a/VDSSample/ViewControllers/TextLinkViewController.swift b/VDSSample/ViewControllers/TextLinkViewController.swift
index ab5516e..c20f09f 100644
--- a/VDSSample/ViewControllers/TextLinkViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkViewController.swift
@@ -41,7 +41,7 @@ class TextLinkViewController: BaseViewController<TextLink> {
         addFormRow(label: "Size", view: buttonSizePickerSelectorView)
         
         disabledSwitch.onChange = { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
         
         textField
@@ -57,7 +57,7 @@ class TextLinkViewController: BaseViewController<TextLink> {
 
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         textField.text = component.text
         buttonSizePickerSelectorView.text = ButtonSize.large.rawValue
     }
diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index 0dd9dfa..4f0b8e3 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -68,7 +68,7 @@ class ToggleViewController: BaseViewController<Toggle> {
         }
         
         disabledSwitch.onChange = { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
         
         boldSwitch.onChange = { [weak self] sender in
diff --git a/VDSSample/ViewControllers/TooltipViewController.swift b/VDSSample/ViewControllers/TooltipViewController.swift
index 5e80f57..c03a9cf 100644
--- a/VDSSample/ViewControllers/TooltipViewController.swift
+++ b/VDSSample/ViewControllers/TooltipViewController.swift
@@ -49,7 +49,7 @@ class  TooltipViewController: BaseViewController<Tooltip> {
         addFormRow(label: "Close Button Text", view: closeButtonTextField)
         
         disabledSwitch.onChange =  { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         titleTextField
@@ -78,7 +78,7 @@ class  TooltipViewController: BaseViewController<Tooltip> {
         
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         titleTextField.text = component.title
         contentTextField.text = component.content
         closeButtonTextField.text = component.closeButtonText
diff --git a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
index 4398884..50dbb96 100644
--- a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
+++ b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
@@ -60,7 +60,7 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
         addFormRow(label: "Tooltip Close Button Text", view: closeButtonTextField)
 
         disabledSwitch.onChange = { [weak self] sender in
-            self?.component.disabled = sender.isOn
+            self?.component.isEnabled = !sender.isOn
         }
 
         boldSwitch
@@ -103,7 +103,7 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
 
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         boldSwitch.isOn = isBold
         textField.text = component.labelText
         
@@ -113,7 +113,7 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
         
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
-        disabledSwitch.isOn = component.disabled
+        disabledSwitch.isOn = !component.isEnabled
         titleTextField.text = component.tooltipTitle
         contentTextField.text = component.tooltipContent
         closeButtonTextField.text = component.tooltipCloseButtonText

From 3b9f43d1fdc4cdecf8d7fbd9516fcce33ce93f43 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Fri, 25 Aug 2023 16:31:16 -0500
Subject: [PATCH 20/22] updated version

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDSSample.xcodeproj/project.pbxproj                | 4 ++--
 VDSSample/ViewControllers/MenuViewController.swift | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj
index 42d240b..4d16f0b 100644
--- a/VDSSample.xcodeproj/project.pbxproj
+++ b/VDSSample.xcodeproj/project.pbxproj
@@ -683,7 +683,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 39;
+				CURRENT_PROJECT_VERSION = 40;
 				DEVELOPMENT_TEAM = FCMA4QKS77;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = VDSSample/Info.plist;
@@ -715,7 +715,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 39;
+				CURRENT_PROJECT_VERSION = 40;
 				DEVELOPMENT_TEAM = FCMA4QKS77;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = VDSSample/Info.plist;
diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift
index 9cff982..474e46b 100644
--- a/VDSSample/ViewControllers/MenuViewController.swift
+++ b/VDSSample/ViewControllers/MenuViewController.swift
@@ -66,7 +66,7 @@ class MenuCell: UITableViewCell {
 class MenuViewController: UITableViewController, TooltipLaunchable {
     static let items: [MenuComponent] = [
         MenuComponent(title: "DropShadow Tester", completed: true, viewController: DropShadowViewController.self),
-        MenuComponent(title: "TableView Tester", completed: true, viewController: TableViewTestController.self),
+        //MenuComponent(title: "TableView Tester", completed: true, viewController: TableViewTestController.self),
         MenuComponent(title: "Badge", completed: true, viewController: BadgeViewController.self),
         MenuComponent(title: "Badge Indicator", completed: true, viewController: BadgeIndicatorViewController.self),
         MenuComponent(title: "Button", completed: true, viewController: ButtonViewController.self),

From de2171aedb0f83bbc62cc0e939dd98ef4492e4b8 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Fri, 25 Aug 2023 14:35:20 -0500
Subject: [PATCH 21/22] converted to use real time rotor

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDSSample/Protocols/CustomRotorable.swift | 45 ++++++-----------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/VDSSample/Protocols/CustomRotorable.swift b/VDSSample/Protocols/CustomRotorable.swift
index acecd19..66c64e8 100644
--- a/VDSSample/Protocols/CustomRotorable.swift
+++ b/VDSSample/Protocols/CustomRotorable.swift
@@ -23,41 +23,12 @@ extension CustomRotorable {
         accessibilityCustomRotors = (accessibilityCustomRotors ?? []).filter { $0.name != name }
         
         //create new rotor
-        let newRotor = AccessibilityCustomRotor(with: name, for: trait, rootView: self.view)
-        
-        //append rotor
-        accessibilityCustomRotors?.append(newRotor)
-    }
-        
-    /// Loads all of the custom rotors for the screen.
-    public func loadCustomRotors() {
-        customRotors.forEach { addCustomRotor(with: $0.name, for: $0.trait) }
-    }
-}
-
-private class AccessibilityCustomRotor: UIAccessibilityCustomRotor {
-    var views: [UIView]?
-    var trait: UIAccessibilityTraits
-    weak var rootView: UIView?
-    
-    init (with name: String, for trait: UIAccessibilityTraits, rootView: UIView){
-        self.rootView = rootView
-        self.trait = trait
-        super.init(name: name, itemSearch: { _ in return nil })
-        self.updateSearch()
-    }
-    
-    func updateSearch() {
-        itemSearchBlock = { [weak self] predicate in
+        let newRotor = UIAccessibilityCustomRotor(name: name) { [weak self] predicate in
+            guard let self else { return nil }
             
-            guard let self, let rootView = self.rootView else { return nil }
+            let views = self.view.accessibleElements(with: trait)
             
-            //create the view accessibleElements cache if it doesn't exist
-            if self.views == nil {
-                self.views = rootView.accessibleElements(with: trait)
-            }
-            
-            guard let views = self.views, !views.isEmpty else { return nil }
+            guard !views.isEmpty else { return nil }
 
             let currentIndex = views.firstIndex(where: { $0 === predicate.currentItem.targetElement })
             let count = views.count
@@ -88,6 +59,14 @@ private class AccessibilityCustomRotor: UIAccessibilityCustomRotor {
             
             return UIAccessibilityCustomRotorItemResult(targetElement: views[nextIndex], targetRange: nil)
         }
+        
+        //append rotor
+        accessibilityCustomRotors?.append(newRotor)
+    }
+        
+    /// Loads all of the custom rotors for the screen.
+    public func loadCustomRotors() {
+        customRotors.forEach { addCustomRotor(with: $0.name, for: $0.trait) }
     }
 }
 

From c01a700b796c0cfdaf2368234bc94bbf5a93d750 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Fri, 25 Aug 2023 16:49:37 -0500
Subject: [PATCH 22/22] Signed-off-by: Matt Bruce <matt.bruce@verizon.com>

# Conflicts:
#	VDSSample/ViewControllers/MenuViewController.swift

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDSSample/ViewControllers/MenuViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift
index 474e46b..44e37be 100644
--- a/VDSSample/ViewControllers/MenuViewController.swift
+++ b/VDSSample/ViewControllers/MenuViewController.swift
@@ -66,7 +66,7 @@ class MenuCell: UITableViewCell {
 class MenuViewController: UITableViewController, TooltipLaunchable {
     static let items: [MenuComponent] = [
         MenuComponent(title: "DropShadow Tester", completed: true, viewController: DropShadowViewController.self),
-        //MenuComponent(title: "TableView Tester", completed: true, viewController: TableViewTestController.self),
+//        MenuComponent(title: "TableView Tester", completed: true, viewController: TableViewTestController.self),
         MenuComponent(title: "Badge", completed: true, viewController: BadgeViewController.self),
         MenuComponent(title: "Badge Indicator", completed: true, viewController: BadgeIndicatorViewController.self),
         MenuComponent(title: "Button", completed: true, viewController: ButtonViewController.self),