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

cleaned up code in tabs

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2023-06-09 14:17:53 -05:00
parent c1c57084cb
commit b0dbb2c2a7
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
VDS/Components/Tabs/Tabs.swift
View File

@ -270,48 +270,37 @@ open class Tabs: View {
} }
//update the width based on rules //update the width based on rules
updateWidth() updateContentView()
setNeedsLayout() setNeedsLayout()
layoutIfNeeded() layoutIfNeeded()
} }
private func updateWidth() { private func updateContentView() {
// Deactivate old constraint // Deactivate old constraint
contentViewWidthConstraint?.isActive = false contentViewWidthConstraint?.isActive = false
// Apply width // Apply overflow
if orientation == .vertical { if orientation == .horizontal && overflow == .scroll && !fillContainer {
contentViewWidthConstraint = contentView.widthAnchor.constraint(equalTo: widthAnchor) let contentWidth = tabStackView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize).width
contentViewWidthConstraint = contentView.widthAnchor.constraint(equalToConstant: contentWidth)
scrollView.contentSize = CGSize(width: contentWidth, height: scrollView.bounds.height)
} else { } else {
// Apply overflow contentViewWidthConstraint = contentView.widthAnchor.constraint(equalTo: widthAnchor)
if overflow == .scroll && !fillContainer { scrollView.contentSize = bounds.size
let contentWidth = tabStackView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize).width
contentViewWidthConstraint = contentView.widthAnchor.constraint(equalToConstant: contentWidth)
// Enable scrolling if necessary
scrollView.contentSize = CGSize(width: contentWidth, height: scrollView.bounds.height)
} else {
contentViewWidthConstraint = contentView.widthAnchor.constraint(equalTo: widthAnchor)
}
} }
scrollView.isScrollEnabled = scrollIsEnabled scrollView.isScrollEnabled = scrollIsEnabled
// Activate old constraint // Activate old constraint
contentViewWidthConstraint?.isActive = true contentViewWidthConstraint?.isActive = true
scrollToSelectedIndex(animated: true)
} }
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
//scrollView Contentsize
if orientation == .horizontal && overflow == .scroll && !fillContainer {
let contentWidth = tabStackView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize).width
scrollView.contentSize = CGSize(width: contentWidth, height: scrollView.bounds.height)
} else {
scrollView.contentSize = bounds.size
}
//borderLine //borderLine
if borderLine { if borderLine {
var edge: UIRectEdge = .bottom var edge: UIRectEdge = .bottom
@ -354,7 +343,5 @@ open class Tabs: View {
} else { } else {
borderlineView.isHidden = true borderlineView.isHidden = true
} }
scrollToSelectedIndex(animated: true)
} }
} }