Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/vds_ios into vasavk/carousel

VDS.xcodeproj/project.pbxproj

@@ -1561,7 +1561,7 @@
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 70;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1599,7 +1599,7 @@
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 70;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;

VDS/Components/DatePicker/DatePicker.swift

@@ -214,7 +214,7 @@ extension DatePicker {
         calendar.indicators = calendarModel.indicators
         calendar.maxDate = calendarModel.maxDate
         calendar.minDate = calendarModel.minDate
-        calendar.surface = calendarModel.surface
+        calendar.surface = surface
         calendar.setNeedsLayout()
         calendar.layoutIfNeeded()
         
@@ -223,7 +223,7 @@ extension DatePicker {
 
         //find scrollView
         if scrollView == nil {
-            scrollView = findScrollView(from: containerView)
+            scrollView = containerView.findSuperview(ofType: UIScrollView.self)
             scrollViewContentSize = scrollView?.contentSize
         }
         
@@ -348,17 +348,6 @@ extension DatePicker {
         }
     }
     
-    private func findScrollView(from view: UIView) -> UIScrollView? {
-        var currentView = view
-        while let superview = currentView.superview {
-            if let scrollView = superview as? UIScrollView {
-                return scrollView
-            }
-            currentView = superview
-        }
-        return nil
-    }
-    
     private func calculatePopoverPosition(relativeTo sourceView: UIView, in parentView: UIView, size: CGSize, with spacing: CGFloat) -> CGPoint? {
         let sourceFrameInParent = sourceView.convert(sourceView.bounds, to: parentView)
         let parentBounds = parentView.bounds
@@ -442,3 +431,16 @@ extension DatePicker {
         }
     }
 }
+
+extension UIView {
+    public func findSuperview<T: UIView>(ofType type: T.Type) -> T? {
+        var currentView: UIView? = self
+        while let view = currentView {
+            if let superview = view.superview as? T {
+                return superview
+            }
+            currentView = view.superview
+        }
+        return nil
+    }
+}

VDS/Components/DatePicker/DatePickerCalendarModel.swift

@@ -10,8 +10,6 @@ import UIKit
 
 extension DatePicker {
     public struct CalendarModel {
-        public let surface: Surface
-        
         /// If set to true, the calendar will not have a border.
         public let hideContainerBorder: Bool
         
@@ -35,15 +33,13 @@ extension DatePicker {
         /// Array of ``CalendarIndicatorModel`` you are wanting to show on legend.
         public let indicators: [CalendarBase.CalendarIndicatorModel]
         
-        public init(surface: Surface = .light,
+        public init(hideContainerBorder: Bool = false,
-                    hideContainerBorder: Bool = false,
                     hideCurrentDateIndicator: Bool = false,
                     activeDates: [Date] = [],
                     inactiveDates: [Date] = [],
                     minDate: Date = Date().startOfMonth,
                     maxDate: Date = Date().endOfMonth,
                     indicators: [CalendarBase.CalendarIndicatorModel] = []) {
-            self.surface = surface
             self.hideContainerBorder = hideContainerBorder
             self.hideCurrentDateIndicator = hideCurrentDateIndicator
             self.activeDates = activeDates

VDS/Components/Icon/Icon.swift

@@ -93,13 +93,16 @@ open class Icon: View {
         backgroundColor = .clear
         
         isAccessibilityElement = true
-        accessibilityTraits = .image
+        accessibilityTraits = .none
+        accessibilityHint = "image"
         
         bridge_accessibilityLabelBlock = {  [weak self] in
             guard let self else { return "" }
             return name?.rawValue ?? "icon"
         }
         
+        
+
     }
     
     /// Used to make changes to the View based off a change events or from local properties.

VDS/Components/RadioBox/RadioBoxItem.swift

@@ -214,7 +214,7 @@ open class RadioBoxItem: Control, Changeable, FormFieldable, Groupable {
         selectorView.isAccessibilityElement = true
         selectorView.accessibilityTraits = .button
         addSubview(selectorView)
-        selectorView.isUserInteractionEnabled = true
+        selectorView.isUserInteractionEnabled = false
         
         selectorView.addSubview(selectorStackView)
                 

VDS/Components/TextFields/EntryFieldBase.swift

@@ -92,12 +92,6 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
         }
     }()
         
-    /// This is the view that will be wrapped with the border for userInteraction.
-    /// The only subview of this view is the fieldStackView
-    internal var containerView = View().with {
-        $0.isAccessibilityElement = true
-    }
-    
     /// This is set by a local method.
     internal var bottomContainerView: UIView!
     
@@ -163,6 +157,12 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
+    /// This is the view that will be wrapped with the border for userInteraction.
+    /// The only subview of this view is the fieldStackView
+    open var containerView = View().with {
+        $0.isAccessibilityElement = true
+    }
+
     open var onChangeSubscriber: AnyCancellable?
     
     open var titleLabel = Label().with {
@@ -186,6 +186,8 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
         $0.isAccessibilityElement = true
     }
     
+    open var useRequiredRule: Bool = true { didSet { setNeedsUpdate() } }
+    
     open var labelText: String? { didSet { setNeedsUpdate() } }
     
     open var helperText: String? { didSet { setNeedsUpdate() } }
@@ -453,27 +455,34 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
     }
     
     open func updateErrorLabel(){
-        if showError, let errorText {
+        
-            errorLabel.text = errorText
+        /// always show the errorIcon if there is an error
-            errorLabel.surface = surface
+        if showError || hasInternalError {
-            errorLabel.isEnabled = isEnabled
-            errorLabel.isHidden = false
-            statusIcon.name = .error
-            statusIcon.surface = surface
-            statusIcon.isHidden = !isEnabled || state.contains(.focused)
-        } else if hasInternalError, let internalErrorText {
-            errorLabel.text = internalErrorText
-            errorLabel.surface = surface
-            errorLabel.isEnabled = isEnabled
-            errorLabel.isHidden = false
             statusIcon.name = .error
             statusIcon.surface = surface
             statusIcon.isHidden = !isEnabled || state.contains(.focused)
         } else {
             statusIcon.isHidden = true
-            errorLabel.isHidden = true
         }
         statusIcon.color = iconColorConfiguration.getColor(self)
+        
+        // only show errorLabel if there is a message
+        var message: String?
+        if showError, let errorText {
+            message = errorText
+        } else if hasInternalError, let internalErrorText {
+            message = internalErrorText
+        }
+        
+        if let message {
+            errorLabel.text = message
+            errorLabel.surface = surface
+            errorLabel.isEnabled = isEnabled
+            errorLabel.isHidden = false
+        } else {
+            errorLabel.isHidden = true
+        }
+        
     }
     
     open func updateHelperLabel(){
@@ -515,7 +524,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
     //--------------------------------------------------
     internal func updateRules() {
         rules.removeAll()
-        if self.isRequired {
+        if isRequired && useRequiredRule {
             let rule = RequiredRule()
             if let errorText, !errorText.isEmpty {
                 rule.errorMessage = errorText

VDS/Components/TextFields/InputField/FieldTypes/FieldType.swift

@@ -68,6 +68,12 @@ extension InputField {
                     actionModel.onClick(inputField)
                 }
                 inputField.actionTextLink.isHidden = false
+                // set the accessibilityLabel
+                if let labelText = inputField.labelText {
+                    inputField.actionTextLink.bridge_accessibilityLabelBlock = {
+                        return "\(actionModel.text) \(labelText)"
+                    }
+                }
                 inputField.fieldStackView.setCustomSpacing(VDSLayout.space2X, after: inputField.statusIcon)
             } else {
                 inputField.actionTextLink.isHidden = true

VDS/Components/TextFields/InputField/FieldTypes/Telephone.swift

@@ -67,7 +67,14 @@ extension InputField {
 
         }
         
-        internal func formatUSNumber(_ number: String) -> String {
+        override func textFieldDidEndEditing(_ inputField: InputField, textField: UITextField) {
+            if let text = inputField.text {
+                let rawNumber = text.filter { $0.isNumber }
+                textField.text = formatUSNumber(rawNumber)
+            }
+        }
+        
+        func formatUSNumber(_ number: String) -> String {
             // Format the number in the style XXX-XXX-XXXX
             let areaCodeLength = 3
             let centralOfficeCodeLength = 3

VDS/Components/TextFields/InputField/InputField.swift

@@ -105,6 +105,11 @@ open class InputField: EntryFieldBase {
         $0.translatesAutoresizingMaskIntoConstraints = false
         $0.textStyle = TextStyle.bodyLarge
         $0.isAccessibilityElement = false
+        $0.autocorrectionType = .no
+        $0.spellCheckingType = .no
+        $0.smartQuotesType = .no
+        $0.smartDashesType = .no
+        $0.smartInsertDeleteType = .no
     }
     
     /// Color configuration for the textField.
@@ -182,6 +187,8 @@ open class InputField: EntryFieldBase {
         super.setup()
         accessibilityHintText = "Double tap to edit"
         
+        actionTextLink.accessibilityTraits = .button
+        
         textField.heightAnchor.constraint(equalToConstant: 20).isActive = true
         textField.delegate = self
         bottomContainerStackView.insertArrangedSubview(successLabel, at: 0)
@@ -205,11 +212,11 @@ open class InputField: EntryFieldBase {
                 accessibilityLabels.append(text)
             }
             
-            if let formatText = textField.formatText, !formatText.isEmpty {
+            if let formatText = textField.formatText, !formatText.isEmpty, textField.text.isEmpty {
                 accessibilityLabels.append("format, \(formatText)")
             }
 
-            if let placeholderText = textField.placeholder, !placeholderText.isEmpty {
+            if let placeholderText = textField.placeholder, !placeholderText.isEmpty, textField.text.isEmpty {
                 accessibilityLabels.append("placeholder, \(placeholderText)")
             }
 
@@ -244,6 +251,11 @@ open class InputField: EntryFieldBase {
                 return nil
             }
         }
+        
+        containerView.bridge_accessibilityValueBlock = { [weak self] in
+            guard let self else { return "" }
+            return textField.isSecureTextEntry ? "\(textField.text.count) stars" : value
+        }
     }
     
     open override func getFieldContainer() -> UIView {
@@ -338,19 +350,19 @@ open class InputField: EntryFieldBase {
 }
 
 extension InputField: UITextFieldDelegate {
-    public func textFieldDidBeginEditing(_ textField: UITextField) {
+    open func textFieldDidBeginEditing(_ textField: UITextField) {
         fieldType.handler().textFieldDidBeginEditing(self, textField: textField)
         updateContainerView()
         updateErrorLabel()
     }
     
-    public func textFieldDidEndEditing(_ textField: UITextField) {
+    open func textFieldDidEndEditing(_ textField: UITextField) {
         fieldType.handler().textFieldDidEndEditing(self, textField: textField)
         validate()
         UIAccessibility.post(notification: .layoutChanged, argument: self.containerView)
     }
     
-    public func textFieldDidChangeSelection(_ textField: UITextField) {
+    open func textFieldDidChangeSelection(_ textField: UITextField) {
         fieldType.handler().textFieldDidChangeSelection(self, textField: textField)
         if fieldType.handler().validateOnChange {
             validate()
@@ -359,8 +371,12 @@ extension InputField: UITextFieldDelegate {
         setNeedsUpdate()
     }
     
-    public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+    open func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
-        return fieldType.handler().textField(self, textField: textField, shouldChangeCharactersIn: range, replacementString: string)
+        let shouldChange = fieldType.handler().textField(self, textField: textField, shouldChangeCharactersIn: range, replacementString: string)
+        if shouldChange {
+            UIAccessibility.post(notification: .announcement, argument: string)
+        }
+        return shouldChange
     }
 }
 

VDS/Components/TextFields/InputField/TextField.swift

@@ -47,6 +47,11 @@ open class TextField: UITextField, ViewProtocol, Errorable {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
+    /// Set to true to hide the blinking textField cursor.
+    open var hideBlinkingCaret = false
+    open var enableClipboardActions: Bool = true
+    open var onDidDeleteBackwards: (() -> Void)?
+    
     /// Key of whether or not updateView() is called in setNeedsUpdate()
     open var shouldUpdateView: Bool = true
 
@@ -209,6 +214,23 @@ open class TextField: UITextField, ViewProtocol, Errorable {
         return success
     }
     
+    open override func caretRect(for position: UITextPosition) -> CGRect {
+        
+        if hideBlinkingCaret {
+            return .zero
+        }
+        
+        let caretRect = super.caretRect(for: position)
+        return CGRect(origin: caretRect.origin, size: CGSize(width: 1, height: caretRect.height))
+    }
+    
+    open override func deleteBackward() {
+        super.deleteBackward()
+        onDidDeleteBackwards?()
+    }
+    
+    open override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool { enableClipboardActions }
+    
     //--------------------------------------------------
     // MARK: - Private Methods
     //--------------------------------------------------

VDS/Components/TextFields/TextArea/TextArea.swift

@@ -101,6 +101,7 @@ open class TextArea: EntryFieldBase {
         $0.isScrollEnabled = true
         $0.textContainerInset = .zero
         $0.autocorrectionType = .no
+        $0.spellCheckingType = .no
         $0.textContainer.lineFragmentPadding = 0
     }
     
@@ -110,7 +111,9 @@ open class TextArea: EntryFieldBase {
         }
         
         didSet {
-            validate()
+            if textView.isFirstResponder {
+                validate()
+            }
         }
     }
     
@@ -132,6 +135,7 @@ open class TextArea: EntryFieldBase {
         super.setup()
         
         accessibilityHintText = "Double tap to edit"
+        textView.delegate = self
         
         //events
         textView
@@ -226,7 +230,7 @@ open class TextArea: EntryFieldBase {
         }
     }
     
-    func textViewDidChange(_ textView: UITextView) {
+    public func textViewDidChange(_ textView: UITextView) {
         
         //dynamic textView Height sizing based on Figma
         //if you want it to work "as-is" delete this code
@@ -288,3 +292,10 @@ open class TextArea: EntryFieldBase {
     //--------------------------------------------------
     var countRule = CharacterCountRule()
 }
+
+extension TextArea: UITextViewDelegate {
+    public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+        UIAccessibility.post(notification: .announcement, argument: text)
+        return true
+    }
+}

VDS/Components/TextFields/TextArea/TextView.swift

@@ -45,6 +45,15 @@ open class TextView: UITextView, ViewProtocol, Errorable {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
+    open var placeholder: String? { didSet { setNeedsUpdate() } }
+
+    open var placeholderLabel = Label().with {
+        $0.textColorConfiguration = ViewColorConfiguration().with {
+            $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forDisabled: true)
+            $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forDisabled: false)
+        }.eraseToAnyColorable()
+    }
+
     /// Key of whether or not updateView() is called in setNeedsUpdate()
     open var shouldUpdateView: Bool = true
     
@@ -88,6 +97,7 @@ open class TextView: UITextView, ViewProtocol, Errorable {
             if textAlignment != oldValue {
                 // Text alignment can be part of our paragraph style, so we may need to
                 // re-style when changed
+                placeholderLabel.textAlignment = textAlignment
                 updateLabel()
             }
         }
@@ -118,6 +128,9 @@ open class TextView: UITextView, ViewProtocol, Errorable {
         done.pinCenterY()
             .pinTrailing(16)
         inputAccessoryView = accessView
+        
+        addSubview(placeholderLabel)
+        placeholderLabel.pinToSuperView()
     }
     
     @objc func doneButtonAction() {
@@ -145,6 +158,10 @@ open class TextView: UITextView, ViewProtocol, Errorable {
         setNeedsUpdate()
     }
     
+    open override func layoutSubviews() {
+        super.layoutSubviews()
+        placeholderLabel.preferredMaxLayoutWidth = textContainer.size.width - textContainer.lineFragmentPadding * 2
+    }
 
     //--------------------------------------------------
     // MARK: - Accessibility
@@ -297,6 +314,10 @@ open class TextView: UITextView, ViewProtocol, Errorable {
         } else {
             attributedText = nil
         }
+        placeholderLabel.textStyle = textStyle
+        placeholderLabel.surface = surface
+        placeholderLabel.text = placeholder
+        placeholderLabel.isHidden = !text.isEmpty
     }
 
 }

VDS/Components/Tilelet/Tilelet.swift

@@ -205,15 +205,10 @@ open class Tilelet: TileContainerBase<Tilelet.Padding> {
     }
     
     /// Descriptive Icon positioned in the contentView.
-    open var descriptiveIcon = Icon().with {
+    open var descriptiveIcon = Icon()
-        $0.isAccessibilityElement = false
-    }
     
     /// Directional Icon positioned in the contentView.
-    open var directionalIcon = Icon().with {
+    open var directionalIcon = Icon()
-        $0.isAccessibilityElement = false
-        $0.name = .rightArrow
-    }
     
     private var _textWidth: TextWidth?
     
@@ -382,6 +377,16 @@ open class Tilelet: TileContainerBase<Tilelet.Padding> {
         titleLockupSubTitleLabelHeightGreaterThanConstraint = titleLockup.subTitleLabel.heightGreaterThanEqualTo(constant: titleLockup.subTitleLabel.minimumLineHeight)
         titleLockupSubTitleLabelHeightGreaterThanConstraint?.priority = .defaultHigh
         titleLockupSubTitleLabelHeightGreaterThanConstraint?.activate()
+        
+        directionalIcon.bridge_accessibilityLabelBlock = { [weak self] in
+            guard let self, let directionalIconModel else { return nil }
+            return directionalIconModel.accessibleText
+        }
+        
+        descriptiveIcon.bridge_accessibilityLabelBlock = { [weak self] in
+            guard let self, let descriptiveIconModel else { return nil }
+            return descriptiveIconModel.accessibleText
+        }
     }
     
     /// Resets to default settings.
@@ -425,6 +430,14 @@ open class Tilelet: TileContainerBase<Tilelet.Padding> {
                 let titleLockupViews = gatherAccessibilityElements(from: titleLockup)
                 views.append(contentsOf: titleLockupViews)
             }
+            
+            if descriptiveIconModel != nil {
+                views.append(descriptiveIcon)
+                
+            } else if directionalIconModel != nil {
+                views.append(directionalIcon)
+            }
+            
             containerView.setAccessibilityLabel(for: views)
             
             // get the views to return

VDS/Components/Tilelet/TileletIconModels.swift

@@ -66,6 +66,10 @@ extension Tilelet {
             public var iconName: Icon.Name {
                 return self == .rightArrow ? .rightArrow : .externalLink
             }
+            
+            public var accessibilityLabel: String {
+                self == .rightArrow ? "Directional right arrow" : "External link"
+            }
         }
         
         public enum IconSize: String, EnumSubset {            
@@ -80,7 +84,7 @@ extension Tilelet {
         public var iconColor: IconColor?
 
         /// Accessible Text for the Icon
-        public var accessibleText: String
+        public var accessibleText: String?
 
         /// Enum for a icon type you want shown..
         public var iconType: IconType
@@ -95,7 +99,7 @@ extension Tilelet {
             
             self.iconType = iconType
             self.iconColor = iconColor
-            self.accessibleText = accessibleText ?? iconType.iconName.rawValue
+            self.accessibleText = accessibleText ?? iconType.accessibilityLabel
             self.size = size
         }
     }

VDS/SupportingFiles/ReleaseNotes.txt

@@ -1,3 +1,15 @@
+1.0.71
+----------------
+- CXTDT-581803 - DatePicker - Calendar does not switch to Dark Mode
+- CXTDT-584278 – InputField - Accessibility
+
+1.0.70
+----------------
+- CXTDT-577463 - InputField - Accessibility - #1 Typing Feedback
+- CXTDT-577463 - InputField - Accessibility - #5 Password / Inline Action
+- CXTDT-560485 - Tilelet - Accessibility Icons
+- DatePicker - Final logic for how the calendar shows.
+
 1.0.69
 ----------------
 - DatePicker - Refactored how this is shown