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 browser clipboard events handling on Windows #1329

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Fix browser clipboard events handling on Windows #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...undation/src/webCommonW3C/kotlin/androidx/compose/foundation/text/TextFieldKeyInput.js.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,16 @@ package androidx.compose.foundation.text
import androidx.compose.ui.dom.domEventOrNull
import androidx.compose.ui.input.key.KeyEvent
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.isCtrlPressed
import androidx.compose.ui.input.key.isMetaPressed
import androidx.compose.ui.input.key.type
import org.w3c.dom.events.KeyboardEvent

actual val KeyEvent.isTypedEvent: Boolean
get() = type == KeyEventType.KeyDown && !isMetaPressed && domEventOrNull?.isPrintable() == true
get() = type == KeyEventType.KeyDown
&& !isMetaPressed
&& !isCtrlPressed
&& domEventOrNull?.isPrintable() == true

private fun KeyboardEvent.isPrintable(): Boolean {
return key.firstOrNull()?.toString() == key
Expand Down
33 changes: 33 additions & 0 deletions compose/ui/ui/src/webTest/kotlin/androidx/compose/ui/input/IsTypedEventTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,39 @@ class IsTypedEventTests {
keyDownEvents.forEach { event -> event.assertIsNotTyped() }
}

@Test
fun shortcutsWithCtrlOnlyAreNotTyped() {
val keyDownEvents = listOf(
keyDownEvent('c', metaKey = false, ctrlKey = true),
keyDownEvent('p', metaKey = false, ctrlKey = true),
keyDownEvent('v', metaKey = false, ctrlKey = true)
)

keyDownEvents.forEach { event -> event.assertIsNotTyped() }
}

@Test
fun shortcutsWithMetaOnlyAreNotTyped() {
val keyDownEvents = listOf(
keyDownEvent('c', metaKey = true, ctrlKey = false),
keyDownEvent('p', metaKey = true, ctrlKey = false),
keyDownEvent('v', metaKey = true, ctrlKey = false)
)

keyDownEvents.forEach { event -> event.assertIsNotTyped() }
}

@Test
fun altProducesATypedEvent() {
val keyDownEvents = listOf(
keyDownEvent('c', altKey = true),
keyDownEvent('p', altKey = true),
keyDownEvent('v', altKey = true)
)

keyDownEvents.forEach { event -> event.assertIsTyped() }
}

@Test
fun functionalsAreNotTyped() {
val keyDownEvents = listOf(
Expand Down
Loading