mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/molecule_replacement_behavior' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/molecule_replacement_header_fix

Browse Source
This commit is contained in:
vimal 2024-01-03 15:26:37 +05:30
commit b6623b34c6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
View File

@ -87,7 +87,7 @@ open class Carousel: View {
showPeaking(false) showPeaking(false)
// Go to current cell. layoutIfNeeded is needed otherwise cellForItem returns nil for peaking logic. The dispatch is a sad way to ensure the collection view is ready to be scrolled. // Go to current cell. layoutIfNeeded is needed otherwise cellForItem returns nil for peaking logic. The dispatch is a sad way to ensure the collection view is ready to be scrolled.
guard let model = model as? CarouselModel, guard let model = model as? CarouselModel, !model.molecules.isEmpty,
(model.paging == true || loop == true) else { return } (model.paging == true || loop == true) else { return }
DispatchQueue.main.async { DispatchQueue.main.async {
self.collectionView.scrollToItem(at: IndexPath(row: self.currentIndex, section: 0), at: self.itemAlignment, animated: false) self.collectionView.scrollToItem(at: IndexPath(row: self.currentIndex, section: 0), at: self.itemAlignment, animated: false)

5
MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift
View File

@ -8,7 +8,6 @@
import UIKit import UIKit
@objcMembers public class CarouselModel: ParentMoleculeModelProtocol, FormFieldProtocol { @objcMembers public class CarouselModel: ParentMoleculeModelProtocol, FormFieldProtocol {
//-------------------------------------------------- //--------------------------------------------------
@ -57,14 +56,14 @@ import UIKit
guard selectable else { guard selectable else {
// Use visible item value, else index // Use visible item value, else index
if let fieldValue = molecules[index].formFieldValue() { if let fieldValue = molecules[safe: index]?.formFieldValue() {
return fieldValue return fieldValue
} }
return index return index
} }
// Use selected item value, else index // Use selected item value, else index
guard let selectedIndex = selectedIndex else { return nil } guard let selectedIndex = selectedIndex else { return nil }
guard let fieldValue = molecules[selectedIndex].formFieldValue() else { return selectedIndex } guard let fieldValue = molecules[safe: selectedIndex]?.formFieldValue() else { return selectedIndex }
return fieldValue return fieldValue
} }