diff --git a/MVMCoreUI/Atomic/Organisms/Stack.swift b/MVMCoreUI/Atomic/Organisms/Stack.swift index e70485a7..9440ccc5 100644 --- a/MVMCoreUI/Atomic/Organisms/Stack.swift +++ b/MVMCoreUI/Atomic/Organisms/Stack.swift @@ -14,7 +14,6 @@ open class Stack: Container where T: (StackModelProtocol & MoleculeModelProto open var contentView: UIView = MVMCoreUICommonViewsUtility.commonView() open var stackItems: [UIView] = [] - var didSetAcessibilityElements = false open var stackModel: T? { get { return model as? T } @@ -48,15 +47,6 @@ open class Stack: Container where T: (StackModelProtocol & MoleculeModelProto addView(view, stackModel.molecules[index], totalSpacing: totalSpace, lastItem: lastItemIndex == index) } - // setAccessibilityElements() - } - - open func setAccessibilityElements() { - - guard !didSetAcessibilityElements, - let stackModel = stackModel - else { return } - isAccessibilityElement = false var accessibleViews: [Any] = [] @@ -65,7 +55,6 @@ open class Stack: Container where T: (StackModelProtocol & MoleculeModelProto } accessibilityElements = accessibleViews - didSetAcessibilityElements = true } /// Removes all stack items views from the view. diff --git a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift index 9c7f3ba6..12f9ce4d 100644 --- a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift +++ b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift @@ -108,10 +108,6 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol } } - open override func accessibilityElementCount() -> Int { - return moleculesInfo?.count ?? 0 - } - open func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat { guard let moleculeInfo = moleculesInfo?[indexPath.row], let estimatedHeight = (moleculeInfo.class as? MoleculeViewProtocol.Type)?.estimatedHeight(with: moleculeInfo.molecule, delegateObject() as? MVMCoreUIDelegateObject) diff --git a/MVMCoreUI/BaseClasses/TableViewCell.swift b/MVMCoreUI/BaseClasses/TableViewCell.swift index 8f936020..c4c1f35c 100644 --- a/MVMCoreUI/BaseClasses/TableViewCell.swift +++ b/MVMCoreUI/BaseClasses/TableViewCell.swift @@ -126,7 +126,6 @@ import UIKit selectionStyle = .none insetsLayoutMarginsFromSafeArea = false preservesSuperviewLayoutMargins = false - isAccessibilityElement = false contentView.insetsLayoutMarginsFromSafeArea = false contentView.preservesSuperviewLayoutMargins = false styleStandard() diff --git a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift index 7d3b7d6b..494599dc 100644 --- a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift +++ b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift @@ -41,7 +41,7 @@ open class ThreeLayerTableViewController: ProgrammaticTableViewController { createViewForTableHeader() createViewForTableFooter() tableView?.reloadData() -// accessibilityElements = [tableView as Any] + accessibilityElements = [tableView as Any] } override open func viewDidLoad() {