Merge/release 26.8 into trunk (#25427)

* Fix background color for Leave Comment button (#25412)

* Fix scrolling to selected comment (#25389)

* Stats: Final Touches (#25418)

* Adjust spacing in Today card

* Use orange for map

* Fix ChartCardHeaderView disabling comparision (regression)

* Add a way to promote subrange to range

* Fix data point mapping on long-press or pan

* Slightly reduce spacing for collision detection

* Add Stats announcemnet (#25411)

Co-authored-by: Tony Li <tony.li@automattic.com>

* Merge release_notes/26.8 into release/26.8 (#25426)

* Add editorialized release notes for version 26.8

* Update metadata strings

* Update metadata strings

---------

Co-authored-by: Tony Li <tony.li@automattic.com>

---------

Co-authored-by: Alex Grebenyuk <alex.grebenyuk@automattic.com>
Co-authored-by: WordPress Mobile Bot Account <mobile+wpmobilebot@automattic.com>

Author: 3 people

Modules/Sources/JetpackStats/Cards/ChartCard.swift

@@ -82,7 +82,7 @@ struct ChartCard: View {
             trend: viewModel.selectedBarTrend ?? .make(data, context: .regular),
             metricTitle: metric.localizedTitle,
             period: context.formatters.dateRange.string(from: viewModel.dateRange.subrange ?? viewModel.dateRange.range),
-            showComparison: dateRange.comparison != .off
+            showDisclosureIndicator: viewModel.dateRange.subrange != nil
         )
     }
 
@@ -93,6 +93,9 @@ struct ChartCard: View {
             .padding(.trailing, Constants.step3 + Constants.step0_5)
             .accessibilityElement(children: .combine)
             .accessibilityLabel(Strings.Accessibility.cardTitle(metric.localizedTitle))
+            .simultaneousGesture(TapGesture().onEnded {
+                viewModel.promoteSubrangeToMainRange()
+            })
     }
 
     @ViewBuilder
@@ -314,7 +317,8 @@ struct ChartCardHeaderView: View {
         let trend: TrendViewModel
         let metricTitle: String
         let period: String
-        let showComparison: Bool
+        var showComparison: Bool = true
+        var showDisclosureIndicator: Bool = false
     }
 
     let viewModel: ViewModel
@@ -332,9 +336,17 @@ struct ChartCardHeaderView: View {
                         .font(.caption.weight(.medium))
                         .foregroundColor(.secondary)
                 }
-                Text(viewModel.period)
-                    .font(.system(.caption, design: .rounded, weight: .medium))
-                    .foregroundStyle(Color.secondary)
+                HStack(spacing: 2) {
+                    Text(viewModel.period)
+                        .font(.system(.caption, design: .rounded, weight: .medium))
+                        .foregroundStyle(Color.secondary)
+                    if viewModel.showDisclosureIndicator {
+                        Image(systemName: "chevron.forward")
+                            .font(.system(.caption2, weight: .semibold))
+                            .scaleEffect(0.8)
+                            .foregroundStyle(Color.secondary)
+                    }
+                }
                 if viewModel.showComparison {
                     Text("\(viewModel.trend.formattedChange)  \(viewModel.trend.iconSign) \(viewModel.trend.formattedPercentage)")
                         .font(.caption.weight(.semibold))

Modules/Sources/JetpackStats/Cards/ChartCardViewModel.swift

@@ -32,6 +32,7 @@ final class ChartCardViewModel: ObservableObject, TrafficCardViewModel {
     }
 
     weak var configurationDelegate: CardConfigurationDelegate?
+    var onDateRangeChanged: ((StatsDateRangeSelection) -> Void)?
 
     var dateRange: StatsDateRangeSelection {
         didSet {
@@ -221,6 +222,11 @@ final class ChartCardViewModel: ObservableObject, TrafficCardViewModel {
         return output
     }
 
+    func promoteSubrangeToMainRange() {
+        guard let subrange = dateRange.subrange else { return }
+        onDateRangeChanged?(StatsDateRangeSelection(range: subrange))
+    }
+
     var selectedBarTrend: TrendViewModel? {
         guard let selectedBarDate,
               let data = chartData[selectedMetric],

Modules/Sources/JetpackStats/Cards/TodayCard.swift

@@ -92,7 +92,7 @@ struct TodayCard: View {
     }
 
     private func makeMetricsView(with metrics: SiteMetricsSet) -> some View {
-        HStack(alignment: .bottom, spacing: 16) {
+        HStack(alignment: .bottom, spacing: 20) {
             ForEach(viewModel.configuration.metrics) { metric in
                 if metric == .views {
                     TodayCardProminentMetricView(value: metrics[metric], metric: metric)
@@ -130,7 +130,7 @@ struct TodayCard: View {
         .frame(maxWidth: .infinity)
         .padding(.trailing, 32)
         .padding(.vertical, 2)
-        .offset(y: -9)
+        .offset(y: -3)
         .transition(.opacity.combined(with: .scale(scale: 0.97)))
     }
 

Modules/Sources/JetpackStats/Cards/TopListCard.swift

@@ -108,7 +108,7 @@ struct TopListCard: View {
     private var mapView: some View {
         CountriesMapView(
             data: viewModel.countriesMapData ?? .init(metric: viewModel.selection.metric, locations: []),
-            primaryColor: Constants.Colors.uiColorBlue
+            primaryColor: Constants.Colors.uiColorOrange
         )
     }
 

Modules/Sources/JetpackStats/Charts/BarChartView.swift

@@ -324,12 +324,9 @@ struct BarChartView: View {
             return nil
         }
 
-        let origin = geometry[frame].origin
-        let location = CGPoint(
-            x: location.x - origin.x,
-            y: location.y - origin.y
-        )
-        guard let date: Date = proxy.value(atX: location.x) else {
+        let plotFrame = geometry[frame]
+        let adjustedX = max(0, min(location.x - plotFrame.origin.x, plotFrame.width))
+        guard let date: Date = proxy.value(atX: adjustedX) else {
             return nil
         }
         // `proxy.value(atX:)` returns a precise date at the tap location.

Modules/Sources/JetpackStats/Charts/Helpers/ChartHelper.swift

@@ -67,7 +67,7 @@ struct ChartHelper {
         } else {
             AxisMarks(values: .stride(by: granularity.component, count: 1, calendar: calendar)) { value in
                 if let date = value.as(Date.self) {
-                    AxisValueLabel(centered: true, collisionResolution: .greedy(minimumSpacing: 6)) {
+                    AxisValueLabel(centered: true, collisionResolution: .greedy(minimumSpacing: 5)) {
                         ChartAxisDateLabel(date: date, granularity: granularity)
                     }
                 }

Modules/Sources/JetpackStats/Constants.swift

@@ -43,6 +43,7 @@ public enum Constants {
         static let celadon = Color(palette: CSColor.Celadon.self)
 
         static let uiColorBlue = UIColor(palette: CSColor.Blue.self)
+        static let uiColorOrange = UIColor(palette: CSColor.Orange.self)
 
         static let jetpack = Color(palette: CSColor.JetpackGreen.self)
 

Modules/Sources/JetpackStats/StatsViewModel.swift

@@ -183,12 +183,16 @@ final class StatsViewModel: ObservableObject, CardConfigurationDelegate {
                 context: context
             )
         case .chart(let configuration):
-            viewModel = ChartCardViewModel(
+            let chartVM = ChartCardViewModel(
                 configuration: configuration,
                 dateRange: effectiveDateRange,
                 service: context.service,
                 tracker: context.tracker
             )
+            chartVM.onDateRangeChanged = { [weak self] newRange in
+                self?.dateRange = newRange
+            }
+            viewModel = chartVM
         case .topList(let configuration):
             viewModel = TopListViewModel(
                 configuration: configuration,

Modules/Sources/JetpackStats/Utilities/SelectedDataPoints.swift

@@ -13,31 +13,21 @@ struct SelectedDataPoints {
         mappedPreviousSeries: [DataPoint]
     ) -> SelectedDataPoints? {
         guard let date else { return nil }
-
-        // Since mappedPreviousData has the same dates as currentData,
-        // we only need to find the closest date in the current series
         guard !currentSeries.isEmpty else { return nil }
 
-        // Find the closest data point in the current series
-        guard let closestPoint = findClosestDataPoint(to: date, in: currentSeries + mappedPreviousSeries) else {
-            return nil
-        }
+        // Find the index of the closest point in currentSeries.
+        // Using index-based lookup so that the corresponding previous point is
+        // retrieved by position, not by exact Date equality — the mapped dates
+        // may differ slightly (e.g. across DST boundaries).
+        guard let closestIndex = currentSeries.indices.min(by: {
+            abs(currentSeries[$0].date.timeIntervalSince(date)) <
+            abs(currentSeries[$1].date.timeIntervalSince(date))
+        }) else { return nil }
 
-        // Find the closest date value
-        let closestDate = closestPoint.date
+        let currentPoint = currentSeries[closestIndex]
+        let previousPoint = mappedPreviousSeries.indices.contains(closestIndex) ? mappedPreviousSeries[closestIndex] : nil
+        let unmappedPrevious = previousSeries.indices.contains(closestIndex) ? previousSeries[closestIndex] : nil
 
-        // Find points with this exact date in both series
-        let currentPoint = currentSeries.first { $0.date == closestDate }
-        let previousPointIndex = mappedPreviousSeries.firstIndex { $0.date == closestDate }
-        var previousPoint: DataPoint? {
-            guard let previousPointIndex, mappedPreviousSeries.indices.contains(previousPointIndex) else { return nil }
-            return mappedPreviousSeries[previousPointIndex]
-        }
-        // We need this just to display the data in the tooltip.
-        var unmappedPrevious: DataPoint? {
-            guard let previousPointIndex, previousSeries.indices.contains(previousPointIndex) else { return nil }
-            return previousSeries[previousPointIndex]
-        }
         return SelectedDataPoints(current: currentPoint, previous: previousPoint, unmappedPrevious: unmappedPrevious)
     }
 
@@ -50,13 +40,4 @@ struct SelectedDataPoints {
         )
     }
 
-    // Helper method to find the closest data point to a given date
-    private static func findClosestDataPoint(to date: Date, in points: [DataPoint]) -> DataPoint? {
-        guard !points.isEmpty else { return nil }
-
-        // Find the point with minimum time difference
-        return points.min { point1, point2 in
-            abs(point1.date.timeIntervalSince(date)) < abs(point2.date.timeIntervalSince(date))
-        }
-    }
 }

Modules/Sources/JetpackStats/Views/ChartValueTooltipView.swift

@@ -75,8 +75,8 @@ struct ChartValueTooltipView: View {
             // Summary view
             if let trend {
                 ChartValuesSummaryView(trend: trend, style: .compact)
-            } else if let previousValue = previousPoint?.value {
-                Text(StatsValueFormatter(metric: metric).format(value: previousValue, context: .regular))
+            } else if let value = currentPoint?.value ?? previousPoint?.value {
+                Text(StatsValueFormatter(metric: metric).format(value: value, context: .regular))
                     .font(.subheadline.weight(.medium))
             }