Inline ComposeDialog due to compilations errors on Android

composablehorizons · Oct 16, 2024 · 9ed8f15 · 9ed8f15
1 parent c8f52c0
commit 9ed8f15
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 46 deletions.
diff --git a/core/src/appleMain/kotlin/Modal.apple.kt b/core/src/appleMain/kotlin/Modal.apple.kt
@@ -1,12 +1,40 @@
 package com.composables.core
 
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.KeyEvent
-import internal.ComposeDialog
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.window.DialogProperties
 
 @Composable
 internal actual fun Modal(
     protectNavBars: Boolean,
     onKeyEvent: (KeyEvent) -> Boolean,
     content: @Composable () -> Unit
-) = ComposeDialog(onKeyEvent, content)
+) = androidx.compose.ui.window.Dialog(
+    onDismissRequest = {},
+    properties = DialogProperties(
+        dismissOnBackPress = false,
+        dismissOnClickOutside = false,
+        usePlatformInsets = false,
+        usePlatformDefaultWidth = false,
+        scrimColor = Color.Transparent
+    ),
+    content = {
+        val focusRequester = remember { FocusRequester() }
+        Box(Modifier.focusRequester(focusRequester).fillMaxSize().onKeyEvent(onKeyEvent)) {
+            LaunchedEffect(Unit) {
+                focusRequester.requestFocus()
+            }
+            content()
+        }
+    }
+)
+
diff --git a/core/src/commonMain/kotlin/internal/ComposeDialog.kt b/core/src/commonMain/kotlin/internal/ComposeDialog.kt
diff --git a/core/src/jsMain/kotlin/Modal.js.kt b/core/src/jsMain/kotlin/Modal.js.kt
@@ -1,12 +1,40 @@
 package com.composables.core
 
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.KeyEvent
-import internal.ComposeDialog
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.window.DialogProperties
 
 @Composable
 internal actual fun Modal(
     protectNavBars: Boolean,
     onKeyEvent: (KeyEvent) -> Boolean,
     content: @Composable () -> Unit
-) = ComposeDialog(onKeyEvent, content)
+) = androidx.compose.ui.window.Dialog(
+    onDismissRequest = {},
+    properties = DialogProperties(
+        dismissOnBackPress = false,
+        dismissOnClickOutside = false,
+        usePlatformInsets = false,
+        usePlatformDefaultWidth = false,
+        scrimColor = Color.Transparent
+    ),
+    content = {
+        val focusRequester = remember { FocusRequester() }
+        Box(Modifier.focusRequester(focusRequester).fillMaxSize().onKeyEvent(onKeyEvent)) {
+            LaunchedEffect(Unit) {
+                focusRequester.requestFocus()
+            }
+            content()
+        }
+    }
+)
+
diff --git a/core/src/jvmMain/kotlin/Modal.jvm.kt b/core/src/jvmMain/kotlin/Modal.jvm.kt
@@ -1,12 +1,39 @@
 package com.composables.core
 
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.KeyEvent
-import internal.ComposeDialog
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.window.DialogProperties
 
 @Composable
 internal actual fun Modal(
     protectNavBars: Boolean,
     onKeyEvent: (KeyEvent) -> Boolean,
     content: @Composable () -> Unit
-) = ComposeDialog(onKeyEvent, content)
+) = androidx.compose.ui.window.Dialog(
+    onDismissRequest = {},
+    properties = DialogProperties(
+        dismissOnBackPress = false,
+        dismissOnClickOutside = false,
+        usePlatformInsets = false,
+        usePlatformDefaultWidth = false,
+        scrimColor = Color.Transparent
+    ),
+    content = {
+        val focusRequester = remember { FocusRequester() }
+        Box(Modifier.focusRequester(focusRequester).fillMaxSize().onKeyEvent(onKeyEvent)) {
+            LaunchedEffect(Unit) {
+                focusRequester.requestFocus()
+            }
+            content()
+        }
+    }
+)
diff --git a/core/src/wasmJsMain/kotlin/Modal.wasmJs.kt b/core/src/wasmJsMain/kotlin/Modal.wasmJs.kt
@@ -1,12 +1,39 @@
 package com.composables.core
 
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.KeyEvent
-import internal.ComposeDialog
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.window.DialogProperties
 
 @Composable
 internal actual fun Modal(
     protectNavBars: Boolean,
     onKeyEvent: (KeyEvent) -> Boolean,
     content: @Composable () -> Unit
-) = ComposeDialog(onKeyEvent, content)
+) = androidx.compose.ui.window.Dialog(
+    onDismissRequest = {},
+    properties = DialogProperties(
+        dismissOnBackPress = false,
+        dismissOnClickOutside = false,
+        usePlatformInsets = false,
+        usePlatformDefaultWidth = false,
+        scrimColor = Color.Transparent
+    ),
+    content = {
+        val focusRequester = remember { FocusRequester() }
+        Box(Modifier.focusRequester(focusRequester).fillMaxSize().onKeyEvent(onKeyEvent)) {
+            LaunchedEffect(Unit) {
+                focusRequester.requestFocus()
+            }
+            content()
+        }
+    }
+)