Rename InputEventExtended to InputEvent

JetBrains · Nov 8, 2024 · ea82e51 · ea82e51
1 parent 8ce4bd1
commit ea82e51
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/compose/ui/ui/src/webCommonW3C/kotlin/androidx/compose/ui/platform/BackingTextArea.kt b/compose/ui/ui/src/webCommonW3C/kotlin/androidx/compose/ui/platform/BackingTextArea.kt
@@ -79,7 +79,7 @@ internal class BackingTextArea(
                 onEditCommand(listOf(CommitTextCommand(evt.data, 1)))
             }
 
-            override fun onInputInsertLineBreak(evt: InputEventExtended) {
+            override fun onInputInsertLineBreak(evt: InputEvent) {
                 if (imeOptions.singleLine) {
                     onImeActionPerformed(imeOptions.imeAction)
                 }
@@ -90,12 +90,12 @@ internal class BackingTextArea(
             This event is used for processing events typed via virtual keyboard
             on mobile devices
              */
-            override fun onInputInsertText(evt: InputEventExtended) {
+            override fun onInputInsertText(evt: InputEvent) {
                 val data = evt.data ?: return
                 onEditCommand(listOf(CommitTextCommand(data, 1)))
             }
 
-            override fun onInputDeleteContentBackward(evt: InputEventExtended) {
+            override fun onInputDeleteContentBackward(evt: InputEvent) {
                 processKeyboardEvent(
                     KeyboardEvent(
                         "keydown",

diff --git a/compose/ui/ui/src/webCommonW3C/kotlin/androidx/compose/ui/platform/DomInputService.kt b/compose/ui/ui/src/webCommonW3C/kotlin/androidx/compose/ui/platform/DomInputService.kt
@@ -17,6 +17,7 @@
 package androidx.compose.ui.platform
 
 import org.w3c.dom.events.CompositionEvent
+import org.w3c.dom.events.Event
 import org.w3c.dom.events.EventTarget
 import org.w3c.dom.events.KeyboardEvent
 
@@ -29,13 +30,13 @@ internal interface DomInputListener {
     fun onKeyDown(evt: KeyboardEvent) {}
     fun onKeyUp(evt: KeyboardEvent) {}
 
-    fun onInputInsertLineBreak(evt: InputEventExtended) {}
-    fun onInputInsertCompositionText(evt: InputEventExtended) {}
-    fun onInputInsertText(evt: InputEventExtended) {}
-    fun onInputDeleteContentBackward(evt: InputEventExtended) {}
+    fun onInputInsertLineBreak(evt: InputEvent) {}
+    fun onInputInsertCompositionText(evt: InputEvent) {}
+    fun onInputInsertText(evt: InputEvent) {}
+    fun onInputDeleteContentBackward(evt: InputEvent) {}
 
     // we end up here only if inputType was unprocessed by any of onInput events above
-    fun onInputUnprocessed(evt: InputEventExtended) {}
+    fun onInputUnprocessed(evt: InputEvent) {}
 }
 
 internal class DomInputService(private val backingElement: EventTarget, private val inputListener: DomInputListener)  {
@@ -52,7 +53,7 @@ internal class DomInputService(private val backingElement: EventTarget, private
         backingElement.addEventListener("compositionend", { inputListener.onCompositionEnd(it as CompositionEvent) })
 
         backingElement.addEventListener("input", { evt ->
-            evt as InputEventExtended
+            evt as InputEvent
 
             when (evt.inputType) {
                 "insertLineBreak" -> inputListener.onInputInsertLineBreak(evt)
@@ -66,7 +67,7 @@ internal class DomInputService(private val backingElement: EventTarget, private
     }
 }
 
-internal external interface InputEventExtended {
+internal external class InputEvent : Event {
     val inputType: String
     val data: String?
 }