Skip to content

Commit b9170db

Browse files
committed
chore(ui/text): expose contentAlignment for aligning leading/trailing icons and textField() relatively
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent 927bad3 commit b9170db

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

ui/components/src/main/kotlin/com/getcode/ui/components/TextInput.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ fun TextInput(
7373
style: TextStyle = CodeTheme.typography.textMedium,
7474
placeholderStyle: TextStyle = CodeTheme.typography.textMedium,
7575
shape: Shape = CodeTheme.shapes.extraSmall,
76+
contentAlignment: Alignment.Vertical = Alignment.CenterVertically,
7677
textFieldAlignment: Alignment = Alignment.CenterStart,
7778
colors: TextFieldColors = inputColors(),
7879
enabled: Boolean = true,
@@ -147,6 +148,7 @@ fun TextInput(
147148
leadingIcon = leadingIcon,
148149
trailingIcon = trailingIcon,
149150
contentPadding = contentPadding,
151+
contentAlignment = contentAlignment,
150152
textFieldAlignment = textFieldAlignment,
151153
shape = shape,
152154
innerTextField = it,
@@ -185,6 +187,7 @@ private fun DecoratorBox(
185187
leadingIcon: (@Composable () -> Unit)?,
186188
trailingIcon: (@Composable () -> Unit)?,
187189
shape: Shape,
190+
contentAlignment: Alignment.Vertical = Alignment.CenterVertically,
188191
textFieldAlignment: Alignment = Alignment.CenterStart,
189192
innerTextField: @Composable () -> Unit,
190193
) {
@@ -196,7 +199,7 @@ private fun DecoratorBox(
196199
color = borderColor,
197200
shape = shape,
198201
),
199-
verticalAlignment = Alignment.CenterVertically,
202+
verticalAlignment = contentAlignment,
200203
horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.staticGrid.x2)
201204
) {
202205
leadingIcon?.invoke()

ui/components/src/main/kotlin/com/getcode/ui/components/chat/ChatInput.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import androidx.compose.foundation.clickable
5252
import androidx.compose.foundation.layout.Spacer
5353
import androidx.compose.foundation.layout.requiredSize
5454
import androidx.compose.material.icons.rounded.ArrowUpward
55+
import androidx.compose.ui.Alignment
5556
import com.getcode.theme.extraSmall
5657

5758
@Composable
@@ -87,6 +88,7 @@ fun ChatInput(
8788
keyboardOptions = KeyboardOptions.Default.copy(
8889
capitalization = KeyboardCapitalization.Sentences
8990
),
91+
contentAlignment = Alignment.Bottom,
9092
contentPadding = PaddingValues(
9193
start = CodeTheme.dimens.staticGrid.x3,
9294
top = CodeTheme.dimens.staticGrid.x2,

0 commit comments

Comments
 (0)