Minor refactoring of ClipboardEventsHandler

JetBrains · Mar 20, 2024 · cd17460 · cd17460
1 parent 763e588
commit cd17460
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/...oundation/src/jsMain/kotlin/androidx/compose/foundation/text/ClipboardEventsHandler.js.kt b/...oundation/src/jsMain/kotlin/androidx/compose/foundation/text/ClipboardEventsHandler.js.kt
@@ -35,23 +35,23 @@ internal actual inline fun rememberClipboardEventsHandler(
     if (isFocused) {
         DisposableEffect(textFieldSelectionManager) {
 
-            val onCopy = EventListenerWrapper { event ->
+            val onCopy = EventListener { event ->
                 val textToCopy = textFieldSelectionManager.onCopyWithResult()
                 if (textToCopy != null && event is ClipboardEvent) {
                     event.clipboardData?.setData("text/plain", textToCopy)
                     event.preventDefault()
                 }
             }
 
-            val onPaste = EventListenerWrapper { event ->
+            val onPaste = EventListener { event ->
                 if (event is ClipboardEvent) {
                     val textToPaste = event.clipboardData?.getData("text/plain") ?: ""
                     event.preventDefault()
                     textFieldSelectionManager.paste(AnnotatedString(textToPaste))
                 }
             }
 
-            val onCut = EventListenerWrapper { event ->
+            val onCut = EventListener { event ->
                 if (event is ClipboardEvent) {
                     val cutText = textFieldSelectionManager.onCutWithResult()
                     event.clipboardData?.setData("text/plain", cutText ?: "")
@@ -63,14 +63,11 @@ internal actual inline fun rememberClipboardEventsHandler(
             document.addEventListener("paste", onPaste)
             document.addEventListener("cut", onCut)
 
-            return@DisposableEffect onDispose {
+            onDispose {
                 document.removeEventListener("copy", onCopy)
                 document.removeEventListener("paste", onPaste)
                 document.removeEventListener("cut", onCut)
             }
         }
     }
 }
-
-private fun EventListenerWrapper(handler: (Event) -> Unit): EventListener =
-    EventListener { handler(it) }
diff --git a/...ion/src/wasmJsMain/kotlin/androidx/compose/foundation/text/ClipboardEventsHandler.wasm.kt b/...ion/src/wasmJsMain/kotlin/androidx/compose/foundation/text/ClipboardEventsHandler.wasm.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.text.AnnotatedString
 import kotlinx.browser.document
 import org.w3c.dom.clipboard.ClipboardEvent
 import org.w3c.dom.events.Event
-import org.w3c.dom.events.EventListener
+import org.w3c.dom.events.EventListener as EventListenerInterface
 
 @Composable
 @NonRestartableComposable
@@ -35,23 +35,23 @@ internal actual inline fun rememberClipboardEventsHandler(
     if (isFocused) {
         DisposableEffect(textFieldSelectionManager) {
 
-            val onCopy = EventListenerWrapper { event ->
+            val onCopy = EventListener { event ->
                 val textToCopy = textFieldSelectionManager.onCopyWithResult()
                 if (textToCopy != null && event is ClipboardEvent) {
                     event.clipboardData?.setData("text/plain", textToCopy)
                     event.preventDefault()
                 }
             }
 
-            val onPaste = EventListenerWrapper { event ->
+            val onPaste = EventListener { event ->
                 if (event is ClipboardEvent) {
                     val textToPaste = event.clipboardData?.getData("text/plain") ?: ""
                     event.preventDefault()
                     textFieldSelectionManager.paste(AnnotatedString(textToPaste))
                 }
             }
 
-            val onCut = EventListenerWrapper { event ->
+            val onCut = EventListener { event ->
                 if (event is ClipboardEvent) {
                     val cutText = textFieldSelectionManager.onCutWithResult()
                     event.clipboardData?.setData("text/plain", cutText ?: "")
@@ -63,7 +63,7 @@ internal actual inline fun rememberClipboardEventsHandler(
             document.addEventListener("paste", onPaste)
             document.addEventListener("cut", onCut)
 
-            return@DisposableEffect onDispose {
+            onDispose {
                 document.removeEventListener("copy", onCopy)
                 document.removeEventListener("paste", onPaste)
                 document.removeEventListener("cut", onCut)
@@ -72,5 +72,5 @@ internal actual inline fun rememberClipboardEventsHandler(
     }
 }
 
-private fun EventListenerWrapper(handler: (Event) -> Unit): EventListener =
+private fun EventListener(handler: (Event) -> Unit): EventListenerInterface =
     js("(event) => { handler(event) }")