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

fixes for pager

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-07-08 17:31:34 -04:00
parent 2052e4ddc6
commit f9a57f5fe5
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ open class Carousel: View {
// 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.paging == true || model.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)
self.collectionView.layoutIfNeeded() self.collectionView.layoutIfNeeded()
@ -108,6 +108,11 @@ open class Carousel: View {
bottomPin = NSLayoutConstraint.constraintPinSubview(toSuperview: collectionView)?[ConstraintBot] as? NSLayoutConstraint bottomPin = NSLayoutConstraint.constraintPinSubview(toSuperview: collectionView)?[ConstraintBot] as? NSLayoutConstraint
collectionViewHeight = collectionView.heightAnchor.constraint(equalToConstant: 300) collectionViewHeight = collectionView.heightAnchor.constraint(equalToConstant: 300)
collectionViewHeight?.isActive = true collectionViewHeight?.isActive = true
// Fixes defects where it scrolls when it shouldn't with voiceover
if UIAccessibility.isVoiceOverRunning {
collectionView.isScrollEnabled = false
}
} }
open override func updateView(_ size: CGFloat) { open override func updateView(_ size: CGFloat) {
@ -382,6 +387,11 @@ extension Carousel: UIScrollViewDelegate {
setAccessiblity(collectionView.cellForItem(at: IndexPath(row: currentIndex, section: 0)), index: index) setAccessiblity(collectionView.cellForItem(at: IndexPath(row: currentIndex, section: 0)), index: index)
UIAccessibility.post(notification: .layoutChanged, argument: cell) UIAccessibility.post(notification: .layoutChanged, argument: cell)
} }
// Force call if no animation
if !animated {
scrollViewDidEndScrollingAnimation(collectionView)
}
} }
/// Adjusts the current contentOffset if we are going onto buffer cells while looping to help with the endless scrolling appearance. /// Adjusts the current contentOffset if we are going onto buffer cells while looping to help with the endless scrolling appearance.
@ -407,8 +417,7 @@ extension Carousel: UIScrollViewDelegate {
open func scrollViewDidScroll(_ scrollView: UIScrollView) { open func scrollViewDidScroll(_ scrollView: UIScrollView) {
// Adjust for looping // Adjust for looping
if let model = model as? CarouselModel, if loop == true {
model.loop == true {
adjustOffsetForLooping(scrollView) adjustOffsetForLooping(scrollView)
} }