From 45c2811adb6d7aa8d048845954a55017dc0f3ac9 Mon Sep 17 00:00:00 2001
From: fhasse95 <49185957+fhasse95@users.noreply.github.com>
Date: Sun, 21 Jun 2026 23:20:57 +0200
Subject: [PATCH] Update DatePicker.swift

---
 .../SkipUI/SkipUI/Controls/DatePicker.swift   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Sources/SkipUI/SkipUI/Controls/DatePicker.swift b/Sources/SkipUI/SkipUI/Controls/DatePicker.swift
index 0a439446..095e1934 100644
--- a/Sources/SkipUI/SkipUI/Controls/DatePicker.swift
+++ b/Sources/SkipUI/SkipUI/Controls/DatePicker.swift
@@ -193,20 +193,19 @@ public struct DatePicker : View, Renderable {
         guard isPresented.value else {
             return
         }
-        let timeZoneOffset = Double(TimeZone.current.secondsFromGMT())
-        let initialSeconds = selection.wrappedValue.timeIntervalSince1970 + timeZoneOffset
+        let initialMillis = datePickerMillis(from: selection.wrappedValue)
         let displayMode = EnvironmentValues.shared.verticalSizeClass == .compact ? DisplayMode.Input : DisplayMode.Picker
 
         // Create selectable dates filter if range is specified
-        let minMillis: Long? = minDate != nil ? Long((minDate!.timeIntervalSince1970 + timeZoneOffset) * 1000.0) : nil
-        let maxMillis: Long? = maxDate != nil ? Long((maxDate!.timeIntervalSince1970 + timeZoneOffset) * 1000.0) : nil
+        let minMillis: Long? = minDate != nil ? datePickerMillis(from: minDate!) : nil
+        let maxMillis: Long? = maxDate != nil ? datePickerMillis(from: maxDate!) : nil
 
         let state: DatePickerState
         if minMillis != nil || maxMillis != nil {
             // SKIP INSERT: val selectableDates = object : SelectableDates { override fun isSelectableDate(utcTimeMillis: Long): Boolean { val min = minMillis; val max = maxMillis; if (min != null && utcTimeMillis < min) return false; if (max != null && utcTimeMillis > max) return false; return true } override fun isSelectableYear(year: Int): Boolean { return true } }
-            state = rememberDatePickerState(initialSelectedDateMillis: Long(initialSeconds * 1000.0), initialDisplayMode: displayMode, selectableDates: selectableDates)
+            state = rememberDatePickerState(initialSelectedDateMillis: initialMillis, initialDisplayMode: displayMode, selectableDates: selectableDates)
         } else {
-            state = rememberDatePickerState(initialSelectedDateMillis: Long(initialSeconds * 1000.0), initialDisplayMode: displayMode)
+            state = rememberDatePickerState(initialSelectedDateMillis: initialMillis, initialDisplayMode: displayMode)
         }
 
         let colors = DatePickerDefaults.colors(selectedDayContainerColor: tintColor, selectedYearContainerColor: tintColor, todayDateBorderColor: tintColor, currentYearContentColor: tintColor)
@@ -214,10 +213,21 @@ public struct DatePicker : View, Renderable {
             DatePicker(modifier: context.modifier, state: state, colors: colors)
         }
         if let millis = state.selectedDateMillis {
-            dateSelected(Date(timeIntervalSince1970: Double(millis / 1000.0) - timeZoneOffset))
+            dateSelected(date(fromDatePickerMillis: millis))
         }
     }
 
+    private func datePickerMillis(from date: Date) -> Long {
+        let timeZoneOffset = Double(TimeZone.current.secondsFromGMT(for: date))
+        return Long((date.timeIntervalSince1970 + timeZoneOffset) * 1000.0)
+    }
+
+    private func date(fromDatePickerMillis millis: Long) -> Date {
+        let utcDate = Date(timeIntervalSince1970: Double(millis) / 1000.0)
+        let timeZoneOffset = Double(TimeZone.current.secondsFromGMT(for: utcDate))
+        return Date(timeIntervalSince1970: utcDate.timeIntervalSince1970 - timeZoneOffset)
+    }
+
     // SKIP INSERT: @OptIn(ExperimentalMaterial3Api::class)
     @Composable private func RenderTimePicker(context: ComposeContext, isPresented: MutableState<Bool>, tintColor: androidx.compose.ui.graphics.Color, hour: Int, minute: Int, timeSelected: (Int, Int) -> Void) {
         guard isPresented.value else {