diff --git a/VDS/Components/Carousel/Carousel.swift b/VDS/Components/Carousel/Carousel.swift index 077fc546..95abb990 100644 --- a/VDS/Components/Carousel/Carousel.swift +++ b/VDS/Components/Carousel/Carousel.swift @@ -47,33 +47,6 @@ open class Carousel: View { case none } - /// Enum used to describe the number of slides visible in the carousel container at one time. The default value will be 3UP in tablet and 1UP in mobile. - public enum Layout: String, CaseIterable { - case oneUP = "1UP" - case twoUP = "2UP" - case threeUP = "3UP" - case fourUP = "4UP" - case fiveUP = "5UP" - case sixUP = "6UP" - - var value: Int { - switch self { - case .oneUP: - 1 - case .twoUP: - 2 - case .threeUP: - 3 - case .fourUP: - 4 - case .fiveUP: - 5 - case .sixUP: - 6 - } - } - } - /// Space between each tile. The default value will be 24px (6X) in tablet and 12px (3X) in mobile. public enum Gutter: String, CaseIterable { case twelvePX = "12px" @@ -263,8 +236,8 @@ open class Carousel: View { $0.kind = .lowContrast $0.iconName = .leftCaret $0.iconOffset = .init(x: -2, y: 0) - $0.icon.size = UIDevice.isIPad ? .small : .xsmall - $0.size = UIDevice.isIPad ? .large : .small + $0.customContainerSize = UIDevice.isIPad ? 40 : 28 + $0.icon.customSize = UIDevice.isIPad ? 16 : 12 } /// Next button to show next slide. @@ -272,8 +245,8 @@ open class Carousel: View { $0.kind = .lowContrast $0.iconName = .rightCaret $0.iconOffset = .init(x: 2, y: 0) - $0.icon.size = UIDevice.isIPad ? .small : .xsmall - $0.size = UIDevice.isIPad ? .large : .small + $0.customContainerSize = UIDevice.isIPad ? 40 : 28 + $0.icon.customSize = UIDevice.isIPad ? 16 : 12 } /// A publisher for when the scrubber position changes. Passes parameters (position). @@ -355,10 +328,10 @@ open class Carousel: View { super.updateView() carouselScrollBar.numberOfSlides = data.count - carouselScrollBar.position = (carouselScrollBar.position == 0 || carouselScrollBar.position > carouselScrollBar.numberOfSlides) ? 1 : carouselScrollBar.position carouselScrollBar.layout = _layout - carouselScrollBar.isHidden = (Int((Float(carouselScrollBar.numberOfSlides)) * Float(carouselScrollBar._layout.value)) <= 1) ? true : false - + carouselScrollBar.position = (carouselScrollBar.position == 0 || carouselScrollBar.position > carouselScrollBar.numberOfSlides) ? 1 : carouselScrollBar.position + carouselScrollBar.isHidden = (totalPositions() <= 1) ? true : false + // When peek is set to ‘none,’ pagination controls are automatically set to persistent. if peek == .none { paginationDisplay = .persistent