Skip to content

Commit 9a34b00

Browse files
authored
Revert "Make canvas focused when Compose handles pointer events (JetBrains#2796)" (JetBrains#2867)
This reverts commit c31fceb ## Release Notes N/A
1 parent 561214f commit 9a34b00

1 file changed

Lines changed: 0 additions & 17 deletions

File tree

compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/window/ComposeWindowInternal.web.kt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ import org.w3c.dom.MediaQueryListEvent
116116
import org.w3c.dom.Node
117117
import org.w3c.dom.events.Event
118118
import org.w3c.dom.events.EventTarget
119-
import org.w3c.dom.events.FocusEvent
120119
import org.w3c.dom.events.KeyboardEvent
121120
import org.w3c.dom.events.MouseEvent
122121
import org.w3c.dom.events.WheelEvent
@@ -370,8 +369,6 @@ internal class ComposeWindow(
370369

371370
private val isMacOS = hostOs.isMacOS
372371

373-
private var canvasFocused = false
374-
375372
private fun processClipKeyDown(keyEvent: KeyEvent) {
376373
val mod = if (isMacOS) keyEvent.isMetaPressed else keyEvent.isCtrlPressed
377374
if (!mod) return
@@ -413,14 +410,6 @@ internal class ComposeWindow(
413410
processKeyboardEvent(event)
414411
}
415412

416-
addTypedEvent<FocusEvent>("focus") { event ->
417-
canvasFocused = true
418-
}
419-
420-
addTypedEvent<FocusEvent>("blur") { event ->
421-
canvasFocused = false
422-
}
423-
424413
state.globalEvents.addDisposableEvent("focus") {
425414
archComponentsOwner.lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
426415
}
@@ -682,12 +671,6 @@ internal class ComposeWindow(
682671

683672
if (result != null && result.anyChangeConsumed && event.cancelable) {
684673
event.preventDefault()
685-
686-
// Since we call preventDefault, the browser will not focus the canvas automatically,
687-
// but it should be focused to receive key events
688-
if (!canvasFocused && eventType == PointerEventType.Press) {
689-
canvas.focus()
690-
}
691674
}
692675
}
693676

0 commit comments

Comments
 (0)