wip

tomosaaan · Nov 22, 2024 · f8bebf3 · f8bebf3
1 parent 7883076
commit f8bebf3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 34 deletions.
diff --git a/Example/Example/ContentView.swift b/Example/Example/ContentView.swift
@@ -17,7 +17,7 @@ struct ContentView: View {
             id: \.x,
             selectedData: $selectedData
         )
-        .hiddenChart(true)
+//        .hiddenChart(true)
 //        .frame(height: 300, alignment: .bottom)
 //        .hiddenChart(true)
 //        .minCount(3)

diff --git a/Sources/GraphRangeSlider/GraphRangeSlider.swift b/Sources/GraphRangeSlider/GraphRangeSlider.swift
@@ -26,26 +26,8 @@ public struct GraphRangeSlider<Data, ID>: View where Data: RandomAccessCollectio
     @Environment(\.isHiddenChart) private var isHiddenChart: Bool
 
     public var body: some View {
-        Group {
-            if isHiddenChart {
-                Group {
-                    if !positions.isEmpty {
-                        Slider(
-                            positions: positions,
-                            onEnded: { builder.onEnded.call(selectedData) },
-                            leftCurrentIndex: $leftCurrentIndex,
-                            rightCurrentIndex: $rightCurrentIndex
-                        )
-                        .frame(height: toggleRadius * 2)
-                    }
-                }
-                .onAppear {
-                    if positions.isEmpty {
-                        updatePositions()
-                        updateIndices()
-                    }
-                }
-            } else {
+        VStack(spacing: margin) {
+            if !isHiddenChart {
                 Chart(data, id: id) { data in
                     BarMark(
                         x: .value(PlottableKeys.x, String(describing: data.x)),
@@ -60,26 +42,24 @@ public struct GraphRangeSlider<Data, ID>: View where Data: RandomAccessCollectio
                         )
                     )
                 }
-                .padding(.horizontal, toggleRadius * 2)
-                .padding(.bottom, toggleRadius + sliderBarHeight / 2 + margin)
                 .chartXAxis(.hidden)
                 .chartYAxis(.hidden)
                 .chartLegend(.hidden)
                 .chartForegroundStyleScale([
                     Status.active: activeColor,
                     Status.inactive: inactiveColor
                 ])
-                .overlay(alignment: .bottom) {
-                    if !positions.isEmpty {
-                        Slider(
-                            positions: positions,
-                            onEnded: { builder.onEnded.call(selectedData) },
-                            leftCurrentIndex: $leftCurrentIndex,
-                            rightCurrentIndex: $rightCurrentIndex
-                        )
-                        .frame(height: toggleRadius * 2)
-                    }
-                }
+                .padding(.horizontal, toggleRadius * 2)
+            }
+
+            if !positions.isEmpty {
+                Slider(
+                    positions: positions,
+                    onEnded: { builder.onEnded.call(selectedData) },
+                    leftCurrentIndex: $leftCurrentIndex,
+                    rightCurrentIndex: $rightCurrentIndex
+                )
+                .frame(height: toggleRadius * 2)
             }
         }
         .background(