Skip to content

[web] Improve faste delete experience #2954

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

Open
Schahen wants to merge 1 commit into
base: jb-main
Choose a base branch
from
Open

[web] Improve faste delete experience #2954

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
101 changes: 94 additions & 7 deletions compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/platform/BackingDomInput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ package androidx.compose.ui.platform
import androidx.compose.ui.input.key.KeyEvent
import androidx.compose.ui.text.TextLayoutResult
import androidx.compose.ui.text.input.EditCommand
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.ImeOptions
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.TextFieldValue
import kotlin.js.js
import kotlinx.browser.document
Expand All @@ -31,7 +33,9 @@ internal interface ComposeCommandCommunicator {
fun sendEditCommand(command: EditCommand) = sendEditCommand(listOf(command))

fun sendKeyboardEvent(keyboardEvent: KeyEvent): Boolean
}

internal interface TextLayoutProvider {
fun currentTextLayoutResult(): TextLayoutResult?
}

Expand All @@ -47,17 +51,19 @@ private fun setBackingInputBox(container: HTMLElement, left: Float, top: Float,
* and the DOM HTMLTextAreaElement we are actually listening events on in order to show
* the virtual keyboard.
*/
internal class BackingDomInput(
internal abstract class BackingDomInput(
val inputContainer: HTMLElement,
imeOptions: ImeOptions,
composeCommunicator : ComposeCommandCommunicator,
) {
private val inputStrategy = DomInputStrategy(
imeOptions,
composeCommunicator
)
): TextLayoutProvider {
internal val backingElement = imeOptions.createDomElement()

internal val backingElement = inputStrategy.htmlInput
private val inputStrategy = object : DomInputStrategy(
backingElement,
composeCommunicator
) {
override fun currentTextLayoutResult(): TextLayoutResult? = this@BackingDomInput.currentTextLayoutResult()
}

fun register() {
setBackingInputBox(container = inputContainer, 0f, 0f, 0f, 0f)
Expand Down Expand Up @@ -99,3 +105,84 @@ internal class BackingDomInput(
backingElement.remove()
}
}


private fun ImeOptions.createDomElement(): HTMLElement {
val htmlElement = document.createElement(
if (singleLine) "input" else "textarea"
) as HTMLElement

// without autocorrect set "on" iOS virtual keyboard won't suggest
// see https://youtrack.jetbrains.com/issue/CMP-8807
htmlElement.setAttribute("autocorrect", "on")
htmlElement.setAttribute("autocomplete", "off")
htmlElement.setAttribute("autocapitalize", "off")
htmlElement.setAttribute("spellcheck", "false")

val inputMode = when (keyboardType) {
KeyboardType.Text -> "text"
KeyboardType.Ascii -> "text"
KeyboardType.Number -> "number"
KeyboardType.Phone -> "tel"
KeyboardType.Uri -> "url"
KeyboardType.Email -> "email"
KeyboardType.Password -> "password"
KeyboardType.NumberPassword -> "number"
KeyboardType.Decimal -> "decimal"
else -> "text"
}

val enterKeyHint = when (imeAction) {
ImeAction.Default -> "enter"
ImeAction.None -> "enter"
ImeAction.Done -> "done"
ImeAction.Go -> "go"
ImeAction.Next -> "next"
ImeAction.Previous -> "previous"
ImeAction.Search -> "search"
ImeAction.Send -> "send"
else -> "enter"
}

htmlElement.setAttribute("inputmode", inputMode)
htmlElement.setAttribute("enterkeyhint", enterKeyHint)


htmlElement.style.apply {
setProperty("position", "absolute")
setProperty("user-select", "none")
setProperty("forced-color-adjust", "none")
setProperty("white-space", "pre")
setProperty("align-content", "center")
setProperty(
"top",
"calc(min(var(--compose-internal-web-backing-input-top) * 1px, 100vh - var(--compose-internal-web-backing-input-height) * 1px))"
)
setProperty(
"left",
"calc(min(var(--compose-internal-web-backing-input-left) * 1px, 100vw - var(--compose-internal-web-backing-input-width) * 1px))"
)
setProperty("width", "calc(var(--compose-internal-web-backing-input-width) * 1px")
setProperty("height", "calc(var(--compose-internal-web-backing-input-height) * 1px")
Comment on lines +165 to +166
Copy link

Copilot AI Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CSS calc(...) strings for width/height are missing a closing ) (e.g., "calc(var(--compose-internal-web-backing-input-width) * 1px"). This makes the style value invalid and may prevent the backing input from being sized/positioned correctly. Add the missing closing parenthesis to both properties.

Suggested change
setProperty("width", "calc(var(--compose-internal-web-backing-input-width) * 1px")
setProperty("height", "calc(var(--compose-internal-web-backing-input-height) * 1px")
setProperty("width", "calc(var(--compose-internal-web-backing-input-width) * 1px)")
setProperty("height", "calc(var(--compose-internal-web-backing-input-height) * 1px)")

Copilot uses AI. Check for mistakes.
setProperty("padding", "0")
setProperty("color", "transparent")
setProperty("background", "transparent")
setProperty("caret-color", "transparent")
setProperty("outline", "none")
setProperty("border", "none")
setProperty("resize", "none")
setProperty("text-shadow", "none")
setProperty("z-index", "-1")
// TODO: do we need pointer-events: none
//setProperty("pointer-events", "none")

// I keep "opacity" commented to make it explicit that we can't use this property.
// Reason: Safari iOS keyboard overlaps the text input. See CMP-8611
// setProperty("opacity", "0")

// To prevent auto-zoom in some mobile browsers, we set a larger font-size
setProperty("font-size", "20px")
}

return htmlElement
}
117 changes: 17 additions & 100 deletions compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/platform/DomInputStrategy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
package androidx.compose.ui.platform

import androidx.compose.ui.input.key.Key
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.ImeOptions
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.TextLayoutResult
import androidx.compose.ui.text.input.SetSelectionCommand
import androidx.compose.ui.text.input.TextFieldValue
import kotlin.js.ExperimentalWasmJsInterop
Expand All @@ -38,12 +36,10 @@ import org.w3c.dom.events.UIEvent
import org.w3c.dom.events.InputEvent
import org.w3c.dom.events.KeyboardEvent

internal class DomInputStrategy(
imeOptions: ImeOptions,
internal abstract class DomInputStrategy(
private val htmlInput: HTMLElement,
private val composeSender: ComposeCommandCommunicator,
) {
val htmlInput = imeOptions.createDomElement()

): TextLayoutProvider {
private var lastMeaningfulUpdate = TextFieldValue("")

// To avoid the re-triggering of the selection change
Expand All @@ -54,14 +50,6 @@ internal class DomInputStrategy(
initEvents()
}

private val nativeInputEventsProcessor = object : NativeInputEventsProcessor(composeSender) {
override fun scheduleCheckpoint() {
window.requestAnimationFrame {
runCheckpoint(currentTextFieldValue = lastMeaningfulUpdate)
}
}
}

fun updateState(textFieldValue: TextFieldValue) {
htmlInput as HTMLElementWithValue

Expand All @@ -82,9 +70,19 @@ internal class DomInputStrategy(
private val tabKeyCode = Key.Tab.keyCode.toInt()

private fun initEvents() {
htmlInput.addEventListener("blur", { evt ->
// TODO: any actions here?
})
val nativeInputEventsProcessor = object : NativeInputEventsProcessor() {
override fun scheduleCheckpoint() {
window.requestAnimationFrame {
runCheckpoint(currentTextFieldValue = lastMeaningfulUpdate)
}
}

override fun withCommandSenderContext(block: ComposeCommandCommunicator.() -> Unit) {
block.invoke(composeSender)
}

override fun currentTextLayoutResult(): TextLayoutResult? = this@DomInputStrategy.currentTextLayoutResult()
}

htmlInput.addEventListener("keydown", { evt ->
nativeInputEventsProcessor.registerEvent(evt as KeyboardEvent)
Expand Down Expand Up @@ -175,87 +173,6 @@ internal inline fun UIEvent.asInputEventExt(): InputEventExt = unsafeCast<Input
internal val InputEventExt.textRangeSize: Int
get() = this.asInputEventExt().let { it.textRangeEnd - it.textRangeStart }


private fun ImeOptions.createDomElement(): HTMLElement {
val htmlElement = document.createElement(
if (singleLine) "input" else "textarea"
) as HTMLElement

// without autocorrect set "on" iOS virtual keyboard won't suggest
// see https://youtrack.jetbrains.com/issue/CMP-8807
htmlElement.setAttribute("autocorrect", "on")
htmlElement.setAttribute("autocomplete", "off")
htmlElement.setAttribute("autocapitalize", "off")
htmlElement.setAttribute("spellcheck", "false")

val inputMode = when (keyboardType) {
KeyboardType.Text -> "text"
KeyboardType.Ascii -> "text"
KeyboardType.Number -> "number"
KeyboardType.Phone -> "tel"
KeyboardType.Uri -> "url"
KeyboardType.Email -> "email"
KeyboardType.Password -> "password"
KeyboardType.NumberPassword -> "number"
KeyboardType.Decimal -> "decimal"
else -> "text"
}

val enterKeyHint = when (imeAction) {
ImeAction.Default -> "enter"
ImeAction.None -> "enter"
ImeAction.Done -> "done"
ImeAction.Go -> "go"
ImeAction.Next -> "next"
ImeAction.Previous -> "previous"
ImeAction.Search -> "search"
ImeAction.Send -> "send"
else -> "enter"
}

htmlElement.setAttribute("inputmode", inputMode)
htmlElement.setAttribute("enterkeyhint", enterKeyHint)


htmlElement.style.apply {
setProperty("position", "absolute")
setProperty("user-select", "none")
setProperty("forced-color-adjust", "none")
setProperty("white-space", "pre")
setProperty("align-content", "center")
setProperty(
"top",
"calc(min(var(--compose-internal-web-backing-input-top) * 1px, 100vh - var(--compose-internal-web-backing-input-height) * 1px))"
)
setProperty(
"left",
"calc(min(var(--compose-internal-web-backing-input-left) * 1px, 100vw - var(--compose-internal-web-backing-input-width) * 1px))"
)
setProperty("width", "calc(var(--compose-internal-web-backing-input-width) * 1px")
setProperty("height", "calc(var(--compose-internal-web-backing-input-height) * 1px")
setProperty("padding", "0")
setProperty("color", "transparent")
setProperty("background", "transparent")
setProperty("caret-color", "transparent")
setProperty("outline", "none")
setProperty("border", "none")
setProperty("resize", "none")
setProperty("text-shadow", "none")
setProperty("z-index", "-1")
// TODO: do we need pointer-events: none
//setProperty("pointer-events", "none")

// I keep "opacity" commented to make it explicit that we can't use this property.
// Reason: Safari iOS keyboard overlaps the text input. See CMP-8611
// setProperty("opacity", "0")

// To prevent auto-zoom in some mobile browsers, we set a larger font-size
setProperty("font-size", "20px")
}

return htmlElement
}

private external interface HTMLElementWithValue {
var value: String
val selectionStart: Int
Expand Down
Loading
Loading