Cleanup

Author: kean

Modules/Sources/JetpackStats/Cards/ChartCard.swift

@@ -85,6 +85,7 @@ struct ChartCard: View {
             }
             chartContentView
         }
+        .environment(\.showComparison, dateRange.comparison != .off)
         .animation(.spring, value: selectedMetric)
         .animation(.spring, value: selectedChartType)
         .animation(.easeInOut, value: viewModel.isFirstLoad)
@@ -272,9 +273,9 @@ struct ChartCard: View {
     private func chartContentView(data: ChartData) -> some View {
         switch selectedChartType {
         case .line:
-            LineChartView(data: data, showComparison: dateRange.comparison != .off)
+            LineChartView(data: data)
         case .columns:
-            BarChartView(data: data, showComparison: dateRange.comparison != .off) { selection in
+            BarChartView(data: data) { selection in
                 handleDateSelection(selection, data: data)
             }
         }

Modules/Sources/JetpackStats/Cards/StandaloneChartCard.swift

@@ -63,6 +63,7 @@ struct StandaloneChartCard: View {
             dateRangeControls
                 .dynamicTypeSize(...DynamicTypeSize.xLarge)
         }
+        .environment(\.showComparison, dateRange.comparison != .off)
         .padding(.vertical, Constants.step2)
         .padding(.horizontal, Constants.step3)
         .dynamicTypeSize(...DynamicTypeSize.xxLarge)
@@ -127,9 +128,9 @@ struct StandaloneChartCard: View {
     private func chartContent(chartData: ChartData) -> some View {
         switch chartType {
         case .line:
-            LineChartView(data: chartData, showComparison: dateRange.comparison != .off)
+            LineChartView(data: chartData)
         case .columns:
-            BarChartView(data: chartData, showComparison: dateRange.comparison != .off)
+            BarChartView(data: chartData)
         }
     }
 

Modules/Sources/JetpackStats/Charts/BarChartView.swift

@@ -3,7 +3,6 @@ import Charts
 
 struct BarChartView: View {
     let data: ChartData
-    var showComparison: Bool = true
     var onDateSelected: ((Date) -> Void)? = nil
 
     @State private var selectedDataPoints: SelectedDataPoints?
@@ -12,6 +11,7 @@ struct BarChartView: View {
 
     @Environment(\.context) var context
     @Environment(\.colorScheme) var colorScheme
+    @Environment(\.showComparison) private var showComparison
 
     private var valueFormatter: StatsValueFormatter {
         StatsValueFormatter(metric: data.metric)

Modules/Sources/JetpackStats/Charts/LineChartView.swift

@@ -3,13 +3,13 @@ import Charts
 
 struct LineChartView: View {
     let data: ChartData
-    var showComparison: Bool = true
 
     @State private var selectedDate: Date?
     @State private var selectedDataPoints: SelectedDataPoints?
 
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.context) var context
+    @Environment(\.showComparison) private var showComparison
 
     private var valueFormatter: StatsValueFormatter {
         StatsValueFormatter(metric: data.metric)

Modules/Sources/JetpackStats/Utilities/ChartEnvironment.swift

@@ -0,0 +1,12 @@
+import SwiftUI
+
+private struct ShowComparisonKey: EnvironmentKey {
+    static let defaultValue = true
+}
+
+extension EnvironmentValues {
+    var showComparison: Bool {
+        get { self[ShowComparisonKey.self] }
+        set { self[ShowComparisonKey.self] = newValue }
+    }
+}

Modules/Sources/JetpackStats/Views/StatsDateRangePickerMenu.swift

@@ -51,7 +51,6 @@ struct StatsDateRangePickerMenu: View {
                 selection.update(preset: preset)
                 UIImpactFeedbackGenerator(style: .light).impactOccurred()
 
-                // Track preset selection
                 context.tracker?.send(.dateRangePresetSelected, properties: [
                     "selected_preset": preset.analyticsName
                 ])
@@ -64,10 +63,11 @@ struct StatsDateRangePickerMenu: View {
             ForEach(DateRangeComparisonPeriod.allCases) { period in
                 Button(action: {
                     let previousPeriod = selection.comparison
-                    selection.update(comparisonPeriod: period)
+                    withAnimation {
+                        selection.update(comparisonPeriod: period)
+                    }
                     UIImpactFeedbackGenerator(style: .light).impactOccurred()
 
-                    // Track comparison period change
                     context.tracker?.send(.comparisonPeriodChanged, properties: [
                         "from_period": previousPeriod.analyticsName,
                         "to_period": period.analyticsName