From d00a219ebb5ba5496cb9e566580c7f2d5dea8a19 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Thu, 8 Sep 2022 17:06:07 -0500
Subject: [PATCH] updated protocol

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDS/Classes/SelectorGroupHandlerBase.swift        | 2 +-
 VDS/Components/Checkbox/CheckboxGroup.swift       | 2 +-
 VDS/Components/RadioBox/RadioBoxGroup.swift       | 2 +-
 VDS/Components/RadioButton/RadioButtonGroup.swift | 2 +-
 VDS/Components/RadioSwatch/RadioSwatchGroup.swift | 2 +-
 VDS/Protocols/ModelHandlerable.swift              | 4 +---
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/VDS/Classes/SelectorGroupHandlerBase.swift b/VDS/Classes/SelectorGroupHandlerBase.swift
index be0c155d..7172b468 100644
--- a/VDS/Classes/SelectorGroupHandlerBase.swift
+++ b/VDS/Classes/SelectorGroupHandlerBase.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 
-public class SelectorGroupHandlerBase<GroupModelType: SelectorGroupModelable, ModelHandlerType: ModelHandlerControl>: Control<GroupModelType>, Changable where GroupModelType.SelectorModelType == ModelHandlerType.ModelType {
+public class SelectorGroupHandlerBase<GroupModelType: SelectorGroupModelable, ModelHandlerType: ModelHandlerable<GroupModelType.SelectorModelType> & UIControl>: Control<GroupModelType>, Changable {
 
     //--------------------------------------------------
     // MARK: - Public Properties
diff --git a/VDS/Components/Checkbox/CheckboxGroup.swift b/VDS/Components/Checkbox/CheckboxGroup.swift
index 45f5ae5a..aaa36d36 100644
--- a/VDS/Components/Checkbox/CheckboxGroup.swift
+++ b/VDS/Components/Checkbox/CheckboxGroup.swift
@@ -23,7 +23,7 @@ public class CheckboxGroup: CheckboxGroupBase<DefaultCheckboxGroupModel, Checkbo
     }
 }
 
-public class CheckboxGroupBase<GroupModelType: CheckboxGroupModel, ModelHandlerType: ModelHandlerControl>: SelectorGroupHandlerBase<GroupModelType, ModelHandlerType> where GroupModelType.SelectorModelType == ModelHandlerType.ModelType {
+public class CheckboxGroupBase<GroupModelType: CheckboxGroupModel, ModelHandlerType: ModelHandlerable<GroupModelType.SelectorModelType> & UIControl>: SelectorGroupHandlerBase<GroupModelType, ModelHandlerType> {
 
     //--------------------------------------------------
     // MARK: - Public Properties
diff --git a/VDS/Components/RadioBox/RadioBoxGroup.swift b/VDS/Components/RadioBox/RadioBoxGroup.swift
index d0e1c4ec..a670feee 100644
--- a/VDS/Components/RadioBox/RadioBoxGroup.swift
+++ b/VDS/Components/RadioBox/RadioBoxGroup.swift
@@ -31,7 +31,7 @@ public class RadioBoxGroup: RadioBoxGroupBase<DefaultRadioBoxGroupModel, RadioBo
     }
 }
 
-public class RadioBoxGroupBase<GroupModelType: RadioBoxGroupModel, ModelHandlerType: ModelHandlerControl>: SelectorGroupSelectedHandlerBase<GroupModelType, ModelHandlerType> where GroupModelType.SelectorModelType == ModelHandlerType.ModelType {
+public class RadioBoxGroupBase<GroupModelType: RadioBoxGroupModel, ModelHandlerType: ModelHandlerable<GroupModelType.SelectorModelType> & UIControl>: SelectorGroupSelectedHandlerBase<GroupModelType, ModelHandlerType> {
 
     //--------------------------------------------------
     // MARK: - Private Properties
diff --git a/VDS/Components/RadioButton/RadioButtonGroup.swift b/VDS/Components/RadioButton/RadioButtonGroup.swift
index 42680d04..167a23e3 100644
--- a/VDS/Components/RadioButton/RadioButtonGroup.swift
+++ b/VDS/Components/RadioButton/RadioButtonGroup.swift
@@ -34,7 +34,7 @@ public class RadioButtonGroup: RadioButtonGroupBase<DefaultRadioButtonGroupModel
     }
 }
 
-public class RadioButtonGroupBase<GroupModelType: RadioButtonGroupModel, ModelHandlerType: ModelHandlerControl>: SelectorGroupSelectedHandlerBase<GroupModelType, ModelHandlerType> where GroupModelType.SelectorModelType == ModelHandlerType.ModelType {
+public class RadioButtonGroupBase<GroupModelType: RadioButtonGroupModel, ModelHandlerType: ModelHandlerable<GroupModelType.SelectorModelType> & UIControl>: SelectorGroupSelectedHandlerBase<GroupModelType, ModelHandlerType> {
     
     //--------------------------------------------------
     // MARK: - Public Properties
diff --git a/VDS/Components/RadioSwatch/RadioSwatchGroup.swift b/VDS/Components/RadioSwatch/RadioSwatchGroup.swift
index b73e4f17..9b885c59 100644
--- a/VDS/Components/RadioSwatch/RadioSwatchGroup.swift
+++ b/VDS/Components/RadioSwatch/RadioSwatchGroup.swift
@@ -32,7 +32,7 @@ public class RadioSwatchGroup: RadioSwatchGroupBase<DefaultRadioSwatchGroupModel
     
 }
 
-public class RadioSwatchGroupBase<GroupModelType: RadioSwatchGroupModel, ModelHandlerType: ModelHandlerControl>: Control<GroupModelType>, Changable, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout, UICollectionViewDelegate where GroupModelType.SelectorModelType == ModelHandlerType.ModelType {
+public class RadioSwatchGroupBase<GroupModelType: RadioSwatchGroupModel, ModelHandlerType: ModelHandlerable<GroupModelType.SelectorModelType> & UIControl>: Control<GroupModelType>, Changable, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout, UICollectionViewDelegate {
 
     //--------------------------------------------------
     // MARK: - Public Properties
diff --git a/VDS/Protocols/ModelHandlerable.swift b/VDS/Protocols/ModelHandlerable.swift
index 6c311bf8..5affe2c1 100644
--- a/VDS/Protocols/ModelHandlerable.swift
+++ b/VDS/Protocols/ModelHandlerable.swift
@@ -9,7 +9,7 @@ import Foundation
 import Combine
 import UIKit
 
-public protocol ModelHandlerable: AnyObject, Initable {
+public protocol ModelHandlerable<ModelType>: AnyObject, Initable {
     associatedtype ModelType: Modelable
     var model: ModelType { get set }
     var modelPublisher: Published<ModelType>.Publisher { get }
@@ -42,5 +42,3 @@ extension ModelHandlerable {
             .store(in: &subscribers)
     }
 }
-
-public typealias ModelHandlerControl = ModelHandlerable & UIControl