Preselect dates on the range time picker

Author: Ecarrion

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsTimeRangeCard.swift

@@ -38,8 +38,7 @@ struct AnalyticsTimeRangeCard: View {
                     ServiceLocator.analytics.track(event: .AnalyticsHub.dateRangeOptionSelected(selection.tracksIdentifier))
                 }
                 .sheet(isPresented: $showCustomRangeSelectionView) {
-                    // TODO: Pass real dates here
-                    RangedDatePicker() { start, end in
+                    RangedDatePicker(startDate: selectionType.startDate, endDate: selectionType.endDate) { start, end in
                         showTimeRangeSelectionView = false // Dismiss the initial sheet for a smooth transition
                         self.selectionType = .custom(start: start, end: end)
                     }

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/AnalyticsHubTimeRageAdapter.swift

@@ -8,7 +8,7 @@ struct AnalyticsHubRangeAdapter {
 
     /// Converts an `AnalyticsHubTimeRangeSelection.SelectionType` range into a `AnalyticsTimeRangeCard.Range`.
     ///
-    fileprivate static func timeCardRange(from analyticsHubRange: AnalyticsHubTimeRangeSelection.SelectionType) -> AnalyticsTimeRangeCard.Range {
+    static func timeCardRange(from analyticsHubRange: AnalyticsHubTimeRangeSelection.SelectionType) -> AnalyticsTimeRangeCard.Range {
         switch analyticsHubRange {
         case .custom:
             return .custom
@@ -37,7 +37,7 @@ struct AnalyticsHubRangeAdapter {
 
     /// Converts an `AnalyticsTimeRangeCard.Range` into a `AnalyticsHubTimeRangeSelection.SelectionType` range.
     ///
-    fileprivate static func analyticsHubRange(from timeCardRange: AnalyticsTimeRangeCard.Range) -> AnalyticsHubTimeRangeSelection.SelectionType {
+    static func analyticsHubRange(from timeCardRange: AnalyticsTimeRangeCard.Range) -> AnalyticsHubTimeRangeSelection.SelectionType {
         switch timeCardRange {
         case .custom:
             return .custom(start: Date(), end: Date())
@@ -179,6 +179,17 @@ struct AnalyticsHubRangeAdapter {
             return TracksIdentifier.yearToDate
         }
     }
+
+    /// Extracts the dates from an analytics hub range custom type.
+    ///
+    static func customDates(from analyticsHubRange: AnalyticsHubTimeRangeSelection.SelectionType) -> (start: Date, end: Date)? {
+        switch analyticsHubRange {
+        case let .custom(startDate, endDate):
+            return (startDate, endDate)
+        default:
+            return nil
+        }
+    }
 }
 
 // MARK: Constants
@@ -241,4 +252,16 @@ extension AnalyticsHubTimeRangeSelection.SelectionType {
     var asTimeCardRange: AnalyticsTimeRangeCard.Range {
         AnalyticsHubRangeAdapter.timeCardRange(from: self)
     }
+
+    /// Extracts the start date from custom range type.
+    ///
+    var startDate: Date? {
+        AnalyticsHubRangeAdapter.customDates(from: self)?.start
+    }
+
+    /// Extracts the end date from custom range type.
+    ///
+    var endDate: Date? {
+        AnalyticsHubRangeAdapter.customDates(from: self)?.end
+    }
 }

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/RangedDatePicker.swift

@@ -22,9 +22,9 @@ struct RangedDatePicker: View {
 
     /// Custom `init` to provide intial start and end dates.
     ///
-    init(startDate: Date = Date(), endDate: Date = Date(), datesSelected: ((_ start: Date, _ end: Date) -> Void)? = nil) {
-        self._startDate = State(initialValue: startDate)
-        self._endDate = State(initialValue: endDate)
+    init(startDate: Date? = nil, endDate: Date? = nil, datesSelected: ((_ start: Date, _ end: Date) -> Void)? = nil) {
+        self._startDate = State(initialValue: startDate ?? Date())
+        self._endDate = State(initialValue: endDate ?? Date())
         self.datesSelected = datesSelected
     }