fix: indicator install origin error

iWECon · Apr 25, 2023 · 09b7b8a · 09b7b8a
1 parent bad8768
commit 09b7b8a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/Demo/Segmenter/ViewController.swift b/Demo/Segmenter/ViewController.swift
@@ -44,7 +44,8 @@ class ViewController: UIViewController {
         let r = UIView()
         r.backgroundColor = .blue
         segmenter.isShadowShouldShow = false
-        segmenter.contentInset.bottom = 10
+        segmenter.contentInset.bottom = 14
+        segmenter.currentIndex = 1
         // set indicator
         segmenter.indicator = LineIndicator()
         segmenter.segments = [

diff --git a/Sources/Segmenter/Indicator/LineIndicator.swift b/Sources/Segmenter/Indicator/LineIndicator.swift
@@ -9,6 +9,8 @@ import UIKit
 
 public final class LineIndicator: UIView, Indicator {
 
+    public var spacing: CGFloat { 0 }
+
     public override init(frame: CGRect) {
         super.init(frame: frame)
 

diff --git a/Sources/Segmenter/Segmenter.swift b/Sources/Segmenter/Segmenter.swift
@@ -76,7 +76,14 @@ public final class Segmenter: UIControl {
     }
 
     /// Indicator, indicating the currently active segment
-    public var indicator: Indicator?
+    public var indicator: Indicator? {
+        didSet {
+            oldValue?.removeFromSuperview()
+            DispatchQueue.main.async {
+                self.reloadIndicator()
+            }
+        }
+    }
 
     /// some property(left/right) won’t be join calculate when use `.cetered` or `.evened`
     /// default is .init(top: 0, left: 15, bottom: 6, right: 15)
@@ -422,11 +429,15 @@ public final class Segmenter: UIControl {
         }
 
         layoutSubviews()
+        reloadIndicator()
     }
 
     func reloadIndicator() {
-        guard let indicator, let selectedSegmentView = segmentViews.filter({ $0.isSelected }).first else { return }
-        indicator.removeFromSuperview()
+        guard !segmentViews.isEmpty else { return }
+        let indexRange = 0 ..< segmentViews.count
+        guard let indicator, indexRange.contains(currentIndex) else { return }
+
+        let selectedSegmentView = segmentViews[currentIndex]
         self.scrollContainer.addSubview(indicator)
         indicator.install(withSementView: selectedSegmentView)
         // set origin