Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix web datepicker text field illegal input crash #1368

Merged
merged 3 commits into from
May 23, 2024
Merged

Fix web datepicker text field illegal input crash #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a13f601
datetime 0.6.0, safe parsing
alexzhirkevich May 23, 2024
b82b195
do not replace narrow weekday
alexzhirkevich May 23, 2024
0a5c0b1
move exception check to web
alexzhirkevich May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...rial3/src/skikoTest/kotlin/androidx/compose/material3/KotlinxDatetimeCalendarModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,15 @@ internal class KotlinxDatetimeCalendarModelTest {
assertThat(model.getDateInputFormat(locale).patternWithoutDelimiters).isEqualTo("ddMMyyyy")
assertThat(model.getDateInputFormat(locale).delimiter).isEqualTo('-')
}

@Test
fun illegalDateParsingDoesNotThrowException(){
val model = KotlinxDatetimeCalendarModel(calendarLocale("en","US"))

assertThat(model.parse("50-50-2000","MM-dd-yyyy")).isEqualTo(null)
assertThat(model.parse("50-50-2000","")).isEqualTo(null)
assertThat(model.parse("","MM-dd-yyyy")).isEqualTo(null)
}
}

internal const val January2022Millis = 1640995200000
89 changes: 39 additions & 50 deletions ...material3/src/webCommonW3C/kotlin/androidx/compose/material3/PlatformDateFormat.jsWasm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@ package androidx.compose.material3
import androidx.compose.ui.text.intl.Locale
import kotlinx.datetime.Instant
import kotlinx.datetime.LocalDate
import kotlinx.datetime.LocalDateTime
import kotlinx.datetime.TimeZone
import kotlinx.datetime.atTime
import kotlinx.datetime.format
import kotlinx.datetime.format.FormatStringsInDatetimeFormats
import kotlinx.datetime.format.byUnicodePattern
import kotlinx.datetime.toInstant
import kotlinx.datetime.toLocalDateTime

Expand All @@ -44,7 +48,8 @@ internal actual class PlatformDateFormat actual constructor(private val locale:
listOf("AE", "AG", "AL", "AS", "AU", "BB", "BD", "BH", "BM", "BN", "BS", "BT", "CA", "CN", "CO", "CY", "DJ", "DM", "DO", "DZ", "EG", "EH", "ER", "ET", "FJ", "FM", "GD", "GH", "GM", "GR", "GU", "GY", "HK", "IN", "IQ", "JM", "JO", "KH", "KI", "KN", "KP", "KR", "KW", "KY", "LB", "LC", "LR", "LS", "LY", "MH", "MO", "MP", "MR", "MW", "MY", "NA", "NZ", "OM", "PA", "PG", "PH", "PK", "PR", "PS", "PW", "QA", "SA", "SB", "SD", "SG", "SL", "SO", "SS", "SY", "SZ", "TC", "TD", "TN", "TO", "TT", "TW", "UM", "US", "VC", "VE", "VG", "VI", "VU", "WS", "YE", "ZM")
}

//TODO: replace formatting with kotlinx datetime when supported (see https://github.com/Kotlin/kotlinx-datetime/pull/251)
//TODO: replace manual locale-aware formatting with kotlinx-datetime when supported
@OptIn(FormatStringsInDatetimeFormats::class)
actual fun formatWithPattern(
utcTimeMillis: Long,
pattern: String,
Expand All @@ -56,36 +61,32 @@ internal actual class PlatformDateFormat actual constructor(private val locale:

val jsDate = Date(utcTimeMillis.toDouble())

val monthShort = jsDate.toLocaleDateString(
locales = locale.toLanguageTag(),
options = dateLocaleOptions {
month = SHORT
})
val (monthShort, monthLong) = listOf(SHORT, LONG).map {
jsDate.toLocaleDateString(
locales = locale.toLanguageTag(),
options = dateLocaleOptions {
month = it
}
)
}

val monthLong = jsDate.toLocaleDateString(
locales = locale.toLanguageTag(),
options = dateLocaleOptions {
month = LONG
})
val (wdShort, wdLong) = listOf(SHORT, LONG).map {
jsDate.toLocaleDateString(
locales = locale.toLanguageTag(),
options = dateLocaleOptions {
weekday = it
}
)
}

return pattern
.replace("yyyy", date.year.toString(), ignoreCase = true)
.replace("yy", date.year.toString().takeLast(2), ignoreCase = true)
return date
.format(LocalDateTime.Format { byUnicodePattern(pattern) })
.replace("MMMM", monthLong)
.replace("MMM", monthShort)
.replace("MM", date.monthNumber.toStringWithLeadingZero())
.replace("M", date.monthNumber.toString())
.replace("dd", date.dayOfMonth.toStringWithLeadingZero(), ignoreCase = true)
.replace("d", date.dayOfMonth.toString(), ignoreCase = true)
.replace("hh", date.hour.toStringWithLeadingZero(), ignoreCase = true)
.replace("h", date.hour.toString(), ignoreCase = true)
.replace("ii", date.minute.toStringWithLeadingZero(), ignoreCase = true)
.replace("i", date.minute.toString(), ignoreCase = true)
.replace("ss", date.second.toStringWithLeadingZero(), ignoreCase = true)
.replace("s", date.second.toString(), ignoreCase = true)
.replace("EEEE", wdLong)
.replace("EEE", wdShort)
}


actual fun formatWithSkeleton(
utcTimeMillis: Long,
skeleton: String,
Expand Down Expand Up @@ -137,35 +138,23 @@ internal actual class PlatformDateFormat actual constructor(private val locale:
)
}

@OptIn(FormatStringsInDatetimeFormats::class)
actual fun parse(
date: String,
pattern: String
): CalendarDate? {
val year = parseSegment(date, pattern, "yyyy")
?: return null

val month = parseSegment(date, pattern, "mm")
?: parseSegment(date, pattern, "m")
?: return null

val day = parseSegment(date, pattern, "dd")
?: parseSegment(date, pattern, "d")
?: 1

return LocalDate(
year, month, day
).atTime(Midnight)
.toInstant(TimeZone.UTC)
.toCalendarDate(TimeZone.UTC)
}

private fun parseSegment(date: String, pattern: String, segmentPattern: String): Int? {
val index = pattern
.indexOf(segmentPattern, ignoreCase = true)
.takeIf { it >= 0 } ?: return null

return date.substring(index, index + segmentPattern.length)
.toIntOrNull()
return try {
LocalDate.parse(
input = date,
format = LocalDate.Format {
byUnicodePattern(pattern)
}
).atTime(Midnight)
.toInstant(TimeZone.UTC)
.toCalendarDate(TimeZone.UTC)
} catch (e: Throwable) {
null
}
}

actual fun getDateInputFormat(): DateInputFormat {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ byteBuddy = "1.12.10"
asm = "9.3"
cmake = "3.22.1"
dagger = "2.44"
datetime="0.5.0"
datetime="0.6.0"
dexmaker = "2.28.3"
dokka = "1.8.10-dev-203"
espresso = "3.6.0-alpha01"
Expand Down