File tree Expand file tree Collapse file tree 11 files changed +11
-12
lines changed
src/webMain/kotlin/androidx/compose/foundation/text
src/webMain/kotlin/androidx/compose/material3/internal
skikoMain/kotlin/androidx/compose/ui/text/platform
webMain/kotlin/androidx/compose/ui/text
ui/src/webTest/kotlin/androidx/compose/ui/input Expand file tree Collapse file tree 11 files changed +11
-12
lines changed Original file line number Diff line number Diff line change @@ -148,12 +148,10 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
148148 resources. srcDir(" src/uikitTest/resources" )
149149 }
150150 jsMain {
151- kotlin. srcDir(" src/webCommonW3C/kotlin" )
152151 dependsOn(webMain)
153152 }
154153
155154 wasmJsMain {
156- kotlin. srcDir(" src/webCommonW3C/kotlin" )
157155 dependsOn(webMain)
158156 }
159157
Original file line number Diff line number Diff line change 1616
1717package androidx.compose.foundation.text
1818
19- import androidx.compose.foundation.InternalFoundationApi
2019import androidx.compose.ui.dom.domEventOrNull
2120import androidx.compose.ui.input.key.KeyEvent
2221import androidx.compose.ui.input.key.KeyEventType
@@ -25,8 +24,7 @@ import androidx.compose.ui.input.key.isMetaPressed
2524import androidx.compose.ui.input.key.type
2625import org.w3c.dom.events.KeyboardEvent
2726
28- @InternalFoundationApi // TODO: Remove from public at all
29- actual val KeyEvent .isTypedEvent: Boolean
27+ internal actual val KeyEvent .isTypedEvent: Boolean
3028 get() = type == KeyEventType .KeyDown
3129 && ! isMetaPressed
3230 && ! isCtrlPressed
Original file line number Diff line number Diff line change 1616
1717package androidx.compose.foundation.text
1818
19- internal actual fun timeNowMillis (): Long = kotlinx.browser.window.performance.now().toLong()
19+ import kotlinx.browser.window
20+
21+ internal actual fun timeNowMillis (): Long = window.performance.now().toLong()
2022
Original file line number Diff line number Diff line change @@ -144,11 +144,9 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
144144 webMain. dependsOn(nonJvmMain)
145145
146146 jsMain {
147- kotlin. srcDir(" src/webCommonW3C/kotlin" )
148147 dependsOn(webMain)
149148 }
150149 wasmJsMain {
151- kotlin. srcDir(" src/webCommonW3C/kotlin" )
152150 dependsOn(webMain)
153151 dependencies {
154152 implementation(libs. kotlinStdlib)
Original file line number Diff line number Diff line change @@ -22,6 +22,8 @@ import androidx.compose.material3.CalendarLocale
2222import androidx.compose.ui.text.intl.Locale
2323import androidx.compose.ui.util.fastFlatMap
2424import androidx.compose.ui.util.fastMap
25+ import kotlin.js.definedExternally
26+ import kotlin.js.js
2527import kotlin.time.ExperimentalTime
2628import kotlin.time.Instant
2729import kotlinx.datetime.LocalDate
Original file line number Diff line number Diff line change @@ -141,12 +141,10 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
141141 webMain. dependsOn(nonJvmMain)
142142
143143 jsMain {
144- kotlin. srcDir(" src/webCommonW3C/kotlin" )
145144 dependsOn(webMain)
146145 }
147146
148147 wasmJsMain {
149- kotlin. srcDir(" src/webCommonW3C/kotlin" )
150148 dependsOn(webMain)
151149 dependencies {
152150 implementation(libs. create(" skikoWasm" ))
Original file line number Diff line number Diff line change @@ -31,7 +31,6 @@ import androidx.compose.ui.text.font.GenericFontFamily
3131import androidx.compose.ui.text.font.LoadedFontFamily
3232import androidx.compose.ui.text.font.Typeface
3333import androidx.compose.ui.text.font.createFontFamilyResolver
34- import androidx.compose.ui.util.fastFilteredMap
3534import androidx.compose.ui.util.fastMap
3635import androidx.compose.ui.util.fastMapNotNull
3736import org.jetbrains.skia.FontMgrWithFallback
Original file line number Diff line number Diff line change 11/*
2- * Copyright 2024 The Android Open Source Project
2+ * Copyright 2023 The Android Open Source Project
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
1717package androidx.compose.ui.text.intl
1818
1919import androidx.compose.ui.util.fastMap
20+ import kotlin.js.JsName
21+ import kotlin.js.js
2022
2123internal actual val PlatformLocale .language: String
2224 get() = _language
File renamed without changes.
Original file line number Diff line number Diff line change @@ -19,6 +19,7 @@ package androidx.compose.ui.text.platform
1919import androidx.compose.ui.text.PlatformStringDelegate
2020import androidx.compose.ui.text.intl.PlatformLocale
2121import androidx.compose.ui.text.intl.language
22+ import kotlin.js.js
2223
2324/* *
2425 * A JS implementation of StringDelegate
You can’t perform that action at this time.
0 commit comments