From e0c1421fd5112afcebbe2610f62c29f5721a3cf5 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 29 Sep 2022 17:42:31 +0100
Subject: [PATCH] fixing missing input cursor due to decoration box not taking
 the original text field into account

---
 .../main/kotlin/app/dapk/st/messenger/MessengerScreen.kt   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt b/features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt
index 6f226fac..fa45f028 100644
--- a/features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt
+++ b/features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt
@@ -598,10 +598,11 @@ private fun TextComposer(state: ComposerState.Text, onTextChange: (String) -> Un
                     cursorBrush = SolidColor(MaterialTheme.colorScheme.primary),
                     textStyle = LocalTextStyle.current.copy(color = SmallTalkTheme.extendedColors.onOthersBubble),
                     keyboardOptions = KeyboardOptions(capitalization = KeyboardCapitalization.Sentences, autoCorrect = true),
-                    decorationBox = {
-                        Box {
+                    decorationBox = { innerField ->
+                        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                            Box(modifier = Modifier.weight(1f).padding(end = 4.dp)) { innerField() }
                             Icon(
-                                modifier = Modifier.align(Alignment.CenterEnd).clickable { onAttach() },
+                                modifier = Modifier.clickable { onAttach() }.wrapContentWidth().align(Alignment.Bottom),
                                 imageVector = Icons.Filled.Image,
                                 contentDescription = "",
                             )