Remove platform-specific FocusablePopup

overpas · Oct 20, 2024 · bddd4a2 · bddd4a2
1 parent cebd185
commit bddd4a2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 59 deletions.
diff --git a/...droidMain/kotlin/by/overpass/treemapchart/sample/shared/complex/FocusablePopup.android.kt b/...droidMain/kotlin/by/overpass/treemapchart/sample/shared/complex/FocusablePopup.android.kt
diff --git a/...ed/src/commonMain/kotlin/by/overpass/treemapchart/sample/shared/complex/FocusablePopup.kt b/...ed/src/commonMain/kotlin/by/overpass/treemapchart/sample/shared/complex/FocusablePopup.kt
@@ -2,16 +2,24 @@ package by.overpass.treemapchart.sample.shared.complex
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupProperties
 
-@Suppress("LongParameterList")
 @Composable
-internal expect fun FocusablePopup(
+internal fun FocusablePopup(
     alignment: Alignment = Alignment.TopStart,
     offset: IntOffset = IntOffset(0, 0),
     onDismissRequest: (() -> Unit)? = null,
-    onPreviewKeyEvent: ((KeyEvent) -> Boolean) = { false },
-    onKeyEvent: ((KeyEvent) -> Boolean) = { false },
     content: @Composable () -> Unit,
-)
+) {
+    Popup(
+        alignment = alignment,
+        offset = offset,
+        onDismissRequest = onDismissRequest,
+        properties = PopupProperties(
+            focusable = true,
+        ),
+        content = content,
+    )
+}
diff --git a/...idMain/kotlin/by/overpass/treemapchart/sample/shared/complex/FocusablePopup.nonAndroid.kt b/...idMain/kotlin/by/overpass/treemapchart/sample/shared/complex/FocusablePopup.nonAndroid.kt