Merge branch 'develop' into feature/monarch

VDSSample.xcodeproj/project.pbxproj

@@ -704,7 +704,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 63;
+				CURRENT_PROJECT_VERSION = 65;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -739,7 +739,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 63;
+				CURRENT_PROJECT_VERSION = 65;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77;
 				GENERATE_INFOPLIST_FILE = YES;

VDSSample/ViewControllers/BreadcrumbsViewController.swift

@@ -18,18 +18,20 @@ class  BreadcrumbsViewController: BaseViewController<Breadcrumbs> {
     var selectedCrumbLabel = Label().with { $0.textStyle = .boldBodyMedium }
     var allBreadcrumbs: [Breadcrumbs.BreadcrumbItemModel] = [
         .init(text: "Home"),
-        .init(text: "Support", enabeled: false),
+        .init(text: "Support"),
         .init(text: "Service & Apps"),
         .init(text: "My Verizon"),
         .init(text: "Bill"),
-        .init(text: "Mobile Billing & Payments"),
         .init(text: "Billing statement FAQs", selected: true)
     ]
     
     var some: [Breadcrumbs.BreadcrumbItemModel] = [
-        .init(text: "Plans"),
+        .init(text: "Home"),
-        .init(text: "Upgrade Plan"),
+        .init(text: "Support"),
-        .init(text: "Billing Statement Frequently Asked Questions About Stuff You don't want to see", selected: true)
+        .init(text: "Service & Apps"),
+        .init(text: "My Verizon"),
+        .init(text: "Bill"),
+        .init(text: "Billing Statement Frequently Asked Questions to cause word wrap", selected: true)
     ]
     
     override func viewDidLoad() {
@@ -47,7 +49,7 @@ class  BreadcrumbsViewController: BaseViewController<Breadcrumbs> {
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Last Crumb Selected", view: selectedSwitch)
-        addFormRow(label: "Large Sample", view: sampleSwitch)
+        addFormRow(label: "No Long Breadcrumbs", view: sampleSwitch)
 
         selectedSwitch.onChange = { [weak self] sender in
             guard let self else { return }
@@ -96,7 +98,7 @@ extension BreadcrumbsViewController: ComponentSampleable {
         let component = Self.makeComponent()
         component.breadcrumbModels =  [
             .init(text: "Home"),
-            .init(text: "Support", enabeled: false),
+            .init(text: "Support"),
             .init(text: "Service & Apps"),
             .init(text: "My Verizon"),
             .init(text: "Bill"),

VDSSample/ViewControllers/DatePickerViewController.swift

@@ -81,12 +81,12 @@ class DatePickerViewController: BaseViewController<DatePicker> {
         addFormRow(label: "onChange", view: label)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Read Only", view: readonlySwitch)
         addFormRow(label: "Required", view: requiredSwitch)
+        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
         addFormRow(label: "Date Format", view: dateFormatPickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Helper Text", view: helperTextField)
-        addFormRow(label: "Readonly", view: readonlySwitch)
-        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
         addFormRow(label: "Error", view: .makeWrapper(for: errorSwitch))
         addFormRow(label: "Error Text", view: errorTextField)
         addFormRow(label: "Width", view: widthTextField)
@@ -411,8 +411,10 @@ extension DatePickerViewController {
             updateIndicatorData(label: legendThreeField.text ?? "", date: sender.date, index: 2)
         case minDatePickerTag:
             minDate = sender.date
+            updateCalendarModel()
         case maxDatePickerTag:
             maxDate = sender.date
+            updateCalendarModel()
         case activeDatePickerTag:
             activeDates.append(sender.date)
             var text = activeDatesField.text
@@ -424,6 +426,7 @@ extension DatePickerViewController {
             text?.append("\(self.getSelectedDate(with: sender.date))")
             clearActiveDatesSwitch.isOn = false
             activeDatesField.text = text
+            updateCalendarModel()
         case inactiveDatePickerTag:
             inactiveDates.append(sender.date)
             var text = inactiveDatesField.text
@@ -435,6 +438,7 @@ extension DatePickerViewController {
             text?.append("\(self.getSelectedDate(with: sender.date))")
             clearInactiveDatesSwitch.isOn = false
             inactiveDatesField.text = text
+            updateCalendarModel()
         default: break
         }
     }

VDSSample/ViewControllers/DropdownSelectViewController.swift

@@ -65,13 +65,13 @@ class DropdownSelectViewController: BaseViewController<DropdownSelect> {
     override func setupForm(){
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Read Only", view: readonlySwitch)
         addFormRow(label: "Required", view: requiredSwitch)
+        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView)
         addFormRow(label: "Helper Text", view: helperTextField)
         addFormRow(label: "Inline Label", view: .makeWrapper(for: inlineLabelSwitch))
-        addFormRow(label: "Readonly", view: readonlySwitch)
-        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
         addFormRow(label: "Error", view: .makeWrapper(for: errorSwitch))
         addFormRow(label: "Error Text", view: errorTextField)
         addFormRow(label: "Width", view: widthTextField)

VDSSample/ViewControllers/InputFieldViewController.swift

@@ -27,6 +27,8 @@ class  InputFieldViewController: BaseViewController<InputField> {
 
     var disabledSwitch = Toggle()
     var requiredSwitch = Toggle()
+    var readonlySwitch = Toggle()
+    var transparentBgSwitch = Toggle()
     var labelTextField = TextField()
     var errorTextField = TextField()
     var successTextField = TextField()
@@ -103,9 +105,11 @@ class  InputFieldViewController: BaseViewController<InputField> {
             $0.title = "\n\nGeneral Settings"
         }
         
-        general.addFormRow(label: "Disabled", view: disabledSwitch)
-        general.addFormRow(label: "Required", view: requiredSwitch)
         general.addFormRow(label: "Surface", view: surfacePickerSelectorView)
+        general.addFormRow(label: "Disabled", view: disabledSwitch)
+        general.addFormRow(label: "Read Only", view: readonlySwitch)
+        general.addFormRow(label: "Required", view: requiredSwitch)
+        general.addFormRow(label: "Transparent Background", view: transparentBgSwitch)
         general.addFormRow(label: "Label Text", view: labelTextField)
         general.addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView)
         general.addFormRow(label: "Helper Text", view: helperTextField)
@@ -147,6 +151,14 @@ class  InputFieldViewController: BaseViewController<InputField> {
         disabledSwitch.onChange = { [weak self] sender in
             self?.component.isEnabled = !sender.isOn
         }
+        
+        readonlySwitch.onChange = { [weak self] sender in
+            self?.component.isReadOnly = sender.isOn
+        }
+
+        transparentBgSwitch.onChange = { [weak self] sender in
+            self?.component.transparentBackground = sender.isOn
+        }
 
         labelTextField
             .textPublisher

VDSSample/ViewControllers/TextAreaViewController.swift

@@ -15,6 +15,7 @@ class  TextAreaViewController: BaseViewController<TextArea> {
 
     var disabledSwitch = Toggle()
     var requiredSwitch = Toggle()
+    var transparentBgSwitch = Toggle()
     var labelTextField = TextField()
     var errorTextField = TextField()
     var helperTextField = TextField()
@@ -40,12 +41,13 @@ class  TextAreaViewController: BaseViewController<TextArea> {
         
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Required", view: requiredSwitch)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
+        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Read Only", view: readOnlySwitch)
+        addFormRow(label: "Required", view: requiredSwitch)
+        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Helper Text", view: helperTextField)
-        addFormRow(label: "Read Only", view: readOnlySwitch)
         addFormRow(label: "Error", view: showErrorSwitch)
         addFormRow(label: "Error Text", view: errorTextField)
         addFormRow(label: "Width", view: widthTextField)
@@ -74,6 +76,10 @@ class  TextAreaViewController: BaseViewController<TextArea> {
             self?.component.isReadOnly = sender.isOn
         }
         
+        transparentBgSwitch.onChange = { [weak self] sender in
+            self?.component.transparentBackground = sender.isOn
+        }
+        
         labelTextField
             .textPublisher
             .sink { [weak self] text in

VDSSample/ViewControllers/TileContainerViewController.swift

@@ -98,10 +98,61 @@ class TileContainerViewController: BaseViewController<TileContainer> {
     override func viewDidLoad() {
         super.viewDidLoad()
         addContentTopView(view: .makeWrapper(for: component))
-        component.width = 150
+        component.width = 300
         component.color = .secondary
         component.accessibilityLabel = "Tile Container"
-        component.addContentView(Label().with { $0.text = "Testing Label" })
+        
+        let level2View = View()
+        level2View.backgroundColor = .purple
+        
+        let level3View = View()
+        level3View.backgroundColor = .yellow
+        level2View.addSubview(level3View)
+        level3View.pinToSuperView(.uniform(15))
+
+        let level2label = Label()
+        level2label.text = "Level 3 Label"
+        level2label.isAccessibilityElement = true
+        level2label.accessibilityLabel = "Level 3 Accessible Label"
+       
+        level3View.addSubview(level2label)
+        level2label.pinTop().pinLeading()
+        
+        let level3Button = Button()
+        level3Button.setTitle("Level 3 Button", for: .normal)
+        level3Button.isAccessibilityElement = true
+        level3Button.accessibilityLabel = "Level 3 Accessible Button"
+        
+        level3View.addSubview(level3Button)
+        level3Button.pinTop(anchor: level2label.bottomAnchor, constant: 5)
+        level3Button.pinLeading()
+       
+        let level4View = View()
+        level4View.backgroundColor = .green
+        level3View.addSubview(level4View)
+        level4View.pinTop(anchor: level3Button.bottomAnchor, constant: 10)
+        level4View.pinLeading()
+        level4View.pinBottom()
+        level4View.pinTrailing()
+       
+        let level4Label = Label()
+        level4Label.text = "Level 4 Label"
+        level4Label.isAccessibilityElement = true
+        level4Label.accessibilityLabel = "Level 4 Accessible Label"
+        level4View.addSubview(level4Label)
+        level4Label.pinTop().pinLeading()
+
+        let level4Button = Button()
+        level4Button.setTitle("Level 4 Button", for: .normal)
+        level4Button.isAccessibilityElement = true
+        level4Button.accessibilityLabel = "Level 4 Accessible Button"
+        level4View.addSubview(level4Button)
+        
+        level4Button.pinTop(anchor: level4Label.bottomAnchor, constant: 5)
+        level4Button.pinLeading().pinBottom()
+        
+
+        component.addContentView(level2View)
         setupPicker()
         setupModel()
     }