Fix datepicker empty row (#921)

JetBrains · Dec 6, 2023 · f9d8a45 · f9d8a45
1 parent 9e63b1f
commit f9d8a45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...3/material3/src/darwinMain/kotlin/androidx/compose/material3/PlatformDateFormat.darwin.kt b/...3/material3/src/darwinMain/kotlin/androidx/compose/material3/PlatformDateFormat.darwin.kt
@@ -43,6 +43,7 @@ internal actual object PlatformDateFormat {
         val nsDate = NSDate.dateWithTimeIntervalSince1970(utcTimeMillis / 1000.0)
 
         return NSDateFormatter().apply {
+            setTimeZone(TimeZone.UTC.toNSTimeZone())
             setLocale(locale)
             setDateFormat(pattern)
         }.stringFromDate(nsDate)

diff --git a/...material3/src/skikoMain/kotlin/androidx/compose/material3/KotlinxDatetimeCalendarModel.kt b/...material3/src/skikoMain/kotlin/androidx/compose/material3/KotlinxDatetimeCalendarModel.kt
@@ -156,7 +156,7 @@ internal class KotlinxDatetimeCalendarModel : CalendarModel {
     }
 
     private fun LocalDate.daysFromStartOfWeekToFirstOfMonth() =
-        (dayOfWeek.isoDayNumber - firstDayOfWeek).let { if (it > 0) it else 7 + it }
+        (dayOfWeek.isoDayNumber - firstDayOfWeek).let { if (it >= 0) it else 7 + it }
 }
 
 internal fun Instant.toCalendarDate(