From e624c9f39e32f6330b7c42767a71278b9f72cbc3 Mon Sep 17 00:00:00 2001
From: Garfie <chiu.garfie@gmail.com>
Date: Wed, 8 Apr 2026 22:21:32 -0500
Subject: [PATCH] fix(chat): apply safe area padding to iOS chat input

---
 .../garfiec/librechat/feature/chat/components/ChatInput.kt    | 2 --
 .../librechat/feature/chat/components/CommonChatInputCore.kt  | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/feature/chat/src/androidMain/kotlin/com/garfiec/librechat/feature/chat/components/ChatInput.kt b/feature/chat/src/androidMain/kotlin/com/garfiec/librechat/feature/chat/components/ChatInput.kt
index c6ebb07..155531c 100644
--- a/feature/chat/src/androidMain/kotlin/com/garfiec/librechat/feature/chat/components/ChatInput.kt
+++ b/feature/chat/src/androidMain/kotlin/com/garfiec/librechat/feature/chat/components/ChatInput.kt
@@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -227,7 +226,6 @@ fun ChatInput(
         onStop = onStop,
         onRemoveFile = onRemoveFile,
         modifier = modifier,
-        columnModifier = Modifier.navigationBarsPadding(),
         leadingButtons = {
             // "+" button to open tools bottom sheet
             Box {
diff --git a/feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/CommonChatInputCore.kt b/feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/CommonChatInputCore.kt
index 61814d4..88b42b7 100644
--- a/feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/CommonChatInputCore.kt
+++ b/feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/CommonChatInputCore.kt
@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
@@ -79,7 +80,6 @@ fun CommonChatInputCore(
     onStop: () -> Unit,
     onRemoveFile: (AttachedFile) -> Unit,
     modifier: Modifier = Modifier,
-    columnModifier: Modifier = Modifier,
     leadingButtons: @Composable RowScope.() -> Unit = {},
     textFieldContent: @Composable RowScope.() -> Unit,
     trailingSpacer: @Composable RowScope.() -> Unit = {},
@@ -102,7 +102,7 @@ fun CommonChatInputCore(
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .then(columnModifier)
+                .navigationBarsPadding()
                 .padding(horizontal = 12.dp, vertical = 8.dp),
         ) {
             AttachmentChipsRow(