Replace Compose KeyEvent with custom

zhelenskiy · Apr 14, 2024 · 9c8b52f · 9c8b52f
1 parent 41a2475
commit 9c8b52f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/editor/src/commonMain/kotlin/editor/basic/BasicSourceCodeTextField.kt b/editor/src/commonMain/kotlin/editor/basic/BasicSourceCodeTextField.kt
@@ -28,8 +28,7 @@ import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.input.key.KeyEvent
-import androidx.compose.ui.input.key.onPreviewKeyEvent
+import androidx.compose.ui.input.key.*
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
@@ -152,7 +151,23 @@ public fun combineKeyboardEventFilters(vararg filters: KeyboardEventFilter?): Ke
 
 public interface KeyboardEvent
 
-public data class PhysicalKeyboardEvent(val keyEvent: KeyEvent) : KeyboardEvent
+public data class PhysicalKeyboardEvent(
+    val key: Key, val utf16CodePoint: Int, val type: KeyEventType,
+    val isShiftPressed: Boolean = false,
+    val isCtrlPressed: Boolean = false,
+    val isAltPressed: Boolean = false,
+    val isMetaPressed: Boolean = false,
+) : KeyboardEvent {
+    public constructor(keyEvent: KeyEvent) : this(
+        key = keyEvent.key,
+        utf16CodePoint = keyEvent.utf16CodePoint,
+        type = keyEvent.type,
+        isShiftPressed = keyEvent.isShiftPressed,
+        isCtrlPressed = keyEvent.isCtrlPressed,
+        isAltPressed = keyEvent.isAltPressed,
+        isMetaPressed = keyEvent.isMetaPressed,
+    )
+}
 
 public sealed class UniversalKeyboardEvent : KeyboardEvent {
     public data object NonTextEvent : UniversalKeyboardEvent()

diff --git a/editor/src/commonMain/kotlin/editor/basic/KeyEventHandlers.kt b/editor/src/commonMain/kotlin/editor/basic/KeyEventHandlers.kt
@@ -16,25 +16,14 @@ public fun PhysicalKeyboardEventFilter.asKeyboardEventFilter(): KeyboardEventFil
     it is PhysicalKeyboardEvent && invoke(it)
 }
 
-public typealias ComposeKeyEventHandler = (KeyEvent) -> TextFieldValue?
-public typealias ComposeKeyEventFilter = (KeyEvent) -> Boolean
-
-@JvmName("composeKeyboardEventHandlerAsKeyboardEventHandler")
-public fun ComposeKeyEventHandler.asKeyboardEventHandler(): KeyboardEventHandler =
-    { event: PhysicalKeyboardEvent -> invoke(event.keyEvent) }.asKeyboardEventHandler()
-
-@JvmName("composeKeyboardEventFilterAsKeyboardEventFilter")
-public fun ComposeKeyEventFilter.asKeyboardEventFilter(): KeyboardEventFilter =
-    { event: PhysicalKeyboardEvent -> invoke(event.keyEvent) }.asKeyboardEventFilter()
-
 public fun <T : Token> handleMovingOffsets(
     state: BasicSourceCodeTextFieldState<T>,
     indent: String = " ".repeat(4),
-    moveForwardFilter: KeyboardEventFilter = { keyEvent: KeyEvent ->
+    moveForwardFilter: KeyboardEventFilter = { keyEvent: PhysicalKeyboardEvent ->
         !keyEvent.isShiftPressed && keyEvent.key == Key.Tab && keyEvent.type == KeyEventType.KeyDown &&
                 !keyEvent.isAltPressed && !keyEvent.isCtrlPressed && !keyEvent.isMetaPressed
     }.asKeyboardEventFilter(),
-    moveBackwardFilter: KeyboardEventFilter = { keyEvent: KeyEvent ->
+    moveBackwardFilter: KeyboardEventFilter = { keyEvent: PhysicalKeyboardEvent ->
         keyEvent.isShiftPressed && keyEvent.key == Key.Tab && keyEvent.type == KeyEventType.KeyDown &&
                 !keyEvent.isAltPressed && !keyEvent.isCtrlPressed && !keyEvent.isMetaPressed
     }.asKeyboardEventFilter(),

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,4 @@ development=true
 
 #Publication
 group=com.zhelenskiy
-version=0.0.13
+version=0.0.14