@expo/ui 55.0.5 → 55.0.6

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 55.0.6 — 2026-03-27
+
+### 🛠 Breaking changes
+
+- [android] Refactored `PullToRefreshBox` indicator props: replaced `loadingIndicatorModifiers` with nested `indicator` prop containing `color`, `containerColor`, and `modifiers`. Added `contentAlignment` prop. ([#44079](https://github.com/expo/expo/pull/44079) by [@nishan](https://github.com/intergalacticspacehighway))
+- [android] Split `Divider` into `HorizontalDivider` and `VerticalDivider` matching native Compose components. Added `thickness` and `color` props. ([#44035](https://github.com/expo/expo/pull/44035) by [@nishan](https://github.com/intergalacticspacehighway))
+- [android] Match `AlertDialog` API to native Compose: replaced string props (`title`, `text`, `confirmButtonText`, `dismissButtonText`) with slot sub-components (`AlertDialog.Title`, `AlertDialog.Text`, `AlertDialog.ConfirmButton`, `AlertDialog.DismissButton`, `AlertDialog.Icon`). Removed `visible` prop (use conditional rendering), `onConfirmPressed`/`onDismissPressed` (renamed to `onDismissRequest`), and `confirmButtonColors`/`dismissButtonColors` (replaced with dialog-level `colors`). ([#43997](https://github.com/expo/expo/pull/43997) by [@nishan](https://github.com/intergalacticspacehighway))
+
+### 🎉 New features
+
+- [android] add `imePadding` modifier ([#43652](https://github.com/expo/expo/pull/43652) by [@Ubax](https://github.com/Ubax))
+
 ## 55.0.5 — 2026-03-19
 
 ### 🛠 Breaking changes
@@ -43,6 +55,8 @@
 
 ### 🎉 New features
 
+- [android] Added `shape`, `border`, `selected`, `checked`, `onClick`, and `onCheckedChange` props to `Surface`, supporting clickable, selectable, and toggleable variants. ([#44079](https://github.com/expo/expo/pull/44079) by [@nishan](https://github.com/intergalacticspacehighway))
+- [android] Added nested text support for Compose `Text` with style inheritance, custom fonts via `expo-font`, `background`, `shadow`, and `lineBreak` properties. ([#44094](https://github.com/expo/expo/pull/44094) by [@nishan](https://github.com/intergalacticspacehighway))
 - [android] Added `outlined` variant to `TextInput` component. ([#43719](https://github.com/expo/expo/pull/43719) by [@benjaminkomen](https://github.com/benjaminkomen))
 - Added `@expo/ui/datetimepicker` — a cross-platform `DateTimePicker` drop-in replacement for `@react-native-community/datetimepicker`. ([#44014](https://github.com/expo/expo/pull/44014) by [@vonovak](https://github.com/vonovak))
 - [iOS] Added `locale` and `timeZone` support to `modifiers`. ([#44013](https://github.com/expo/expo/pull/44013) by [@vonovak](https://github.com/vonovak))
@@ -244,6 +258,7 @@ _This version does not introduce any user-facing changes._
 
 ### 🎉 New features
 
+- [Android] Add `label`, and `placeholder` props to TextField component. ([#40452](https://github.com/expo/expo/pull/40452) by [@akshayjadhav4](https://github.com/akshayjadhav4))
 - [iOS] Add `refreshable` modifier. ([#40201](https://github.com/expo/expo/pull/40201) by [@christianwooldridge](https://github.com/christianwooldridge))
 - [iOS] Add RTL support in swiftui. ([#40335](https://github.com/expo/expo/pull/40335) by [@kfirfitousi](https://github.com/kfirfitousi))
 - [Android] Add Carousel component. ([#40325](https://github.com/expo/expo/pull/40325) by [@aleqsio](https://github.com/aleqsio))

package/android/build.gradle

@@ -12,13 +12,13 @@ apply plugin: 'expo-module-gradle-plugin'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 
 group = 'expo.modules.ui'
-version = '55.0.5'
+version = '55.0.6'
 
 android {
   namespace "expo.modules.ui"
   defaultConfig {
     versionCode 1
-    versionName "55.0.5"
+    versionName "55.0.6"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildFeatures {

package/android/src/main/java/expo/modules/ui/AlertDialogView.kt

@@ -1,52 +1,80 @@
 package expo.modules.ui
 
+import android.graphics.Color
 import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
+import androidx.compose.material3.AlertDialogDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
+import expo.modules.kotlin.records.Field
 import expo.modules.kotlin.records.Record
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.FunctionalComposableScope
-import java.io.Serializable
 
-open class AlertDialogButtonPressedEvent() : Record, Serializable
+data class AlertDialogColors(
+  @Field val containerColor: Color? = null,
+  @Field val iconContentColor: Color? = null,
+  @Field val titleContentColor: Color? = null,
+  @Field val textContentColor: Color? = null
+) : Record
+
+data class ExpoDialogProperties(
+  @Field val dismissOnBackPress: Boolean = true,
+  @Field val dismissOnClickOutside: Boolean = true,
+  @Field val usePlatformDefaultWidth: Boolean = true,
+  @Field val decorFitsSystemWindows: Boolean = true
+) : Record
 
 data class AlertDialogProps(
-  val title: String? = null,
-  val text: String? = null,
-  val confirmButtonText: String? = null,
-  val dismissButtonText: String? = null,
-  val visible: Boolean = false,
+  val colors: AlertDialogColors = AlertDialogColors(),
+  val tonalElevation: Double? = null,
+  val properties: ExpoDialogProperties = ExpoDialogProperties(),
   val modifiers: ModifierList = emptyList()
 ) : ComposeProps
 
 @Composable
 fun FunctionalComposableScope.AlertDialogContent(
   props: AlertDialogProps,
-  onDismissPressed: (AlertDialogButtonPressedEvent) -> Unit,
-  onConfirmPressed: (AlertDialogButtonPressedEvent) -> Unit
+  onDismissRequest: () -> Unit
 ) {
-  if (!props.visible) {
-    return
-  }
+  val titleSlotView = findChildSlotView(view, "title")
+  val textSlotView = findChildSlotView(view, "text")
+  val confirmButtonSlotView = findChildSlotView(view, "confirmButton")
+  val dismissButtonSlotView = findChildSlotView(view, "dismissButton")
+  val iconSlotView = findChildSlotView(view, "icon")
 
   AlertDialog(
+    onDismissRequest = { onDismissRequest() },
     confirmButton = {
-      props.confirmButtonText?.let {
-        TextButton(onClick = { onConfirmPressed(AlertDialogButtonPressedEvent()) }) {
-          Text(it)
-        }
-      }
+      confirmButtonSlotView?.renderSlot()
+    },
+    modifier = ModifierRegistry.applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher),
+    dismissButton = dismissButtonSlotView?.let {
+      { it.renderSlot() }
+    },
+    title = titleSlotView?.let {
+      { it.renderSlot() }
+    },
+    text = textSlotView?.let {
+      { it.renderSlot() }
     },
-    dismissButton = {
-      props.dismissButtonText?.let {
-        TextButton(onClick = { onDismissPressed(AlertDialogButtonPressedEvent()) }) {
-          Text(it)
-        }
-      }
+    icon = iconSlotView?.let {
+      { it.renderSlot() }
     },
-    onDismissRequest = { onDismissPressed(AlertDialogButtonPressedEvent()) },
-    title = { props.title?.let { Text(it) } },
-    text = { props.text?.let { Text(it) } }
+    containerColor = props.colors.containerColor.composeOrNull
+      ?: AlertDialogDefaults.containerColor,
+    iconContentColor = props.colors.iconContentColor.composeOrNull
+      ?: AlertDialogDefaults.iconContentColor,
+    titleContentColor = props.colors.titleContentColor.composeOrNull
+      ?: AlertDialogDefaults.titleContentColor,
+    textContentColor = props.colors.textContentColor.composeOrNull
+      ?: AlertDialogDefaults.textContentColor,
+    tonalElevation = props.tonalElevation?.dp ?: AlertDialogDefaults.TonalElevation,
+    properties = DialogProperties(
+      dismissOnBackPress = props.properties.dismissOnBackPress,
+      dismissOnClickOutside = props.properties.dismissOnClickOutside,
+      usePlatformDefaultWidth = props.properties.usePlatformDefaultWidth,
+      decorFitsSystemWindows = props.properties.decorFitsSystemWindows
+    )
   )
 }

package/android/src/main/java/expo/modules/ui/BasicAlertDialogView.kt

@@ -3,11 +3,13 @@ package expo.modules.ui
 import androidx.compose.material3.BasicAlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.window.DialogProperties
 import expo.modules.kotlin.views.ComposableScope
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.FunctionalComposableScope
 
 data class BasicAlertDialogProps(
+  val properties: ExpoDialogProperties = ExpoDialogProperties(),
   val modifiers: ModifierList = emptyList()
 ) : ComposeProps
 
@@ -19,7 +21,13 @@ fun FunctionalComposableScope.BasicAlertDialogContent(
 ) {
   BasicAlertDialog(
     onDismissRequest = { onDismissRequest() },
-    modifier = ModifierRegistry.applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher)
+    modifier = ModifierRegistry.applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher),
+    properties = DialogProperties(
+      dismissOnBackPress = props.properties.dismissOnBackPress,
+      dismissOnClickOutside = props.properties.dismissOnClickOutside,
+      usePlatformDefaultWidth = props.properties.usePlatformDefaultWidth,
+      decorFitsSystemWindows = props.properties.decorFitsSystemWindows
+    )
   ) {
     Children(ComposableScope())
   }

package/android/src/main/java/expo/modules/ui/DividerView.kt

@@ -1,15 +1,34 @@
 package expo.modules.ui
 
+import android.graphics.Color
+import androidx.compose.material3.DividerDefaults
 import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.VerticalDivider
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.dp
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.FunctionalComposableScope
 
 data class DividerProps(
+  val thickness: Float? = null,
+  val color: Color? = null,
   val modifiers: ModifierList = emptyList()
 ) : ComposeProps
 
 @Composable
-fun FunctionalComposableScope.DividerContent(props: DividerProps) {
-  HorizontalDivider(modifier = ModifierRegistry.applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher))
+fun FunctionalComposableScope.HorizontalDividerContent(props: DividerProps) {
+  HorizontalDivider(
+    modifier = ModifierRegistry.applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher),
+    thickness = props.thickness?.dp ?: DividerDefaults.Thickness,
+    color = props.color.composeOrNull ?: DividerDefaults.color
+  )
+}
+
+@Composable
+fun FunctionalComposableScope.VerticalDividerContent(props: DividerProps) {
+  VerticalDivider(
+    modifier = ModifierRegistry.applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher),
+    thickness = props.thickness?.dp ?: DividerDefaults.Thickness,
+    color = props.color.composeOrNull ?: DividerDefaults.color
+  )
 }

package/android/src/main/java/expo/modules/ui/ExpoUIModule.kt

@@ -210,8 +210,12 @@ class ExpoUIModule : Module() {
       ShapeContent(props)
     }
 
-    ExpoUIView("DividerView") { props: DividerProps ->
-      DividerContent(props)
+    ExpoUIView("HorizontalDividerView") { props: DividerProps ->
+      HorizontalDividerContent(props)
+    }
+
+    ExpoUIView("VerticalDividerView") { props: DividerProps ->
+      VerticalDividerContent(props)
     }
 
     ExpoUIView("DateTimePickerView", events = {
@@ -325,18 +329,10 @@ class ExpoUIModule : Module() {
     }
 
     ExpoUIView("AlertDialogView", events = {
-      Events(
-        "onDismissPressed",
-        "onConfirmPressed"
-      )
+      Events("onDismissRequest")
     }) { props: AlertDialogProps ->
-      val onDismissPressed by remember { EventDispatcher<AlertDialogButtonPressedEvent>() }
-      val onConfirmPressed by remember { EventDispatcher<AlertDialogButtonPressedEvent>() }
-      AlertDialogContent(
-        props,
-        { onDismissPressed(it) },
-        { onConfirmPressed(it) }
-      )
+      val onDismissRequest by remember { EventDispatcher<Unit>() }
+      AlertDialogContent(props) { onDismissRequest(Unit) }
     }
 
     ExpoUIView("AssistChipView", events = {
@@ -422,8 +418,12 @@ class ExpoUIModule : Module() {
       BasicAlertDialogContent(props) { onDismissRequest(Unit) }
     }
 
-    ExpoUIView("SurfaceView") { props: SurfaceProps ->
-      SurfaceContent(props)
+    ExpoUIView("SurfaceView", events = {
+      Events("onSurfaceClick", "onCheckedChange")
+    }) { props: SurfaceProps ->
+      val onSurfaceClick by remember { EventDispatcher<Unit>() }
+      val onCheckedChange by remember { EventDispatcher<GenericEventPayload1<Boolean>>() }
+      SurfaceContent(props, onClick = { onSurfaceClick(Unit) }, onCheckedChange = { onCheckedChange(GenericEventPayload1(it)) })
     }
 
     ExpoUIView("AnimatedVisibilityView") { props: AnimatedVisibilityProps ->

package/android/src/main/java/expo/modules/ui/ModifierRegistry.kt

@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -365,6 +366,11 @@ object ModifierRegistry {
       } ?: Modifier.wrapContentHeight()
     }
 
+    // Inset modifiers
+    register("imePadding") { _, _, _, _ ->
+      Modifier.imePadding()
+    }
+
     // Position modifiers
     register("offset") { map, _, _, _ ->
       val params = recordFromMap<OffsetParams>(map)

package/android/src/main/java/expo/modules/ui/PullToRefreshBoxView.kt

@@ -2,19 +2,33 @@
 
 package expo.modules.ui
 
+import android.graphics.Color
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults
 import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import expo.modules.kotlin.views.ComposableScope
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.FunctionalComposableScope
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+import expo.modules.ui.convertibles.ContentAlignment
+
+data class PullToRefreshIndicatorProps(
+  @Field val color: Color? = null,
+  @Field val containerColor: Color? = null,
+  @Field val modifiers: ModifierList = emptyList()
+) : Record
 
 data class PullToRefreshBoxProps(
   val isRefreshing: Boolean = false,
-  val modifiers: ModifierList = emptyList(),
-  val loadingIndicatorModifiers: ModifierList = emptyList()
+  val contentAlignment: ContentAlignment? = null,
+  val indicator: PullToRefreshIndicatorProps = PullToRefreshIndicatorProps(),
+  val modifiers: ModifierList = emptyList()
 ) : ComposeProps
 
 @Composable
@@ -26,11 +40,14 @@ fun FunctionalComposableScope.PullToRefreshBoxContent(props: PullToRefreshBoxPro
     isRefreshing = isRefreshing,
     onRefresh = { onRefresh() },
     state = pullToRefreshState,
+    contentAlignment = props.contentAlignment?.toComposeAlignment() ?: Alignment.TopStart,
     indicator = {
       PullToRefreshDefaults.LoadingIndicator(
         isRefreshing = isRefreshing,
         state = pullToRefreshState,
-        modifier = ModifierRegistry.applyModifiers(props.loadingIndicatorModifiers, appContext, composableScope, globalEventDispatcher)
+        modifier = ModifierRegistry.applyModifiers(props.indicator.modifiers, appContext, composableScope, globalEventDispatcher),
+        color = props.indicator.color.composeOrNull ?: MaterialTheme.colorScheme.primary,
+        containerColor = props.indicator.containerColor.composeOrNull ?: MaterialTheme.colorScheme.surfaceContainerHigh
       )
     },
     modifier = ModifierRegistry.applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher)

package/android/src/main/java/expo/modules/ui/SlotView.kt

@@ -34,6 +34,14 @@ class SlotView(context: Context, appContext: AppContext) :
   }
 }
 
+/**
+ * Renders the slot content within a new [ComposableScope].
+ */
+@Composable
+fun SlotView.renderSlot() {
+  with(ComposableScope()) { with(this@renderSlot) { Content() } }
+}
+
 fun isSlotWithName(view: ExpoComposeView<*>, slotName: String): Boolean {
   return view is SlotView && view.props.slotName.value == slotName
 }

package/android/src/main/java/expo/modules/ui/SurfaceView.kt

@@ -5,32 +5,109 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.unit.dp
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
 import expo.modules.kotlin.views.ComposableScope
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.FunctionalComposableScope
 
+
+data class SurfaceBorder(
+  @Field val width: Float = 1f,
+  @Field val color: Color? = null
+) : Record
+
 data class SurfaceProps(
   val color: Color? = null,
   val contentColor: Color? = null,
-  val tonalElevation: Float = 0f,
-  val shadowElevation: Float = 0f,
+  val tonalElevation: Float? = null,
+  val shadowElevation: Float? = null,
+  val shape: ShapeRecord? = null,
+  val border: SurfaceBorder? = null,
+  val clickable: Boolean = false,
+  val enabled: Boolean = true,
+  val selected: Boolean? = null,
+  val checked: Boolean? = null,
   val modifiers: ModifierList = emptyList()
 ) : ComposeProps
 
 @Composable
-fun FunctionalComposableScope.SurfaceContent(props: SurfaceProps) {
+fun FunctionalComposableScope.SurfaceContent(
+  props: SurfaceProps,
+  onClick: () -> Unit,
+  onCheckedChange: (Boolean) -> Unit
+) {
   val modifier = ModifierRegistry.applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher)
   val color = props.color?.compose ?: MaterialTheme.colorScheme.surface
   val contentColor = props.contentColor?.compose ?: contentColorFor(color)
+  val shape = remember(props.shape) { shapeFromShapeRecord(props.shape) ?: RectangleShape }
+  val tonalElevation = (props.tonalElevation ?: 0f).dp
+  val shadowElevation = (props.shadowElevation ?: 0f).dp
+  val outlineColor = MaterialTheme.colorScheme.outline
+  val border = remember(props.border, outlineColor) {
+    props.border?.let { b ->
+      val bColor = b.color.composeOrNull ?: outlineColor
+      androidx.compose.foundation.BorderStroke(b.width.dp, bColor)
+    }
+  }
+
+  val content: @Composable () -> Unit = { Children(ComposableScope()) }
 
-  Surface(
-    modifier = modifier,
-    color = color,
-    contentColor = contentColor,
-    tonalElevation = props.tonalElevation.dp,
-    shadowElevation = props.shadowElevation.dp
-  ) {
-    Children(ComposableScope())
+  when {
+    // Toggleable variant
+    props.checked != null -> Surface(
+      checked = props.checked,
+      onCheckedChange = { onCheckedChange(it) },
+      modifier = modifier,
+      enabled = props.enabled,
+      shape = shape,
+      color = color,
+      contentColor = contentColor,
+      tonalElevation = tonalElevation,
+      shadowElevation = shadowElevation,
+      border = border,
+      content = content
+    )
+    // Selectable variant
+    props.selected != null -> Surface(
+      selected = props.selected,
+      onClick = { onClick() },
+      modifier = modifier,
+      enabled = props.enabled,
+      shape = shape,
+      color = color,
+      contentColor = contentColor,
+      tonalElevation = tonalElevation,
+      shadowElevation = shadowElevation,
+      border = border,
+      content = content
+    )
+    // Clickable variant
+    props.clickable -> Surface(
+      onClick = { onClick() },
+      modifier = modifier,
+      enabled = props.enabled,
+      shape = shape,
+      color = color,
+      contentColor = contentColor,
+      tonalElevation = tonalElevation,
+      shadowElevation = shadowElevation,
+      border = border,
+      content = content
+    )
+    // Basic (non-interactive) variant
+    else -> Surface(
+      modifier = modifier,
+      shape = shape,
+      color = color,
+      contentColor = contentColor,
+      tonalElevation = tonalElevation,
+      shadowElevation = shadowElevation,
+      border = border,
+      content = content
+    )
   }
 }

package/android/src/main/java/expo/modules/ui/TextInputView.kt

@@ -12,21 +12,27 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.types.Enumerable
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ComposableScope
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.ExpoComposeView
 
+enum class TextInputViewVariant(val value: String) : Enumerable {
+  FILLED("filled"),
+  OUTLINED("outlined"),
+}
+
 data class TextInputProps(
   val defaultValue: MutableState<String> = mutableStateOf(""),
   val placeholder: MutableState<String> = mutableStateOf(""),
-  val variant: MutableState<String> = mutableStateOf("filled"),
+  val variant: MutableState<TextInputViewVariant> = mutableStateOf(TextInputViewVariant.FILLED),
   val multiline: MutableState<Boolean> = mutableStateOf(false),
   val numberOfLines: MutableState<Int?> = mutableStateOf(null),
   val keyboardType: MutableState<String> = mutableStateOf("default"),
   val autocorrection: MutableState<Boolean> = mutableStateOf(true),
   val autoCapitalize: MutableState<String> = mutableStateOf("none"),
-  val modifiers: MutableState<ModifierList> = mutableStateOf(emptyList())
+  val modifiers: MutableState<ModifierList> = mutableStateOf(emptyList()),
 ) : ComposeProps
 
 private fun String.keyboardType(): KeyboardType {
@@ -85,9 +91,13 @@ class TextInputView(context: Context, appContext: AppContext) :
       autoCorrectEnabled = props.autocorrection.value,
       capitalization = props.autoCapitalize.value.autoCapitalize()
     )
+    val labelSlotView = findChildSlotView(this@TextInputView, "label")
+    val label: (@Composable () -> Unit)? = labelSlotView?.let {
+      { with(ComposableScope()) { with(it) { Content() } } }
+    }
     val modifier = ModifierRegistry.applyModifiers(props.modifiers.value, appContext, this@Content, globalEventDispatcher)
 
-    if (props.variant.value == "outlined") {
+    if (props.variant.value == TextInputViewVariant.OUTLINED) {
       OutlinedTextField(
         value = value,
         onValueChange = onValueChange,
@@ -95,6 +105,7 @@ class TextInputView(context: Context, appContext: AppContext) :
         maxLines = maxLines,
         singleLine = singleLine,
         keyboardOptions = keyboardOptions,
+        label = label,
         modifier = modifier
       )
     } else {
@@ -105,6 +116,7 @@ class TextInputView(context: Context, appContext: AppContext) :
         maxLines = maxLines,
         singleLine = singleLine,
         keyboardOptions = keyboardOptions,
+        label = label,
         modifier = modifier
       )
     }