From fb22b5c614ef706cc7744e2eafb1472aaea4e726 Mon Sep 17 00:00:00 2001 From: Keerthy Date: Fri, 21 Jul 2023 15:44:35 +0530 Subject: [PATCH 1/4] Removed accessibilityElements to resolve focus stuck --- MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift index 7d8b991c..4faff136 100644 --- a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift +++ b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift @@ -55,7 +55,6 @@ open class ThreeLayerTableViewController: ProgrammaticTableViewController { createViewForTableHeader() createViewForTableFooter() tableView?.reloadData() - accessibilityElements = [tableView as Any] } override open func viewDidLoad() { From e70d1dc15107015d841f2a99b77bc9ff3c4788c1 Mon Sep 17 00:00:00 2001 From: Keerthy Date: Fri, 21 Jul 2023 15:58:34 +0530 Subject: [PATCH 2/4] Focus getting stuck in backward direction for stack --- MVMCoreUI/Atomic/Organisms/Stack.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Organisms/Stack.swift b/MVMCoreUI/Atomic/Organisms/Stack.swift index 1f35e34d..f79ef8f3 100644 --- a/MVMCoreUI/Atomic/Organisms/Stack.swift +++ b/MVMCoreUI/Atomic/Organisms/Stack.swift @@ -48,13 +48,13 @@ open class Stack: Container where T: (StackModelProtocol & MoleculeModelProto } isAccessibilityElement = false - var accessibleViews: [Any] = [] + /* var accessibleViews: [Any] = [] for (index, view) in stackItems.enumerated() where !stackModel.molecules[index].gone { accessibleViews.append(view) } - accessibilityElements = accessibleViews + accessibilityElements = accessibleViews */ } /// Removes all stack items views from the view. From a8115e068e54426b0dfa1bb32e4e055ba993d5d9 Mon Sep 17 00:00:00 2001 From: Krishna Kishore Bandaru Date: Mon, 24 Jul 2023 20:15:01 +0530 Subject: [PATCH 3/4] added accessibilityElements for stack --- MVMCoreUI/Atomic/Organisms/Stack.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Organisms/Stack.swift b/MVMCoreUI/Atomic/Organisms/Stack.swift index f79ef8f3..1f35e34d 100644 --- a/MVMCoreUI/Atomic/Organisms/Stack.swift +++ b/MVMCoreUI/Atomic/Organisms/Stack.swift @@ -48,13 +48,13 @@ open class Stack: Container where T: (StackModelProtocol & MoleculeModelProto } isAccessibilityElement = false - /* var accessibleViews: [Any] = [] + var accessibleViews: [Any] = [] for (index, view) in stackItems.enumerated() where !stackModel.molecules[index].gone { accessibleViews.append(view) } - accessibilityElements = accessibleViews */ + accessibilityElements = accessibleViews } /// Removes all stack items views from the view. From dce8143ed2a28b70d0cbfa94f33b68bd75b18d19 Mon Sep 17 00:00:00 2001 From: Sumanth Nadigadda Date: Fri, 28 Jul 2023 17:35:59 +0530 Subject: [PATCH 4/4] changing access from public to open for few methods in base drop down field --- .../TextFields/Dropdown Fields/BaseDropdownEntryField.swift | 6 +++--- .../TextFields/Dropdown Fields/BaseDropdownFieldModel.swift | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryField.swift index 172f304d..96bb8acf 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryField.swift @@ -66,7 +66,7 @@ import MVMCore // MARK: - Setup //-------------------------------------------------- - @objc public override func setupFieldContainerContent(_ container: UIView) { + @objc open override func setupFieldContainerContent(_ container: UIView) { super.setupFieldContainerContent(container) container.addSubview(dropDownCaretView) @@ -79,7 +79,7 @@ import MVMCore dropDownCaretView.centerYAnchor.constraint(equalTo: container.centerYAnchor).isActive = true } - public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { + open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { super.set(with: model, delegateObject, additionalData) self.additionalData = additionalData guard let model = model as? BaseDropdownEntryFieldModel else { return } @@ -87,7 +87,7 @@ import MVMCore dropDownCaretView.setOptional(with: model.caretView, delegateObject, additionalData) } - @objc public override func dismissFieldInput(_ sender: Any?) { + @objc open override func dismissFieldInput(_ sender: Any?) { if !textField.isFirstResponder { performDropdownAction() } diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownFieldModel.swift index d13935d5..e5f2e0b7 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownFieldModel.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownFieldModel.swift @@ -14,7 +14,7 @@ public var caretView: CaretViewModel? public var action: ActionModelProtocol? - public override class var identifier: String { "" } + open override class var identifier: String { "" } //-------------------------------------------------- // MARK: - Keys @@ -46,7 +46,7 @@ action = try typeContainer.decodeModelIfPresent(codingKey: .action) } - public override func encode(to encoder: Encoder) throws { + open override func encode(to encoder: Encoder) throws { try super.encode(to: encoder) var container = encoder.container(keyedBy: CodingKeys.self) try container.encode(moleculeName, forKey: .moleculeName)