molecule list

moduleMolecule

MVMCoreUI.xcodeproj/project.pbxproj

@@ -33,6 +33,9 @@
 		D282AACB2243C61700C46919 /* ButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D282AACA2243C61700C46919 /* ButtonView.swift */; };
 		D28B4F8A21FF967C00712C7A /* MVMCoreUIObject.h in Headers */ = {isa = PBXBuildFile; fileRef = D28B4F8821FF967C00712C7A /* MVMCoreUIObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D28B4F8B21FF967C00712C7A /* MVMCoreUIObject.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B4F8921FF967C00712C7A /* MVMCoreUIObject.m */; };
+		D296E13C229598BF0051EBE7 /* MoleculeListCellProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D296E13B2295969C0051EBE7 /* MoleculeListCellProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D296E1412295EBBA0051EBE7 /* MoleculeDelegateProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D296E1402295EBBA0051EBE7 /* MoleculeDelegateProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D296E143229729C30051EBE7 /* MoleculeMappingObject+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D296E142229729C30051EBE7 /* MoleculeMappingObject+Extension.swift */; };
 		D29770C821F7C4AE00B2F0D0 /* TopLabelsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */; };
 		D29770C921F7C4AE00B2F0D0 /* TopLabelsView.h in Headers */ = {isa = PBXBuildFile; fileRef = D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D29770F221F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */; };
@@ -192,6 +195,9 @@
 		D282AACA2243C61700C46919 /* ButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonView.swift; sourceTree = "<group>"; };
 		D28B4F8821FF967C00712C7A /* MVMCoreUIObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIObject.h; sourceTree = "<group>"; };
 		D28B4F8921FF967C00712C7A /* MVMCoreUIObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIObject.m; sourceTree = "<group>"; };
+		D296E13B2295969C0051EBE7 /* MoleculeListCellProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MoleculeListCellProtocol.h; sourceTree = "<group>"; };
+		D296E1402295EBBA0051EBE7 /* MoleculeDelegateProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MoleculeDelegateProtocol.h; sourceTree = "<group>"; };
+		D296E142229729C30051EBE7 /* MoleculeMappingObject+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MoleculeMappingObject+Extension.swift"; sourceTree = "<group>"; };
 		D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsView.m; sourceTree = "<group>"; };
 		D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopLabelsView.h; sourceTree = "<group>"; };
 		D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsAndBottomButtonsTableViewController.m; sourceTree = "<group>"; };
@@ -319,10 +325,10 @@
 		D2C5001621F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIViewControllerMappingObject.h; sourceTree = "<group>"; };
 		D2C5001721F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIViewControllerMappingObject.m; sourceTree = "<group>"; };
 		D2E1FADA2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUIDelegateObject.swift; sourceTree = "<group>"; };
-		DB891E822253FA8500022516 /* Label.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Label.swift; sourceTree = "<group>"; };
 		D2E1FADC2268B25E00AEFD8C /* MoleculeTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeTableViewCell.swift; sourceTree = "<group>"; };
 		D2E1FADE2268B8E700AEFD8C /* ThreeLayerTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerTableViewController.swift; sourceTree = "<group>"; };
 		D2E1FAE02268E81D00AEFD8C /* MoleculeListTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeListTemplate.swift; sourceTree = "<group>"; };
+		DB891E822253FA8500022516 /* Label.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Label.swift; sourceTree = "<group>"; };
 		DBC4391622442196001AB423 /* CaretView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaretView.swift; sourceTree = "<group>"; };
 		DBC4391722442197001AB423 /* DashLine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DashLine.swift; sourceTree = "<group>"; };
 		DBC4391A224421A0001AB423 /* CaretButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaretButton.swift; sourceTree = "<group>"; };
@@ -411,6 +417,7 @@
 				01DF566F21FA5AB300CC099B /* TextFieldListFormViewController.swift */,
 				D2A5146022121FBF00345BFB /* MoleculeStackTemplate.swift */,
 				D2A514622213643100345BFB /* MoleculeStackCenteredTemplate.swift */,
+				D296E13B2295969C0051EBE7 /* MoleculeListCellProtocol.h */,
 				D2E1FAE02268E81D00AEFD8C /* MoleculeListTemplate.swift */,
 			);
 			path = Templates;
@@ -651,8 +658,10 @@
 				D29DF27421E79E81003B2FB9 /* MVMCoreUILoggingHandler.m */,
 				D2C5001621F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h */,
 				D2C5001721F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m */,
+				D296E1402295EBBA0051EBE7 /* MoleculeDelegateProtocol.h */,
 				D2A514562211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.h */,
 				D2A514572211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.m */,
+				D296E142229729C30051EBE7 /* MoleculeMappingObject+Extension.swift */,
 			);
 			path = OtherHandlers;
 			sourceTree = "<group>";
@@ -773,6 +782,7 @@
 				D29DF12D21E6851E003B2FB9 /* MVMCoreUITopAlertBaseView.h in Headers */,
 				D29DF24E21E6A177003B2FB9 /* MFDigitTextField.h in Headers */,
 				D29770F321F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.h in Headers */,
+				D296E1412295EBBA0051EBE7 /* MoleculeDelegateProtocol.h in Headers */,
 				D2C5001821F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h in Headers */,
 				D29770FD21F7C77400B2F0D0 /* MVMCoreUITextFieldView.h in Headers */,
 				D29DF17421E69E1F003B2FB9 /* MFCustomButton.h in Headers */,
@@ -781,6 +791,7 @@
 				D29DF2A121E7AF4E003B2FB9 /* MVMCoreUIUtility.h in Headers */,
 				D29DF17621E69E1F003B2FB9 /* PrimaryButton.h in Headers */,
 				D29DF2C821E7BFC1003B2FB9 /* MFSizeObject.h in Headers */,
+				D296E13C229598BF0051EBE7 /* MoleculeListCellProtocol.h in Headers */,
 				D29DF32021ED0CBA003B2FB9 /* LabelView.h in Headers */,
 				D29770C921F7C4AE00B2F0D0 /* TopLabelsView.h in Headers */,
 				D29DF2E121E9240B003B2FB9 /* MVMCoreUIPanelProtocol.h in Headers */,
@@ -913,6 +924,7 @@
 				D29DF28321E7AB24003B2FB9 /* MVMCoreUICommonViewsUtility.m in Sources */,
 				D206997821FB8A0B00CAE0DE /* MVMCoreUINavigationController.m in Sources */,
 				D29DF27A21E7A533003B2FB9 /* MVMCoreUISession.m in Sources */,
+				D296E143229729C30051EBE7 /* MoleculeMappingObject+Extension.swift in Sources */,
 				01DF55E021F8FAA800CC099B /* MFTextFieldListView.swift in Sources */,
 				D2A5146B2214905000345BFB /* ThreeLayerViewController.swift in Sources */,
 				D29DF2C921E7BFC6003B2FB9 /* MFSizeObject.m in Sources */,

MVMCoreUI/Atoms/Buttons/CaretButton.swift

@@ -9,6 +9,7 @@
 
 
 open class CaretButton: MFCustomButton, MVMCoreUIMoleculeViewProtocol {
+    
     //------------------------------------------------------
     // MARK: - Constants
     //------------------------------------------------------
@@ -51,6 +52,9 @@ open class CaretButton: MFCustomButton, MVMCoreUIMoleculeViewProtocol {
         changeCaretColor()
     }
     
+    public func updateView(_ size: CGFloat) {
+    }
+    
     //------------------------------------------------------
     // MARK: - Functions
     //------------------------------------------------------
@@ -110,7 +114,7 @@ open class CaretButton: MFCustomButton, MVMCoreUIMoleculeViewProtocol {
         setTitleColor(disabledColor, for: .disabled)
     }
     
-    @objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    @objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         setWithActionMap(json, delegateObject: delegateObject, additionalData: additionalData)
         
         guard let dictionary = json else { return }

MVMCoreUI/Atoms/Buttons/MFTextButton.m

@@ -128,7 +128,7 @@
 
 #pragma mark - MVMCoreUIMoleculeViewProtocol
 
-- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(MVMCoreUIDelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     NSString *color = [json string:KeyTextColor];
     if (color) {
         [self setTitleColor:[UIColor mfGetColorForHex:color] forState:UIControlStateNormal];

MVMCoreUI/Atoms/Buttons/PrimaryButton.m

@@ -648,10 +648,8 @@
     [self setAsStandardCustom];
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(MVMCoreUIDelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
-    if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) {
+    [FormValidator setupValidationWithMolecule:self delegate:delegateObject.formValidationProtocol];
-        [FormValidator setupValidationWithMolecule:self delegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol];
-    }
 
     self.primaryButtonType = PrimaryButtonTypeCustom;
     NSString *color = [json string:@"fillColor"];

MVMCoreUI/Atoms/TextFields/MFTextField.m

@@ -559,14 +559,14 @@
     self.isMolecule = YES;
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(MVMCoreUIDelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) {
-        [FormValidator setupValidationWithMolecule:self delegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol];
+        [FormValidator setupValidationWithMolecule:self delegate:delegateObject.formValidationProtocol];
-        FormValidator *formValidator = [FormValidator getFormValidatorForDelegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol];
+        FormValidator *formValidator = [FormValidator getFormValidatorForDelegate:delegateObject.formValidationProtocol];
         
         [self setWithMap:json];
         self.mfTextFieldDelegate = formValidator;
-        self.uiTextFieldDelegate = ((MVMCoreUIDelegateObject *)delegateObject).uiTextFieldDelegate;
+        self.uiTextFieldDelegate = delegateObject.uiTextFieldDelegate;
         [MVMCoreUICommonViewsUtility addDismissToolbar:self.textField delegate:self.uiTextFieldDelegate];
     }
 }

MVMCoreUI/Atoms/Views/CaretView.swift

@@ -103,7 +103,7 @@ open class CaretView: MFView {
         defaultState()
     }
 
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         // Configure class properties with JSON values
         guard let dictionary = json else { return }

MVMCoreUI/Atoms/Views/DashLine.swift

@@ -68,7 +68,7 @@ open class DashLine: MFView {
         isHidden = false
     }
     
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         
         // Configure class properties with JSON values

MVMCoreUI/Atoms/Views/Label.swift

@@ -295,7 +295,7 @@ import MVMCore
     // MARK: - Atomization
     //------------------------------------------------------
     
-    @objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    @objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         Label.setUILabel(self, withJSON: json, delegate: delegateObject, additionalData: additionalData)
         originalAttributedString = attributedText
     }

MVMCoreUI/Atoms/Views/LabelView.m

@@ -73,7 +73,7 @@
     }
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(MVMCoreUIDelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     [super setWithJSON:json delegateObject:delegateObject additionalData:additionalData];
     [self.label setWithJSON:json delegateObject:delegateObject additionalData:additionalData];
 }

MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift

@@ -734,7 +734,7 @@ extension LabelWithInternalButton: MVMCoreUIMoleculeViewProtocol {
         
     }
     
-    @objc open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    @objc open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         // Configure class properties with JSON values
         guard let dictionary = json else { return }
         

MVMCoreUI/Atoms/Views/MFLoadImageView.swift

@@ -203,7 +203,7 @@ import UIKit
     }
     
     // MARK: - MVMCoreUIMoleculeViewProtocol functions
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         if let backgroundColorString = json?.optionalStringForKey(KeyBackgroundColor) {
             backgroundColor = UIColor.mfGet(forHex: backgroundColorString)

MVMCoreUI/Atoms/Views/MFView.m

@@ -44,7 +44,7 @@
 
 #pragma mark - MVMCoreUIMoleculeViewProtocol
 
-- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(MVMCoreUIDelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     self.json = json;
 }
 

MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m

@@ -58,9 +58,9 @@ static const CGFloat CheckBoxHeightWidth = 18.0;
     return UIStackViewAlignmentLeading;
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(MVMCoreUIDelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     
-    [FormValidator setupValidationWithMolecule:self delegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol];
+    [FormValidator setupValidationWithMolecule:self delegate:delegateObject.formValidationProtocol];
     self.delegate = delegateObject;
     self.fieldKey = [json stringForKey:KeyFieldKey];
     self.isRequired = [json boolForKey:KeyRequired];

MVMCoreUI/Atoms/Views/SeparatorView.m

@@ -95,17 +95,21 @@
     }
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(MVMCoreUIDelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     [super setWithJSON:json delegateObject:delegateObject additionalData:additionalData];
     if (json) {
-        self.hidden = NO;
         NSString *type = [json string:KeyType];
-        if ([type isEqualToString:@"standard"]) {
+        if ([type isEqualToString:@"none"]) {
-            [self setSize:1];
+            self.hidden = YES;
-        } else if ([type isEqualToString:@"medium"]) {
+        } else {
-            [self setSize:2];
+            self.hidden = NO;
-        } else if ([type isEqualToString:@"heavy"]) {
+            if ([type isEqualToString:@"medium"]) {
-            [self setSize:4];
+                [self setAsMedium];
+            } else if ([type isEqualToString:@"heavy"]) {
+                [self setAsHeavy];
+            } else {
+                [self setAsLight];
+            }
         }
         NSString *backgroundColor = [json string:KeyBackgroundColor];
         if (backgroundColor) {

MVMCoreUI/Atoms/Views/ViewConstrainingView.m

@@ -151,7 +151,7 @@
     self.updateViewHorizontalDefaults = YES;
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(MVMCoreUIDelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     [super setWithJSON:json delegateObject:delegateObject additionalData:additionalData];
     if (self.molecule) {
         [self.molecule setWithJSON:json delegateObject:delegateObject additionalData:additionalData];

MVMCoreUI/BaseControllers/MFViewController.h

@@ -27,13 +27,14 @@
 #import <MVMCoreUI/ButtonDelegateProtocol.h>
 #import <MVMCoreUI/MFStyler.h>
 #import <MVMCoreUI/MVMCoreUIDetailViewProtocol.h>
+#import <MVMCoreUI/MoleculeDelegateProtocol.h>
 
 @class MainMenuViewController;
 @class MVMCoreUITabBarPageControlViewController;
 @class MVMAnimationManager;
 @class DelegateObject;
 
-@interface MFViewController : UIViewController <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol, MVMCoreActionDelegateProtocol, UITextFieldDelegate, UITextViewDelegate, MFTextFieldDelegate, ButtonDelegateProtocol, MVMCoreViewControllerProtocol, MVMCoreViewManagerViewControllerProtocol, MVMCoreUIDetailViewProtocol>
+@interface MFViewController : UIViewController <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol, MVMCoreActionDelegateProtocol, UITextFieldDelegate, UITextViewDelegate, MFTextFieldDelegate, ButtonDelegateProtocol, MVMCoreViewControllerProtocol, MVMCoreViewManagerViewControllerProtocol, MVMCoreUIDetailViewProtocol, MoleculeDelegateProtocol>
 
 // Stores the load object that this screen was loaded with.
 @property (nullable, strong, nonatomic) MVMCoreLoadObject *loadObject;

MVMCoreUI/BaseControllers/MFViewController.m

@@ -786,6 +786,15 @@
     }
 }
 
+#pragma mark - MoleculeDelegateProtocol
+
+- (NSDictionary *)getModuleWithName:(NSString *)name {
+    if (!name) {
+        return nil;
+    }
+    return [self.loadObject.modulesJSON dict:name];
+}
+
 #pragma mark - adobe analytics
 
 - (nullable NSArray <NSDictionary *> *)additionalActionsToTrackWithMainActionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData {

MVMCoreUI/MVMCoreUI.h

@@ -20,6 +20,8 @@ FOUNDATION_EXPORT const unsigned char MVMCoreUIVersionString[];
 #import <MVMCoreUI/MVMCoreUISession.h>
 #import <MVMCoreUI/MVMCoreUILoggingHandler.h>
 #import <MVMCoreUI/MVMCoreUIViewControllerMappingObject.h>
+#import <MVMCoreUI/MoleculeDelegateProtocol.h>
+#import <MVMCoreUI/MoleculeListCellProtocol.h>
 #import <MVMCoreUI/MVMCoreUIMoleculeMappingObject.h>
 
 #pragma mark - TopAlert

MVMCoreUI/Molecules/ButtonView.swift

@@ -33,7 +33,7 @@ import UIKit
         primaryButton?.isEnabled = enabled
     }
     
-    public init(withJSON json: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
+    public init(withJSON json: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) {
         super.init(frame: .zero)
         setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
     }
@@ -58,7 +58,7 @@ import UIKit
         primaryButton?.setAsMolecule()
     }
 
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         primaryButton?.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
     }

MVMCoreUI/Molecules/MVMCoreUIMoleculeViewProtocol.h

@@ -7,12 +7,13 @@
 //
 
 #import <UIKit/UIKit.h>
-@class DelegateObject;
+@import MVMCore.MVMCoreViewProtocol;
+@class MVMCoreUIDelegateObject;
 
-@protocol MVMCoreUIMoleculeViewProtocol <NSObject>
+@protocol MVMCoreUIMoleculeViewProtocol <NSObject, MVMCoreViewProtocol>
 
 // Sets up the ui based on the json
-- (void)setWithJSON:(nullable NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData;
+- (void)setWithJSON:(nullable NSDictionary *)json delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData;
 
 @optional
 

MVMCoreUI/Molecules/MoleculeStackView.swift

@@ -18,12 +18,12 @@ public class MoleculeStackView: MFView {
         super.init(frame: frame)
     }
     
-    public init(withJSON json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable : Any]?) {
+    public init(withJSON json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
         super.init(frame: CGRect.zero)
         setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
     }
     
-    public convenience init(withJSON json: [AnyHashable: Any]?, delegateObject: DelegateObject?, spacingBlock: ((Any) -> UIEdgeInsets)?) {
+    public convenience init(withJSON json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, spacingBlock: ((Any) -> UIEdgeInsets)?) {
         self.init(withJSON: json, delegateObject: delegateObject, additionalData: nil)
         self.spacingBlock = spacingBlock
     }
@@ -51,7 +51,7 @@ public class MoleculeStackView: MFView {
     }
     
     // MARK: - MVMCoreUIMoleculeViewProtocol
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         guard let molecules = json?.arrayForKey(KeyMolecules) as? [[String: Any]] else {
             return
@@ -60,7 +60,7 @@ public class MoleculeStackView: MFView {
         // Create the molecules and set the json.
         var moleculesArray = [] as [UIView]
         for moleculeJSON in molecules {
-            if let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForStack(withJSON: moleculeJSON, delegateObject: delegateObject) {
+            if let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject, constrainIfNeeded: true) {
                 moleculesArray.append(molecule)
             }
         }

MVMCoreUI/Molecules/MoleculeTableViewCell.swift

@@ -8,8 +8,10 @@
 
 import UIKit
 
-@objcMembers open class MoleculeTableViewCell: UITableViewCell, MVMCoreViewProtocol, MVMCoreUIMoleculeViewProtocol {
+@objcMembers open class MoleculeTableViewCell: UITableViewCell, MVMCoreUIMoleculeViewProtocol, MoleculeListCellProtocol {
+    
     open var molecule: (UIView & MVMCoreUIMoleculeViewProtocol)?
+    open var json: [AnyHashable: Any]?
     
     // For the accessory view convenience.
     public var caretView: CaretView?
@@ -50,9 +52,7 @@ import UIKit
             bottomSeparatorView?.setLeftAndRightPinConstant(layoutMargins.left)
         }
         
-        if let molecule = molecule as? MVMCoreViewProtocol {
+        molecule?.updateView(size)
-            molecule.updateView(size)
-        }
         if let _ = accessoryView, let caretView = caretView, let widthObject = caretViewWidthSizeObject, let heightObject = caretViewHeightSizeObject {
             caretView.frame = CGRect(x: 0, y: 0, width: widthObject.getValueBased(onSize: size), height: heightObject.getValueBased(onSize: size))
         }
@@ -67,23 +67,31 @@ import UIKit
     }
     
     // MARK: - MVMCoreUIMoleculeViewProtocol
-    public func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable : Any]?) {
+    public func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
-        guard let json = json else {
+        self.json = json;
+        guard let json = json, let moleculeJSON = json.optionalDictionaryForKey(KeyMolecule) else {
             return
         }
         if molecule == nil {
-            if let moleculeView = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForStack(withJSON: json, delegateObject: delegateObject) {
+            if let moleculeView = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject, constrainIfNeeded: true) {
                 contentView.addSubview(moleculeView)
                 NSLayoutConstraint.activate(Array(NSLayoutConstraint.pinView(toSuperview: moleculeView, useMargins: moleculeView.needsToBeConstrained?() ?? false).values))
                 molecule = moleculeView
             }
         } else {
-            molecule?.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
+            molecule?.setWithJSON(moleculeJSON, delegateObject: delegateObject, additionalData: additionalData)
         }
         backgroundColor = molecule?.backgroundColor
+        
+        // Add the caret if there is an action and it's not declared hidden.
+        if let _ = json.optionalDictionaryForKey("actionMap"), !json.boolForKey("hideArrow") {
+            addCaretViewAccessory()
+        } else {
+            accessoryView = nil
+        }
     }
     
-    // MARK: - Convenience
+    // MARK: - Arrow
     /// Adds the standard mvm style caret to the accessory view
     public func addCaretViewAccessory() {
         guard accessoryView == nil else {
@@ -98,6 +106,34 @@ import UIKit
         accessoryView = caretView
     }
     
+    // MARK: - MoleculeListCellProtocol
+    public static func moleculeName(_ molecule: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> String? {
+        return molecule?.optionalDictionaryForKey(KeyMolecule)?.optionalStringForKey(KeyMoleculeName)
+    }
+    
+    /// For when the separator between cells shows using json and frequency. Default is type: standard, frequency: allExceptTop.
+    public func setSeparatorWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?, indexPath: IndexPath) {
+        addSeparatorsIfNeeded()
+        if let json = json {
+            topSeparatorView?.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
+            bottomSeparatorView?.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
+            if let separatorFrequencyString = json.optionalStringForKey("frequency"), let separatorFrequency = SeparatorFrequency(rawValue: separatorFrequencyString) {
+                setSeparatorFrequency(separatorFrequency, indexPath: indexPath)
+            }
+        } else {
+            topSeparatorView?.hide()
+            bottomSeparatorView?.setAsLight()
+            setSeparatorFrequency(MoleculeTableViewCell.SeparatorFrequency.AllExceptTop, indexPath: indexPath)
+        }
+    }
+    
+    public func didSelectCell(atIndex indexPath: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
+        if let actionMap = json?.optionalDictionaryForKey("actionMap") {
+            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
+        }
+    }
+    
+    // MARK: - Separator
     func addSeparatorsIfNeeded() {
         if topSeparatorView == nil {
             topSeparatorView = SeparatorView.separatorAdd(to: self, position: SeparatorPositionTop)
@@ -109,19 +145,6 @@ import UIKit
         }
     }
     
-    /// For when the separator between cells shows using json and frequency.
-    public func setSeparatorWithJSON(_ json: [AnyHashable : Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable : Any]?, indexPath: IndexPath) {
-        guard let json = json else {
-            return
-        }
-        addSeparatorsIfNeeded()
-        topSeparatorView?.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        bottomSeparatorView?.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        if let separatorFrequencyString = json.optionalStringForKey("frequency"), let separatorFrequency = SeparatorFrequency(rawValue: separatorFrequencyString) {
-            setSeparatorFrequency(separatorFrequency, indexPath: indexPath)
-        }
-    }
-    
     /// For when the separator between cells shows.
     public func setSeparatorFrequency(_ separatorFrequency: SeparatorFrequency, indexPath: IndexPath) {
         switch separatorFrequency {

MVMCoreUI/Molecules/StandardFooterView.swift

@@ -93,7 +93,7 @@ public class StandardFooterView: ViewConstrainingView {
         layoutIfNeeded()
     }
     
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         if let colorString = json?.optionalStringForKey(KeyBackgroundColor) {
             backgroundColor = .mfGet(forHex: colorString)

MVMCoreUI/Molecules/StandardHeaderView.swift

@@ -110,7 +110,7 @@ public class StandardHeaderView: ViewConstrainingView {
         separatorView?.rightPin?.constant = constant
     }
     
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         if let colorString = json?.optionalStringForKey(KeyBackgroundColor) {
             backgroundColor = .mfGet(forHex: colorString)

MVMCoreUI/Molecules/TwoButtonView.swift

@@ -39,7 +39,7 @@ import UIKit
     }
     
     // MARK: - MVMCoreUIMoleculeViewProtocol
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         if let backgroundColorString = json?.optionalStringForKey(KeyBackgroundColor) {
             backgroundColor = UIColor.mfGet(forHex: backgroundColorString)
@@ -142,7 +142,7 @@ import UIKit
         }
     }
     
-    open func set(primaryButtonJSON: [AnyHashable: Any]?, secondaryButtonJSON: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    open func set(primaryButtonJSON: [AnyHashable: Any]?, secondaryButtonJSON: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         setupUI(withPrimaryButtonMap: primaryButtonJSON, secondaryButtonMap: secondaryButtonJSON, legacy: false)
         setDefaultCustom()
         primaryButton?.setWithJSON(primaryButtonJSON, delegateObject: delegateObject, additionalData: additionalData)

MVMCoreUI/OtherHandlers/MVMCoreUIDelegateObject.swift

@@ -12,11 +12,17 @@ open class MVMCoreUIDelegateObject: DelegateObject {
     public weak var formValidationProtocol: FormValidationProtocol?
     public weak var buttonDelegate: ButtonDelegateProtocol?
     public weak var uiTextFieldDelegate: UITextFieldDelegate?
+    public weak var moleculeDelegate: MoleculeDelegateProtocol?
     
     open override func setAll(withDelegate delegate: Any) {
         super.setAll(withDelegate: delegate)
         formValidationProtocol = delegate as? FormValidationProtocol
         buttonDelegate = delegate as? ButtonDelegateProtocol
         uiTextFieldDelegate = delegate as? UITextFieldDelegate
+        moleculeDelegate = delegate as? MoleculeDelegateProtocol
+    }
+    
+    class func delegateObject(from controller: MVMCoreViewControllerProtocol?) -> MVMCoreUIDelegateObject? {
+        return controller?.delegateObject?() as? MVMCoreUIDelegateObject
     }
 }

MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.h

@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import <MVMCoreUI/MVMCoreUIMoleculeViewProtocol.h>
-@class DelegateObject;
+@class MVMCoreUIDelegateObject;
 @class MVMCoreLoadObject;
 @class MVMCoreErrorObject;
 
@@ -20,20 +20,23 @@
 /// Returns the shared instance
 + (nullable instancetype)sharedMappingObject;
 
-/// Returns the molecule for the given name.
+/// Returns the molecule class.
-- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForName:(nonnull NSString *)name;
+- (nullable Class)getMoleculeClassWithJSON:(nonnull NSDictionary *)json delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject;
-- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForJSON:(nonnull NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject;
 
-/// Returns the molecule for the json. Also checks if the molecule needs to be constrained for a stack.
+#pragma mark - Molecule Creation
-- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForStackWithJSON:(nonnull NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject;
 
-/// Returns the molecule for the json. Checks if the molecule needs to be constrained for a stack. Load object may be used if the molecule needs to be loaded from the page or module map.
+/// Creates the molecule for the given name.
-- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForStackWithJSON:(nonnull NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject loadObject:(nullable MVMCoreLoadObject *)loadObject;
+- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)createMoleculeForName:(nonnull NSString *)name;
 
-#pragma mark - Helpers
+/// Creates the molecule for the molecule json. Takes into account moduleMolecule as well.
+- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)createMoleculeForJSON:(nonnull NSDictionary *)json delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject;
 
-/// Gets the molecule from the passed in module map.
+/// Creates the molecule for the molecule json. Takes into account moduleMolecule as well. Also checks if the molecule needs to be constrained for a stack/list style situation.
-+ (nullable NSDictionary *)getMoleculeMapForModuleMolecule:(nullable NSDictionary *)moduleMolecule moduleMap:(nullable NSDictionary *)moduleMap error:(MVMCoreErrorObject *_Nullable *_Nullable)error;
+- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)createMoleculeForJSON:(nonnull NSDictionary *)json delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject constrainIfNeeded:(BOOL)constrainIfNeeded;
-+ (nullable NSString *)getMoleculeNameForModuleMolecule:(nullable NSDictionary *)moduleMolecule moduleMap:(nullable NSDictionary *)moduleMap error:(MVMCoreErrorObject *_Nullable *_Nullable)error;
+
+#pragma mark - ModuleMolecule Helpers
+
+/// If the molecule is a module molecule, will get the map for the molecule to load from a module. Otherwise nil.
++ (nullable NSDictionary *)getMoleculeMapForModuleMolecule:(nullable NSDictionary *)moduleMolecule delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject error:(MVMCoreErrorObject *_Nullable *_Nullable)error;
 
 @end

MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m

@@ -45,7 +45,18 @@
     return [MVMCoreActionUtility initializerClassCheck:[MVMCoreUIObject sharedInstance].moleculeMap classToVerify:self];
 }
 
-- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForName:(nonnull NSString *)name {
+- (nullable Class)getMoleculeClassWithJSON:(nonnull NSDictionary *)json delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject {
+    NSDictionary *moleculeJSON = [MVMCoreUIMoleculeMappingObject getMoleculeMapForModuleMolecule:json delegateObject:delegateObject error:nil] ?: json;
+    NSString *moleculeName = [moleculeJSON string:KeyMoleculeName];
+    if (moleculeName) {
+        return [self.moleculeMapping objectForKey:moleculeName];
+    }
+    return nil;
+}
+
+#pragma mark - Molecule Creation
+
+- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)createMoleculeForName:(nonnull NSString *)name {
     Class class = [self.moleculeMapping objectForKey:name];
     if (!class) {
         return nil;
@@ -57,58 +68,31 @@
     return molecule;
 }
 
-- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForJSON:(nonnull NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject {
+- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)createMoleculeForJSON:(nonnull NSDictionary *)json delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject {
-    NSString *moleculeName = [json string:KeyMoleculeName];
+    return [self createMoleculeForJSON:json delegateObject:delegateObject constrainIfNeeded:NO];
-    if (!moleculeName) {
-        return nil;
-    }
-    UIView <MVMCoreUIMoleculeViewProtocol>*molecule = [self getMoleculeForName:moleculeName];
-    [molecule setWithJSON:json delegateObject:delegateObject additionalData:nil];
-    return molecule;
 }
 
-
+- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)createMoleculeForJSON:(nonnull NSDictionary *)json delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject constrainIfNeeded:(BOOL)constrainIfNeeded {
-- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForStackWithJSON:(nonnull NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject {
+    NSDictionary *moleculeJSON = [MVMCoreUIMoleculeMappingObject getMoleculeMapForModuleMolecule:json delegateObject:delegateObject error:nil] ?: json;
-    NSString *moleculeName = [json string:KeyMoleculeName];
+    NSString *moleculeName = [moleculeJSON string:KeyMoleculeName];
     if (!moleculeName) {
         return nil;
     }
-    UIView <MVMCoreUIMoleculeViewProtocol>*molecule = [self getMoleculeForName:moleculeName];
+    UIView <MVMCoreUIMoleculeViewProtocol>*molecule = [self createMoleculeForName:moleculeName];
-    if ([molecule respondsToSelector:@selector(needsToBeConstrained)] && [molecule needsToBeConstrained]) {
+    if (constrainIfNeeded && [molecule respondsToSelector:@selector(needsToBeConstrained)] && [molecule needsToBeConstrained]) {
         molecule = [[ViewConstrainingView alloc] initWithMolecule:molecule alignment:[molecule respondsToSelector:@selector(moleculeAlignment)] ? [molecule moleculeAlignment] : UIStackViewAlignmentFill];
     }
-    [molecule setWithJSON:json delegateObject:delegateObject additionalData:nil];
+    [molecule setWithJSON:moleculeJSON delegateObject:delegateObject additionalData:nil];
     return molecule;
 }
 
-- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForStackWithJSON:(nonnull NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject loadObject:(nullable MVMCoreLoadObject *)loadObject {
+#pragma mark - ModuleMolecule Helpers
-    NSString *moleculeName = [json string:KeyMoleculeName];
-    if (!moleculeName) {
-        return nil;
-    } else if ([moleculeName isEqualToString:@"moduleMolecule"]) {
-        NSString *moduleName = [json string:@"moduleName"];
-        if (moduleName) {
-            NSDictionary *newJSON = [loadObject.modulesJSON dict:moduleName];
-            if (newJSON) {
-                json = newJSON;
-            }
-        }
-    }
-    UIView <MVMCoreUIMoleculeViewProtocol>*molecule = [self getMoleculeForName:moleculeName];
-    if ([molecule respondsToSelector:@selector(needsToBeConstrained)] && [molecule needsToBeConstrained]) {
-        molecule = [[ViewConstrainingView alloc] initWithMolecule:molecule alignment:[molecule respondsToSelector:@selector(moleculeAlignment)] ? [molecule moleculeAlignment] : UIStackViewAlignmentFill];
-    }
-    [molecule setWithJSON:json delegateObject:delegateObject additionalData:nil];
-    return molecule;
-}
 
-#pragma mark - Helpers
++ (nullable NSDictionary *)getMoleculeMapForModuleMolecule:(nullable NSDictionary *)moduleMolecule delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject error:(MVMCoreErrorObject *_Nullable *_Nullable)error {
-
-+ (nullable NSDictionary *)getMoleculeMapForModuleMolecule:(nullable NSDictionary *)moduleMolecule moduleMap:(nullable NSDictionary *)moduleMap error:(MVMCoreErrorObject *_Nullable *_Nullable)error {
     NSString *moleculeName = [moduleMolecule string:KeyMoleculeName];
     if ([moleculeName isEqualToString:@"moduleMolecule"]) {
         NSString *moduleName = [moduleMolecule string:@"moduleName"];
-        NSDictionary *module = moduleName ? [moduleMap dict:moduleName] : nil;
+        NSDictionary *module = moduleName ? [delegateObject.moleculeDelegate getModuleWithName:moduleName] : nil;
         if (!module && error) {
             *error = [[MVMCoreErrorObject alloc] initWithTitle:nil message:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess] code:ErrorCodeModuleMolecule domain:ErrorDomainNative location:NSStringFromClass(self)];
         }
@@ -118,8 +102,4 @@
     }
 }
 
-+ (nullable NSString *)getMoleculeNameForModuleMolecule:(nullable NSDictionary *)moduleMolecule moduleMap:(nullable NSDictionary *)moduleMap error:(MVMCoreErrorObject *_Nullable *_Nullable)error {
-    return [[self getMoleculeMapForModuleMolecule:moduleMolecule moduleMap:moduleMap error:error] string:KeyMoleculeName];
-}
-
 @end

MVMCoreUI/OtherHandlers/MoleculeDelegateProtocol.h

@@ -0,0 +1,15 @@
+//
+//  MoleculeDelegateProtocol.h
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 5/22/19.
+//  Copyright © 2019 Verizon Wireless. All rights reserved.
+//
+#import <UIKit/UIKit.h>
+
+@protocol MoleculeDelegateProtocol <NSObject>
+
+/// returns a module for the corresponding module name.
+- (nullable NSDictionary *)getModuleWithName:(nullable NSString *)name;
+
+@end

MVMCoreUI/OtherHandlers/MoleculeMappingObject+Extension.swift

@@ -0,0 +1,47 @@
+//
+//  MoleculeMappingObject+Extension.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 5/23/19.
+//  Copyright © 2019 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public extension MVMCoreUIMoleculeMappingObject {
+    
+    /// Gets the molecule, and if it belonged to a moduleMolecule, the module name or error.
+    static func getMoleculeJSON(for map: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) -> (molecule: [AnyHashable: Any]?, moduleName: String?, error: MVMCoreErrorObject?)? {
+        guard let map = map, let moleculeName = map.optionalStringForKey(KeyMoleculeName) else {
+            return nil
+        }
+        guard moleculeName == "moduleMolecule" else {
+            // Not a module molecule.
+            return (map, moleculeName, nil)
+        }
+        
+        guard let moduleName = map.optionalStringForKey("moduleName"),
+            let module = delegateObject?.moleculeDelegate?.getModuleWithName(moduleName) else {
+                guard let error = MVMCoreErrorObject(title: nil, message: MVMCoreGetterUtility.hardcodedString(withKey: HardcodedErrorUnableToProcess), code: CoreUIErrorCode.ErrorCodeModuleMolecule.rawValue, domain: ErrorDomainNative, location: String(describing: self)) else {
+                    return nil
+                }
+                MVMCoreUILoggingHandler.shared()?.addError(toLog: error)
+                return (nil, nil, error)
+        }
+        return (module, moduleName, nil)
+    }
+    
+    /// Gets the molecule, and if it belonged to a moduleMolecule adds the module name or error to the passed lists.
+    static func getMoleculeJSON(for map: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, moduleNames: inout [String]?, errors: inout [MVMCoreErrorObject]?) -> [AnyHashable: Any]? {
+        guard let molecule = getMoleculeJSON(for: map, delegateObject: delegateObject) else {
+            return nil
+        }
+        if let moduleName = molecule.moduleName {
+            moduleNames?.append(moduleName)
+        }
+        if let error = molecule.error {
+            errors?.append(error)
+        }
+        return molecule.molecule
+    }
+}

MVMCoreUI/Templates/MoleculeListCellProtocol.h

@@ -0,0 +1,23 @@
+//
+//  MoleculeListCellProtocol.h
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 5/22/19.
+//  Copyright © 2019 Verizon Wireless. All rights reserved.
+//
+#import <UIKit/UIKit.h>
+@class MVMCoreLoadObject;
+@class MVMCoreUIDelegateObject;
+
+@protocol MoleculeListCellProtocol <NSObject>
+@optional
+/// Can override the molecule name for the given molecule. Otherwise we assume value for key moleculeName.
++ (nullable NSString *)moleculeName:(nullable NSDictionary *)molecule loadObject:(nullable MVMCoreLoadObject *)loadObject;
+
+/// Can set the separator according to what the moleculeList commands.
+- (void)setSeparatorWithJSON:(nullable NSDictionary *)json delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData indexPath:(nonnull NSIndexPath *)indexPath;
+
+/// Handle action
+- (void)didSelectCellAtIndex:(nonnull NSIndexPath *)indexPath delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData;
+
+@end

MVMCoreUI/Templates/MoleculeListTemplate.swift

@@ -10,27 +10,27 @@ import UIKit
 
 open class MoleculeListTemplate: ThreeLayerTableViewController {
     
-    open override func registerWithTable() {
+    open override func shouldFinishProcessingLoad(_ loadObject: MVMCoreLoadObject, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject>) -> Bool {
-        super.registerWithTable()
+        var shouldFinish = super.shouldFinishProcessingLoad(loadObject, error: error)
-        guard let molecules = loadObject?.pageJSON?.arrayForKey(KeyMolecules) else {
+        if shouldFinish, let firstError = modulesNeeded().errors?.first {
-            return
+            // Don't continue if there was an error loading needed modules.
-        }
+            error.pointee = firstError
-        for case let molecule as Dictionary<AnyHashable, Any> in molecules {
+            shouldFinish = false
-            if let moleculeName = molecule.optionalStringForKey(KeyMoleculeName) {
-                tableView?.register(MoleculeTableViewCell.self, forCellReuseIdentifier: moleculeName)
-            }
         }
+        return shouldFinish
     }
     
     open override func viewForTop() -> UIView {
-        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("header"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForStack(withJSON: moleculeJSON, delegateObject: delegateObject()) else {
+        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("header"),
+            let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, constrainIfNeeded: true) else {
             return super.viewForTop()
         }
         return molecule
     }
     
     override open func viewForBottom() -> UIView {
-        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("footer"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForStack(withJSON: moleculeJSON, delegateObject: delegateObject()) else {
+        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("footer"),
+            let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, constrainIfNeeded: true) else {
             return viewForBottom()
         }
         return molecule
@@ -41,12 +41,26 @@ open class MoleculeListTemplate: ThreeLayerTableViewController {
         registerWithTable()
     }
     
-    open override func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
+    // MARK: - table
-        if let moleculeName = loadObject?.pageJSON?.stringOptionalWithChainOfKeysOrIndexes([KeyMolecules,indexPath.row,KeyMoleculeName]), let theClass = MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping?[moleculeName] as? MVMCoreUIMoleculeViewProtocol.Type,
+    open override func registerWithTable() {
-            let estimatedHeightForRow = theClass.estimatedHeightForRow {
+        super.registerWithTable()
-            return estimatedHeightForRow()
+        guard let molecules = loadObject?.pageJSON?.arrayForKey(KeyMolecules) else {
+            return
         }
-        return 0
+        for case let map as Dictionary<AnyHashable, Any> in molecules {
+            if let molecule = getMoleculeInfo(with: map), let moleculeToRegister = molecule.name {
+                tableView?.register(molecule.class, forCellReuseIdentifier: moleculeToRegister)
+            }
+        }
+    }
+    
+    open override func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
+        guard let map = loadObject?.pageJSON?.optionalDictionaryWithChainOfKeysOrIndexes([KeyMolecules,indexPath.row]),
+            let molecule = getMoleculeInfo(with: map),
+            let estimatedHeightForRow = molecule.class.estimatedHeightForRow else {
+                return 0
+        }
+        return estimatedHeightForRow()
     }
     
     open override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -54,15 +68,67 @@ open class MoleculeListTemplate: ThreeLayerTableViewController {
     }
     
     open override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        guard let molecule = loadObject?.pageJSON?.optionalDictionaryWithChainOfKeysOrIndexes([KeyMolecules,indexPath.row]),
+        let delegate = delegateObject() as? MVMCoreUIDelegateObject
-        let moleculeName = molecule.optionalStringForKey(KeyMoleculeName),
+        guard let map = loadObject?.pageJSON?.optionalDictionaryWithChainOfKeysOrIndexes([KeyMolecules,indexPath.row]),
-        let cell = tableView.dequeueReusableCell(withIdentifier: moleculeName) as? MoleculeTableViewCell else {
+            let moleculeJSON = MVMCoreUIMoleculeMappingObject.getMoleculeJSON(for: map, delegateObject: delegate)?.molecule,
+            let moleculeName = moleculeJSON.optionalStringForKey(KeyMoleculeName),
+            let cell = tableView.dequeueReusableCell(withIdentifier: moleculeName) else {
             return UITableViewCell()
         }
-        let delegate = delegateObject()
+        if let protocolCell = cell as? MoleculeListCellProtocol {
-        cell.setWithJSON(molecule, delegateObject: delegate, additionalData: nil)
+            protocolCell.setSeparatorWithJSON?(loadObject?.pageJSON?.optionalDictionaryForKey("separator"), delegateObject: delegate, additionalData: nil, indexPath: indexPath)
-        cell.setSeparatorWithJSON(loadObject?.pageJSON?.optionalDictionaryForKey("separator"), delegateObject: delegate, additionalData: nil, indexPath: indexPath)
+        }
-        cell.updateView(tableView.bounds.width)
+        if let protocolCell = cell as? MVMCoreUIMoleculeViewProtocol {
+            protocolCell.setWithJSON(moleculeJSON, delegateObject: delegate, additionalData: nil)
+            protocolCell.updateView(tableView.bounds.width)
+        }
         return cell
     }
+    
+    open override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if let cell = tableView.cellForRow(at: indexPath) as? MoleculeListCellProtocol {
+            cell.didSelectCell?(atIndex: indexPath, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, additionalData: nil)
+        }
+    }
+    
+    // MARK: - cache handling
+    open override func pageTypesToListenFor() -> [Any]? {
+        guard let pageType = self.pageType else {
+            return super.pageTypesToListenFor()
+        }
+        return [pageType]
+    }
+    
+    open override func modulesToListenFor() -> [Any]? {
+        // Get all of the molecules that need modules.
+        return modulesNeeded().modules
+    }
+    
+    // MARK: - Module Molecule Handling
+    /// Returns the (name, class) of the molecule for the given map.
+    func getMoleculeInfo(with map: [AnyHashable: Any]?) -> (name: String?, class: AnyClass)? {
+        guard let map = map, let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(withJSON: map, delegateObject: delegateObject() as? MVMCoreUIDelegateObject) else {
+            return nil
+        }
+        if let moleculeClass = moleculeClass as? MoleculeListCellProtocol.Type, let moleculeName = moleculeClass.moleculeName {
+            return (moleculeName(map, loadObject), moleculeClass)
+        } else {
+            return (map.optionalStringForKey(KeyMoleculeName), moleculeClass)
+        }
+    }
+    
+    func modulesNeeded() -> (modules: [String]?, errors: [MVMCoreErrorObject]?) {
+        var modules: [String]? = []
+        var errors: [MVMCoreErrorObject]? = []
+        let delegate = delegateObject() as? MVMCoreUIDelegateObject
+        
+        let _ = MVMCoreUIMoleculeMappingObject.getMoleculeJSON(for: loadObject?.pageJSON?.optionalDictionaryForKey("header"), delegateObject: delegate, moduleNames: &modules, errors: &errors)
+        let _ = MVMCoreUIMoleculeMappingObject.getMoleculeJSON(for: loadObject?.pageJSON?.optionalDictionaryForKey("footer"), delegateObject: delegate, moduleNames: &modules, errors: &errors)
+        if let molecules = loadObject?.pageJSON?.optionalArrayForKey(KeyMolecules) as? [[AnyHashable: Any]] {
+            for molecule in molecules {
+                let _ = MVMCoreUIMoleculeMappingObject.getMoleculeJSON(for: molecule, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, moduleNames: &modules, errors: &errors)
+            }
+        }
+        return (modules?.count ?? 0 > 0 ? modules : nil, errors?.count ?? 0 > 0 ? errors : nil)
+    }
 }

MVMCoreUI/Templates/MoleculeStackCenteredTemplate.swift

@@ -8,27 +8,8 @@
 
 import UIKit
 
-public class MoleculeStackCenteredTemplate: ThreeLayerViewController {
+public class MoleculeStackCenteredTemplate: MoleculeStackTemplate {
-    
+    public override func spaceBetweenTopAndMiddle() -> CGFloat? {
-    public override func viewForMiddle() -> UIView? {
+        return nil
-        let molecule = loadObject?.pageJSON?.optionalDictionaryForKey("moleculeStack")
-        let moleculeStack = MoleculeStackView(withJSON: molecule, delegateObject: delegateObject(), additionalData: nil)
-        return moleculeStack
-    }
-
-    public override func viewForTop() -> UIView? {
-        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("header"),
-            let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForStack(withJSON: moleculeJSON, delegateObject: delegateObject()) else {
-            return nil
-        }
-        return molecule
-    }
-    
-    override public func viewForBottom() -> UIView? {
-        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("footer"),
-            let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForStack(withJSON: moleculeJSON, delegateObject: delegateObject()) else {
-            return nil
-        }
-        return molecule
     }
 }

MVMCoreUI/Templates/MoleculeStackTemplate.swift

@@ -25,7 +25,7 @@ public class MoleculeStackTemplate: ThreeLayerViewController {
     }
     
     public override func viewForTop() -> UIView? {
-        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("header"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForStack(withJSON: moleculeJSON, delegateObject: delegateObject()) else {
+        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("header"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, constrainIfNeeded: true) else {
             return nil
         }
         return molecule
@@ -35,11 +35,11 @@ public class MoleculeStackTemplate: ThreeLayerViewController {
         guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("moleculeStack") else {
             return nil
         }
-        return MoleculeStackView(withJSON: moleculeJSON, delegateObject: delegateObject(), additionalData: nil)
+        return MoleculeStackView(withJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, additionalData: nil)
     }
     
     override public func viewForBottom() -> UIView? {
-        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("footer"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForStack(withJSON: moleculeJSON, delegateObject: delegateObject()) else {
+        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("footer"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, constrainIfNeeded: true) else {
             return nil
         }
         return molecule
@@ -59,27 +59,18 @@ public class MoleculeStackTemplate: ThreeLayerViewController {
     }
     
     // MARK: - Module Molecule Handling
-    func addModule(for moduleMolecule: [AnyHashable: Any]?, modules: inout [String], errors: inout [MVMCoreErrorObject]) {
-        var error: MVMCoreErrorObject?
-        if let moleculeName = MVMCoreUIMoleculeMappingObject.getMoleculeName(forModuleMolecule: moduleMolecule, moduleMap: loadObject?.modulesJSON, error: &error) {
-            modules.append(moleculeName)
-            if let errorObject = error {
-                MVMCoreLoggingHandler.shared()?.addError(toLog: errorObject)
-                errors.append(errorObject)
-            }
-        }
-    }
-    
     func modulesNeeded() -> (modules: [String]?, errors: [MVMCoreErrorObject]?) {
-        var modules: [String] = []
+        var modules: [String]? = []
-        var errors: [MVMCoreErrorObject] = []
+        var errors: [MVMCoreErrorObject]? = []
-        addModule(for: loadObject?.pageJSON?.optionalDictionaryForKey("header"), modules: &modules, errors: &errors)
+        let delegate = delegateObject() as? MVMCoreUIDelegateObject
-        addModule(for: loadObject?.pageJSON?.optionalDictionaryForKey("footer"), modules: &modules, errors: &errors)
+
-        if let molecules = loadObject?.pageJSON?.optionalArrayForChainOfKeysOrIndexes(["moleculeStack","molecules"]) as? [[AnyHashable: Any]] {
+        let _ = MVMCoreUIMoleculeMappingObject.getMoleculeJSON(for: loadObject?.pageJSON?.optionalDictionaryForKey("header"), delegateObject: delegate, moduleNames: &modules, errors: &errors)
+        let _ = MVMCoreUIMoleculeMappingObject.getMoleculeJSON(for: loadObject?.pageJSON?.optionalDictionaryForKey("footer"), delegateObject: delegate, moduleNames: &modules, errors: &errors)
+        if let molecules = loadObject?.pageJSON?.optionalArrayForChainOfKeysOrIndexes(["moleculeStack",KeyMolecules]) as? [[AnyHashable: Any]] {
             for molecule in molecules {
-                addModule(for: molecule, modules: &modules, errors: &errors)
+                let _ = MVMCoreUIMoleculeMappingObject.getMoleculeJSON(for: molecule, delegateObject: delegate, moduleNames: &modules, errors: &errors)
             }
         }
-        return (modules.count > 0 ? modules : nil, errors.count > 0 ? errors : nil)
+        return (modules?.count ?? 0 > 0 ? modules : nil, errors?.count ?? 0 > 0 ? errors : nil)
     }
 }

MVMCoreUI/Utility/MVMCoreUIConstants.h

@@ -15,6 +15,7 @@ extern NSString * const KeyScreenHeading;
 
 extern NSString * const KeyMolecules;
 extern NSString * const KeyMoleculeName;
+extern NSString * const KeyMolecule;
 
 extern NSString * const KeyDisableButton;
 
@@ -73,5 +74,6 @@ extern NSString * const KeyHandScroll;
 
 // Native Error Codes (Add new ones to bottom, don't change order!)
 typedef NS_ENUM(NSInteger, CoreUIErrorCode) {
-    ErrorCodeModuleMolecule = 100
+    ErrorCodeModuleMolecule = 100,
+    ErrorCodeListMolecule = 101
 };

MVMCoreUI/Utility/MVMCoreUIConstants.m

@@ -14,6 +14,7 @@ NSString * const KeyScreenHeading = @"screenHeading";
 
 NSString * const KeyMolecules = @"molecules";
 NSString * const KeyMoleculeName = @"moleculeName";
+NSString * const KeyMolecule = @"molecule";
 
 NSString * const KeyDisableButton = @"disableAction";