Merge branch 'feature/FormEffects' into 'develop'

updated formFieldValue to look for enabled property

See merge request BPHV_MIPS/mvm_core_ui!784

MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxesModel.swift

@@ -28,6 +28,7 @@
     
     /// Returns the fieldValue of the selected box, otherwise the text of the selected box.
     public func formFieldValue() -> AnyHashable? {
+        guard enabled else { return nil }
         let selectedBox = boxes.first { (box) -> Bool in
             return box.selected
         }

MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift

@@ -118,7 +118,8 @@ import UIKit
     }
     
     public func formFieldValue() -> AnyHashable? {
-        radioModel?.fieldValue
+        guard let radioModel = radioModel, radioModel.enabled else { return nil }
+        return radioModel.fieldValue
     }
     
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonModel.swift

@@ -57,7 +57,10 @@ open class RadioButtonModel: MoleculeModelProtocol, FormFieldProtocol {
     // MARK: - Validation
     //--------------------------------------------------
     
-    public func formFieldValue() -> AnyHashable? { fieldValue }
+    public func formFieldValue() -> AnyHashable? {
+        guard enabled else { return nil }
+        return fieldValue
+    }
     
     //--------------------------------------------------
     // MARK: - Codec

MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonSelectionHelper.swift

@@ -77,5 +77,8 @@
 // MARK: - FormValidationFormFieldProtocol
 extension RadioButtonSelectionHelper {
     
-    public func formFieldValue() -> AnyHashable? { selectedRadioButtonModel?.fieldValue }
+    public func formFieldValue() -> AnyHashable? {
+        guard enabled else { return nil }
+        return selectedRadioButtonModel?.fieldValue
+    }
 }

MVMCoreUI/Atomic/Atoms/Selectors/RadioSwatchesModel.swift

@@ -27,6 +27,7 @@
     
     /// Returns the fieldValue of the selected swatch, otherwise the text of selected swatch.
     public func formFieldValue() -> AnyHashable? {
+        guard enabled else { return nil }
         let selectedSwatch = swatches.first { (swatch) -> Bool in
             return swatch.selected
         }

MVMCoreUI/Atomic/Atoms/Selectors/ToggleModel.swift

@@ -56,7 +56,10 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
     // MARK: - Form Valdiation
     //--------------------------------------------------
     
-    public func formFieldValue() -> AnyHashable? { selected }
+    public func formFieldValue() -> AnyHashable? {
+        guard enabled else { return nil }
+        return selected
+    }
     
     //--------------------------------------------------
     // MARK: - Initializer

MVMCoreUI/Atomic/Molecules/Items/CarouselItemModel.swift

@@ -7,7 +7,7 @@
 //
 
 
-@objcMembers open class CarouselItemModel: MoleculeCollectionItemModel, CarouselItemModelProtocol {
+@objcMembers open class CarouselItemModel: MoleculeCollectionItemModel, CarouselItemModelProtocol, EnableableModelProtocol {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
@@ -18,8 +18,12 @@
     public var peakingArrowColor: Color?
     public var analyticsData: JSONValueDictionary?
     public var fieldValue: String?
+    public var enabled: Bool = true
     
-    public func formFieldValue() -> AnyHashable? { fieldValue }
+    public func formFieldValue() -> AnyHashable? {
+        guard enabled else { return nil }
+        return fieldValue
+    }
     
     //--------------------------------------------------
     // MARK: - Keys

MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift

@@ -47,6 +47,8 @@ import UIKit
     }
     
     public func formFieldValue() -> AnyHashable? {
+        guard enabled else { return nil }
+        
         guard selectable else {
             // Use visible item value, else index
             if let fieldValue = molecules[index].formFieldValue() {